From 6acf10c0d43487816ee9d434b298017e1d1bcedf Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Wed, 19 Feb 2020 11:54:55 +0100
Subject: [PATCH 001/144] extend retained warranty to be  available for all
 invoices

---
 htdocs/admin/facture_situation.php            |   4 +-
 htdocs/compta/facture/card.php                | 247 ++++++++++--------
 htdocs/compta/facture/class/facture.class.php |  49 +++-
 htdocs/compta/facture/list.php                |   4 +-
 .../facture/doc/pdf_sponge.modules.php        |  57 ++--
 .../install/mysql/migration/11.0.0-12.0.0.sql |   4 +-
 htdocs/langs/en_US/bills.lang                 |   2 +
 7 files changed, 204 insertions(+), 163 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 408b762358e..aced29bc125 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -96,7 +96,9 @@ print "</tr>\n";
 
 _printOnOff('INVOICE_USE_SITUATION', $langs->trans('UseSituationInvoices'));
 _printOnOff('INVOICE_USE_SITUATION_CREDIT_NOTE', $langs->trans('UseSituationInvoicesCreditNote'));
-_printOnOff('INVOICE_USE_SITUATION_RETAINED_WARRANTY', $langs->trans('Retainedwarranty'));
+_printOnOff('INVOICE_USE_RETAINED_WARRANTY',$langs->trans('Retainedwarranty'));
+_printOnOff('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION',$langs->trans('RetainedwarrantyOnlyForSituation'));
+_printOnOff('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL',$langs->trans('RetainedwarrantyOnlyForSituationFinal'));
 
 $metas = array(
     'type' => 'number',
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5038079085b..593e33734c5 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -136,7 +136,12 @@ if ($user->socid) $socid = $user->socid;
 $isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid, $isdraft);
 
-
+// retained warranty invoice available type
+if(empty($conf->global->USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION)) {
+	$RetainedWarrantyInvoiceAvailableType = array( Facture::TYPE_SITUATION, Facture::TYPE_STANDARD);
+} else {
+	$RetainedWarrantyInvoiceAvailableType = array( Facture::TYPE_SITUATION );
+}
 
 /*
  * Actions
@@ -1308,18 +1313,17 @@ if (empty($reshook))
 					$object->situation_counter = 1;
 					$object->situation_final = 0;
 					$object->situation_cycle_ref = $object->newCycle();
-
-
-					$object->retained_warranty = GETPOST('retained_warranty', 'int');
-					$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-
-				    $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
-				    if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
-				        $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
-				    }
-				    $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
 				}
 
+				$object->retained_warranty  = GETPOST('retained_warranty', 'int');
+				$object->retained_warranty_fk_cond_reglement  = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+
+				$retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
+				if(!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)){
+					$object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
+				}
+				$object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+
 				$object->fetch_thirdparty();
 
 				// If creation from another object of another module (Example: origin=propal, originid=1)
@@ -1714,6 +1718,23 @@ if (empty($reshook))
 					$object->origin = $origin;
 					$object->origin_id = $originid;
 
+					// retained warranty
+					if(!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY))
+					{
+					    $retained_warranty = GETPOST('retained_warranty');
+					    if(price2num($retained_warranty) > 0)
+					    {
+					        $object->retained_warranty  = price2num($retained_warranty);
+					    }
+
+					    if(GETPOST('retained_warranty_fk_cond_reglement', 'int') > 0)
+					    {
+					        $object->retained_warranty_fk_cond_reglement  = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+					    }
+
+					    $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+					}
+
 					foreach ($object->lines as $i => &$line)
 					{
 						$line->origin = $object->origin;
@@ -3309,40 +3330,41 @@ if ($action == 'create')
 	$form->select_conditions_paiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
-	if (!empty($conf->global->INVOICE_USE_SITUATION))
-	{
-	    if ($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY) {
-	        $rwStyle = 'display:none;';
-	        if (GETPOST('type', 'int') == Facture::TYPE_SITUATION) {
-	            $rwStyle = '';
-	        }
 
-	        $retained_warranty = GETPOST('retained_warranty', 'int');
-	        $retained_warranty = !empty($retained_warranty) ? $retained_warranty : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
-	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
-	        print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
+	if($conf->global->INVOICE_USE_RETAINED_WARRANTY){
 
-	        // Retained warranty payment term
-	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td><td colspan="2">';
-	        $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-	        $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
-	        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
-	        print '</td></tr>';
+		$rwStyle = 'display:none;';
+		if(in_array(GETPOST('type', 'int'), $RetainedWarrantyInvoiceAvailableType)){
+			$rwStyle = '';
+		}
 
-	        print '<script type="text/javascript" language="javascript">
-    		$(document).ready(function() {
-    			$("[name=\'type\'").change(function() {
-    				if($( this ).prop("checked") && $( this ).val() == '.Facture::TYPE_SITUATION.')
-                    {
-                        $(".retained-warranty-line").show();
-                    }
-                    else{
-                        $(".retained-warranty-line").hide();
-                    }
-    			});
-    		});
-    		</script>';
-	    }
+
+		$retained_warranty = GETPOST('retained_warranty', 'int');
+		$retained_warranty = !empty($retained_warranty)?$retained_warranty:$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
+		print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">' . $langs->trans('RetainedWarranty') . '</td><td colspan="2">';
+		print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
+
+		// Retained warranty payment term
+		print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">' . $langs->trans('PaymentConditionsShortRetainedWarranty') . '</td><td colspan="2">';
+		$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+		$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement)? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+		$form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+		print '</td></tr>';
+
+		print '<script type="text/javascript" language="javascript">
+		$(document).ready(function() {
+			$("[name=\'type\']").change(function() {
+
+				if($( this ).prop("checked") && $.inArray(parseInt($( this ).val()), '.json_encode($RetainedWarrantyInvoiceAvailableType).' ) !== -1)
+				{
+					$(".retained-warranty-line").show();
+				}
+				else{
+					$(".retained-warranty-line").hide();
+				}
+			});
+		});
+		</script>';
 	}
 
 	// Payment mode
@@ -4243,89 +4265,82 @@ elseif ($id > 0 || !empty($ref))
 		print '</td></tr>';
 	}
 
-	$displayWarranty = false;
-	if (($object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY))))
-	{
-	    // Check if this situation invoice is 100% for real
-	    if (!empty($object->situation_final) && !empty($object->lines)) {
-	        $displayWarranty = true;
-	        foreach ($object->lines as $i => $line) {
-	            if ($line->product_type < 2 && $line->situation_percent < 100) {
-	                $displayWarranty = false;
-	                break;
-	            }
-	        }
-	    }
 
 
+	if(!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
 
-    	// Retained Warranty
-    	print '<tr class="retained-warranty-lines"  ><td>';
-    	print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
-    	print $langs->trans('RetainedWarranty');
-    	print '</td>';
-    	if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
-    	    print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
-    	}
+		$displayWarranty = true;
+		if(!in_array($object->type, $RetainedWarrantyInvoiceAvailableType) && empty($object->retained_warranty)){
+			$displayWarranty = false;
+		}
 
-        print '</tr></table>';
-        print '</td><td>';
-        if ($action == 'editretainedwarranty')
-        {
-            print '<form  id="retained-warranty-form"  method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
-            print '<input type="hidden" name="action" value="setretainedwarranty">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input name="retained_warranty" type="number" step="0.01" min="0" max="100" value="'.$object->retained_warranty.'" >';
-            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            print '</form>';
-        }
-        else
-        {
-            print price($object->retained_warranty).'%';
-        }
-        print '</td></tr>';
+		if($displayWarranty)
+		{
 
-        // Retained warranty payment term
-        print '<tr class="retained-warranty-lines"  ><td>';
-        print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
-        print $langs->trans('PaymentConditionsShortRetainedWarranty');
-        print '</td>';
-        if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
-            print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
-        }
+			// Retained Warranty
+			print '<tr class="retained-warranty-lines"  ><td>';
+			print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('RetainedWarranty');
+			print '</td>';
+			if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
+			}
 
-        print '</tr></table>';
-        print '</td><td>';
-        $defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
-        if ($object->date > $defaultDate) {
-            $defaultDate = $object->date;
-        }
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editretainedwarranty')
+			{
+				print '<form  id="retained-warranty-form"  method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="setretainedwarranty">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input name="retained_warranty" type="number" step="0.01" min="0" max="100" value="'.$object->retained_warranty.'" >';
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			}
+			else
+			{
+				print price($object->retained_warranty).'%';
+			}
+			print '</td></tr>';
 
-        if ($action == 'editretainedwarrantypaymentterms')
-        {
-            //date('Y-m-d',$object->date_lim_reglement)
-            print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
-            print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-            $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $object->retained_warranty_fk_cond_reglement;
-            $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
-            $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
-            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            print '</form>';
-        }
-        else
-        {
-            $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
-            if (!$displayWarranty) {
-                print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
-            }
-        }
-        print '</td></tr>';
+			// Retained warranty payment term
+			print '<tr class="retained-warranty-lines"  ><td>';
+			print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('PaymentConditionsShortRetainedWarranty');
+			print '</td>';
+			if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
+			}
 
+			print '</tr></table>';
+			print '</td><td>';
+			$defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
+			if ($object->date > $defaultDate) {
+				$defaultDate = $object->date;
+			}
+
+			if ($action == 'editretainedwarrantypaymentterms')
+			{
+				//date('Y-m-d',$object->date_lim_reglement)
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+				$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $object->retained_warranty_fk_cond_reglement;
+				$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+				$form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			}
+			else
+			{
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
+				if (!$displayWarranty) {
+					print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
+				}
+			}
+			print '</td></tr>';
 
-        if ($displayWarranty)
-        {
             // Retained Warranty payment date limit
             print '<tr class="retained-warranty-lines"  ><td>';
             print '<table id="retained-warranty-date-limit-table"  class="nobordernopadding" width="100%"><tr><td>';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index cb2bf087652..30f3867a843 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -297,9 +297,9 @@ class Facture extends CommonInvoice
 		'situation_cycle_ref' =>array('type'=>'smallint(6)', 'label'=>'Situation cycle ref', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION', 'visible'=>-1, 'position'=>230),
 		'situation_counter' =>array('type'=>'smallint(6)', 'label'=>'Situation counter', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION', 'visible'=>-1, 'position'=>235),
 		'situation_final' =>array('type'=>'smallint(6)', 'label'=>'Situation final', 'enabled'=>'empty($conf->global->INVOICE_USE_SITUATION) ? 0 : 1', 'visible'=>-1, 'position'=>240),
-		'retained_warranty' =>array('type'=>'double', 'label'=>'Retained warranty', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>245),
-		'retained_warranty_date_limit' =>array('type'=>'date', 'label'=>'Retained warranty date limit', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>250),
-		'retained_warranty_fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Retained warranty fk cond reglement', 'enabled'=>'$conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>255),
+		'retained_warranty' =>array('type'=>'double', 'label'=>'Retained warranty', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>245),
+		'retained_warranty_date_limit' =>array('type'=>'date', 'label'=>'Retained warranty date limit', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>250),
+		'retained_warranty_fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Retained warranty fk cond reglement', 'enabled'=>'$conf->global->INVOICE_USE_RETAINED_WARRANTY', 'visible'=>-1, 'position'=>255),
 		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermsCode', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>260),
 		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermsLocation', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-1, 'position'=>265),
 		'date_pointoftax' =>array('type'=>'date', 'label'=>'DatePointOfTax', 'enabled'=>'$conf->global->INVOICE_POINTOFTAX_DATE', 'visible'=>-1, 'position'=>270),
@@ -4606,6 +4606,42 @@ class Facture extends CommonInvoice
 		return $hasDelay;
 	}
 
+	/**
+	 * Currently used for documents generation : to know if retained warranty need to be displayed
+	 * @return bool
+	 */
+	function displayRetainedWarranty(){
+		global $conf;
+
+		// TODO : add a flag on invoices to store this conf : USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL
+
+		// note : we dont need to test USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION because if $this->retained_warranty is not empty it's because it was set when this conf was active
+
+		$displayWarranty = false;
+		if(!empty($this->retained_warranty)) {
+			$displayWarranty = true;
+
+			if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL)) {
+				// Check if this situation invoice is 100% for real
+				$displayWarranty = false;
+				if (!empty($this->situation_final)) {
+					$displayWarranty = true;
+				} elseif (!empty($this->lines) && $this->status == Facture::STATUS_DRAFT) {
+					// $object->situation_final need validation to be done so this test is need for draft
+					$displayWarranty = true;
+
+					foreach ($this->lines as $i => $line) {
+						if ($line->product_type < 2 && $line->situation_percent < 100) {
+							$displayWarranty = false;
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return $displayWarranty;
+	}
 
 	/**
 	 * @param	int			$rounding		Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)
@@ -4621,7 +4657,7 @@ class Facture extends CommonInvoice
 	    $retainedWarrantyAmount = 0;
 
 	    // Billed - retained warranty
-	    if ($this->type == Facture::TYPE_SITUATION)
+	    if($this->type == Facture::TYPE_SITUATION && !empty($conf->global->USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL))
 	    {
 	        $displayWarranty = true;
 	        // Check if this situation invoice is 100% for real
@@ -4659,7 +4695,10 @@ class Facture extends CommonInvoice
 
 		if ($rounding < 0){
 			$rounding=min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
-			return round($retainedWarrantyAmount, 2);
+		}
+
+		if($rounding>0){
+			return round($retainedWarrantyAmount, $rounding);
 		}
 
 	    return $retainedWarrantyAmount;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index b32d82a08cb..dc685c0a893 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -188,7 +188,7 @@ $arrayfields = array(
 	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 
-if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY)
 {
 	$arrayfields['f.retained_warranty'] = array('label'=>$langs->trans("RetainedWarranty"), 'checked'=>0, 'position'=>86);
 }
@@ -1002,7 +1002,7 @@ if ($resql)
 			$facturestatic->date_lim_reglement = $db->jdate($obj->datelimite);
 			$facturestatic->note_public = $obj->note_public;
 			$facturestatic->note_private = $obj->note_private;
-			if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_SITUATION_RETAINED_WARRANTY)
+			if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY)
 			{
 			     $facturestatic->retained_warranty = $obj->retained_warranty;
 			     $facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index a9d1230fdec..5ab59275666 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1663,51 +1663,32 @@ class pdf_sponge extends ModelePDFFactures
 
 
 				// Retained warranty
-				if (!empty($object->situation_final) && ($object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty))))
+				if ($object->displayRetainedWarranty())
 				{
-				    $displayWarranty = false;
+					$pdf->SetTextColor(40, 40, 40);
+					$pdf->SetFillColor(255, 255, 255);
 
-				    // Check if this situation invoice is 100% for real
-				    if (!empty($object->situation_final)) {
-				        $displayWarranty = true;
-				    }
-				    elseif (!empty($object->lines) && $object->status == Facture::STATUS_DRAFT) {
-				        // $object->situation_final need validation to be done so this test is need for draft
-				        $displayWarranty = true;
-				        foreach ($object->lines as $i => $line) {
-				            if ($line->product_type < 2 && $line->situation_percent < 100) {
-				                $displayWarranty = false;
-				                break;
-							}
-						}
-					}
+					$retainedWarranty = $object->getRetainedWarrantyAmount();
+					$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
 
-				    if ($displayWarranty) {
-				        $pdf->SetTextColor(40, 40, 40);
-				        $pdf->SetFillColor(255, 255, 255);
+					// Billed - retained warranty
+					$index++;
+					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFEVOLToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
 
-				        $retainedWarranty = $total_a_payer_ttc * $object->retained_warranty / 100;
-				        $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
+					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
 
-				        // Billed - retained warranty
-				        $index++;
-				        $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				        $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFEVOLToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
+					// retained warranty
+					$index++;
+					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-				        $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				        $pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
+					$retainedWarrantyToPayOn = $outputlangs->transnoentities("PDFEVOLRetainedWarranty").' ('.$object->retained_warranty.'%)';
+					$retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("PDFEVOLtoPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 
-				        // retained warranty
-				        $index++;
-				        $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-				        $retainedWarrantyToPayOn = $outputlangs->transnoentities("PDFEVOLRetainedWarranty").' ('.$object->retained_warranty.'%)';
-				        $retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("PDFEVOLtoPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
-
-				        $pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
-				        $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				        $pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
-				    }
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
+					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
 				}
 			}
 		}
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 447630e7eb2..bf641871be9 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -163,4 +163,6 @@ INSERT INTO llx_c_ticket_resolution (code, pos, label, active, use_default, desc
 INSERT INTO llx_c_ticket_resolution (code, pos, label, active, use_default, description) VALUES('CANCELED', '50', 'Canceled',  1, 0, NULL);
 INSERT INTO llx_c_ticket_resolution (code, pos, label, active, use_default, description) VALUES('OTHER',    '90', 'Other',     1, 0, NULL);
 
-DELETE FROM llx_const WHERE name = __ENCRYPT('DONATION_ART885')__;
\ No newline at end of file
+DELETE FROM llx_const WHERE name = __ENCRYPT('DONATION_ART885')__;
+
+UPDATE llx_const SET name = 'INVOICE_USE_RETAINED_WARRANTY' WHERE name = 'INVOICE_USE_SITUATION_RETAINED_WARRANTY'
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 6d7c61784f7..fe33c173cea 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -220,6 +220,8 @@ UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
 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

From 028566616d5f4210383afa249ad338f8e0586a25 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 19 Feb 2020 11:07:42 +0000
Subject: [PATCH 002/144] Fixing style errors.

---
 htdocs/admin/facture_situation.php            | 6 +++---
 htdocs/compta/facture/card.php                | 1 -
 htdocs/compta/facture/class/facture.class.php | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index aced29bc125..0a4c36cb8a8 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -96,9 +96,9 @@ print "</tr>\n";
 
 _printOnOff('INVOICE_USE_SITUATION', $langs->trans('UseSituationInvoices'));
 _printOnOff('INVOICE_USE_SITUATION_CREDIT_NOTE', $langs->trans('UseSituationInvoicesCreditNote'));
-_printOnOff('INVOICE_USE_RETAINED_WARRANTY',$langs->trans('Retainedwarranty'));
-_printOnOff('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION',$langs->trans('RetainedwarrantyOnlyForSituation'));
-_printOnOff('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL',$langs->trans('RetainedwarrantyOnlyForSituationFinal'));
+_printOnOff('INVOICE_USE_RETAINED_WARRANTY', $langs->trans('Retainedwarranty'));
+_printOnOff('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituation'));
+_printOnOff('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL', $langs->trans('RetainedwarrantyOnlyForSituationFinal'));
 
 $metas = array(
     'type' => 'number',
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 593e33734c5..75e56b580a4 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3332,7 +3332,6 @@ if ($action == 'create')
 
 
 	if($conf->global->INVOICE_USE_RETAINED_WARRANTY){
-
 		$rwStyle = 'display:none;';
 		if(in_array(GETPOST('type', 'int'), $RetainedWarrantyInvoiceAvailableType)){
 			$rwStyle = '';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 30f3867a843..135d30ef576 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4610,7 +4610,8 @@ class Facture extends CommonInvoice
 	 * Currently used for documents generation : to know if retained warranty need to be displayed
 	 * @return bool
 	 */
-	function displayRetainedWarranty(){
+	function displayRetainedWarranty()
+	{
 		global $conf;
 
 		// TODO : add a flag on invoices to store this conf : USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL

From d65c17df7dd323c3743f68a733699c283d8040a6 Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Wed, 19 Feb 2020 12:30:52 +0100
Subject: [PATCH 003/144] Add retained warranty for all invoice for crabe PDF

---
 .../modules/facture/doc/pdf_crabe.modules.php | 52 +++++++------------
 1 file changed, 19 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 6e8918920a6..7dc9aa245e9 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1377,47 +1377,33 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 
 				// Retained warranty
-				if (!empty($object->situation_final) && ($object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty))))
+				if ($object->displayRetainedWarranty())
 				{
-					$displayWarranty = false;
+					$pdf->SetTextColor(40, 40, 40);
+					$pdf->SetFillColor(255, 255, 255);
 
-				    // Check if this situation invoice is 100% for real
-				    if (!empty($object->lines)) {
-				        $displayWarranty = true;
-				        foreach ($object->lines as $i => $line) {
-				            if ($line->product_type < 2 && $line->situation_percent < 100) {
-				                $displayWarranty = false;
-				                break;
-				            }
-						}
-				    }
+					$retainedWarranty = $object->getRetainedWarrantyAmount();
+					$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
 
-				    if ($displayWarranty) {
-    				    $pdf->SetTextColor(40, 40, 40);
-    				    $pdf->SetFillColor(255, 255, 255);
+					// Billed - retained warranty
+					$index++;
+					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
 
-    				    $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
-    				    $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
+					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
 
-    				    // Billed - retained warranty
-    				    $index++;
-    				    $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-    				    $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
+					// retained warranty
+					$index++;
+					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-    				    $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-    				    $pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
+					$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty").' ('.$object->retained_warranty.'%)';
+					$retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 
-    				    // retained warranty
-    				    $index++;
-    				    $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
+					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
 
-    				    $retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty").' ('.$object->retained_warranty.'%)';
-    				    $retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
-
-    				    $pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
-    				    $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-    				    $pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
-				    }
 				}
 			}
 		}

From 729048a1131f7e5402edc01d5cc8f01dfde79c31 Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Wed, 19 Feb 2020 12:33:36 +0100
Subject: [PATCH 004/144] Fix langs

---
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 5ab59275666..82a55fbf319 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1674,7 +1674,7 @@ class pdf_sponge extends ModelePDFFactures
 					// Billed - retained warranty
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFEVOLToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
@@ -1683,8 +1683,8 @@ class pdf_sponge extends ModelePDFFactures
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-					$retainedWarrantyToPayOn = $outputlangs->transnoentities("PDFEVOLRetainedWarranty").' ('.$object->retained_warranty.'%)';
-					$retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("PDFEVOLtoPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
+					$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty").' ('.$object->retained_warranty.'%)';
+					$retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 
 					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);

From 4865e34cc2610dd66561bc838d160306cab8ad5c Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 25 Feb 2020 23:02:13 +0100
Subject: [PATCH 005/144] fix missing visibility

---
 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 24d4b40d339..30a607afc0a 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4713,7 +4713,7 @@ class Facture extends CommonInvoice
 	 * Currently used for documents generation : to know if retained warranty need to be displayed
 	 * @return bool
 	 */
-	function displayRetainedWarranty()
+	public function displayRetainedWarranty()
 	{
 		global $conf;
 

From 035bb671f25f601bc4680639dec36d2da065af5f Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 31 Mar 2020 16:32:07 +0200
Subject: [PATCH 006/144] Fix sql ; missing

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

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 4959d3afdc5..70eb7c7357c 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -189,7 +189,7 @@ DELETE FROM llx_const WHERE name = __ENCRYPT('DONATION_ART885')__;
 ALTER TABLE llx_extrafields MODIFY COLUMN printable integer DEFAULT 0;
 ALTER TABLE llx_extrafields ADD COLUMN printable integer DEFAULT 0;
 
-UPDATE llx_const SET name = 'INVOICE_USE_RETAINED_WARRANTY' WHERE name = 'INVOICE_USE_SITUATION_RETAINED_WARRANTY'
+UPDATE llx_const SET name = 'INVOICE_USE_RETAINED_WARRANTY' WHERE name = 'INVOICE_USE_SITUATION_RETAINED_WARRANTY';
 
 ALTER TABLE llx_accounting_account DROP COLUMN pcg_subtype;
 

From 004d9381f51f65de155ff3aa266457b1d398b52d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 31 Mar 2020 14:36:42 +0000
Subject: [PATCH 007/144] Fixing style errors.

---
 htdocs/compta/facture/card.php                | 20 +++++++++----------
 htdocs/compta/facture/class/facture.class.php |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 8495bc8be70..8dec5123623 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3359,18 +3359,18 @@ if ($action == 'create')
 
 	if($conf->global->INVOICE_USE_RETAINED_WARRANTY){
 	        $rwStyle = 'display:none;';
-			if(in_array(GETPOST('type', 'int'), $RetainedWarrantyInvoiceAvailableType)){
-	            $rwStyle = '';
-	        }
+		if(in_array(GETPOST('type', 'int'), $RetainedWarrantyInvoiceAvailableType)){
+			$rwStyle = '';
+		}
 
 	        $retained_warranty = GETPOST('retained_warranty', 'int');
-	        if(empty($retained_warranty)){
-                if(!empty($objectsrc->retained_warranty)){ // use previous situation value
-                    $retained_warranty = $objectsrc->retained_warranty;
-                }else{
-                    $retained_warranty = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
-                }
-            }
+		if(empty($retained_warranty)){
+			if(!empty($objectsrc->retained_warranty)){ // use previous situation value
+				$retained_warranty = $objectsrc->retained_warranty;
+			}else{
+				$retained_warranty = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
+			}
+		}
 
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
 	        print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 7860ee93f0a..0b1915a6fc9 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3724,10 +3724,10 @@ class Facture extends CommonInvoice
 			$moduleSourceName = 'Invoice';
 			$addonConstName = 'FACTURE_ADDON';
 
-		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->FACTURE_ADDON)) $conf->global->FACTURE_ADDON = 'mod_facture_terre';
-		elseif ($conf->global->FACTURE_ADDON == 'terre') $conf->global->FACTURE_ADDON = 'mod_facture_terre';
-		elseif ($conf->global->FACTURE_ADDON == 'mercure') $conf->global->FACTURE_ADDON = 'mod_facture_mercure';
+			// Clean parameters (if not defined or using deprecated value)
+			if (empty($conf->global->FACTURE_ADDON)) $conf->global->FACTURE_ADDON = 'mod_facture_terre';
+			elseif ($conf->global->FACTURE_ADDON == 'terre') $conf->global->FACTURE_ADDON = 'mod_facture_terre';
+			elseif ($conf->global->FACTURE_ADDON == 'mercure') $conf->global->FACTURE_ADDON = 'mod_facture_mercure';
 
 			$addon = $conf->global->FACTURE_ADDON;
 		}

From 79fe66436525005b90c75975dcadb04692507775 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 31 Mar 2020 16:43:38 +0200
Subject: [PATCH 008/144] fix merge not applied

---
 htdocs/compta/facture/card.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 8dec5123623..62a84a51245 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -141,9 +141,9 @@ $result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid, $isd
 
 // retained warranty invoice available type
 if(empty($conf->global->USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION)) {
-	$RetainedWarrantyInvoiceAvailableType = array( Facture::TYPE_SITUATION, Facture::TYPE_STANDARD);
+	$retainedWarrantyInvoiceAvailableType = array( Facture::TYPE_SITUATION, Facture::TYPE_STANDARD);
 } else {
-	$RetainedWarrantyInvoiceAvailableType = array( Facture::TYPE_SITUATION );
+	$retainedWarrantyInvoiceAvailableType = array( Facture::TYPE_SITUATION );
 }
 
 
@@ -3359,7 +3359,7 @@ if ($action == 'create')
 
 	if($conf->global->INVOICE_USE_RETAINED_WARRANTY){
 	        $rwStyle = 'display:none;';
-		if(in_array(GETPOST('type', 'int'), $RetainedWarrantyInvoiceAvailableType)){
+		if(in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)){
 			$rwStyle = '';
 		}
 
@@ -3393,7 +3393,7 @@ if ($action == 'create')
     		$(document).ready(function() {
 			$("[name=\'type\']").change(function() {
 
-				if($( this ).prop("checked") && $.inArray(parseInt($( this ).val()), '.json_encode($RetainedWarrantyInvoiceAvailableType).' ) !== -1)
+				if($( this ).prop("checked") && $.inArray(parseInt($( this ).val()), '.json_encode($retainedWarrantyInvoiceAvailableType).' ) !== -1)
                     {
                         $(".retained-warranty-line").show();
                     }
@@ -4308,7 +4308,7 @@ elseif ($id > 0 || !empty($ref))
 	if(!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
 
 	    $displayWarranty = true;
-		if(!in_array($object->type, $RetainedWarrantyInvoiceAvailableType) && empty($object->retained_warranty)){
+		if(!in_array($object->type, $retainedWarrantyInvoiceAvailableType) && empty($object->retained_warranty)){
 	         $displayWarranty = false;
 	    }
 
@@ -4983,7 +4983,7 @@ elseif ($id > 0 || !empty($ref))
 	}
 
 	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid')).'" method="POST">
-	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'].'">
+	<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.'">
@@ -5179,7 +5179,7 @@ elseif ($id > 0 || !empty($ref))
 			}
 
 			// Classify paid
-			if (($object->statut == 1 && $object->paye == 0 && $usercanissuepayment && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0)))
+			if (($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0)))
 				|| ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 0 && $object->total_ttc > 0 && $resteapayer == 0 && $usercanissuepayment && empty($discount->id))
 			)
 			{

From 81adc6913e2eec36643b455ff390dbed3a3f0cff Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 1 Apr 2020 12:12:30 +0200
Subject: [PATCH 009/144] change conf usage

---
 htdocs/admin/facture_situation.php            | 31 ++++++++++++++++---
 htdocs/compta/facture/card.php                |  7 ++---
 htdocs/compta/facture/class/facture.class.php |  8 ++---
 htdocs/langs/en_US/bills.lang                 |  1 +
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 0a4c36cb8a8..65f7ca4b8de 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -96,9 +96,26 @@ print "</tr>\n";
 
 _printOnOff('INVOICE_USE_SITUATION', $langs->trans('UseSituationInvoices'));
 _printOnOff('INVOICE_USE_SITUATION_CREDIT_NOTE', $langs->trans('UseSituationInvoicesCreditNote'));
-_printOnOff('INVOICE_USE_RETAINED_WARRANTY', $langs->trans('Retainedwarranty'));
-_printOnOff('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituation'));
-_printOnOff('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL', $langs->trans('RetainedwarrantyOnlyForSituationFinal'));
+//_printOnOff('INVOICE_USE_RETAINED_WARRANTY', $langs->trans('Retainedwarranty'));
+
+$confkey = 'INVOICE_USE_RETAINED_WARRANTY';
+
+$arrayAvailableType = array(
+	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
+	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
+);
+$selected = array();
+$implodeglue = '+';
+if(!empty($conf->global->{$confkey}) && !is_array($conf->global->{$confkey})){
+	$selected = explode('+', $conf->global->{$confkey});
+}
+
+$curentInput = (empty($inputCount)?1:($inputCount+1));
+$formSelectInvoiceType = $form->selectarray('value'.  $curentInput, $arrayAvailableType, $selected, 1);
+_printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty'), '', array(), $formSelectInvoiceType);
+
+//_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituation'));
+_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituationFinal'));
 
 $metas = array(
     'type' => 'number',
@@ -228,9 +245,13 @@ function _printInputFormPart($confkey, $title = false, $desc = '', $metas = arra
 
     print '<input type="hidden" name="action" value="setModuleOptions">';
     if ($type=='textarea') {
-        print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
-    } else {
+		print '<textarea ' . $metascompil . '  >' . dol_htmlentities($conf->global->{$confkey}) . '</textarea>';
+	}elseif($type=='input'){
         print '<input '.$metascompil.'  />';
     }
+	else{
+		// custom
+		print $type;
+	}
     print '</td></tr>';
 }
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 62a84a51245..ada61efae91 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -140,10 +140,9 @@ $isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid, $isdraft);
 
 // retained warranty invoice available type
-if(empty($conf->global->USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION)) {
-	$retainedWarrantyInvoiceAvailableType = array( Facture::TYPE_SITUATION, Facture::TYPE_STANDARD);
-} else {
-	$retainedWarrantyInvoiceAvailableType = array( Facture::TYPE_SITUATION );
+$retainedWarrantyInvoiceAvailableType=array();
+if(!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
+	$retainedWarrantyInvoiceAvailableType = explode('+', $conf->global->INVOICE_USE_RETAINED_WARRANTY);
 }
 
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 0b1915a6fc9..af709cec2c4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4750,15 +4750,15 @@ class Facture extends CommonInvoice
 	{
 		global $conf;
 
-		// TODO : add a flag on invoices to store this conf : USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL
+		// TODO : add a flag on invoices to store this conf : INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION
 
-		// note : we dont need to test USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION because if $this->retained_warranty is not empty it's because it was set when this conf was active
+		// note : we dont need to test INVOICE_USE_RETAINED_WARRANTY because if $this->retained_warranty is not empty it's because it was set when this conf was active
 
 		$displayWarranty = false;
 		if(!empty($this->retained_warranty)) {
 			$displayWarranty = true;
 
-			if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL)) {
+			if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION)) {
 				// Check if this situation invoice is 100% for real
 				$displayWarranty = false;
 				if (!empty($this->situation_final)) {
@@ -4794,7 +4794,7 @@ class Facture extends CommonInvoice
 	    $retainedWarrantyAmount = 0;
 
 	    // Billed - retained warranty
-	    if($this->type == Facture::TYPE_SITUATION && !empty($conf->global->USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL))
+	    if($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION))
 	    {
 	        $displayWarranty = true;
 	        // Check if this situation invoice is 100% for real
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index d2b830119ca..36747c4625a 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -219,6 +219,7 @@ ShowInvoiceSituation=Show situation invoice
 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

From 26befa3b93f2f2fb51d03296f1e9ac7cbb64ce17 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 13 Apr 2020 15:38:50 +0200
Subject: [PATCH 010/144] New fields on usergroup object + card uses common tpl

---
 htdocs/user/class/usergroup.class.php |  10 ++
 htdocs/user/group/card.php            | 135 ++++++++++++--------------
 2 files changed, 70 insertions(+), 75 deletions(-)

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 1f8040a83ea..9c48c321196 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -100,6 +100,16 @@ class UserGroup extends CommonObject
 
 	public $oldcopy; // To contains a clone of this when we need to save old properties of object
 
+	public $fields = array(
+		'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
+		'nom'=>array('type'=>'varchar(180)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Group name'),
+		'note' => array('type'=>'html', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>20, 'notnull'=>-1,),
+		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>50, 'notnull'=>1,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>60, 'notnull'=>1,),
+		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>100),
+	);
+
 
 	/**
      *    Constructor de la classe
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 335b66ebdd2..f3ae62beed8 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -54,6 +54,7 @@ $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'groupcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
 
 $userid = GETPOST('user', 'int');
 
@@ -91,19 +92,20 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
+
+	$backurlforlist = DOL_URL_ROOT.'/user/group/list.php';
+
+	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('/user/group/card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+
 	if ($cancel)
 	{
-		if (!empty($backtopage))
-		{
-			header("Location: ".$backtopage);
-			exit;
-		}
-		else
-		{
-			header("Location: ".DOL_URL_ROOT.'/user/group/list.php');
-			exit;
-		}
-		$action = '';
+		header("Location: ".$backtopage);
+		exit;
 	}
 
 	// Action remove group
@@ -215,7 +217,7 @@ if (empty($reshook)) {
 
 			$object->oldcopy = clone $object;
 
-			$object->name	= trim(GETPOST("group", 'nohtml'));
+			$object->name	= trim(GETPOST("nom", 'nohtml'));
 			$object->nom = $object->name; // For backward compatibility
 			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
 
@@ -273,14 +275,11 @@ if ($action == 'create')
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
     print '<input type="hidden" name="token" value="'.newToken().'">';
     print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
     dol_fiche_head('', '', '', 0, '');
 
-    print '<table class="border centpercent">';
-
-	print "<tr>";
-	print '<td class="fieldrequired titlefield">'.$langs->trans("Name").'</td>';
-	print '<td><input type="text" id="nom" name="nom" value="'.dol_escape_htmltag(GETPOST('nom', 'nohtml')).'"></td></tr>';
+    print '<table class="border centpercent tableforfieldcreate">';
 
 	// Multicompany
 	if (!empty($conf->multicompany->enabled) && is_object($mc))
@@ -297,27 +296,18 @@ if ($action == 'create')
 		}
 	}
 
-    print "<tr>".'<td class="tdtop">'.$langs->trans("Description").'</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('note', '', '', 240, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
-    $doleditor->Create();
-    print "</td></tr>\n";
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 
 	// Other attributes
-    $parameters = array('object' => $object);
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
-    {
-		print $object->showOptionals($extrafields, 'edit');
-    }
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
-    print "</table>\n";
+	print "</table>\n";
 
     dol_fiche_end();
 
     print '<div class="center">';
-    print '<input class="button" value="'.$langs->trans("CreateGroup").'" type="submit">';
+    print '<input class="button" name="add" value="'.$langs->trans("CreateGroup").'" type="submit">';
     print ' &nbsp; ';
     print '<input class="button" value="'.$langs->trans("Cancel").'" name="cancel" type="submit">';
     print '</div>';
@@ -359,6 +349,7 @@ else
 			dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
 			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
 			print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border centpercent tableforfield">';
@@ -384,19 +375,18 @@ else
 				print "</td></tr>\n";
 			}
 
-			// Note
-			print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td>';
-			print '<td class="valeur sensiblehtmlcontent"">';
-			print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note));
-			print '</td>';
-			print "</tr>\n";
+			// Common attributes
+			$keyforbreak = '';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 			// Other attributes
-            $parameters = array('colspan' => ' colspan="2"');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-			print "</table>\n";
-            print '</div>';
+			print '</table>';
+			print '</div>';
+			print '</div>';
+
+			print '<div class="clearboth"></div>';
 
 			dol_fiche_end();
 
@@ -407,6 +397,10 @@ else
 
 			print '<div class="tabsAction">';
 
+			$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 ($caneditperms)
 			{
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
@@ -421,7 +415,7 @@ else
 
             // List users in group
 
-            print load_fiche_titre($langs->trans("ListOfUsersInGroup"), '', '');
+            print load_fiche_titre($langs->trans("ListOfUsersInGroup"), '', 'user');
 
             // On selectionne les users qui ne sont pas deja dans le groupe
             $exclude = array();
@@ -485,7 +479,7 @@ else
 						print '</td>';
 						print '<td>'.$useringroup->lastname.'</td>';
 						print '<td>'.$useringroup->firstname.'</td>';
-						print '<td class="center">'.$useringroup->getLibStatut(3).'</td>';
+						print '<td class="center">'.$useringroup->getLibStatut(5).'</td>';
 						print '<td class="right">';
 						if (!empty($user->admin)) {
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
@@ -542,53 +536,44 @@ else
 
         if ($action == 'edit' && $caneditperms)
         {
-            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post" name="updategroup" enctype="multipart/form-data">';
+            print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="updategroup" enctype="multipart/form-data">';
             print '<input type="hidden" name="token" value="'.newToken().'">';
             print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
             dol_fiche_head($head, 'group', $title, 0, 'group');
 
-            print '<table class="border centpercent">';
-            print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Name").'</td>';
-            print '<td class="valeur"><input class="minwidth300" type="text" name="group" value="'.dol_escape_htmltag($object->name).'">';
-            print "</td></tr>\n";
+			print '<table class="border centpercent tableforfieldedit">'."\n";
 
-            // Multicompany
-            if (!empty($conf->multicompany->enabled) && is_object($mc))
-            {
-                if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)
-                {
-                    print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
-                    print "<td>".$mc->select_entities($object->entity);
-                    print "</td></tr>\n";
-                }
-                else
-                {
+			// Multicompany
+			if (!empty($conf->multicompany->enabled) && is_object($mc))
+			{
+				if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)
+				{
+					print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
+					print "<td>".$mc->select_entities($object->entity);
+					print "</td></tr>\n";
+				}
+				else
+				{
 					print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 				}
-            }
+			}
+
+			// Common attributes
+			include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
 
-            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
-            print '<td class="valeur">';
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-            $doleditor = new DolEditor('note', $object->note, '', 240, 'dolibarr_notes', '', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
-            $doleditor->Create();
-            print '</td>';
-            print "</tr>\n";
 			// Other attributes
-            $parameters = array();
-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
-            if (empty($reshook))
-            {
-				print $object->showOptionals($extrafields, 'edit');
-            }
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
-            print "</table>\n";
+			print '</table>';
 
             dol_fiche_end();
 
-            print '<div class="center"><input class="button" value="'.$langs->trans("Save").'" type="submit"></div>';
+			print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+			print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '</div>';
 
             print '</form>';
         }

From 2e004e93ea2161b53260d67abab8a8c7452140c4 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 13 Apr 2020 19:02:19 +0200
Subject: [PATCH 011/144] Commonobject : delete extrafields + syslog

---
 htdocs/core/class/commonobject.class.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4b94f87c65f..dcbb25775e7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7876,6 +7876,7 @@ abstract class CommonObject
 	public function createCommon(User $user, $notrigger = false)
 	{
 		global $langs;
+		dol_syslog(get_class($this)."::createCommon create", LOG_DEBUG);
 
 		$error = 0;
 
@@ -8114,6 +8115,7 @@ abstract class CommonObject
 	public function updateCommon(User $user, $notrigger = false)
 	{
 		global $conf, $langs;
+		dol_syslog(get_class($this)."::updateCommon update", LOG_DEBUG);
 
 		$error = 0;
 
@@ -8203,6 +8205,8 @@ abstract class CommonObject
 	 */
 	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)
 	{
+		dol_syslog(get_class($this)."::deleteCommon delete", LOG_DEBUG);
+
 		$error = 0;
 
 		$this->db->begin();
@@ -8260,17 +8264,10 @@ abstract class CommonObject
 			}
 		}
 
-		if (!$error && !empty($this->isextrafieldmanaged))
+		if (!$error)
 		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
-			$sql .= " WHERE fk_object=".$this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
-				$this->errors[] = $this->db->lasterror();
-				$error++;
-			}
+			$result = $this->deleteExtraFields();
+			if ($result < 0) { $error++; }
 		}
 
 		if (!$error)

From b8a0b4b6e4b86e6576fb7b3bbc4e3d2ffa4e9967 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 13 Apr 2020 19:03:48 +0200
Subject: [PATCH 012/144] New class UserGroup works with common functions now

---
 htdocs/user/class/usergroup.class.php | 212 ++++----------------------
 htdocs/user/group/card.php            |  14 +-
 2 files changed, 37 insertions(+), 189 deletions(-)

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 9c48c321196..269089c73f2 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -110,6 +110,21 @@ class UserGroup extends CommonObject
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>100),
 	);
 
+	/**
+	 * @var int    Field with ID of parent key if this field has a parent
+	 */
+	public $fk_element = 'fk_usergroup';
+
+	/**
+	 * @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.
+	 */
+	protected $childtablesoncascade = array('usergroup_rights','usergroup_user');
+
 
 	/**
      *    Constructor de la classe
@@ -135,47 +150,23 @@ class UserGroup extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT g.rowid, g.entity, g.nom as name, g.note, g.datec, g.tms as datem";
-		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
-		if ($groupname)
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		if (!empty($groupname))
 		{
-			$sql .= " WHERE g.nom = '".$this->db->escape($groupname)."'";
+			$result = $this->fetchCommon(0, '', ' AND nom = \''.$this->db->escape($groupname).'\'');
 		}
 		else
 		{
-			$sql .= " WHERE g.rowid = ".$id;
+			$result = $this->fetchCommon($id);
 		}
 
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
+		if($result)
 		{
-			if ($this->db->num_rows($result))
+			if ($load_members)
 			{
-				$obj = $this->db->fetch_object($result);
-
-				$this->id = $obj->rowid;
-				$this->ref = $obj->rowid;
-				$this->entity = $obj->entity;
-				$this->name = $obj->name;
-				$this->nom = $obj->name; // Deprecated
-				$this->note = $obj->note;
-				$this->datec = $obj->datec;
-				$this->datem = $obj->datem;
-
-				if ($load_members)
-					$this->members = $this->listUsersForGroup();
-
-
-				// Retreive all extrafield
-				// fetch optionals attributes and labels
-				$this->fetch_optionals();
-
-
-				// Sav current LDAP Current DN
-				//$this->ldap_dn = $this->_load_ldap_dn($this->_load_ldap_info(),0);
+				$this->members = $this->listUsersForGroup();
 			}
-			$this->db->free($result);
+
 			return 1;
 		}
 		else
@@ -647,50 +638,7 @@ class UserGroup extends CommonObject
 	 */
 	public function delete(User $user)
 	{
-		global $conf, $langs;
-
-		$error = 0;
-
-		$this->db->begin();
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
-		$sql .= " WHERE fk_usergroup = ".$this->id;
-		$this->db->query($sql);
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
-		$sql .= " WHERE fk_usergroup = ".$this->id;
-		$this->db->query($sql);
-
-        // Remove extrafields
-        if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-        {
-            $result = $this->deleteExtraFields();
-            if ($result < 0)
-            {
-                $error++;
-                dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-            }
-        }
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup";
-		$sql .= " WHERE rowid = ".$this->id;
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-            // Call trigger
-            $result = $this->call_trigger('GROUP_DELETE', $user);
-            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-            // End call triggers
-
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->db->rollback();
-			dol_print_error($this->db);
-			return -1;
-		}
+		return $this->deleteCommon($user);
 	}
 
 	/**
@@ -701,67 +649,15 @@ class UserGroup extends CommonObject
 	 */
 	public function create($notrigger = 0)
 	{
-		global $user, $conf, $langs, $hookmanager;
+		global $user, $conf;
 
-		$error = 0;
-		$now = dol_now();
+		$this->datec = dol_now();
 
 		if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value
-
 		$entity = $this->entity;
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1) $entity = $this->entity;
 
-		$this->db->begin();
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup (";
-		$sql .= "datec";
-		$sql .= ", nom";
-		$sql .= ", entity";
-		$sql .= ") VALUES (";
-		$sql .= "'".$this->db->idate($now)."'";
-		$sql .= ",'".$this->db->escape($this->nom)."'";
-		$sql .= ",".$this->db->escape($entity);
-		$sql .= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."usergroup");
-
-			if ($this->update(1) < 0) return -2;
-
-			$action = 'create';
-
-			// Actions on extra fields (by external module or standard code)
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-			{
-				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
-			}
-
-			if (!$error && !$notrigger)
-			{
-                // Call trigger
-                $result = $this->call_trigger('GROUP_CREATE', $user);
-                if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-                // End call triggers
-			}
-
-			if ($error > 0) { $error++; $this->db->rollback(); return -1; }
-			else $this->db->commit();
-
-			return $this->id;
-		}
-		else
-		{
-		    $this->db->rollback();
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
+		return $this->createCommon($user, $notrigger);
 	}
 
 	/**
@@ -772,9 +668,7 @@ class UserGroup extends CommonObject
 	 */
 	public function update($notrigger = 0)
 	{
-		global $user, $conf, $langs, $hookmanager;
-
-		$error = 0;
+		global $user, $conf;
 
 		$entity = $conf->entity;
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1)
@@ -782,55 +676,7 @@ class UserGroup extends CommonObject
 			$entity = $this->entity;
 		}
 
-		$this->db->begin();
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."usergroup SET ";
-		$sql .= " nom = '".$this->db->escape($this->name)."'";
-		$sql .= ", entity = ".$this->db->escape($entity);
-		$sql .= ", note = '".$this->db->escape($this->note)."'";
-		$sql .= " WHERE rowid = ".$this->id;
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$action = 'update';
-
-			// Actions on extra fields (by external module or standard code)
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-			{
-				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
-					$error++;
-				}
-			}
-
-			if (!$error && !$notrigger)
-			{
-                // Call trigger
-                $result = $this->call_trigger('GROUP_MODIFY', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-			}
-
-			if (!$error)
-			{
-			    $this->db->commit();
-			    return 1;
-			}
-			else
-			{
-			    $this->db->rollback();
-			    return -$error;
-			}
-		}
-		else
-		{
-		    $this->db->rollback();
-			dol_print_error($this->db);
-			return -1;
-		}
+		return $this->updateCommon($user, $notrigger);
 	}
 
 
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index f3ae62beed8..7285c9ad5f3 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -68,16 +68,14 @@ if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->
 }
 
 $object = new Usergroup($db);
-if ($id > 0)
-{
-	$object->fetch($id);
-	$object->getrights();
-}
-
 $extrafields = new ExtraFields($db);
 // 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.
+$object->getrights();
+
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('groupcard', 'globalcard'));
 
@@ -325,6 +323,8 @@ else
 {
     if ($id)
     {
+		$res = $object->fetch_optionals();
+
         $head = group_prepare_head($object);
         $title = $langs->trans("Group");
 
@@ -375,6 +375,8 @@ else
 				print "</td></tr>\n";
 			}
 
+			unset($object->fields['nom']); // Name already displayed in banner
+
 			// Common attributes
 			$keyforbreak = '';
 			include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';

From 261e6cbc52197460849377a51105a6916d42ac36 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 13 Apr 2020 19:08:03 +0200
Subject: [PATCH 013/144] Fix delete extrafield test

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index dcbb25775e7..41a7107b8d9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -8264,7 +8264,7 @@ abstract class CommonObject
 			}
 		}
 
-		if (!$error)
+		if (!$error && !empty($this->isextrafieldmanaged))
 		{
 			$result = $this->deleteExtraFields();
 			if ($result < 0) { $error++; }

From 92b6b6e1f56c2e5cdc95b7b02b868360ee2f76c3 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 13 Apr 2020 17:16:14 +0000
Subject: [PATCH 014/144] Fixing style errors.

---
 htdocs/user/group/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 7285c9ad5f3..25a0db9d633 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -90,7 +90,6 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-
 	$backurlforlist = DOL_URL_ROOT.'/user/group/list.php';
 
 	if (empty($backtopage) || ($cancel && empty($id))) {

From f4c346cdbbc45c123d4b05145001a9e2abf6c0ef Mon Sep 17 00:00:00 2001
From: oscim <dom@oscim.fr>
Date: Tue, 14 Apr 2020 07:48:34 +0200
Subject: [PATCH 015/144] Update llx_commandedet.key.sql

add external key
---
 htdocs/install/mysql/tables/llx_commandedet.key.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql
index bba65d62aa0..849ff70a5e9 100644
--- a/htdocs/install/mysql/tables/llx_commandedet.key.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql
@@ -25,3 +25,8 @@ ALTER TABLE llx_commandedet ADD INDEX idx_commandedet_fk_product (fk_product);
 
 ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
 ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commande FOREIGN KEY (fk_commande) REFERENCES llx_commande (rowid);
+ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commandefourndet FOREIGN KEY (fk_commandefourndet) REFERENCES llx_commande_fournisseurdet (rowid);
+ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_multicurrency FOREIGN KEY (fk_multicurrency) REFERENCES llx_multicurrency (rowid);
+ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_product_fournisseur_price FOREIGN KEY (fk_product_fournisseur_price) REFERENCES llx_product_fournisseur_price (rowid);
+ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_remise_except FOREIGN KEY (fk_remise_except) REFERENCES llx_societe_remise_except (rowid);
+

From cbf6afb4a0540653215b91fa60220e782f198324 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 14 Apr 2020 12:13:38 +0000
Subject: [PATCH 016/144] Fixing style errors.

---
 htdocs/compta/facture/card.php | 36 +++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 95d2010a4f6..6865edcecfd 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3389,18 +3389,18 @@ if ($action == 'create')
 
 	if($conf->global->INVOICE_USE_RETAINED_WARRANTY){
 	        $rwStyle = 'display:none;';
-			if(in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)){
-	            $rwStyle = '';
-	        }
+		if(in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)){
+			$rwStyle = '';
+		}
 
 	        $retained_warranty = GETPOST('retained_warranty', 'int');
-	        if(empty($retained_warranty)){
-                if(!empty($objectsrc->retained_warranty)){ // use previous situation value
-                    $retained_warranty = $objectsrc->retained_warranty;
-                }else{
-                    $retained_warranty = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
-                }
-            }
+		if(empty($retained_warranty)){
+			if(!empty($objectsrc->retained_warranty)){ // use previous situation value
+				$retained_warranty = $objectsrc->retained_warranty;
+			}else{
+				$retained_warranty = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
+			}
+		}
 
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
 	        print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
@@ -3408,14 +3408,14 @@ if ($action == 'create')
 	        // Retained warranty payment term
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td><td colspan="2">';
 	        $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-	        if(empty($retained_warranty_fk_cond_reglement)){
-                $retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
-                if(!empty($objectsrc->retained_warranty_fk_cond_reglement)){ // use previous situation value
-                    $retained_warranty_fk_cond_reglement = $objectsrc->retained_warranty_fk_cond_reglement;
-                }else{
-                    $retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
-                }
-            }
+		if(empty($retained_warranty_fk_cond_reglement)){
+			$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+			if(!empty($objectsrc->retained_warranty_fk_cond_reglement)){ // use previous situation value
+				$retained_warranty_fk_cond_reglement = $objectsrc->retained_warranty_fk_cond_reglement;
+			}else{
+				$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+			}
+		}
 	        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 	        print '</td></tr>';
 

From 7fea2bc557e84f26e54964d01aa4e46bb624da35 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 15 Apr 2020 08:44:29 +0200
Subject: [PATCH 017/144] Update changelog + trigger name change for class
 UserGroup

---
 ChangeLog                                                   | 2 +-
 htdocs/core/class/events.class.php                          | 6 +++---
 htdocs/core/triggers/interface_20_all_Logevents.class.php   | 6 +++---
 .../triggers/interface_50_modLdap_Ldapsynchro.class.php     | 6 +++---
 .../interface_99_modZapier_ZapierTriggers.class.php         | 6 +++---
 .../interface_99_modMyModule_MyModuleTriggers.class.php     | 6 +++---
 htdocs/user/class/usergroup.class.php                       | 4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0de59b03184..68cd7695057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,7 @@ For Developers or integrators:
   - replace $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); 
   - remove input field in form '<input type="hidden" name="page" value="'.$page.'">';'
   - add parameter $pagenavastextinput to value 1 when calling print_barre_liste   
-
+* UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE
 
 WARNING:
 
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index c32fe1d77f2..9c2e5b145dd 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -100,9 +100,9 @@ class Events // extends CommonObject
 		array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
 		array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
 		array('id'=>'USER_DELETE', 'test'=>1),
-		array('id'=>'GROUP_CREATE', 'test'=>1),
-		array('id'=>'GROUP_MODIFY', 'test'=>1),
-		array('id'=>'GROUP_DELETE', 'test'=>1),
+		array('id'=>'USERGROUP_CREATE', 'test'=>1),
+		array('id'=>'USERGROUP_MODIFY', 'test'=>1),
+		array('id'=>'USERGROUP_DELETE', 'test'=>1),
 	);
 
 
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 7acd977e714..fceb1552f0b 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -151,7 +151,7 @@ class InterfaceLogevents extends DolibarrTriggers
         }
 
 		// Groupes
-        elseif ($action == 'GROUP_CREATE')
+        elseif ($action == 'USERGROUP_CREATE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -159,7 +159,7 @@ class InterfaceLogevents extends DolibarrTriggers
             $text = $langs->transnoentities("NewGroupCreated", $object->name);
             $desc = $langs->transnoentities("NewGroupCreated", $object->name);
 		}
-        elseif ($action == 'GROUP_MODIFY')
+        elseif ($action == 'USERGROUP_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -167,7 +167,7 @@ class InterfaceLogevents extends DolibarrTriggers
             $text = $langs->transnoentities("GroupModified", $object->name);
             $desc = $langs->transnoentities("GroupModified", $object->name);
 		}
-        elseif ($action == 'GROUP_DELETE')
+        elseif ($action == 'USERGROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 2febdacff91..8b8c392615a 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -269,7 +269,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		}
 
 		// Groupes
-		elseif ($action == 'GROUP_CREATE')
+		elseif ($action == 'USERGROUP_CREATE')
 		{
 			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')
@@ -293,7 +293,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
-		elseif ($action == 'GROUP_MODIFY')
+		elseif ($action == 'USERGROUP_MODIFY')
 		{
 			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')
@@ -330,7 +330,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
 		}
-		elseif ($action == 'GROUP_DELETE')
+		elseif ($action == 'USERGROUP_DELETE')
 		{
 			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')
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index dc9ca6448a9..1091b5ee198 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -147,9 +147,9 @@ class InterfaceZapierTriggers extends DolibarrTriggers
                 break;
 
             // Groups
-            //case 'GROUP_CREATE':
-            //case 'GROUP_MODIFY':
-            //case 'GROUP_DELETE':
+            //case 'USERGROUP_CREATE':
+            //case 'USERGROUP_MODIFY':
+            //case 'USERGROUP_DELETE':
 
             // Companies
             case 'COMPANY_CREATE':
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 e0dd34cf180..dcee9eeaea5 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
@@ -118,9 +118,9 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
             //case 'ACTION_DELETE':
 
             // Groups
-            //case 'GROUP_CREATE':
-            //case 'GROUP_MODIFY':
-            //case 'GROUP_DELETE':
+            //case 'USERGROUP_CREATE':
+            //case 'USERGROUP_MODIFY':
+            //case 'USERGROUP_DELETE':
 
             // Companies
             //case 'COMPANY_CREATE':
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 269089c73f2..aaa631fdf36 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -404,7 +404,7 @@ class UserGroup extends CommonObject
 				$this->context = array('audit'=>$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));
 
 			    // Call trigger
-			    $result = $this->call_trigger('GROUP_MODIFY', $user);
+			    $result = $this->call_trigger('USERGROUP_MODIFY', $user);
 			    if ($result < 0) { $error++; }
 			    // End call triggers
 			}
@@ -528,7 +528,7 @@ class UserGroup extends CommonObject
 				$this->context = array('audit'=>$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));
 
 			    // Call trigger
-			    $result = $this->call_trigger('GROUP_MODIFY', $user);
+			    $result = $this->call_trigger('USERGROUP_MODIFY', $user);
 			    if ($result < 0) { $error++; }
 			    // End call triggers
 			}

From 9a1993f71c0ede76e9975540d93f86242c094998 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 15 Apr 2020 10:44:07 +0200
Subject: [PATCH 018/144] Fix retained warranty default value

---
 htdocs/compta/facture/card.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 95d2010a4f6..170daad50f9 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3397,12 +3397,11 @@ if ($action == 'create')
 	        if(empty($retained_warranty)){
                 if(!empty($objectsrc->retained_warranty)){ // use previous situation value
                     $retained_warranty = $objectsrc->retained_warranty;
-                }else{
-                    $retained_warranty = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
                 }
             }
+			$retained_warranty_js_default = !empty($retained_warranty)?$retained_warranty:$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
 
-	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
+			print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
 	        print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
 
 	        // Retained warranty payment term
@@ -3421,16 +3420,19 @@ if ($action == 'create')
 
 	        print '<script type="text/javascript" language="javascript">
     		$(document).ready(function() {
-			$("[name=\'type\']").change(function() {
-
-				if($( this ).prop("checked") && $.inArray(parseInt($( this ).val()), '.json_encode($retainedWarrantyInvoiceAvailableType).' ) !== -1)
+				$("[name=\'type\']").change(function() {
+					if($( this ).prop("checked") && $.inArray($( this ).val(), '.json_encode($retainedWarrantyInvoiceAvailableType).' ) !== -1)
                     {
                         $(".retained-warranty-line").show();
+                        $("#new-situation-invoice-retained-warranty").val("'.doubleval($retained_warranty_js_default).'");
                     }
                     else{
                         $(".retained-warranty-line").hide();
+                        $("#new-situation-invoice-retained-warranty").val("");
                     }
     			});
+
+				$("[name=\'type\']").trigger("change");
     		});
     		</script>';
 	}

From e6b29aa0f0a4cb64c6102922c98f714134a68d0f Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 15 Apr 2020 08:48:45 +0000
Subject: [PATCH 019/144] Fixing style errors.

---
 htdocs/compta/facture/card.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 96bc813e45d..d670bed146a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3389,16 +3389,16 @@ if ($action == 'create')
 
 	if($conf->global->INVOICE_USE_RETAINED_WARRANTY){
 	        $rwStyle = 'display:none;';
-			if(in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)){
-	            $rwStyle = '';
-	        }
+		if(in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)){
+			$rwStyle = '';
+		}
 
 	        $retained_warranty = GETPOST('retained_warranty', 'int');
-	        if(empty($retained_warranty)){
-                if(!empty($objectsrc->retained_warranty)){ // use previous situation value
-                    $retained_warranty = $objectsrc->retained_warranty;
-                }
-            }
+		if(empty($retained_warranty)){
+			if(!empty($objectsrc->retained_warranty)){ // use previous situation value
+				$retained_warranty = $objectsrc->retained_warranty;
+			}
+		}
 			$retained_warranty_js_default = !empty($retained_warranty)?$retained_warranty:$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
 
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
@@ -3407,14 +3407,14 @@ if ($action == 'create')
 	        // Retained warranty payment term
 	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td><td colspan="2">';
 	        $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-	        if(empty($retained_warranty_fk_cond_reglement)){
-                $retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
-                if(!empty($objectsrc->retained_warranty_fk_cond_reglement)){ // use previous situation value
-                    $retained_warranty_fk_cond_reglement = $objectsrc->retained_warranty_fk_cond_reglement;
-                }else{
-                    $retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
-                }
-            }
+		if(empty($retained_warranty_fk_cond_reglement)){
+			$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+			if(!empty($objectsrc->retained_warranty_fk_cond_reglement)){ // use previous situation value
+				$retained_warranty_fk_cond_reglement = $objectsrc->retained_warranty_fk_cond_reglement;
+			}else{
+				$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+			}
+		}
 	        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 	        print '</td></tr>';
 

From 4b4f69c76a4293e55220f43019af5804d684a202 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 15 Apr 2020 10:52:28 +0200
Subject: [PATCH 020/144] fix indentation

---
 htdocs/compta/facture/card.php | 52 +++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index d670bed146a..d96cd61a308 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3388,25 +3388,25 @@ if ($action == 'create')
 
 
 	if($conf->global->INVOICE_USE_RETAINED_WARRANTY){
-	        $rwStyle = 'display:none;';
+		$rwStyle = 'display:none;';
 		if(in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)){
 			$rwStyle = '';
 		}
 
-	        $retained_warranty = GETPOST('retained_warranty', 'int');
+		$retained_warranty = GETPOST('retained_warranty', 'int');
 		if(empty($retained_warranty)){
 			if(!empty($objectsrc->retained_warranty)){ // use previous situation value
 				$retained_warranty = $objectsrc->retained_warranty;
 			}
 		}
-			$retained_warranty_js_default = !empty($retained_warranty)?$retained_warranty:$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
+		$retained_warranty_js_default = !empty($retained_warranty)?$retained_warranty:$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT;
 
-	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
-	        print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
+		print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('RetainedWarranty').'</td><td colspan="2">';
+		print '<input id="new-situation-invoice-retained-warranty" name="retained_warranty" type="number" value="'.$retained_warranty.'" step="0.01" min="0" max="100" />%';
 
-	        // Retained warranty payment term
-	        print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td><td colspan="2">';
-	        $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+		// Retained warranty payment term
+		print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td><td colspan="2">';
+		$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
 		if(empty($retained_warranty_fk_cond_reglement)){
 			$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
 			if(!empty($objectsrc->retained_warranty_fk_cond_reglement)){ // use previous situation value
@@ -3415,26 +3415,26 @@ if ($action == 'create')
 				$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
 			}
 		}
-	        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
-	        print '</td></tr>';
+		$form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+		print '</td></tr>';
 
-	        print '<script type="text/javascript" language="javascript">
-    		$(document).ready(function() {
-			$("[name=\'type\']").change(function() {
-					if($( this ).prop("checked") && $.inArray($( this ).val(), '.json_encode($retainedWarrantyInvoiceAvailableType).' ) !== -1)
-                    {
-                        $(".retained-warranty-line").show();
-                        $("#new-situation-invoice-retained-warranty").val("'.doubleval($retained_warranty_js_default).'");
-                    }
-                    else{
-                        $(".retained-warranty-line").hide();
-                        $("#new-situation-invoice-retained-warranty").val("");
-                    }
-    			});
+		print '<script type="text/javascript" language="javascript">
+		$(document).ready(function() {
+		$("[name=\'type\']").change(function() {
+				if($( this ).prop("checked") && $.inArray($( this ).val(), '.json_encode($retainedWarrantyInvoiceAvailableType).' ) !== -1)
+				{
+					$(".retained-warranty-line").show();
+					$("#new-situation-invoice-retained-warranty").val("'.doubleval($retained_warranty_js_default).'");
+				}
+				else{
+					$(".retained-warranty-line").hide();
+					$("#new-situation-invoice-retained-warranty").val("");
+				}
+			});
 
-				$("[name=\'type\']").trigger("change");
-    		});
-    		</script>';
+			$("[name=\'type\']").trigger("change");
+		});
+		</script>';
 	}
 
 	// Payment mode

From e6669348e1e295e833c8d9faf877a6025b544e26 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 15 Apr 2020 11:09:34 +0200
Subject: [PATCH 021/144] Fix dom manipulation on creation

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index d96cd61a308..5e280535c27 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1362,8 +1362,14 @@ if (empty($reshook))
 					$object->situation_cycle_ref = $object->newCycle();
 				}
 
-				$object->retained_warranty = GETPOST('retained_warranty', 'int');
-				$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+				if(in_array($object->type, $retainedWarrantyInvoiceAvailableType)){
+					$object->retained_warranty = GETPOST('retained_warranty', 'int');
+					$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+				}
+				else{
+					$object->retained_warranty = 0;
+					$object->retained_warranty_fk_cond_reglement = 0;
+				}
 
 			    $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
 			    if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {

From 3b4b30ea576413f81454ba676845fd54228fdc72 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Thu, 16 Apr 2020 20:33:53 +0200
Subject: [PATCH 022/144] Fix merge remaining lines

---
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 1a5b5d47a23..6fad6fc4665 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1338,7 +1338,6 @@ class pdf_sponge extends ModelePDFFactures
 		    $total_a_payer_ttc = 0;
 		}
 
-		$deja_paye = 0;
 		$i = 1;
 		if (!empty($TPreviousIncoice)) {
 		    $pdf->setY($tab2_top);
@@ -1370,7 +1369,6 @@ class pdf_sponge extends ModelePDFFactures
 		        $pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
 
 		        $i++;
-		        $deja_paye += $fac->total_ht;
 		        $posy += $tab2_hl;
 
 		        $pdf->setY($posy);

From 3e7f0b364e97995dcf82e5e548da48c737a9f6f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 17 Apr 2020 10:22:08 +0200
Subject: [PATCH 023/144] FIX #13611

---
 htdocs/core/modules/expensereport/doc/pdf_standard.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 7bef90f514e..32a8714cf12 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -745,7 +745,7 @@ class pdf_standard extends ModeleExpenseReport
    		$pdf->SetXY($posx, $posy);
    		$pdf->SetFont('', 'B', $default_font_size + 2);
    		$pdf->SetTextColor(111, 81, 124);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $object->getLibStatut(0), '', 'R');
+   		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities($object->statuts_short[$object->status]), '', 'R');
 
 		if ($showaddress) {
 			// Sender properties

From ea60d0be635138ce6e90a4807e1bc0636c77d5d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 17 Apr 2020 10:27:38 +0200
Subject: [PATCH 024/144] FIX #13618

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

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 7c7437bfb8e..a178e5bba82 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -445,8 +445,7 @@ class Invoices extends DolibarrApi
 		}
 
         $result = $this->invoice->delete_contact($rowid);
-
-        if (!$result) {
+        if ($result < 0) {
             throw new RestException(500, 'Error when deleted the contact');
         }
 
@@ -543,7 +542,7 @@ class Invoices extends DolibarrApi
     /**
      * Delete invoice
      *
-     * @param int   $id Invoice ID
+     * @param int   $id 	Invoice ID
      * @return array
      */
     public function delete($id)
@@ -560,7 +559,8 @@ class Invoices extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if ($this->invoice->delete($id) < 0)
+		$result = $this->invoice->delete(DolibarrApiAccess::$user);
+        if ($result < 0)
         {
             throw new RestException(500);
         }

From 7c6c6002258d90de9f4daa03b0db8b65efd83232 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 11:38:24 +0200
Subject: [PATCH 025/144] CSS

---
 htdocs/comm/propal/list.php               | 2 +-
 htdocs/core/class/html.formfile.class.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index b274689ef3e..e3ba84a6dc5 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -904,7 +904,7 @@ if ($resql)
 
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 			// Picto + Ref
-			print '<td class="nobordernopadding nowrap">';
+			print '<td class="nobordernopadding nowraponall">';
 			print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1));
 			print '</td>';
 			// Warning
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 4a50525c88a..433e959b176 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -733,7 +733,9 @@ class FormFile
 					$arraykeys = array_keys($modellist);
 					$modelselected = $arraykeys[0];
 				}
-				$out .= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$morecss = 'maxwidth200';
+				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
+				$out .= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss);
 				if ($conf->use_javascript_ajax)
 				{
 					$out .= ajax_combobox('model');

From f23266e56012127153f8909ed672e1bdeb25f449 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 11:40:26 +0200
Subject: [PATCH 026/144] css

---
 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 433e959b176..c9c99370816 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -873,7 +873,7 @@ class FormFile
 						if ($printer)
 						{
 							//$out.= '<td class="right">';
-							$out .= '<a class="paddingleft" href="'.$urlsource.(strpos($urlsource, '?') ? '&amp;' : '?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
+							$out .= '<a class="marginleftonly" href="'.$urlsource.(strpos($urlsource, '?') ? '&amp;' : '?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
 							$out .= ($param ? '&amp;'.$param : '');
 							$out .= '">'.img_picto($langs->trans("PrintFile", $relativepath), 'printer.png').'</a>';
 						}

From 47ff3f866a82c28c1dcba5d92bfd579bc9903da6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 12:54:28 +0200
Subject: [PATCH 027/144] css

---
 htdocs/comm/propal/list.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e3ba84a6dc5..f1552cd7b39 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -572,40 +572,40 @@ if ($resql)
 	if (!empty($arrayfields['p.ref']['checked']))
 	{
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
  		print '</td>';
 	}
 	if (!empty($arrayfields['p.ref_client']['checked']))
 	{
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
+		print '<input class="flat maxwidth50" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
 	    print '</td>';
 	}
 	if (!empty($arrayfields['pr.ref']['checked']))
 	{
     	print '<td class="liste_titre">';
-    	print '<input class="flat" size="6" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
+    	print '<input class="flat maxwidth50" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
 	    print '</td>';
 	}
 	if (!empty($arrayfields['pr.title']['checked']))
 	{
 	    print '<td class="liste_titre">';
-	    print '<input class="flat" size="6" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
+	    print '<input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
 	    print '</td>';
 	}
 	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" size="10" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
+		print '<input class="flat maxwidth100" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 	    print '</td>';
 	}
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
 	// State
 	if (!empty($arrayfields['state.nom']['checked']))
 	{
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+		print '<input class="flat maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
@@ -618,7 +618,7 @@ if ($resql)
 	// Company type
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
 		print ajax_combobox('search_type_thirdparty');
 		print '</td>';
@@ -668,7 +668,7 @@ if ($resql)
 	// Availability
 	if (!empty($arrayfields['ava.rowid']['checked']))
 	{
-		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print '<td class="liste_titre maxwidth100onsmartphone center">';
 		$form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
 		print ajax_combobox('search_availability');
 		print '</td>';

From 8f7c3fc867b2a83dc5f51769d06b2c4319a872ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 14:39:02 +0200
Subject: [PATCH 028/144] Fix: restore jselect2 4.0.5 (4.0.6 create troubles in
 responsive)

---
 COPYRIGHT                                     |   2 +-
 htdocs/comm/propal/list.php                   |   6 +-
 htdocs/core/class/html.form.class.php         | 167 ++--
 .../tpl/extrafields_list_search_input.tpl.php |   2 +
 .../jquery/plugins/select2/.editorconfig      |   6 -
 .../jquery/plugins/select2/.gitignore         |   3 -
 .../jquery/plugins/select2/.jshintignore      |   4 -
 .../includes/jquery/plugins/select2/.jshintrc |  25 -
 .../jquery/plugins/select2/CHANGELOG.md       | 173 ----
 .../jquery/plugins/select2/Gruntfile.js       | 125 ++-
 .../includes/jquery/plugins/select2/README.md |  64 +-
 .../jquery/plugins/select2/component.json     |   2 +-
 .../jquery/plugins/select2/composer.json      |   3 +
 .../plugins/select2/dist/css/select2.css      |  19 +-
 .../plugins/select2/dist/css/select2.min.css  |   2 +-
 .../jquery/plugins/select2/dist/js/i18n/af.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ar.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/az.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/bg.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/bn.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/bs.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ca.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/cs.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/da.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/de.js |   3 -
 .../plugins/select2/dist/js/i18n/dsb.js       |   3 -
 .../jquery/plugins/select2/dist/js/i18n/el.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/en.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/es.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/et.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/eu.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/fa.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/fi.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/fr.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/gl.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/he.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/hi.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/hr.js |   3 -
 .../plugins/select2/dist/js/i18n/hsb.js       |   3 -
 .../jquery/plugins/select2/dist/js/i18n/hu.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/hy.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/id.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/is.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/it.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ja.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ka.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/km.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ko.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/lt.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/lv.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/mk.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ms.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/nb.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ne.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/nl.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/pl.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ps.js |   3 -
 .../plugins/select2/dist/js/i18n/pt-BR.js     |   3 -
 .../jquery/plugins/select2/dist/js/i18n/pt.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ro.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/ru.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/sk.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/sl.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/sq.js |   3 -
 .../plugins/select2/dist/js/i18n/sr-Cyrl.js   |   3 -
 .../jquery/plugins/select2/dist/js/i18n/sr.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/sv.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/th.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/tk.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/tr.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/uk.js |   3 -
 .../jquery/plugins/select2/dist/js/i18n/vi.js |   3 -
 .../plugins/select2/dist/js/i18n/zh-CN.js     |   3 -
 .../plugins/select2/dist/js/i18n/zh-TW.js     |   3 -
 .../plugins/select2/dist/js/select2.full.js   | 803 +++++-------------
 .../select2/dist/js/select2.full.min.js       |   3 +-
 .../jquery/plugins/select2/dist/js/select2.js | 790 +++++------------
 .../plugins/select2/dist/js/select2.min.js    |   3 +-
 .../jquery/plugins/select2/package.json       |  40 +-
 79 files changed, 694 insertions(+), 1725 deletions(-)
 delete mode 100644 htdocs/includes/jquery/plugins/select2/.editorconfig
 delete mode 100644 htdocs/includes/jquery/plugins/select2/.gitignore
 delete mode 100644 htdocs/includes/jquery/plugins/select2/.jshintignore
 delete mode 100644 htdocs/includes/jquery/plugins/select2/.jshintrc
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/af.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ar.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/az.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/bg.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/bn.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/bs.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ca.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/cs.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/da.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/de.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/dsb.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/el.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/en.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/es.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/et.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/eu.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/fa.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/fi.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/fr.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/gl.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/he.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hi.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hr.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hsb.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hu.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hy.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/id.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/is.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/it.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ja.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ka.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/km.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ko.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/lt.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/lv.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/mk.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ms.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/nb.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ne.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/nl.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/pl.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ps.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt-BR.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ro.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ru.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sk.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sl.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sq.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr-Cyrl.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sv.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/th.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/tk.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/tr.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/uk.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/vi.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-CN.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-TW.js

diff --git a/COPYRIGHT b/COPYRIGHT
index 137682bc514..42241a47d37 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -41,7 +41,7 @@ Ace                    1.4.8         BSD                         Yes
 ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
 jQuery                 3.4.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
+jQuery select2         4.0.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles with responsive
 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)
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index f1552cd7b39..10dcf49b426 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -496,7 +496,7 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit, 0, 0, 1);
+//	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$topicmail = "SendPropalRef";
 	$modelmail = "proposal_send";
@@ -562,7 +562,8 @@ if ($resql)
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+///////////
+//	$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">';
@@ -765,6 +766,7 @@ if ($resql)
 		print '<td class="liste_titre"></td>';
 	}
 	// Extra fields
+////////////
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 914106ac49a..ee2ae092420 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6120,11 +6120,11 @@ class Form
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
 		}
-        else
-        {
+		else
+		{
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
-        }
+		}
 
 		if (empty($fieldstoshow))
 		{
@@ -6146,107 +6146,100 @@ class Form
 
 		// Search data
 		$sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX.$objecttmp->table_element." as t";
-		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {
-			$tmparray = explode('@', $objecttmp->ismultientitymanaged);
-			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON parenttable.rowid = t.'.$tmparray[0];
-		}
-		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe')
+		if ($objecttmp->ismultientitymanaged == 2)
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE 1=1";
-		if (isset($objecttmp->ismultientitymanaged) && $objecttmp->ismultientitymanaged == 1) $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
-		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {
-			$sql .= ' AND parenttable.entity = t.'.$tmparray[0];
-		}
-		if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {
-			if ($objecttmp->element == 'societe') $sql .= " AND t.rowid = ".$user->socid;
-			else $sql .= " AND t.fk_soc = ".$user->socid;
-		}
-		if ($searchkey != '') $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
-		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-		}
-		if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-			/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
-			{
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$objecttmp->filter);
-			}*/
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";
-		}
-		$sql .= $this->db->order($fieldstoshow, "ASC");
-		//$sql.=$this->db->plimit($limit, 0);
-		//print $sql;
-
-		// Build output string
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$forcecombo)
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
+			$sql .= " WHERE 1=1";
+			if (!empty($objecttmp->ismultientitymanaged)) $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
+			if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {
+				if ($objecttmp->element == 'societe') $sql .= " AND t.rowid = ".$user->socid;
+				else $sql .= " AND t.fk_soc = ".$user->socid;
 			}
-
-			// Construct $out and $outarray
-			$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";
-
-			// Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4
-			$textifempty = '&nbsp;';
-
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (!empty($conf->global->$confkeyforautocompletemode))
-			{
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+			if ($searchkey != '') $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
+			if ($objecttmp->ismultientitymanaged == 2) {
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			}
-			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
+			if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+				/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
+				 {
+				 throw new RestException(503, 'Error when validating parameter sqlfilters '.$objecttmp->filter);
+				 }*/
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+				$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";
+			}
+			$sql .= $this->db->order($fieldstoshow, "ASC");
+			//$sql.=$this->db->plimit($limit, 0);
+			//print $sql;
 
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
+			// Build output string
+			$resql = $this->db->query($sql);
+			if ($resql)
 			{
-				while ($i < $num)
+				if (!$forcecombo)
 				{
-					$obj = $this->db->fetch_object($resql);
-					$label = '';
-					$tmparray = explode(',', $fieldstoshow);
-					foreach ($tmparray as $key => $val)
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+					$out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
+				}
+
+				// Construct $out and $outarray
+				$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";
+
+				// Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4
+				$textifempty = '&nbsp;';
+
+				//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+				if (!empty($conf->global->$confkeyforautocompletemode))
+				{
+					if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+					else $textifempty .= $langs->trans("All");
+				}
+				if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
+
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				if ($num)
+				{
+					while ($i < $num)
 					{
-						$val = preg_replace('/t\./', '', $val);
-						$label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;
-					}
-					if (empty($outputmode))
-					{
-						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
+						$obj = $this->db->fetch_object($resql);
+						$label = '';
+						$tmparray = explode(',', $fieldstoshow);
+						foreach ($tmparray as $key => $val)
 						{
-							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
+							$val = preg_replace('/t\./', '', $val);
+							$label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;
+						}
+						if (empty($outputmode))
+						{
+							if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
+							{
+								$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
+							}
+							else
+							{
+								$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
+							}
 						}
 						else
 						{
-							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
+							array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 						}
-					}
-					else
-					{
-						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
-					}
 
-					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+						$i++;
+						if (($i % 10) == 0) $out .= "\n";
+					}
 				}
+
+				$out .= '</select>'."\n";
+			}
+			else
+			{
+				dol_print_error($this->db);
 			}
 
-			$out .= '</select>'."\n";
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
+			$this->result = array('nbofelement'=>$num);
 
-		$this->result = array('nbofelement'=>$num);
-
-		if ($outputmode) return $outarray;
-		return $out;
+			if ($outputmode) return $outarray;
+			return $out;
 	}
 
 
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index cfd15deb91c..d6ebb8b919f 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -1,5 +1,7 @@
 <?php
 
+print '<!-- extrafields_list_search_input.tpl.php -->'."\n";
+
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf))
 {
diff --git a/htdocs/includes/jquery/plugins/select2/.editorconfig b/htdocs/includes/jquery/plugins/select2/.editorconfig
deleted file mode 100644
index 54f4d3beedb..00000000000
--- a/htdocs/includes/jquery/plugins/select2/.editorconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-[*]
-indent_style = space
-end_of_line = lf
-
-[*.js]
-indent_size = 2
diff --git a/htdocs/includes/jquery/plugins/select2/.gitignore b/htdocs/includes/jquery/plugins/select2/.gitignore
deleted file mode 100644
index aa970da6518..00000000000
--- a/htdocs/includes/jquery/plugins/select2/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-node_modules
-dist/js/i18n/build.txt
-.sass-cache
diff --git a/htdocs/includes/jquery/plugins/select2/.jshintignore b/htdocs/includes/jquery/plugins/select2/.jshintignore
deleted file mode 100644
index ba5a30f8c38..00000000000
--- a/htdocs/includes/jquery/plugins/select2/.jshintignore
+++ /dev/null
@@ -1,4 +0,0 @@
-src/js/banner.*.js
-src/js/wrapper.*.js
-tests/vendor/*.js
-tests/helpers.js
diff --git a/htdocs/includes/jquery/plugins/select2/.jshintrc b/htdocs/includes/jquery/plugins/select2/.jshintrc
deleted file mode 100644
index 94299268771..00000000000
--- a/htdocs/includes/jquery/plugins/select2/.jshintrc
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "bitwise": true,
-  "camelcase": true,
-  "curly": true,
-  "es3": true,
-  "eqnull": true,
-  "freeze": true,
-  "globals": {
-    "console": false,
-    "define": false,
-    "document": false,
-    "MockContainer": false,
-    "module": false,
-    "QUnit": false,
-    "require": false,
-    "test": false,
-    "window": false
-  },
-  "indent": 2,
-  "maxlen": 80,
-  "noarg": true,
-  "nonew": true,
-  "quotmark": "single",
-  "undef": true
-}
diff --git a/htdocs/includes/jquery/plugins/select2/CHANGELOG.md b/htdocs/includes/jquery/plugins/select2/CHANGELOG.md
index d6b2a7587dd..3ae60aff255 100644
--- a/htdocs/includes/jquery/plugins/select2/CHANGELOG.md
+++ b/htdocs/includes/jquery/plugins/select2/CHANGELOG.md
@@ -1,178 +1,5 @@
 # Change Log
 
-## 4.0.13
-
-### New features / improvements
-
-* Trigger `input` event before `change` events (#4649)
-* Feed back the keypress code that was responsible for the 'close' event (#5513)
-* Only trigger `selection:update` once on DOM change events (#5734)
-
-### Bug fixes
-
-* Prevent opening of disabled elements (#5751)
-
-### Documentation
-
-* Fix "edit this page" links in docs (#5689)
-
-### Miscellaneous
-
-* Registered Select2 on Open Collective (#5700, #5721, #5741)
-
-## 4.0.12
-
-### Bug fixes
-
-* Fixes incorrect offset when using the Shadow DOM and styling the `<html>` element (#5682)
-
-### Miscellaneous
-
-* Replace cdnjs with jsDelivr in the documentation (#5687)
-* Fix incorrect provider for the automated NPM deployment (#5686)
-
-## 4.0.11
-
-### Bug fixes
-
-* Fixes jQuery migrate error when getting offset when dropdownParent not in document (#5584)
-
-### Miscellaneous
-
-* Enable GitHub actions for CI (#5591)
-* Documentation has been moved into and is deployed from the code repository (#5638)
-* Remove Travis CI integration (#5665)
-
-## 4.0.10
-
-### New features / improvements
-
-* Support passing in a selector for `dropdownParent` option (#5622)
-
-### Bug fixes
-
-* Fix bug where dropdowns pointing upwards were incorrectly positioned (#5621)
-
-## 4.0.9
-
-### New features / improvements
-
-* Mirror disabled state through aria-disabled on selection (#5579)
-* Select2 now clears the internal ID when it is destroyed (#5587)
-* Set the main ARIA 1.1 roles and properties for comboboxes (#5582)
-* The `language` option now has a clearly defined fallback chain (#5602)
-
-### Bug fixes
-
-* Do not propagate click when search box is not empty (#5580)
-* Fix `maximumSelectionLength` being ignored by `closeOnSelect` (#5581)
-* Fix generated options not receiving result IDs (#5586)
-* Remove selection title attribute if text is empty (#5589)
-* Reposition dropdown whenever items are selected (#5590)
-* Fix dropdown positioning when displayed above with messages (#5592)
-* Fix search box expanding width of container (#5595)
-* `allowClear` no longer shifts selections to a new line (#5603)
-
-### Translations
-
-* Fix error in German translations (#5604)
-
-### Miscellaneous
-
-* Updated development grunt version so it no longer shows as vulnerable (#5597)
-* Remove unused variables (#5554)
-
-## 4.0.8
-
-### New features / improvements
-
-* Test against and fix compatibility with jQuery 3.4.1 (#5531)
-* Results respect disabled state of `<option>` (#5560)
-* Add `computedstyle` option for calculating the width (#5559)
-
-### Bug fixes
-
-* Fix tag creation being broken in 4.0.7 (#5558)
-* Fix infinite scroll when the scrollbar is not visible (#5575)
-* Revert change to focusing behaviour in 4.0.6 (#5576)
-
-### Translations
-
-* Fix wording in French translations (#5521)
-
-### Miscellaneous
-
-* Update grunt-contrib-qunit to latest version (#5530)
-* Removed unused `.select2-selection__placeholder` CSS definitions for multiple selects (#5508)
-* Remove deprecated jQuery shorthand (#5564)
-
-## 4.0.7
-
-### New features/improvements
-- Do not close on select if Ctrl or Meta (Cmd) keys being held (#5222)
-
-### Bug fixes
-- Fixed issue where single select boxes would automatically reopen when they were closed (#5490, #5492)
-
-### Miscellaneous
-- Move almost and jquery-mousewheel to devDependencies (#5489)
-
-## 4.0.6
-
-### New features/improvements
-- Add style property to package.json (#5019)
-- Implement `clear` and `clearing` events (#5058)
-- Add `scrollAfterSelect` option (#5150)
-- Add missing diacritics (#4118, #4337, #5464)
-
-### Bug fixes
-- Fix up arrow error when there are no options in dropdown (#5127)
-- Add `;` before beginning of factory wrapper (#5089)
-- Fix IE11 issue with select losing focus after selecting an item (#4860)
-- Clear tooltip from `select2-selection__rendered` when selection is cleared (#4640, #4746)
-- Fix keyboard not closing when closing dropdown on iOS 10 (#4680)
-- User-defined types not normalized properly when passed in as data (#4632)
-- Perform deep merge for `Defaults.set()` (#4364)
-- Fix "the results could not be loaded" displaying during AJAX request (#4356)
-- Cache objects in `Utils.__cache` instead of using `$.data` (#4346, #5486)
-- Removing the double event binding registration of `selection:update` (#4306)
-
-#### Accessibility
-- Improve `.select2-hidden-accessible` (#4908)
-- Add role and aria-readonly attributes to single selection dropdown value (#4881)
-
-### Translations
-- Add Turkmen translations (`tk`) (#5125)
-- Fix error in French translations (#5122)
-- Add Albanian translation (`sq`) (#5199)
-- Add Georgian translation (`ka`) (#5179)
-- Add Nepali translation (`ne`) (#5295)
-- Add Bangla translation (`bn`) (#5248)
-- Add `removeAllItems` translation for clear "x" title (#5291)
-- Fix wording in Vietnamese translations (#5387)
-- Fix error in Russian translation (#5401)
-
-### Miscellaneous
--  Remove duplicate CSS selector in classic theme (#5115)
-
-## 4.0.5
-
-### Bug fixes
-- Replace `autocapitalize=off` with `autocapitalize=none` (#4994)
-
-### Translations
-- Vietnamese: remove an unnecessary quote mark (#5059)
-- Czech: Add missing commas and periods (#5052)
-- Spanish: Update the 'errorLoading' message (#5032)
-- Fix typo in Romanian (#5005)
-- Improve French translation (#4988)
-- Add Pashto translation (`ps`) (#4960)
-- Add translations for lower and upper Sorbian (`dsb` and `hsb`) (#4949)
-- Updates to Slovak (#4915)
-- Fixed Norwegian `inputTooShort` message (#4817, 4896)
-- Add Afrikaans translation (`af`) (#4850)
-- Add Bosnian translation (`bs`) (#4504)
-
 ## 4.0.4
 
 ### New features / Improvements
diff --git a/htdocs/includes/jquery/plugins/select2/Gruntfile.js b/htdocs/includes/jquery/plugins/select2/Gruntfile.js
index 23ef3d9cf50..bf0f38d4303 100644
--- a/htdocs/includes/jquery/plugins/select2/Gruntfile.js
+++ b/htdocs/includes/jquery/plugins/select2/Gruntfile.js
@@ -1,5 +1,3 @@
-const sass = require('node-sass');
-
 module.exports = function (grunt) {
   // Full list of files that must be included by RequireJS
   includes = [
@@ -64,6 +62,10 @@ module.exports = function (grunt) {
   grunt.initConfig({
     package: grunt.file.readJSON('package.json'),
 
+    clean: {
+      docs: ['docs/_site']
+    },
+
     concat: {
       'dist': {
         options: {
@@ -122,10 +124,81 @@ module.exports = function (grunt) {
       }
     },
 
+    'saucelabs-qunit': {
+      all: {
+        options: {
+          build: testBuildNumber,
+          tags: ['tests', 'qunit'],
+          urls: testUrls,
+          testname: 'QUnit test for Select2',
+          browsers: [
+            {
+              browserName: 'internet explorer',
+              version: '8'
+            },
+            {
+              browserName: 'internet explorer',
+              version: '9'
+            },
+            {
+              browserName: 'internet explorer',
+              version: '10'
+            },
+            {
+              browserName: 'internet explorer',
+              version: '11'
+            },
+
+            {
+              browserName: 'firefox',
+              platform: 'linux'
+            },
+
+            {
+              browserName: 'chrome'
+            },
+
+            {
+              browserName: 'opera',
+              version: '12',
+              platform: 'linux'
+            }
+          ]
+        }
+      }
+    },
+
+    'gh-pages': {
+      options: {
+        base: 'docs',
+        branch: 'master',
+        clone: 'node_modules/grunt-gh-pages/repo',
+        message: 'Updated docs with master',
+        push: true,
+        repo: 'git@github.com:select2/select2.github.io.git'
+      },
+      src: '**'
+    },
+
+    jekyll: {
+      options: {
+        src: 'docs',
+        dest: 'docs/_site'
+      },
+      build: {
+        d: null
+      },
+      serve: {
+        options: {
+          serve: true,
+          watch: true
+        }
+      }
+    },
+
     jshint: {
       options: {
-        jshintrc: true,
-        reporterOutput: ''
+        jshintrc: true
       },
       code: {
         src: ['src/js/**/*.js']
@@ -138,7 +211,6 @@ module.exports = function (grunt) {
     sass: {
       dist: {
         options: {
-          implementation: sass,
           outputStyle: 'compressed'
         },
         files: {
@@ -150,7 +222,6 @@ module.exports = function (grunt) {
       },
       dev: {
         options: {
-          implementation: sass,
           outputStyle: 'nested'
         },
         files: {
@@ -162,6 +233,19 @@ module.exports = function (grunt) {
       }
     },
 
+    symlink: {
+      docs: {
+        cwd: 'dist',
+        expand: true,
+        overwrite: false,
+        src: [
+          '*'
+        ],
+        dest: 'docs/dist',
+        filter: 'isDirectory'
+      }
+    },
+
     requirejs: {
       'dist': {
         options: {
@@ -240,17 +324,22 @@ module.exports = function (grunt) {
     }
   });
 
+  grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-qunit');
   grunt.loadNpmTasks('grunt-contrib-requirejs');
+  grunt.loadNpmTasks('grunt-contrib-symlink');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
 
+  grunt.loadNpmTasks('grunt-gh-pages');
+  grunt.loadNpmTasks('grunt-jekyll');
+  grunt.loadNpmTasks('grunt-saucelabs');
   grunt.loadNpmTasks('grunt-sass');
 
-  grunt.registerTask('default', ['compile', 'test', 'lint', 'minify']);
+  grunt.registerTask('default', ['compile', 'test', 'minify']);
 
   grunt.registerTask('compile', [
     'requirejs:dist', 'requirejs:dist.full', 'requirejs:i18n',
@@ -258,6 +347,24 @@ module.exports = function (grunt) {
     'sass:dev'
   ]);
   grunt.registerTask('minify', ['uglify', 'sass:dist']);
-  grunt.registerTask('lint', ['jshint']);
-  grunt.registerTask('test', ['connect:tests', 'qunit']);
+  grunt.registerTask('test', ['connect:tests', 'qunit', 'jshint']);
+
+  var ciTasks = [];
+
+  ciTasks.push('compile');
+  ciTasks.push('connect:tests');
+
+  // Can't run Sauce Labs tests in pull requests
+  if (process.env.TRAVIS_PULL_REQUEST == 'false') {
+    ciTasks.push('saucelabs-qunit');
+  }
+
+  ciTasks.push('qunit');
+  ciTasks.push('jshint');
+
+  grunt.registerTask('ci', ciTasks);
+
+  grunt.registerTask('docs', ['symlink:docs', 'jekyll:serve']);
+
+  grunt.registerTask('docs-release', ['default', 'clean:docs', 'gh-pages']);
 };
diff --git a/htdocs/includes/jquery/plugins/select2/README.md b/htdocs/includes/jquery/plugins/select2/README.md
index a27484fa40c..6ee975d6ee0 100644
--- a/htdocs/includes/jquery/plugins/select2/README.md
+++ b/htdocs/includes/jquery/plugins/select2/README.md
@@ -1,8 +1,6 @@
 Select2
 =======
-![Build Status][github-actions-image]
-[![Financial Contributors on Open Collective](https://opencollective.com/select2/all/badge.svg?label=financial+contributors)](https://opencollective.com/select2) [![cdnjs](https://img.shields.io/cdnjs/v/select2.svg)][cdnjs]
-[![jsdelivr](https://data.jsdelivr.com/v1/package/npm/select2/badge)][jsdelivr]
+[![Build Status][travis-ci-image]][travis-ci-status]
 
 Select2 is a jQuery-based replacement for select boxes. It supports searching,
 remote data sets, and pagination of results.
@@ -33,10 +31,14 @@ Browser compatibility
 * Safari 3+
 * Opera 10.6+
 
+Select2 is automatically tested on the following browsers.
+
+[![Sauce Labs Test Status][saucelabs-matrix]][saucelabs-status]
+
 Usage
 -----
-You can source Select2 directly from a CDN like [jsDelivr][jsdelivr] or
-[cdnjs][cdnjs], [download it from this GitHub repo][releases], or use one of
+You can source Select2 directly from a CDN like [JSDliver][jsdelivr] or
+[CDNJS][cdnjs], [download it from this GitHub repo][releases], or use one of
 the integrations below.
 
 Integrations
@@ -49,17 +51,14 @@ Plugins
   - [django-autocomplete-light]
   - [django-easy-select2]
   - [django-select2]
-* [Drupal] - [drupal-select2]
 * [Meteor] - [meteor-select2]
 * [Ruby on Rails][ruby-on-rails] - [select2-rails]
 * [Wicket] - [wicketstuff-select2]
 * [Yii 2][yii2] - [yii2-widget-select2]
-* [Angularjs][angularjs] - [mdr-angular-select2]
 
 Themes
 
 - [Bootstrap 3][bootstrap3] - [select2-bootstrap-theme]
-- [Bootstrap 4][bootstrap4] - [select2-bootstrap4-theme]
 - [Flat UI][flat-ui] - [select2-flat-theme]
 - [Metro UI][metro-ui] - [select2-metro]
 
@@ -77,8 +76,8 @@ make a pull request back to Select2 here on GitHub.
 Documentation
 -------------
 The documentation for Select2 is available
-[online at the documentation website][documentation] and is located within the
-[`docs` directory of this repository][documentation-directory].
+[through GitHub Pages][documentation] and is located within this repository
+in the [`docs` folder][documentation-folder].
 
 Community
 ---------
@@ -92,31 +91,28 @@ The license is available within the repository in the [LICENSE][license] file.
 [cdnjs]: http://www.cdnjs.com/libraries/select2
 [community]: https://select2.org/getting-help
 [documentation]: https://select2.org
-[documentation-directory]: https://github.com/select2/select2/tree/develop/docs
+[documentation-folder]: https://github.com/select2/select2/tree/master/docs
 [freenode]: https://freenode.net/
-[github-actions-image]: https://github.com/select2/select2/workflows/CI/badge.svg
-[jsdelivr]: https://www.jsdelivr.com/package/npm/select2
+[jsdelivr]: http://www.jsdelivr.com/#!select2
 [license]: LICENSE.md
 [releases]: https://github.com/select2/select2/releases
+[saucelabs-matrix]: https://saucelabs.com/browser-matrix/select2.svg
+[saucelabs-status]: https://saucelabs.com/u/select2
+[travis-ci-image]: https://img.shields.io/travis/select2/select2/master.svg
+[travis-ci-status]: https://travis-ci.org/select2/select2
 
-[angularjs]: https://angularjs.org/
 [bootstrap3]: https://getbootstrap.com/
-[bootstrap4]: https://getbootstrap.com/
 [django]: https://www.djangoproject.com/
 [django-autocomplete-light]: https://github.com/yourlabs/django-autocomplete-light
 [django-easy-select2]: https://github.com/asyncee/django-easy-select2
 [django-select2]: https://github.com/applegrew/django-select2
-[drupal]: https://www.drupal.org/
-[drupal-select2]: https://www.drupal.org/project/select2
 [flat-ui]: http://designmodo.github.io/Flat-UI/
-[mdr-angular-select2]: https://github.com/modulr/mdr-angular-select2
 [meteor]: https://www.meteor.com/
 [meteor-select2]: https://github.com/nate-strauser/meteor-select2
 [metro-ui]: http://metroui.org.ua/
 [select2-metro]: http://metroui.org.ua/select2.html
 [ruby-on-rails]: http://rubyonrails.org/
 [select2-bootstrap-theme]: https://github.com/select2/select2-bootstrap-theme
-[select2-bootstrap4-theme]: https://github.com/ttskch/select2-bootstrap4-theme
 [select2-flat-theme]: https://github.com/techhysahil/select2-Flat_Theme
 [select2-rails]: https://github.com/argerim/select2-rails
 [vue.js]: http://vuejs.org/
@@ -125,33 +121,3 @@ The license is available within the repository in the [LICENSE][license] file.
 [wicketstuff-select2]: https://github.com/wicketstuff/core/tree/master/select2-parent
 [yii2]: http://www.yiiframework.com/
 [yii2-widget-select2]: https://github.com/kartik-v/yii2-widget-select2
-
-## Contributors
-
-### Code Contributors
-
-This project exists thanks to all the people who contribute. [[Contribute](.github/CONTRIBUTING.md)].
-<a href="https://github.com/select2/select2/graphs/contributors"><img src="https://opencollective.com/select2/contributors.svg?width=890&button=false" /></a>
-
-### Financial Contributors
-
-Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/select2/contribute)]
-
-#### Individuals
-
-<a href="https://opencollective.com/select2"><img src="https://opencollective.com/select2/individuals.svg?width=890"></a>
-
-#### Organizations
-
-Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/select2/contribute)]
-
-<a href="https://opencollective.com/select2/organization/0/website"><img src="https://opencollective.com/select2/organization/0/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/1/website"><img src="https://opencollective.com/select2/organization/1/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/2/website"><img src="https://opencollective.com/select2/organization/2/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/3/website"><img src="https://opencollective.com/select2/organization/3/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/4/website"><img src="https://opencollective.com/select2/organization/4/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/5/website"><img src="https://opencollective.com/select2/organization/5/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/6/website"><img src="https://opencollective.com/select2/organization/6/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/7/website"><img src="https://opencollective.com/select2/organization/7/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/8/website"><img src="https://opencollective.com/select2/organization/8/avatar.svg"></a>
-<a href="https://opencollective.com/select2/organization/9/website"><img src="https://opencollective.com/select2/organization/9/avatar.svg"></a>
diff --git a/htdocs/includes/jquery/plugins/select2/component.json b/htdocs/includes/jquery/plugins/select2/component.json
index a8e74c52499..078338b59d3 100644
--- a/htdocs/includes/jquery/plugins/select2/component.json
+++ b/htdocs/includes/jquery/plugins/select2/component.json
@@ -2,7 +2,7 @@
   "name": "select2",
   "repo": "select/select2",
   "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-  "version": "4.0.13",
+  "version": "4.0.4",
   "demo": "https://select2.org/",
   "keywords": [
     "jquery"
diff --git a/htdocs/includes/jquery/plugins/select2/composer.json b/htdocs/includes/jquery/plugins/select2/composer.json
index 5ef2db2b1db..141f4e14155 100644
--- a/htdocs/includes/jquery/plugins/select2/composer.json
+++ b/htdocs/includes/jquery/plugins/select2/composer.json
@@ -4,6 +4,9 @@
   "type": "component",
   "homepage": "https://select2.org/",
   "license": "MIT",
+  "require": {
+    "robloach/component-installer": "*"
+  },
   "extra": {
     "component": {
       "scripts": [
diff --git a/htdocs/includes/jquery/plugins/select2/dist/css/select2.css b/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
index 750b3207aeb..447b2b86cc0 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
+++ b/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
@@ -118,14 +118,12 @@
 .select2-hidden-accessible {
   border: 0 !important;
   clip: rect(0 0 0 0) !important;
-  -webkit-clip-path: inset(50%) !important;
-  clip-path: inset(50%) !important;
   height: 1px !important;
+  margin: -1px !important;
   overflow: hidden !important;
   padding: 0 !important;
   position: absolute !important;
-  width: 1px !important;
-  white-space: nowrap !important; }
+  width: 1px !important; }
 
 .select2-container--default .select2-selection--single {
   background-color: #fff;
@@ -188,13 +186,16 @@
     width: 100%; }
     .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
       list-style: none; }
+  .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
+    color: #999;
+    margin-top: 5px;
+    float: left; }
   .select2-container--default .select2-selection--multiple .select2-selection__clear {
     cursor: pointer;
     float: right;
     font-weight: bold;
     margin-top: 5px;
-    margin-right: 10px;
-    padding: 1px; }
+    margin-right: 10px; }
   .select2-container--default .select2-selection--multiple .select2-selection__choice {
     background-color: #e4e4e4;
     border: 1px solid #aaa;
@@ -213,7 +214,7 @@
     .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
       color: #333; }
 
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
   float: right; }
 
 .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
@@ -419,7 +420,9 @@
       color: #555; }
 
 .select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
-  float: right;
+  float: right; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
   margin-left: 5px;
   margin-right: auto; }
 
diff --git a/htdocs/includes/jquery/plugins/select2/dist/css/select2.min.css b/htdocs/includes/jquery/plugins/select2/dist/css/select2.min.css
index 7c18ad59dfc..76de04d9233 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/css/select2.min.css
+++ b/htdocs/includes/jquery/plugins/select2/dist/css/select2.min.css
@@ -1 +1 @@
-.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;height:1px !important;margin:-1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/af.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/af.js
deleted file mode 100644
index 32e5ac7de89..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/af.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/af",[],function(){return{errorLoading:function(){return"Die resultate kon nie gelaai word nie."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Verwyders asseblief "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Voer asseblief "+(e.minimum-e.input.length)+" of meer karakters"},loadingMore:function(){return"Meer resultate word gelaai…"},maximumSelected:function(e){var n="Kies asseblief net "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"Geen resultate gevind"},searching:function(){return"Besig…"},removeAllItems:function(){return"Verwyder alle items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ar.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ar.js
deleted file mode 100644
index 64e1caad34d..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ar.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ar",[],function(){return{errorLoading:function(){return"لا يمكن تحميل النتائج"},inputTooLong:function(n){return"الرجاء حذ� "+(n.input.length-n.maximum)+" عناصر"},inputTooShort:function(n){return"الرجاء إضا�ة "+(n.minimum-n.input.length)+" عناصر"},loadingMore:function(){return"جاري تحميل نتائج إضا�ية..."},maximumSelected:function(n){return"تستطيع إختيار "+n.maximum+" بنود �قط"},noResults:function(){return"لم يتم العثور على أي نتائج"},searching:function(){return"جاري البحث…"},removeAllItems:function(){return"قم بإزالة كل العناصر"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/az.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/az.js
deleted file mode 100644
index 1d52c260f29..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/az.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/az",[],function(){return{inputTooLong:function(n){return n.input.length-n.maximum+" simvol silin"},inputTooShort:function(n){return n.minimum-n.input.length+" simvol daxil edin"},loadingMore:function(){return"Daha çox nəticə yüklənir…"},maximumSelected:function(n){return"Sadəcə "+n.maximum+" element seçə bilərsiniz"},noResults:function(){return"Nəticə tapılmadı"},searching:function(){return"Axtarılır…"},removeAllItems:function(){return"Bütün elementləri sil"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bg.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bg.js
deleted file mode 100644
index 73b730a705a..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bg.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/bg",[],function(){return{inputTooLong:function(n){var e=n.input.length-n.maximum,u="Мол� въведете � "+e+" по-малко �имвол";return e>1&&(u+="a"),u},inputTooShort:function(n){var e=n.minimum-n.input.length,u="Мол� въведете още "+e+" �имвол";return e>1&&(u+="a"),u},loadingMore:function(){return"Зареждат �е още…"},maximumSelected:function(n){var e="Можете да направите до "+n.maximum+" ";return n.maximum>1?e+="избора":e+="избор",e},noResults:function(){return"��ма намерени �ъвпадени�"},searching:function(){return"Тър�ене…"},removeAllItems:function(){return"Премахнете в�ички елементи"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bn.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bn.js
deleted file mode 100644
index 2d17b9d8e05..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bn.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/bn",[],function(){return{errorLoading:function(){return"ফলাফলগ�লি লোড করা যায়নি।"},inputTooLong:function(n){var e=n.input.length-n.maximum,u="অন�গ�রহ করে "+e+" টি অক�ষর ম�ছে দিন।";return 1!=e&&(u="অন�গ�রহ করে "+e+" টি অক�ষর ম�ছে দিন।"),u},inputTooShort:function(n){return n.minimum-n.input.length+" টি অক�ষর অথবা অধিক অক�ষর লিখ�ন।"},loadingMore:function(){return"আরো ফলাফল লোড হচ�ছে ..."},maximumSelected:function(n){var e=n.maximum+" টি আইটেম নির�বাচন করতে পারবেন।";return 1!=n.maximum&&(e=n.maximum+" টি আইটেম নির�বাচন করতে পারবেন।"),e},noResults:function(){return"কোন ফলাফল পাওয়া যায়নি।"},searching:function(){return"অন�সন�ধান করা হচ�ছে ..."}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bs.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bs.js
deleted file mode 100644
index 46b084d7583..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bs.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/bs",[],function(){function e(e,n,r,t){return e%10==1&&e%100!=11?n:e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?r:t}return{errorLoading:function(){return"Preuzimanje nije uspijelo."},inputTooLong:function(n){var r=n.input.length-n.maximum,t="Obrišite "+r+" simbol";return t+=e(r,"","a","a")},inputTooShort:function(n){var r=n.minimum-n.input.length,t="Ukucajte bar još "+r+" simbol";return t+=e(r,"","a","a")},loadingMore:function(){return"Preuzimanje još rezultata…"},maximumSelected:function(n){var r="Možete izabrati samo "+n.maximum+" stavk";return r+=e(n.maximum,"u","e","i")},noResults:function(){return"Ništa nije pronađeno"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Uklonite sve stavke"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ca.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ca.js
deleted file mode 100644
index 82dbbb7a212..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ca.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/ca",[],function(){return{errorLoading:function(){return"La càrrega ha fallat"},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Si us plau, elimina "+n+" car";return r+=1==n?"àcter":"àcters"},inputTooShort:function(e){var n=e.minimum-e.input.length,r="Si us plau, introdueix "+n+" car";return r+=1==n?"àcter":"àcters"},loadingMore:function(){return"Carregant més resultats…"},maximumSelected:function(e){var n="Només es pot seleccionar "+e.maximum+" element";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No s'han trobat resultats"},searching:function(){return"Cercant…"},removeAllItems:function(){return"Treu tots els elements"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/cs.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/cs.js
deleted file mode 100644
index 7116d6c1dfd..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/cs.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/cs",[],function(){function e(e,n){switch(e){case 2:return n?"dva":"dvě";case 3:return"tři";case 4:return"�tyři"}return""}return{errorLoading:function(){return"Výsledky nemohly být na�teny."},inputTooLong:function(n){var t=n.input.length-n.maximum;return 1==t?"Prosím, zadejte o jeden znak méně.":t<=4?"Prosím, zadejte o "+e(t,!0)+" znaky méně.":"Prosím, zadejte o "+t+" znaků méně."},inputTooShort:function(n){var t=n.minimum-n.input.length;return 1==t?"Prosím, zadejte ještě jeden znak.":t<=4?"Prosím, zadejte ještě další "+e(t,!0)+" znaky.":"Prosím, zadejte ještě dalších "+t+" znaků."},loadingMore:function(){return"Na�ítají se další výsledky…"},maximumSelected:function(n){var t=n.maximum;return 1==t?"Můžete zvolit jen jednu položku.":t<=4?"Můžete zvolit maximálně "+e(t,!1)+" položky.":"Můžete zvolit maximálně "+t+" položek."},noResults:function(){return"Nenalezeny žádné položky."},searching:function(){return"Vyhledávání…"},removeAllItems:function(){return"Odstraňte všechny položky"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/da.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/da.js
deleted file mode 100644
index cda32c34aaa..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/da.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/da",[],function(){return{errorLoading:function(){return"Resultaterne kunne ikke indlæses."},inputTooLong:function(e){return"Angiv venligst "+(e.input.length-e.maximum)+" tegn mindre"},inputTooShort:function(e){return"Angiv venligst "+(e.minimum-e.input.length)+" tegn mere"},loadingMore:function(){return"Indlæser flere resultater…"},maximumSelected:function(e){var n="Du kan kun vælge "+e.maximum+" emne";return 1!=e.maximum&&(n+="r"),n},noResults:function(){return"Ingen resultater fundet"},searching:function(){return"Søger…"},removeAllItems:function(){return"Fjern alle elementer"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/de.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/de.js
deleted file mode 100644
index c2e61e5800b..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/de.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/de",[],function(){return{errorLoading:function(){return"Die Ergebnisse konnten nicht geladen werden."},inputTooLong:function(e){return"Bitte "+(e.input.length-e.maximum)+" Zeichen weniger eingeben"},inputTooShort:function(e){return"Bitte "+(e.minimum-e.input.length)+" Zeichen mehr eingeben"},loadingMore:function(){return"Lade mehr Ergebnisse…"},maximumSelected:function(e){var n="Sie können nur "+e.maximum+" Element";return 1!=e.maximum&&(n+="e"),n+=" auswählen"},noResults:function(){return"Keine Übereinstimmungen gefunden"},searching:function(){return"Suche…"},removeAllItems:function(){return"Entferne alle Elemente"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/dsb.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/dsb.js
deleted file mode 100644
index 02f283abada..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/dsb.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/dsb",[],function(){var n=["znamuško","znamušce","znamuška","znamuškow"],e=["zapisk","zapiska","zapiski","zapiskow"],u=function(n,e){return 1===n?e[0]:2===n?e[1]:n>2&&n<=4?e[2]:n>=5?e[3]:void 0};return{errorLoading:function(){return"Wuslědki njejsu se dali zacytaś."},inputTooLong:function(e){var a=e.input.length-e.maximum;return"Pšosym lašuj "+a+" "+u(a,n)},inputTooShort:function(e){var a=e.minimum-e.input.length;return"Pšosym zapódaj nanejmjenjej "+a+" "+u(a,n)},loadingMore:function(){return"Dalšne wuslědki se zacytaju…"},maximumSelected:function(n){return"Móžoš jano "+n.maximum+" "+u(n.maximum,e)+"wubraś."},noResults:function(){return"Žedne wuslědki namakane"},searching:function(){return"Pyta se…"},removeAllItems:function(){return"Remove all items"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/el.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/el.js
deleted file mode 100644
index d4922a1df5b..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/el.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/el",[],function(){return{errorLoading:function(){return"Τα αποτελέσματα δεν μπό�εσαν να φο�τώσουν."},inputTooLong:function(n){var e=n.input.length-n.maximum,u="Πα�ακαλώ διαγ�άψτε "+e+" χα�ακτή�";return 1==e&&(u+="α"),1!=e&&(u+="ες"),u},inputTooShort:function(n){return"Πα�ακαλώ συμπλη�ώστε "+(n.minimum-n.input.length)+" ή πε�ισσότε�ους χα�ακτή�ες"},loadingMore:function(){return"Φό�τωση πε�ισσότε�ων αποτελεσμάτων…"},maximumSelected:function(n){var e="Μπο�είτε να επιλέξετε μόνο "+n.maximum+" επιλογ";return 1==n.maximum&&(e+="ή"),1!=n.maximum&&(e+="ές"),e},noResults:function(){return"Δεν β�έθηκαν αποτελέσματα"},searching:function(){return"Αναζήτηση…"},removeAllItems:function(){return"Κατα�γήστε όλα τα στοιχεία"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/en.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/en.js
deleted file mode 100644
index 3b192857342..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/en.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Please delete "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var n="You can only select "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/es.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/es.js
deleted file mode 100644
index 68afd6d2592..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/es.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/es",[],function(){return{errorLoading:function(){return"No se pudieron cargar los resultados"},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Por favor, elimine "+n+" car";return r+=1==n?"ácter":"acteres"},inputTooShort:function(e){var n=e.minimum-e.input.length,r="Por favor, introduzca "+n+" car";return r+=1==n?"ácter":"acteres"},loadingMore:function(){return"Cargando más resultados…"},maximumSelected:function(e){var n="Sólo puede seleccionar "+e.maximum+" elemento";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No se encontraron resultados"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Eliminar todos los elementos"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/et.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/et.js
deleted file mode 100644
index 070b61a26dd..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/et.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/et",[],function(){return{inputTooLong:function(e){var n=e.input.length-e.maximum,t="Sisesta "+n+" täht";return 1!=n&&(t+="e"),t+=" vähem"},inputTooShort:function(e){var n=e.minimum-e.input.length,t="Sisesta "+n+" täht";return 1!=n&&(t+="e"),t+=" rohkem"},loadingMore:function(){return"Laen tulemusi…"},maximumSelected:function(e){var n="Saad vaid "+e.maximum+" tulemus";return 1==e.maximum?n+="e":n+="t",n+=" valida"},noResults:function(){return"Tulemused puuduvad"},searching:function(){return"Otsin…"},removeAllItems:function(){return"Eemalda kõik esemed"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/eu.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/eu.js
deleted file mode 100644
index 90d5e73f8a8..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/eu.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/eu",[],function(){return{inputTooLong:function(e){var t=e.input.length-e.maximum,n="Idatzi ";return n+=1==t?"karaktere bat":t+" karaktere",n+=" gutxiago"},inputTooShort:function(e){var t=e.minimum-e.input.length,n="Idatzi ";return n+=1==t?"karaktere bat":t+" karaktere",n+=" gehiago"},loadingMore:function(){return"Emaitza gehiago kargatzen…"},maximumSelected:function(e){return 1===e.maximum?"Elementu bakarra hauta dezakezu":e.maximum+" elementu hauta ditzakezu soilik"},noResults:function(){return"Ez da bat datorrenik aurkitu"},searching:function(){return"Bilatzen…"},removeAllItems:function(){return"Kendu elementu guztiak"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fa.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fa.js
deleted file mode 100644
index e1ffdbed0d8..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fa.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/fa",[],function(){return{errorLoading:function(){return"امکان بارگذاری نتایج وجود ندارد."},inputTooLong:function(n){return"لط�اً "+(n.input.length-n.maximum)+" کاراکتر را حذ� نمایید"},inputTooShort:function(n){return"لط�اً تعداد "+(n.minimum-n.input.length)+" کاراکتر یا بیشتر وارد نمایید"},loadingMore:function(){return"در حال بارگذاری نتایج بیشتر..."},maximumSelected:function(n){return"شما تنها می‌توانید "+n.maximum+" آیتم را انتخاب نمایید"},noResults:function(){return"هیچ نتیجه‌ای یا�ت نشد"},searching:function(){return"در حال جستجو..."},removeAllItems:function(){return"همه موارد را حذ� کنید"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fi.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fi.js
deleted file mode 100644
index ffed1247dd0..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fi.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/fi",[],function(){return{errorLoading:function(){return"Tuloksia ei saatu ladattua."},inputTooLong:function(n){return"Ole hyvä ja anna "+(n.input.length-n.maximum)+" merkkiä vähemmän"},inputTooShort:function(n){return"Ole hyvä ja anna "+(n.minimum-n.input.length)+" merkkiä lisää"},loadingMore:function(){return"Ladataan lisää tuloksia…"},maximumSelected:function(n){return"Voit valita ainoastaan "+n.maximum+" kpl"},noResults:function(){return"Ei tuloksia"},searching:function(){return"Haetaan…"},removeAllItems:function(){return"Poista kaikki kohteet"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fr.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fr.js
deleted file mode 100644
index dd02f973ffa..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fr.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/fr",[],function(){return{errorLoading:function(){return"Les résultats ne peuvent pas être chargés."},inputTooLong:function(e){var n=e.input.length-e.maximum;return"Supprimez "+n+" caractère"+(n>1?"s":"")},inputTooShort:function(e){var n=e.minimum-e.input.length;return"Saisissez au moins "+n+" caractère"+(n>1?"s":"")},loadingMore:function(){return"Chargement de résultats supplémentaires…"},maximumSelected:function(e){return"Vous pouvez seulement sélectionner "+e.maximum+" élément"+(e.maximum>1?"s":"")},noResults:function(){return"Aucun résultat trouvé"},searching:function(){return"Recherche en cours…"},removeAllItems:function(){return"Supprimer tous les éléments"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/gl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/gl.js
deleted file mode 100644
index 208a0057057..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/gl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/gl",[],function(){return{errorLoading:function(){return"Non foi posíbel cargar os resultados."},inputTooLong:function(e){var n=e.input.length-e.maximum;return 1===n?"Elimine un carácter":"Elimine "+n+" caracteres"},inputTooShort:function(e){var n=e.minimum-e.input.length;return 1===n?"Engada un carácter":"Engada "+n+" caracteres"},loadingMore:function(){return"Cargando máis resultados…"},maximumSelected:function(e){return 1===e.maximum?"Só pode seleccionar un elemento":"Só pode seleccionar "+e.maximum+" elementos"},noResults:function(){return"Non se atoparon resultados"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Elimina todos os elementos"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/he.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/he.js
deleted file mode 100644
index 25a8805aa02..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/he.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/he",[],function(){return{errorLoading:function(){return"שגי�ה בטעינת התוצ�ות"},inputTooLong:function(n){var e=n.input.length-n.maximum,r="נ� למחוק ";return r+=1===e?"תו �חד":e+" תווי�"},inputTooShort:function(n){var e=n.minimum-n.input.length,r="נ� להכניס ";return r+=1===e?"תו �חד":e+" תווי�",r+=" �ו יותר"},loadingMore:function(){return"טוען תוצ�ות נוספות…"},maximumSelected:function(n){var e="ב�פשרותך לבחור עד ";return 1===n.maximum?e+="פריט �חד":e+=n.maximum+" פריטי�",e},noResults:function(){return"ל� נמצ�ו תוצ�ות"},searching:function(){return"מחפש…"},removeAllItems:function(){return"הסר �ת כל הפריטי�"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hi.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hi.js
deleted file mode 100644
index f3ed798434b..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hi.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hi",[],function(){return{errorLoading:function(){return"परिणामों को लोड नहीं किया जा सका।"},inputTooLong:function(n){var e=n.input.length-n.maximum,r=e+" अक�षर को हटा दें";return e>1&&(r=e+" अक�षरों को हटा दें "),r},inputTooShort:function(n){return"कृपया "+(n.minimum-n.input.length)+" या अधिक अक�षर दर�ज करें"},loadingMore:function(){return"अधिक परिणाम लोड हो रहे है..."},maximumSelected:function(n){return"आप केवल "+n.maximum+" आइटम का चयन कर सकते हैं"},noResults:function(){return"कोई परिणाम नहीं मिला"},searching:function(){return"खोज रहा है..."},removeAllItems:function(){return"सभी वस�त�ओं को हटा दें"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hr.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hr.js
deleted file mode 100644
index cb3268db161..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hr.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hr",[],function(){function n(n){var e=" "+n+" znak";return n%10<5&&n%10>0&&(n%100<5||n%100>19)?n%10>1&&(e+="a"):e+="ova",e}return{errorLoading:function(){return"Preuzimanje nije uspjelo."},inputTooLong:function(e){return"Unesite "+n(e.input.length-e.maximum)},inputTooShort:function(e){return"Unesite još "+n(e.minimum-e.input.length)},loadingMore:function(){return"U�itavanje rezultata…"},maximumSelected:function(n){return"Maksimalan broj odabranih stavki je "+n.maximum},noResults:function(){return"Nema rezultata"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Ukloni sve stavke"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hsb.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hsb.js
deleted file mode 100644
index 3d5bf09dbd5..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hsb.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hsb",[],function(){var n=["znamješko","znamješce","znamješka","znamješkow"],e=["zapisk","zapiskaj","zapiski","zapiskow"],u=function(n,e){return 1===n?e[0]:2===n?e[1]:n>2&&n<=4?e[2]:n>=5?e[3]:void 0};return{errorLoading:function(){return"Wuslědki njedachu so za�itać."},inputTooLong:function(e){var a=e.input.length-e.maximum;return"Prošu zhašej "+a+" "+u(a,n)},inputTooShort:function(e){var a=e.minimum-e.input.length;return"Prošu zapodaj znajmjeńša "+a+" "+u(a,n)},loadingMore:function(){return"Dalše wuslědki so za�itaja…"},maximumSelected:function(n){return"Móžeš jenož "+n.maximum+" "+u(n.maximum,e)+"wubrać"},noResults:function(){return"Žane wuslědki namakane"},searching:function(){return"Pyta so…"},removeAllItems:function(){return"Remove all items"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hu.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hu.js
deleted file mode 100644
index 4893aa2f70d..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hu.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/hu",[],function(){return{errorLoading:function(){return"Az eredmények betöltése nem sikerült."},inputTooLong:function(e){return"Túl hosszú. "+(e.input.length-e.maximum)+" karakterrel több, mint kellene."},inputTooShort:function(e){return"Túl rövid. Még "+(e.minimum-e.input.length)+" karakter hiányzik."},loadingMore:function(){return"Töltés…"},maximumSelected:function(e){return"Csak "+e.maximum+" elemet lehet kiválasztani."},noResults:function(){return"Nincs találat."},searching:function(){return"Keresés…"},removeAllItems:function(){return"Távolítson el minden elemet"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hy.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hy.js
deleted file mode 100644
index 8230007141a..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hy.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hy",[],function(){return{errorLoading:function(){return"Արդյունքները հնարավոր չէ բեռնել։"},inputTooLong:function(n){return"Խնդրում ենք հեռա�նել "+(n.input.length-n.maximum)+" նշան"},inputTooShort:function(n){return"Խնդրում ենք մուտքագրել "+(n.minimum-n.input.length)+" կամ ավել նշաններ"},loadingMore:function(){return"Բեռնվում են նոր արդյունքներ․․․"},maximumSelected:function(n){return"Դուք կարող եք ընտրել առավելագույնը "+n.maximum+" կետ"},noResults:function(){return"Արդյունքներ չեն գտնվել"},searching:function(){return"Որոնում․․․"},removeAllItems:function(){return"Հեռա�նել բոլոր տարրերը"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/id.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/id.js
deleted file mode 100644
index 4a0b3bf009d..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/id.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/id",[],function(){return{errorLoading:function(){return"Data tidak boleh diambil."},inputTooLong:function(n){return"Hapuskan "+(n.input.length-n.maximum)+" huruf"},inputTooShort:function(n){return"Masukkan "+(n.minimum-n.input.length)+" huruf lagi"},loadingMore:function(){return"Mengambil data…"},maximumSelected:function(n){return"Anda hanya dapat memilih "+n.maximum+" pilihan"},noResults:function(){return"Tidak ada data yang sesuai"},searching:function(){return"Mencari…"},removeAllItems:function(){return"Hapus semua item"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/is.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/is.js
deleted file mode 100644
index cca5bbecf02..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/is.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/is",[],function(){return{inputTooLong:function(n){var t=n.input.length-n.maximum,e="Vinsamlegast styttið texta um "+t+" staf";return t<=1?e:e+"i"},inputTooShort:function(n){var t=n.minimum-n.input.length,e="Vinsamlegast skrifið "+t+" staf";return t>1&&(e+="i"),e+=" í viðbót"},loadingMore:function(){return"Sæki fleiri niðurstöður…"},maximumSelected:function(n){return"Þú getur aðeins valið "+n.maximum+" atriði"},noResults:function(){return"Ekkert fannst"},searching:function(){return"Leita…"},removeAllItems:function(){return"Fjarlægðu öll atriði"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/it.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/it.js
deleted file mode 100644
index 507c7d9f293..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/it.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/it",[],function(){return{errorLoading:function(){return"I risultati non possono essere caricati."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Per favore cancella "+n+" caratter";return t+=1!==n?"i":"e"},inputTooShort:function(e){return"Per favore inserisci "+(e.minimum-e.input.length)+" o più caratteri"},loadingMore:function(){return"Caricando più risultati…"},maximumSelected:function(e){var n="Puoi selezionare solo "+e.maximum+" element";return 1!==e.maximum?n+="i":n+="o",n},noResults:function(){return"Nessun risultato trovato"},searching:function(){return"Sto cercando…"},removeAllItems:function(){return"Rimuovi tutti gli oggetti"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ja.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ja.js
deleted file mode 100644
index 451025e2c7d..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ja.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ja",[],function(){return{errorLoading:function(){return"�果�読�込�れ��ん���"},inputTooLong:function(n){return n.input.length-n.maximum+" 文字を削除������"},inputTooShort:function(n){return"少���も "+(n.minimum-n.input.length)+" 文字を入力������"},loadingMore:function(){return"読�込�中…"},maximumSelected:function(n){return n.maximum+" 件���択����ん"},noResults:function(){return"対象�見��り��ん"},searching:function(){return"検索�����…"},removeAllItems:function(){return"����アイテムを削除"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ka.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ka.js
deleted file mode 100644
index 60c593b705d..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ka.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ka",[],function(){return{errorLoading:function(){return"მ�ნ�ცემების ჩ�ტვირთვ� შეუძლებელი�."},inputTooLong:function(n){return"გთხ�ვთ �კრიფეთ "+(n.input.length-n.maximum)+" სიმბ�ლ�თი ნ�კლები"},inputTooShort:function(n){return"გთხ�ვთ �კრიფეთ "+(n.minimum-n.input.length)+" სიმბ�ლ� �ნ მეტი"},loadingMore:function(){return"მ�ნ�ცემების ჩ�ტვირთვ�…"},maximumSelected:function(n){return"თქვენ შეგიძლი�თ �ირჩი�თ �რ�უმეტეს "+n.maximum+" ელემენტი"},noResults:function(){return"რეზულტ�ტი �რ მ�იძებნ�"},searching:function(){return"ძიებ�…"},removeAllItems:function(){return"�მ�იღე ყველ� ელემენტი"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/km.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/km.js
deleted file mode 100644
index 4dca94f414e..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/km.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/km",[],function(){return{errorLoading:function(){return"មិនអាចទាញយកទិន្នន�យ"},inputTooLong:function(n){return"សូមលុបច�ញ  "+(n.input.length-n.maximum)+" អក្សរ"},inputTooShort:function(n){return"សូមបញ្ចូល"+(n.minimum-n.input.length)+" អក្សរ រឺ ច្រើនជាងន�ះ"},loadingMore:function(){return"កំពុងទាញយកទិន្នន�យបន្�ែម..."},maximumSelected:function(n){return"អ្នកអាចជ្រើសរើសបាន�ែ "+n.maximum+" ជម្រើសប៉ុណ្ណោះ"},noResults:function(){return"មិនមានលទ្ធផល"},searching:function(){return"កំពុងស្វែងរក..."},removeAllItems:function(){return"លុបធា�ុទាំងអស់"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ko.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ko.js
deleted file mode 100644
index f2880fb0043..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ko.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(n){return"너무 �니다. "+(n.input.length-n.maximum)+" 글� 지워주세요."},inputTooShort:function(n){return"너무 짧습니다. "+(n.minimum-n.input.length)+" 글� � 입력해주세요."},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(n){return"최대 "+n.maximum+"개까지만 선� 가능합니다."},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"},removeAllItems:function(){return"모든 항목 삭제"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lt.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lt.js
deleted file mode 100644
index f6a42155ad8..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lt.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/lt",[],function(){function n(n,e,i,t){return n%10==1&&(n%100<11||n%100>19)?e:n%10>=2&&n%10<=9&&(n%100<11||n%100>19)?i:t}return{inputTooLong:function(e){var i=e.input.length-e.maximum,t="Pašalinkite "+i+" simbol";return t+=n(i,"į","ius","ių")},inputTooShort:function(e){var i=e.minimum-e.input.length,t="Įrašykite dar "+i+" simbol";return t+=n(i,"į","ius","ių")},loadingMore:function(){return"Kraunama daugiau rezultatų…"},maximumSelected:function(e){var i="Jūs galite pasirinkti tik "+e.maximum+" element";return i+=n(e.maximum,"ą","us","ų")},noResults:function(){return"Atitikmenų nerasta"},searching:function(){return"Ieškoma…"},removeAllItems:function(){return"Pašalinti visus elementus"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lv.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lv.js
deleted file mode 100644
index 806dc5c4339..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lv.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/lv",[],function(){function e(e,n,u,i){return 11===e?n:e%10==1?u:i}return{inputTooLong:function(n){var u=n.input.length-n.maximum,i="Lūdzu ievadiet par  "+u;return(i+=" simbol"+e(u,"iem","u","iem"))+" maz�k"},inputTooShort:function(n){var u=n.minimum-n.input.length,i="Lūdzu ievadiet vēl "+u;return i+=" simbol"+e(u,"us","u","us")},loadingMore:function(){return"Datu iel�de…"},maximumSelected:function(n){var u="Jūs varat izvēlēties ne vair�k k� "+n.maximum;return u+=" element"+e(n.maximum,"us","u","us")},noResults:function(){return"Sakritību nav"},searching:function(){return"Meklēšana…"},removeAllItems:function(){return"Noņemt visus vienumus"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/mk.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/mk.js
deleted file mode 100644
index cb7b84a2634..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/mk.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/mk",[],function(){return{inputTooLong:function(n){var e=(n.input.length,n.maximum,"Ве молиме вне�ете "+n.maximum+" помалку карактер");return 1!==n.maximum&&(e+="и"),e},inputTooShort:function(n){var e=(n.minimum,n.input.length,"Ве молиме вне�ете уште "+n.maximum+" карактер");return 1!==n.maximum&&(e+="и"),e},loadingMore:function(){return"Вчитување резултати…"},maximumSelected:function(n){var e="Можете да изберете �амо "+n.maximum+" �тавк";return 1===n.maximum?e+="а":e+="и",e},noResults:function(){return"�ема пронајдено �овпаѓања"},searching:function(){return"Пребарување…"},removeAllItems:function(){return"От�трани ги �ите предмети"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ms.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ms.js
deleted file mode 100644
index 6bd7eaa3e02..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ms.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ms",[],function(){return{errorLoading:function(){return"Keputusan tidak berjaya dimuatkan."},inputTooLong:function(n){return"Sila hapuskan "+(n.input.length-n.maximum)+" aksara"},inputTooShort:function(n){return"Sila masukkan "+(n.minimum-n.input.length)+" atau lebih aksara"},loadingMore:function(){return"Sedang memuatkan keputusan…"},maximumSelected:function(n){return"Anda hanya boleh memilih "+n.maximum+" pilihan"},noResults:function(){return"Tiada padanan yang ditemui"},searching:function(){return"Mencari…"},removeAllItems:function(){return"Keluarkan semua item"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nb.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nb.js
deleted file mode 100644
index 25d89c68704..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nb.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/nb",[],function(){return{errorLoading:function(){return"Kunne ikke hente resultater."},inputTooLong:function(e){return"Vennligst fjern "+(e.input.length-e.maximum)+" tegn"},inputTooShort:function(e){return"Vennligst skriv inn "+(e.minimum-e.input.length)+" tegn til"},loadingMore:function(){return"Laster flere resultater…"},maximumSelected:function(e){return"Du kan velge maks "+e.maximum+" elementer"},noResults:function(){return"Ingen treff"},searching:function(){return"Søker…"},removeAllItems:function(){return"Fjern alle elementer"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ne.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ne.js
deleted file mode 100644
index 1c39f672103..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ne.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ne",[],function(){return{errorLoading:function(){return"नतिजाहर� देखाउन सकि�न।"},inputTooLong:function(n){var e=n.input.length-n.maximum,u="कृपया "+e+" अक�षर मेटाउन�होस�।";return 1!=e&&(u+="कृपया "+e+" अक�षरहर� मेटाउन�होस�।"),u},inputTooShort:function(n){return"कृपया बा�की रहेका "+(n.minimum-n.input.length)+" वा अर� धेरै अक�षरहर� भर�न�होस�।"},loadingMore:function(){return"अर� नतिजाहर� भरि�दैछन� …"},maximumSelected:function(n){var e="त�पाई "+n.maximum+" वस�त� मात�र छान�न पाउ�न�ह�न�छ।";return 1!=n.maximum&&(e="त�पाई "+n.maximum+" वस�त�हर� मात�र छान�न पाउ�न�ह�न�छ।"),e},noResults:function(){return"क�नै पनि नतिजा भेटि�न।"},searching:function(){return"खोजि ह��दैछ…"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nl.js
deleted file mode 100644
index 2b74058d237..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/nl",[],function(){return{errorLoading:function(){return"De resultaten konden niet worden geladen."},inputTooLong:function(e){return"Gelieve "+(e.input.length-e.maximum)+" karakters te verwijderen"},inputTooShort:function(e){return"Gelieve "+(e.minimum-e.input.length)+" of meer karakters in te voeren"},loadingMore:function(){return"Meer resultaten laden…"},maximumSelected:function(e){var n=1==e.maximum?"kan":"kunnen",r="Er "+n+" maar "+e.maximum+" item";return 1!=e.maximum&&(r+="s"),r+=" worden geselecteerd"},noResults:function(){return"Geen resultaten gevonden…"},searching:function(){return"Zoeken…"},removeAllItems:function(){return"Verwijder alle items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pl.js
deleted file mode 100644
index 4ca5748c386..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/pl",[],function(){var n=["znak","znaki","znaków"],e=["element","elementy","elementów"],r=function(n,e){return 1===n?e[0]:n>1&&n<=4?e[1]:n>=5?e[2]:void 0};return{errorLoading:function(){return"Nie można załadować wyników."},inputTooLong:function(e){var t=e.input.length-e.maximum;return"Usuń "+t+" "+r(t,n)},inputTooShort:function(e){var t=e.minimum-e.input.length;return"Podaj przynajmniej "+t+" "+r(t,n)},loadingMore:function(){return"Trwa ładowanie…"},maximumSelected:function(n){return"Możesz zaznaczyć tylko "+n.maximum+" "+r(n.maximum,e)},noResults:function(){return"Brak wyników"},searching:function(){return"Trwa wyszukiwanie…"},removeAllItems:function(){return"Usuń wszystkie przedmioty"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ps.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ps.js
deleted file mode 100644
index 9b008e4c145..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ps.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ps",[],function(){return{errorLoading:function(){return"پايلي نه سي ترلاسه ک�دای"},inputTooLong:function(n){var e=n.input.length-n.maximum,r="د مهربان� لمخي "+e+" توری ړنګ کړئ";return 1!=e&&(r=r.replace("توری","توري")),r},inputTooShort:function(n){return"لږ تر لږه "+(n.minimum-n.input.length)+" يا ډ�ر توري وليکئ"},loadingMore:function(){return"نوري پايلي ترلاسه کيږي..."},maximumSelected:function(n){var e="تاسو يوازي "+n.maximum+" قلم په نښه کولای سی";return 1!=n.maximum&&(e=e.replace("قلم","قلمونه")),e},noResults:function(){return"پايلي و نه موندل سو�"},searching:function(){return"لټول کيږي..."},removeAllItems:function(){return"ټول توکي لر� کړئ"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt-BR.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt-BR.js
deleted file mode 100644
index c991e2550ae..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt-BR.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/pt-BR",[],function(){return{errorLoading:function(){return"Os resultados não puderam ser carregados."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Apague "+n+" caracter";return 1!=n&&(r+="es"),r},inputTooShort:function(e){return"Digite "+(e.minimum-e.input.length)+" ou mais caracteres"},loadingMore:function(){return"Carregando mais resultados…"},maximumSelected:function(e){var n="Você só pode selecionar "+e.maximum+" ite";return 1==e.maximum?n+="m":n+="ns",n},noResults:function(){return"Nenhum resultado encontrado"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Remover todos os itens"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt.js
deleted file mode 100644
index b5da1a6b496..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/pt",[],function(){return{errorLoading:function(){return"Os resultados não puderam ser carregados."},inputTooLong:function(e){var r=e.input.length-e.maximum,n="Por favor apague "+r+" ";return n+=1!=r?"caracteres":"caractere"},inputTooShort:function(e){return"Introduza "+(e.minimum-e.input.length)+" ou mais caracteres"},loadingMore:function(){return"A carregar mais resultados…"},maximumSelected:function(e){var r="Apenas pode seleccionar "+e.maximum+" ";return r+=1!=e.maximum?"itens":"item"},noResults:function(){return"Sem resultados"},searching:function(){return"A procurar…"},removeAllItems:function(){return"Remover todos os itens"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ro.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ro.js
deleted file mode 100644
index 1ba7b40bef7..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ro.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/ro",[],function(){return{errorLoading:function(){return"Rezultatele nu au putut fi incărcate."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Vă rugăm să ștergeți"+t+" caracter";return 1!==t&&(n+="e"),n},inputTooShort:function(e){return"Vă rugăm să introduceți "+(e.minimum-e.input.length)+" sau mai multe caractere"},loadingMore:function(){return"Se încarcă mai multe rezultate…"},maximumSelected:function(e){var t="Aveți voie să selectați cel mult "+e.maximum;return t+=" element",1!==e.maximum&&(t+="e"),t},noResults:function(){return"Nu au fost găsite rezultate"},searching:function(){return"Căutare…"},removeAllItems:function(){return"Eliminați toate elementele"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ru.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ru.js
deleted file mode 100644
index 63a7d66c3b4..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ru.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ru",[],function(){function n(n,e,r,u){return n%10<5&&n%10>0&&n%100<5||n%100>20?n%10>1?r:e:u}return{errorLoading:function(){return"�евозможно загрузить результаты"},inputTooLong:function(e){var r=e.input.length-e.maximum,u="Пожалуй�та, введите на "+r+" �имвол";return u+=n(r,"","a","ов"),u+=" меньше"},inputTooShort:function(e){var r=e.minimum-e.input.length,u="Пожалуй�та, введите ещё хот� бы "+r+" �имвол";return u+=n(r,"","a","ов")},loadingMore:function(){return"Загрузка данных…"},maximumSelected:function(e){var r="Вы можете выбрать не более "+e.maximum+" �лемент";return r+=n(e.maximum,"","a","ов")},noResults:function(){return"Совпадений не найдено"},searching:function(){return"Пои�к…"},removeAllItems:function(){return"Удалить в�е �лементы"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sk.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sk.js
deleted file mode 100644
index 5049528ad0d..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sk.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sk",[],function(){var e={2:function(e){return e?"dva":"dve"},3:function(){return"tri"},4:function(){return"štyri"}};return{errorLoading:function(){return"Výsledky sa nepodarilo na�ítať."},inputTooLong:function(n){var t=n.input.length-n.maximum;return 1==t?"Prosím, zadajte o jeden znak menej":t>=2&&t<=4?"Prosím, zadajte o "+e[t](!0)+" znaky menej":"Prosím, zadajte o "+t+" znakov menej"},inputTooShort:function(n){var t=n.minimum-n.input.length;return 1==t?"Prosím, zadajte ešte jeden znak":t<=4?"Prosím, zadajte ešte �alšie "+e[t](!0)+" znaky":"Prosím, zadajte ešte �alších "+t+" znakov"},loadingMore:function(){return"Na�ítanie �alších výsledkov…"},maximumSelected:function(n){return 1==n.maximum?"Môžete zvoliť len jednu položku":n.maximum>=2&&n.maximum<=4?"Môžete zvoliť najviac "+e[n.maximum](!1)+" položky":"Môžete zvoliť najviac "+n.maximum+" položiek"},noResults:function(){return"Nenašli sa žiadne položky"},searching:function(){return"Vyhľadávanie…"},removeAllItems:function(){return"Odstráňte všetky položky"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sl.js
deleted file mode 100644
index 4d0b7d3e345..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sl",[],function(){return{errorLoading:function(){return"Zadetkov iskanja ni bilo mogo�e naložiti."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Prosim zbrišite "+n+" znak";return 2==n?t+="a":1!=n&&(t+="e"),t},inputTooShort:function(e){var n=e.minimum-e.input.length,t="Prosim vpišite še "+n+" znak";return 2==n?t+="a":1!=n&&(t+="e"),t},loadingMore:function(){return"Nalagam ve� zadetkov…"},maximumSelected:function(e){var n="Ozna�ite lahko najve� "+e.maximum+" predmet";return 2==e.maximum?n+="a":1!=e.maximum&&(n+="e"),n},noResults:function(){return"Ni zadetkov."},searching:function(){return"Iš�em…"},removeAllItems:function(){return"Odstranite vse elemente"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sq.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sq.js
deleted file mode 100644
index 59162024ed3..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sq.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sq",[],function(){return{errorLoading:function(){return"Rezultatet nuk mund të ngarkoheshin."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Të lutem fshi "+n+" karakter";return 1!=n&&(t+="e"),t},inputTooShort:function(e){return"Të lutem shkruaj "+(e.minimum-e.input.length)+" ose më shumë karaktere"},loadingMore:function(){return"Duke ngarkuar më shumë rezultate…"},maximumSelected:function(e){var n="Mund të zgjedhësh vetëm "+e.maximum+" element";return 1!=e.maximum&&(n+="e"),n},noResults:function(){return"Nuk u gjet asnjë rezultat"},searching:function(){return"Duke kërkuar…"},removeAllItems:function(){return"Hiq të gjitha sendet"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr-Cyrl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr-Cyrl.js
deleted file mode 100644
index ce13ce8f9a1..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr-Cyrl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sr-Cyrl",[],function(){function n(n,e,r,u){return n%10==1&&n%100!=11?e:n%10>=2&&n%10<=4&&(n%100<12||n%100>14)?r:u}return{errorLoading:function(){return"Преузимање није у�пело."},inputTooLong:function(e){var r=e.input.length-e.maximum,u="Обришите "+r+" �имбол";return u+=n(r,"","а","а")},inputTooShort:function(e){var r=e.minimum-e.input.length,u="Укуцајте бар још "+r+" �имбол";return u+=n(r,"","а","а")},loadingMore:function(){return"Преузимање још резултата…"},maximumSelected:function(e){var r="Можете изабрати �амо "+e.maximum+" �тавк";return r+=n(e.maximum,"у","е","и")},noResults:function(){return"�ишта није пронађено"},searching:function(){return"Претрага…"},removeAllItems:function(){return"Уклоните �ве �тавке"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr.js
deleted file mode 100644
index dd407a06dc4..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sr",[],function(){function n(n,e,r,t){return n%10==1&&n%100!=11?e:n%10>=2&&n%10<=4&&(n%100<12||n%100>14)?r:t}return{errorLoading:function(){return"Preuzimanje nije uspelo."},inputTooLong:function(e){var r=e.input.length-e.maximum,t="Obrišite "+r+" simbol";return t+=n(r,"","a","a")},inputTooShort:function(e){var r=e.minimum-e.input.length,t="Ukucajte bar još "+r+" simbol";return t+=n(r,"","a","a")},loadingMore:function(){return"Preuzimanje još rezultata…"},maximumSelected:function(e){var r="Možete izabrati samo "+e.maximum+" stavk";return r+=n(e.maximum,"u","e","i")},noResults:function(){return"Ništa nije pronađeno"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Уклоните �ве �тавке"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sv.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sv.js
deleted file mode 100644
index 1bc8724a79a..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sv.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sv",[],function(){return{errorLoading:function(){return"Resultat kunde inte laddas."},inputTooLong:function(n){return"Vänligen sudda ut "+(n.input.length-n.maximum)+" tecken"},inputTooShort:function(n){return"Vänligen skriv in "+(n.minimum-n.input.length)+" eller fler tecken"},loadingMore:function(){return"Laddar fler resultat…"},maximumSelected:function(n){return"Du kan max välja "+n.maximum+" element"},noResults:function(){return"Inga träffar"},searching:function(){return"Söker…"},removeAllItems:function(){return"Ta bort alla objekt"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/th.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/th.js
deleted file mode 100644
index 63eab7114b0..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/th.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/th",[],function(){return{errorLoading:function(){return"ไม่สามารถค้นข้อมูลได้"},inputTooLong:function(n){return"โปรดลบออ� "+(n.input.length-n.maximum)+" ตัวอั�ษร"},inputTooShort:function(n){return"โปรดพิมพ์เพิ่มอี� "+(n.minimum-n.input.length)+" ตัวอั�ษร"},loadingMore:function(){return"�ำลังค้นข้อมูลเพิ่ม…"},maximumSelected:function(n){return"คุณสามารถเลือ�ได้ไม่เ�ิน "+n.maximum+" ราย�าร"},noResults:function(){return"ไม่พบข้อมูล"},searching:function(){return"�ำลังค้นข้อมูล…"},removeAllItems:function(){return"ลบราย�ารทั้งหมด"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tk.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tk.js
deleted file mode 100644
index 30255ff3777..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tk.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/tk",[],function(){return{errorLoading:function(){return"Netije ýüklenmedi."},inputTooLong:function(e){return e.input.length-e.maximum+" harp bozuň."},inputTooShort:function(e){return"�ene-de iň az "+(e.minimum-e.input.length)+" harp ýazyň."},loadingMore:function(){return"Köpräk netije görkezilýär…"},maximumSelected:function(e){return"Diňe "+e.maximum+" sanysyny saýlaň."},noResults:function(){return"Netije tapylmady."},searching:function(){return"Gözlenýär…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tr.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tr.js
deleted file mode 100644
index fc4c0bf0512..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tr.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/tr",[],function(){return{errorLoading:function(){return"Sonuç yüklenemedi"},inputTooLong:function(n){return n.input.length-n.maximum+" karakter daha girmelisiniz"},inputTooShort:function(n){return"En az "+(n.minimum-n.input.length)+" karakter daha girmelisiniz"},loadingMore:function(){return"Daha fazla…"},maximumSelected:function(n){return"Sadece "+n.maximum+" seçim yapabilirsiniz"},noResults:function(){return"Sonuç bulunamadı"},searching:function(){return"Aranıyor…"},removeAllItems:function(){return"Tüm öğeleri kaldır"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/uk.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/uk.js
deleted file mode 100644
index 63697e38849..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/uk.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/uk",[],function(){function n(n,e,u,r){return n%100>10&&n%100<15?r:n%10==1?e:n%10>1&&n%10<5?u:r}return{errorLoading:function(){return"�еможливо завантажити результати"},inputTooLong:function(e){return"Будь ла�ка, видаліть "+(e.input.length-e.maximum)+" "+n(e.maximum,"літеру","літери","літер")},inputTooShort:function(n){return"Будь ла�ка, введіть "+(n.minimum-n.input.length)+" або більше літер"},loadingMore:function(){return"Завантаженн� інших результатів…"},maximumSelected:function(e){return"Ви можете вибрати лише "+e.maximum+" "+n(e.maximum,"пункт","пункти","пунктів")},noResults:function(){return"�ічого не знайдено"},searching:function(){return"Пошук…"},removeAllItems:function(){return"Видалити в�і елементи"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/vi.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/vi.js
deleted file mode 100644
index 24f3bc2d61a..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/vi.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/vi",[],function(){return{inputTooLong:function(n){return"Vui lòng xóa bớt "+(n.input.length-n.maximum)+" ký tự"},inputTooShort:function(n){return"Vui lòng nhập thêm từ "+(n.minimum-n.input.length)+" ký tự trở lên"},loadingMore:function(){return"�ang lấy thêm kết quả…"},maximumSelected:function(n){return"Chỉ có thể ch�n được "+n.maximum+" lựa ch�n"},noResults:function(){return"Không tìm thấy kết quả"},searching:function(){return"�ang tìm…"},removeAllItems:function(){return"Xóa tất cả các mục"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-CN.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-CN.js
deleted file mode 100644
index 2c5649d3108..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-CN.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/zh-CN",[],function(){return{errorLoading:function(){return"无法载入结果。"},inputTooLong:function(n){return"请删除"+(n.input.length-n.maximum)+"个字符"},inputTooShort:function(n){return"请�输入至少"+(n.minimum-n.input.length)+"个字符"},loadingMore:function(){return"载入更多结果…"},maximumSelected:function(n){return"最多�能选择"+n.maximum+"个项目"},noResults:function(){return"未找到结果"},searching:function(){return"�索中…"},removeAllItems:function(){return"删除所有项目"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-TW.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-TW.js
deleted file mode 100644
index 570a5669374..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-TW.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-
-!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/zh-TW",[],function(){return{inputTooLong:function(n){return"請刪掉"+(n.input.length-n.maximum)+"個字元"},inputTooShort:function(n){return"請�輸入"+(n.minimum-n.input.length)+"個字元"},loadingMore:function(){return"載入中…"},maximumSelected:function(n){return"你�能�擇最多"+n.maximum+"項"},noResults:function(){return"沒有找到相符的項目"},searching:function(){return"�尋中…"},removeAllItems:function(){return"刪除所有項目"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js b/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js
index 358572a6576..608642bf64e 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js
@@ -1,11 +1,11 @@
 /*!
- * Select2 4.0.13
+ * Select2 4.0.5
  * https://select2.github.io
  *
  * Released under the MIT license
  * https://github.com/select2/select2/blob/master/LICENSE.md
  */
-;(function (factory) {
+(function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
@@ -574,10 +574,10 @@ S2.define('select2/utils',[
     DecoratedClass.prototype = new ctr();
 
     for (var m = 0; m < superMethods.length; m++) {
-      var superMethod = superMethods[m];
+        var superMethod = superMethods[m];
 
-      DecoratedClass.prototype[superMethod] =
-        SuperClass.prototype[superMethod];
+        DecoratedClass.prototype[superMethod] =
+          SuperClass.prototype[superMethod];
     }
 
     var calledMethod = function (methodName) {
@@ -772,70 +772,6 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
-  // Cache objects in Utils.__cache instead of $.data (see #4346)
-  Utils.__cache = {};
-
-  var id = 0;
-  Utils.GetUniqueElementId = function (element) {
-    // Get a unique element Id. If element has no id,
-    // creates a new unique number, stores it in the id
-    // attribute and returns the new id.
-    // If an id already exists, it simply returns it.
-
-    var select2Id = element.getAttribute('data-select2-id');
-    if (select2Id == null) {
-      // If element has id, use it.
-      if (element.id) {
-        select2Id = element.id;
-        element.setAttribute('data-select2-id', select2Id);
-      } else {
-        element.setAttribute('data-select2-id', ++id);
-        select2Id = id.toString();
-      }
-    }
-    return select2Id;
-  };
-
-  Utils.StoreData = function (element, name, value) {
-    // Stores an item in the cache for a specified element.
-    // name is the cache key.
-    var id = Utils.GetUniqueElementId(element);
-    if (!Utils.__cache[id]) {
-      Utils.__cache[id] = {};
-    }
-
-    Utils.__cache[id][name] = value;
-  };
-
-  Utils.GetData = function (element, name) {
-    // Retrieves a value from the cache by its key (name)
-    // name is optional. If no name specified, return
-    // all cache items for the specified element.
-    // and for a specified element.
-    var id = Utils.GetUniqueElementId(element);
-    if (name) {
-      if (Utils.__cache[id]) {
-        if (Utils.__cache[id][name] != null) {
-          return Utils.__cache[id][name];
-        }
-        return $(element).data(name); // Fallback to HTML5 data attribs.
-      }
-      return $(element).data(name); // Fallback to HTML5 data attribs.
-    } else {
-      return Utils.__cache[id];
-    }
-  };
-
-  Utils.RemoveData = function (element) {
-    // Removes all cached items for a specified element.
-    var id = Utils.GetUniqueElementId(element);
-    if (Utils.__cache[id] != null) {
-      delete Utils.__cache[id];
-    }
-
-    element.removeAttribute('data-select2-id');
-  };
-
   return Utils;
 });
 
@@ -855,7 +791,7 @@ S2.define('select2/results',[
 
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="listbox"></ul>'
+      '<ul class="select2-results__options" role="tree"></ul>'
     );
 
     if (this.options.get('multiple')) {
@@ -878,7 +814,7 @@ S2.define('select2/results',[
     this.hideLoading();
 
     var $message = $(
-      '<li role="alert" aria-live="assertive"' +
+      '<li role="treeitem" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
 
@@ -971,7 +907,7 @@ S2.define('select2/results',[
       $options.each(function () {
         var $option = $(this);
 
-        var item = Utils.GetData(this, 'data');
+        var item = $.data(this, 'data');
 
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
@@ -1012,16 +948,11 @@ S2.define('select2/results',[
     option.className = 'select2-results__option';
 
     var attrs = {
-      'role': 'option',
+      'role': 'treeitem',
       'aria-selected': 'false'
     };
 
-    var matches = window.Element.prototype.matches ||
-      window.Element.prototype.msMatchesSelector ||
-      window.Element.prototype.webkitMatchesSelector;
-
-    if ((data.element != null && matches.call(data.element, ':disabled')) ||
-        (data.element == null && data.disabled)) {
+    if (data.disabled) {
       delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
     }
@@ -1081,7 +1012,7 @@ S2.define('select2/results',[
       this.template(data, option);
     }
 
-    Utils.StoreData(option, 'data', data);
+    $.data(option, 'data', data);
 
     return option;
   };
@@ -1122,10 +1053,7 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-
-      if (self.options.get('scrollAfterSelect')) {
-        self.highlightFirstItem();
-      }
+      self.highlightFirstItem();
     });
 
     container.on('unselect', function () {
@@ -1134,10 +1062,7 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-
-      if (self.options.get('scrollAfterSelect')) {
-        self.highlightFirstItem();
-      }
+      self.highlightFirstItem();
     });
 
     container.on('open', function () {
@@ -1173,7 +1098,7 @@ S2.define('select2/results',[
         return;
       }
 
-      var data = Utils.GetData($highlighted[0], 'data');
+      var data = $highlighted.data('data');
 
       if ($highlighted.attr('aria-selected') == 'true') {
         self.trigger('close', {});
@@ -1191,9 +1116,8 @@ S2.define('select2/results',[
 
       var currentIndex = $options.index($highlighted);
 
-      // If we are already at the top, don't move further
-      // If no options, currentIndex will be -1
-      if (currentIndex <= 0) {
+      // If we are already at te top, don't move further
+      if (currentIndex === 0) {
         return;
       }
 
@@ -1286,7 +1210,7 @@ S2.define('select2/results',[
       function (evt) {
       var $this = $(this);
 
-      var data = Utils.GetData(this, 'data');
+      var data = $this.data('data');
 
       if ($this.attr('aria-selected') === 'true') {
         if (self.options.get('multiple')) {
@@ -1309,7 +1233,7 @@ S2.define('select2/results',[
 
     this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
       function (evt) {
-      var data = Utils.GetData(this, 'data');
+      var data = $(this).data('data');
 
       self.getHighlightedResults()
           .removeClass('select2-results__option--highlighted');
@@ -1424,15 +1348,14 @@ S2.define('select2/selection/base',[
 
     this._tabindex = 0;
 
-    if (Utils.GetData(this.$element[0], 'old-tabindex') != null) {
-      this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex');
+    if (this.$element.data('old-tabindex') != null) {
+      this._tabindex = this.$element.data('old-tabindex');
     } else if (this.$element.attr('tabindex') != null) {
       this._tabindex = this.$element.attr('tabindex');
     }
 
     $selection.attr('title', this.$element.attr('title'));
     $selection.attr('tabindex', this._tabindex);
-    $selection.attr('aria-disabled', 'false');
 
     this.$selection = $selection;
 
@@ -1442,6 +1365,7 @@ S2.define('select2/selection/base',[
   BaseSelection.prototype.bind = function (container, $container) {
     var self = this;
 
+    var id = container.id + '-container';
     var resultsId = container.id + '-results';
 
     this.container = container;
@@ -1484,19 +1408,17 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.trigger('focus');
+      self.$selection.focus();
 
       self._detachCloseHandler(container);
     });
 
     container.on('enable', function () {
       self.$selection.attr('tabindex', self._tabindex);
-      self.$selection.attr('aria-disabled', 'false');
     });
 
     container.on('disable', function () {
       self.$selection.attr('tabindex', '-1');
-      self.$selection.attr('aria-disabled', 'true');
     });
   };
 
@@ -1519,6 +1441,7 @@ S2.define('select2/selection/base',[
   };
 
   BaseSelection.prototype._attachCloseHandler = function (container) {
+    var self = this;
 
     $(document.body).on('mousedown.select2.' + container.id, function (e) {
       var $target = $(e.target);
@@ -1528,11 +1451,13 @@ S2.define('select2/selection/base',[
       var $all = $('.select2.select2-container--open');
 
       $all.each(function () {
+        var $this = $(this);
+
         if (this == $select[0]) {
           return;
         }
 
-        var $element = Utils.GetData(this, 'element');
+        var $element = $this.data('element');
 
         $element.select2('close');
       });
@@ -1556,27 +1481,6 @@ S2.define('select2/selection/base',[
     throw new Error('The `update` method must be defined in child classes.');
   };
 
-  /**
-   * Helper method to abstract the "enabled" (not "disabled") state of this
-   * object.
-   *
-   * @return {true} if the instance is not disabled.
-   * @return {false} if the instance is disabled.
-   */
-  BaseSelection.prototype.isEnabled = function () {
-    return !this.isDisabled();
-  };
-
-  /**
-   * Helper method to abstract the "disabled" state of this object.
-   *
-   * @return {true} if the disabled option is true.
-   * @return {false} if the disabled option is false.
-   */
-  BaseSelection.prototype.isDisabled = function () {
-    return this.options.get('disabled');
-  };
-
   return BaseSelection;
 });
 
@@ -1614,10 +1518,7 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered')
-      .attr('id', id)
-      .attr('role', 'textbox')
-      .attr('aria-readonly', 'true');
+    this.$selection.find('.select2-selection__rendered').attr('id', id);
     this.$selection.attr('aria-labelledby', id);
 
     this.$selection.on('mousedown', function (evt) {
@@ -1641,15 +1542,17 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.trigger('focus');
+        self.$selection.focus();
       }
     });
+
+    container.on('selection:update', function (params) {
+      self.update(params.data);
+    });
   };
 
   SingleSelection.prototype.clear = function () {
-    var $rendered = this.$selection.find('.select2-selection__rendered');
-    $rendered.empty();
-    $rendered.removeAttr('title'); // clear tooltip on empty
+    this.$selection.find('.select2-selection__rendered').empty();
   };
 
   SingleSelection.prototype.display = function (data, container) {
@@ -1675,14 +1578,7 @@ S2.define('select2/selection/single',[
     var formatted = this.display(selection, $rendered);
 
     $rendered.empty().append(formatted);
-
-    var title = selection.title || selection.text;
-
-    if (title) {
-      $rendered.attr('title', title);
-    } else {
-      $rendered.removeAttr('title');
-    }
+    $rendered.prop('title', selection.title || selection.text);
   };
 
   return SingleSelection;
@@ -1727,14 +1623,14 @@ S2.define('select2/selection/multiple',[
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.isDisabled()) {
+        if (self.options.get('disabled')) {
           return;
         }
 
         var $remove = $(this);
         var $selection = $remove.parent();
 
-        var data = Utils.GetData($selection[0], 'data');
+        var data = $selection.data('data');
 
         self.trigger('unselect', {
           originalEvent: evt,
@@ -1745,9 +1641,7 @@ S2.define('select2/selection/multiple',[
   };
 
   MultipleSelection.prototype.clear = function () {
-    var $rendered = this.$selection.find('.select2-selection__rendered');
-    $rendered.empty();
-    $rendered.removeAttr('title');
+    this.$selection.find('.select2-selection__rendered').empty();
   };
 
   MultipleSelection.prototype.display = function (data, container) {
@@ -1785,14 +1679,9 @@ S2.define('select2/selection/multiple',[
       var formatted = this.display(selection, $selection);
 
       $selection.append(formatted);
+      $selection.prop('title', selection.title || selection.text);
 
-      var title = selection.title || selection.text;
-
-      if (title) {
-        $selection.attr('title', title);
-      }
-
-      Utils.StoreData($selection[0], 'data', selection);
+      $selection.data('data', selection);
 
       $selections.push($selection);
     }
@@ -1857,9 +1746,8 @@ S2.define('select2/selection/placeholder',[
 
 S2.define('select2/selection/allowClear',[
   'jquery',
-  '../keys',
-  '../utils'
-], function ($, KEYS, Utils) {
+  '../keys'
+], function ($, KEYS) {
   function AllowClear () { }
 
   AllowClear.prototype.bind = function (decorated, container, $container) {
@@ -1888,7 +1776,7 @@ S2.define('select2/selection/allowClear',[
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.isDisabled()) {
+    if (this.options.get('disabled')) {
       return;
     }
 
@@ -1901,22 +1789,10 @@ S2.define('select2/selection/allowClear',[
 
     evt.stopPropagation();
 
-    var data = Utils.GetData($clear[0], 'data');
-
-    var previousVal = this.$element.val();
-    this.$element.val(this.placeholder.id);
-
-    var unselectData = {
-      data: data
-    };
-    this.trigger('clear', unselectData);
-    if (unselectData.prevented) {
-      this.$element.val(previousVal);
-      return;
-    }
+    var data = $clear.data('data');
 
     for (var d = 0; d < data.length; d++) {
-      unselectData = {
+      var unselectData = {
         data: data[d]
       };
 
@@ -1926,12 +1802,11 @@ S2.define('select2/selection/allowClear',[
 
       // If the event was prevented, don't clear it out.
       if (unselectData.prevented) {
-        this.$element.val(previousVal);
         return;
       }
     }
 
-    this.$element.trigger('input').trigger('change');
+    this.$element.val(this.placeholder.id).trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -1954,14 +1829,12 @@ S2.define('select2/selection/allowClear',[
       return;
     }
 
-    var removeAll = this.options.get('translations').get('removeAllItems');
-
     var $remove = $(
-      '<span class="select2-selection__clear" title="' + removeAll() +'">' +
+      '<span class="select2-selection__clear">' +
         '&times;' +
       '</span>'
     );
-    Utils.StoreData($remove[0], 'data', data);
+    $remove.data('data', data);
 
     this.$selection.find('.select2-selection__rendered').prepend($remove);
   };
@@ -1983,7 +1856,7 @@ S2.define('select2/selection/search',[
       '<li class="select2-search select2-search--inline">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
       '</li>'
     );
 
@@ -2000,18 +1873,14 @@ S2.define('select2/selection/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
-    var resultsId = container.id + '-results';
-
     decorated.call(this, container, $container);
 
     container.on('open', function () {
-      self.$search.attr('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
-      self.$search.removeAttr('aria-controls');
       self.$search.removeAttr('aria-activedescendant');
       self.$search.trigger('focus');
     });
@@ -2031,11 +1900,7 @@ S2.define('select2/selection/search',[
     });
 
     container.on('results:focus', function (params) {
-      if (params.data._resultId) {
-        self.$search.attr('aria-activedescendant', params.data._resultId);
-      } else {
-        self.$search.removeAttr('aria-activedescendant');
-      }
+      self.$search.attr('aria-activedescendant', params.id);
     });
 
     this.$selection.on('focusin', '.select2-search--inline', function (evt) {
@@ -2060,7 +1925,7 @@ S2.define('select2/selection/search',[
           .prev('.select2-selection__choice');
 
         if ($previousChoice.length > 0) {
-          var item = Utils.GetData($previousChoice[0], 'data');
+          var item = $previousChoice.data('data');
 
           self.searchRemoveChoice(item);
 
@@ -2069,12 +1934,6 @@ S2.define('select2/selection/search',[
       }
     });
 
-    this.$selection.on('click', '.select2-search--inline', function (evt) {
-      if (self.$search.val()) {
-        evt.stopPropagation();
-      }
-    });
-
     // Try to detect the IE version should the `documentMode` property that
     // is stored on the document. This is only implemented in IE and is
     // slightly cleaner than doing a user agent check.
@@ -2160,7 +2019,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.trigger('focus');
+      this.$search.focus();
     }
   };
 
@@ -2193,7 +2052,7 @@ S2.define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.find('.select2-selection__rendered').width();
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 
@@ -2217,13 +2076,10 @@ S2.define('select2/selection/eventRelay',[
       'open', 'opening',
       'close', 'closing',
       'select', 'selecting',
-      'unselect', 'unselecting',
-      'clear', 'clearing'
+      'unselect', 'unselecting'
     ];
 
-    var preventableEvents = [
-      'opening', 'closing', 'selecting', 'unselecting', 'clearing'
-    ];
+    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
 
     decorated.call(this, container, $container);
 
@@ -2556,7 +2412,6 @@ S2.define('select2/diacritics',[
     '\u019F': 'O',
     '\uA74A': 'O',
     '\uA74C': 'O',
-    '\u0152': 'OE',
     '\u01A2': 'OI',
     '\uA74E': 'OO',
     '\u0222': 'OU',
@@ -2966,7 +2821,6 @@ S2.define('select2/diacritics',[
     '\uA74B': 'o',
     '\uA74D': 'o',
     '\u0275': 'o',
-    '\u0153': 'oe',
     '\u01A3': 'oi',
     '\u0223': 'ou',
     '\uA74F': 'oo',
@@ -3135,9 +2989,8 @@ S2.define('select2/diacritics',[
     '\u03CD': '\u03C5',
     '\u03CB': '\u03C5',
     '\u03B0': '\u03C5',
-    '\u03CE': '\u03C9',
-    '\u03C2': '\u03C3',
-    '\u2019': '\''
+    '\u03C9': '\u03C9',
+    '\u03C2': '\u03C3'
   };
 
   return diacritics;
@@ -3222,7 +3075,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('input').trigger('change');
+      this.$element.trigger('change');
 
       return;
     }
@@ -3243,13 +3096,13 @@ S2.define('select2/data/select',[
         }
 
         self.$element.val(val);
-        self.$element.trigger('input').trigger('change');
+        self.$element.trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('input').trigger('change');
+      this.$element.trigger('change');
     }
   };
 
@@ -3265,7 +3118,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('input').trigger('change');
+      this.$element.trigger('change');
 
       return;
     }
@@ -3283,7 +3136,7 @@ S2.define('select2/data/select',[
 
       self.$element.val(val);
 
-      self.$element.trigger('input').trigger('change');
+      self.$element.trigger('change');
     });
   };
 
@@ -3305,7 +3158,7 @@ S2.define('select2/data/select',[
     // Remove anything added to child elements
     this.$element.find('*').each(function () {
       // Remove any custom data set by Select2
-      Utils.RemoveData(this);
+      $.removeData(this, 'data');
     });
   };
 
@@ -3378,7 +3231,7 @@ S2.define('select2/data/select',[
     normalizedData.element = option;
 
     // Override the option's data with the combined data
-    Utils.StoreData(option, 'data', normalizedData);
+    $.data(option, 'data', normalizedData);
 
     return $option;
   };
@@ -3386,7 +3239,7 @@ S2.define('select2/data/select',[
   SelectAdapter.prototype.item = function ($option) {
     var data = {};
 
-    data = Utils.GetData($option[0], 'data');
+    data = $.data($option[0], 'data');
 
     if (data != null) {
       return data;
@@ -3424,13 +3277,13 @@ S2.define('select2/data/select',[
     data = this._normalizeItem(data);
     data.element = $option[0];
 
-    Utils.StoreData($option[0], 'data', data);
+    $.data($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (item !== Object(item)) {
+    if (!$.isPlainObject(item)) {
       item = {
         id: item,
         text: item
@@ -3476,19 +3329,15 @@ S2.define('select2/data/array',[
   'jquery'
 ], function (SelectAdapter, Utils, $) {
   function ArrayAdapter ($element, options) {
-    this._dataToConvert = options.get('data') || [];
+    var data = options.get('data') || [];
 
     ArrayAdapter.__super__.constructor.call(this, $element, options);
+
+    this.addOptions(this.convertToOptions(data));
   }
 
   Utils.Extend(ArrayAdapter, SelectAdapter);
 
-  ArrayAdapter.prototype.bind = function (container, $container) {
-    ArrayAdapter.__super__.bind.call(this, container, $container);
-
-    this.addOptions(this.convertToOptions(this._dataToConvert));
-  };
-
   ArrayAdapter.prototype.select = function (data) {
     var $option = this.$element.find('option').filter(function (i, elm) {
       return elm.value == data.id.toString();
@@ -3638,8 +3487,7 @@ S2.define('select2/data/ajax',[
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
-        if ('status' in $request &&
-            ($request.status === 0 || $request.status === '0')) {
+        if ($request.status && $request.status === '0') {
           return;
         }
 
@@ -3778,6 +3626,8 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype._removeOldTags = function (_) {
+    var tag = this._lastTag;
+
     var $options = this.$element.find('option[data-select2-tag]');
 
     $options.each(function () {
@@ -3852,7 +3702,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.trigger('focus');
+        this.$search.focus();
       }
 
       params.term = tokenData.term;
@@ -3981,30 +3831,10 @@ S2.define('select2/data/maximumSelectionLength',[
     decorated.call(this, $e, options);
   }
 
-  MaximumSelectionLength.prototype.bind =
-    function (decorated, container, $container) {
-      var self = this;
-
-      decorated.call(this, container, $container);
-
-      container.on('select', function () {
-        self._checkIfMaximumSelected();
-      });
-  };
-
   MaximumSelectionLength.prototype.query =
     function (decorated, params, callback) {
       var self = this;
 
-      this._checkIfMaximumSelected(function () {
-        decorated.call(self, params, callback);
-      });
-  };
-
-  MaximumSelectionLength.prototype._checkIfMaximumSelected =
-    function (_, successCallback) {
-      var self = this;
-
       this.current(function (currentData) {
         var count = currentData != null ? currentData.length : 0;
         if (self.maximumSelectionLength > 0 &&
@@ -4017,10 +3847,7 @@ S2.define('select2/data/maximumSelectionLength',[
           });
           return;
         }
-
-        if (successCallback) {
-          successCallback();
-        }
+        decorated.call(self, params, callback);
       });
   };
 
@@ -4059,7 +3886,7 @@ S2.define('select2/dropdown',[
   };
 
   Dropdown.prototype.position = function ($dropdown, $container) {
-    // Should be implemented in subclasses
+    // Should be implmented in subclasses
   };
 
   Dropdown.prototype.destroy = function () {
@@ -4083,7 +3910,7 @@ S2.define('select2/dropdown/search',[
       '<span class="select2-search select2-search--dropdown">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="textbox" />' +
       '</span>'
     );
 
@@ -4098,8 +3925,6 @@ S2.define('select2/dropdown/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
-    var resultsId = container.id + '-results';
-
     decorated.call(this, container, $container);
 
     this.$search.on('keydown', function (evt) {
@@ -4122,27 +3947,23 @@ S2.define('select2/dropdown/search',[
 
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
-      self.$search.attr('aria-controls', resultsId);
 
-      self.$search.trigger('focus');
+      self.$search.focus();
 
       window.setTimeout(function () {
-        self.$search.trigger('focus');
+        self.$search.focus();
       }, 0);
     });
 
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
-      self.$search.removeAttr('aria-controls');
-      self.$search.removeAttr('aria-activedescendant');
 
       self.$search.val('');
-      self.$search.trigger('blur');
     });
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.trigger('focus');
+        self.$search.focus();
       }
     });
 
@@ -4157,14 +3978,6 @@ S2.define('select2/dropdown/search',[
         }
       }
     });
-
-    container.on('results:focus', function (params) {
-      if (params.data._resultId) {
-        self.$search.attr('aria-activedescendant', params.data._resultId);
-      } else {
-        self.$search.removeAttr('aria-activedescendant');
-      }
-    });
   };
 
   Search.prototype.handleSearch = function (evt) {
@@ -4249,7 +4062,6 @@ S2.define('select2/dropdown/infiniteScroll',[
 
     if (this.showLoadingMore(data)) {
       this.$results.append(this.$loadingMore);
-      this.loadMoreIfNeeded();
     }
   };
 
@@ -4268,27 +4080,25 @@ S2.define('select2/dropdown/infiniteScroll',[
       self.loading = true;
     });
 
-    this.$results.on('scroll', this.loadMoreIfNeeded.bind(this));
-  };
+    this.$results.on('scroll', function () {
+      var isLoadMoreVisible = $.contains(
+        document.documentElement,
+        self.$loadingMore[0]
+      );
 
-  InfiniteScroll.prototype.loadMoreIfNeeded = function () {
-    var isLoadMoreVisible = $.contains(
-      document.documentElement,
-      this.$loadingMore[0]
-    );
+      if (self.loading || !isLoadMoreVisible) {
+        return;
+      }
 
-    if (this.loading || !isLoadMoreVisible) {
-      return;
-    }
+      var currentOffset = self.$results.offset().top +
+        self.$results.outerHeight(false);
+      var loadingMoreOffset = self.$loadingMore.offset().top +
+        self.$loadingMore.outerHeight(false);
 
-    var currentOffset = this.$results.offset().top +
-      this.$results.outerHeight(false);
-    var loadingMoreOffset = this.$loadingMore.offset().top +
-      this.$loadingMore.outerHeight(false);
-
-    if (currentOffset + 50 >= loadingMoreOffset) {
-      this.loadMore();
-    }
+      if (currentOffset + 50 >= loadingMoreOffset) {
+        self.loadMore();
+      }
+    });
   };
 
   InfiniteScroll.prototype.loadMore = function () {
@@ -4309,7 +4119,7 @@ S2.define('select2/dropdown/infiniteScroll',[
     var $option = $(
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="option" aria-disabled="true"></li>'
+      'role="treeitem" aria-disabled="true"></li>'
     );
 
     var message = this.options.get('translations').get('loadingMore');
@@ -4327,7 +4137,7 @@ S2.define('select2/dropdown/attachBody',[
   '../utils'
 ], function ($, Utils) {
   function AttachBody (decorated, $element, options) {
-    this.$dropdownParent = $(options.get('dropdownParent') || document.body);
+    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
 
     decorated.call(this, $element, options);
   }
@@ -4335,14 +4145,27 @@ S2.define('select2/dropdown/attachBody',[
   AttachBody.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var setupResultsEvents = false;
+
     decorated.call(this, container, $container);
 
     container.on('open', function () {
       self._showDropdown();
       self._attachPositioningHandler(container);
 
-      // Must bind after the results handlers to ensure correct sizing
-      self._bindContainerResultHandlers(container);
+      if (!setupResultsEvents) {
+        setupResultsEvents = true;
+
+        container.on('results:all', function () {
+          self._positionDropdown();
+          self._resizeDropdown();
+        });
+
+        container.on('results:append', function () {
+          self._positionDropdown();
+          self._resizeDropdown();
+        });
+      }
     });
 
     container.on('close', function () {
@@ -4391,44 +4214,6 @@ S2.define('select2/dropdown/attachBody',[
     this.$dropdownContainer.detach();
   };
 
-  AttachBody.prototype._bindContainerResultHandlers =
-      function (decorated, container) {
-
-    // These should only be bound once
-    if (this._containerResultsHandlersBound) {
-      return;
-    }
-
-    var self = this;
-
-    container.on('results:all', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    container.on('results:append', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    container.on('results:message', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    container.on('select', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    container.on('unselect', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    this._containerResultsHandlersBound = true;
-  };
-
   AttachBody.prototype._attachPositioningHandler =
       function (decorated, container) {
     var self = this;
@@ -4439,14 +4224,14 @@ S2.define('select2/dropdown/attachBody',[
 
     var $watchers = this.$container.parents().filter(Utils.hasScroll);
     $watchers.each(function () {
-      Utils.StoreData(this, 'select2-scroll-position', {
+      $(this).data('select2-scroll-position', {
         x: $(this).scrollLeft(),
         y: $(this).scrollTop()
       });
     });
 
     $watchers.on(scrollEvent, function (ev) {
-      var position = Utils.GetData(this, 'select2-scroll-position');
+      var position = $(this).data('select2-scroll-position');
       $(this).scrollTop(position.y);
     });
 
@@ -4505,26 +4290,16 @@ S2.define('select2/dropdown/attachBody',[
       top: container.bottom
     };
 
-    // Determine what the parent element is to use for calculating the offset
+    // Determine what the parent element is to use for calciulating the offset
     var $offsetParent = this.$dropdownParent;
 
-    // For statically positioned elements, we need to get the element
+    // For statically positoned elements, we need to get the element
     // that is determining the offset
     if ($offsetParent.css('position') === 'static') {
       $offsetParent = $offsetParent.offsetParent();
     }
 
-    var parentOffset = {
-      top: 0,
-      left: 0
-    };
-
-    if (
-      $.contains(document.body, $offsetParent[0]) ||
-      $offsetParent[0].isConnected
-      ) {
-      parentOffset = $offsetParent.offset();
-    }
+    var parentOffset = $offsetParent.offset();
 
     css.top -= parentOffset.top;
     css.left -= parentOffset.left;
@@ -4621,8 +4396,8 @@ S2.define('select2/dropdown/minimumResultsForSearch',[
 });
 
 S2.define('select2/dropdown/selectOnClose',[
-  '../utils'
-], function (Utils) {
+
+], function () {
   function SelectOnClose () { }
 
   SelectOnClose.prototype.bind = function (decorated, container, $container) {
@@ -4653,7 +4428,7 @@ S2.define('select2/dropdown/selectOnClose',[
       return;
     }
 
-    var data = Utils.GetData($highlightedResults[0], 'data');
+    var data = $highlightedResults.data('data');
 
     // Don't re-select already selected resulte
     if (
@@ -4694,7 +4469,7 @@ S2.define('select2/dropdown/closeOnSelect',[
     var originalEvent = evt.originalEvent;
 
     // Don't close if the control key is being held
-    if (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)) {
+    if (originalEvent && originalEvent.ctrlKey) {
       return;
     }
 
@@ -4748,9 +4523,6 @@ S2.define('select2/i18n/en',[],function () {
     },
     searching: function () {
       return 'Searching…';
-    },
-    removeAllItems: function () {
-      return 'Remove all items';
     }
   };
 });
@@ -4989,29 +4761,66 @@ S2.define('select2/defaults',[
       );
     }
 
-    // If the defaults were not previously applied from an element, it is
-    // possible for the language option to have not been resolved
-    options.language = this._resolveLanguage(options.language);
+    if (typeof options.language === 'string') {
+      // Check if the language is specified with a region
+      if (options.language.indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = options.language.split('-');
+        var baseLanguage = languageParts[0];
 
-    // Always fall back to English since it will always be complete
-    options.language.push('en');
-
-    var uniqueLanguages = [];
-
-    for (var l = 0; l < options.language.length; l++) {
-      var language = options.language[l];
-
-      if (uniqueLanguages.indexOf(language) === -1) {
-        uniqueLanguages.push(language);
+        options.language = [options.language, baseLanguage];
+      } else {
+        options.language = [options.language];
       }
     }
 
-    options.language = uniqueLanguages;
+    if ($.isArray(options.language)) {
+      var languages = new Translation();
+      options.language.push('en');
 
-    options.translations = this._processTranslations(
-      options.language,
-      options.debug
-    );
+      var languageNames = options.language;
+
+      for (var l = 0; l < languageNames.length; l++) {
+        var name = languageNames[l];
+        var language = {};
+
+        try {
+          // Try to load it with the original name
+          language = Translation.loadPath(name);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            name = this.defaults.amdLanguageBase + name;
+            language = Translation.loadPath(name);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files.
+            if (options.debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + name + '" could not be ' +
+                'automatically loaded. A fallback will be used instead.'
+              );
+            }
+
+            continue;
+          }
+        }
+
+        languages.extend(language);
+      }
+
+      options.translations = languages;
+    } else {
+      var baseTranslation = Translation.loadPath(
+        this.defaults.amdLanguageBase + 'en'
+      );
+      var customTranslation = new Translation(options.language);
+
+      customTranslation.extend(baseTranslation);
+
+      options.translations = customTranslation;
+    }
 
     return options;
   };
@@ -5078,14 +4887,13 @@ S2.define('select2/defaults',[
       debug: false,
       dropdownAutoWidth: false,
       escapeMarkup: Utils.escapeMarkup,
-      language: {},
+      language: EnglishTranslation,
       matcher: matcher,
       minimumInputLength: 0,
       maximumInputLength: 0,
       maximumSelectionLength: 0,
       minimumResultsForSearch: 0,
       selectOnClose: false,
-      scrollAfterSelect: false,
       sorter: function (data) {
         return data;
       },
@@ -5100,103 +4908,6 @@ S2.define('select2/defaults',[
     };
   };
 
-  Defaults.prototype.applyFromElement = function (options, $element) {
-    var optionLanguage = options.language;
-    var defaultLanguage = this.defaults.language;
-    var elementLanguage = $element.prop('lang');
-    var parentLanguage = $element.closest('[lang]').prop('lang');
-
-    var languages = Array.prototype.concat.call(
-      this._resolveLanguage(elementLanguage),
-      this._resolveLanguage(optionLanguage),
-      this._resolveLanguage(defaultLanguage),
-      this._resolveLanguage(parentLanguage)
-    );
-
-    options.language = languages;
-
-    return options;
-  };
-
-  Defaults.prototype._resolveLanguage = function (language) {
-    if (!language) {
-      return [];
-    }
-
-    if ($.isEmptyObject(language)) {
-      return [];
-    }
-
-    if ($.isPlainObject(language)) {
-      return [language];
-    }
-
-    var languages;
-
-    if (!$.isArray(language)) {
-      languages = [language];
-    } else {
-      languages = language;
-    }
-
-    var resolvedLanguages = [];
-
-    for (var l = 0; l < languages.length; l++) {
-      resolvedLanguages.push(languages[l]);
-
-      if (typeof languages[l] === 'string' && languages[l].indexOf('-') > 0) {
-        // Extract the region information if it is included
-        var languageParts = languages[l].split('-');
-        var baseLanguage = languageParts[0];
-
-        resolvedLanguages.push(baseLanguage);
-      }
-    }
-
-    return resolvedLanguages;
-  };
-
-  Defaults.prototype._processTranslations = function (languages, debug) {
-    var translations = new Translation();
-
-    for (var l = 0; l < languages.length; l++) {
-      var languageData = new Translation();
-
-      var language = languages[l];
-
-      if (typeof language === 'string') {
-        try {
-          // Try to load it with the original name
-          languageData = Translation.loadPath(language);
-        } catch (e) {
-          try {
-            // If we couldn't load it, check if it wasn't the full path
-            language = this.defaults.amdLanguageBase + language;
-            languageData = Translation.loadPath(language);
-          } catch (ex) {
-            // The translation could not be loaded at all. Sometimes this is
-            // because of a configuration problem, other times this can be
-            // because of how Select2 helps load all possible translation files
-            if (debug && window.console && console.warn) {
-              console.warn(
-                'Select2: The language file for "' + language + '" could ' +
-                'not be automatically loaded. A fallback will be used instead.'
-              );
-            }
-          }
-        }
-      } else if ($.isPlainObject(language)) {
-        languageData = new Translation(language);
-      } else {
-        languageData = language;
-      }
-
-      translations.extend(languageData);
-    }
-
-    return translations;
-  };
-
   Defaults.prototype.set = function (key, value) {
     var camelKey = $.camelCase(key);
 
@@ -5205,7 +4916,7 @@ S2.define('select2/defaults',[
 
     var convertedData = Utils._convertData(data);
 
-    $.extend(true, this.defaults, convertedData);
+    $.extend(this.defaults, convertedData);
   };
 
   var defaults = new Defaults();
@@ -5226,10 +4937,6 @@ S2.define('select2/options',[
       this.fromElement($element);
     }
 
-    if ($element != null) {
-      this.options = Defaults.applyFromElement(this.options, $element);
-    }
-
     this.options = Defaults.apply(this.options);
 
     if ($element && $element.is('input')) {
@@ -5253,6 +4960,14 @@ S2.define('select2/options',[
       this.options.disabled = $e.prop('disabled');
     }
 
+    if (this.options.language == null) {
+      if ($e.prop('lang')) {
+        this.options.language = $e.prop('lang').toLowerCase();
+      } else if ($e.closest('[lang]').prop('lang')) {
+        this.options.language = $e.closest('[lang]').prop('lang');
+      }
+    }
+
     if (this.options.dir == null) {
       if ($e.prop('dir')) {
         this.options.dir = $e.prop('dir');
@@ -5266,7 +4981,7 @@ S2.define('select2/options',[
     $e.prop('disabled', this.options.disabled);
     $e.prop('multiple', this.options.multiple);
 
-    if (Utils.GetData($e[0], 'select2Tags')) {
+    if ($e.data('select2Tags')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-select2-tags` attribute has been changed to ' +
@@ -5275,11 +4990,11 @@ S2.define('select2/options',[
         );
       }
 
-      Utils.StoreData($e[0], 'data', Utils.GetData($e[0], 'select2Tags'));
-      Utils.StoreData($e[0], 'tags', true);
+      $e.data('data', $e.data('select2Tags'));
+      $e.data('tags', true);
     }
 
-    if (Utils.GetData($e[0], 'ajaxUrl')) {
+    if ($e.data('ajaxUrl')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-ajax-url` attribute has been changed to ' +
@@ -5288,45 +5003,21 @@ S2.define('select2/options',[
         );
       }
 
-      $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
-      Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl'));
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
     }
 
     var dataset = {};
 
-    function upperCaseLetter(_, letter) {
-      return letter.toUpperCase();
-    }
-
-    // Pre-load all of the attributes which are prefixed with `data-`
-    for (var attr = 0; attr < $e[0].attributes.length; attr++) {
-      var attributeName = $e[0].attributes[attr].name;
-      var prefix = 'data-';
-
-      if (attributeName.substr(0, prefix.length) == prefix) {
-        // Get the contents of the attribute after `data-`
-        var dataName = attributeName.substring(prefix.length);
-
-        // Get the data contents from the consistent source
-        // This is more than likely the jQuery data helper
-        var dataValue = Utils.GetData($e[0], dataName);
-
-        // camelCase the attribute name to match the spec
-        var camelDataName = dataName.replace(/-([a-z])/g, upperCaseLetter);
-
-        // Store the data attribute contents into the dataset since
-        dataset[camelDataName] = dataValue;
-      }
-    }
-
     // Prefer the element's `dataset` attribute if it exists
     // jQuery 1.x does not correctly handle data attributes with multiple dashes
     if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
-      dataset = $.extend(true, {}, $e[0].dataset, dataset);
+      dataset = $.extend(true, {}, $e[0].dataset, $e.data());
+    } else {
+      dataset = $e.data();
     }
 
-    // Prefer our internal data cache if it exists
-    var data = $.extend(true, {}, Utils.GetData($e[0]), dataset);
+    var data = $.extend(true, {}, dataset);
 
     data = Utils._convertData(data);
 
@@ -5363,8 +5054,8 @@ S2.define('select2/core',[
   './keys'
 ], function ($, Options, Utils, KEYS) {
   var Select2 = function ($element, options) {
-    if (Utils.GetData($element[0], 'select2') != null) {
-      Utils.GetData($element[0], 'select2').destroy();
+    if ($element.data('select2') != null) {
+      $element.data('select2').destroy();
     }
 
     this.$element = $element;
@@ -5380,7 +5071,7 @@ S2.define('select2/core',[
     // Set up the tabindex
 
     var tabindex = $element.attr('tabindex') || 0;
-    Utils.StoreData($element[0], 'old-tabindex', tabindex);
+    $element.data('old-tabindex', tabindex);
     $element.attr('tabindex', '-1');
 
     // Set up containers and adapters
@@ -5441,9 +5132,6 @@ S2.define('select2/core',[
     // Synchronize any monitored attributes
     this._syncAttributes();
 
-    Utils.StoreData($element[0], 'select2', this);
-
-    // Ensure backwards compatibility with $element.data('select2').
     $element.data('select2', this);
   };
 
@@ -5520,12 +5208,6 @@ S2.define('select2/core',[
       return null;
     }
 
-    if (method == 'computedstyle') {
-      var computedStyle = window.getComputedStyle($element[0]);
-
-      return computedStyle.width;
-    }
-
     return method;
   };
 
@@ -5566,8 +5248,8 @@ S2.define('select2/core',[
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        self._syncA();
-        self._syncS(null, mutations);
+        $.each(mutations, self._syncA);
+        $.each(mutations, self._syncS);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -5689,7 +5371,7 @@ S2.define('select2/core',[
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close(evt);
+          self.close();
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -5723,7 +5405,7 @@ S2.define('select2/core',[
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.isDisabled()) {
+    if (this.options.get('disabled')) {
       if (this.isOpen()) {
         this.close();
       }
@@ -5734,7 +5416,7 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._isChangeMutation = function (evt, mutations) {
+  Select2.prototype._syncSubtree = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -5762,22 +5444,7 @@ S2.define('select2/core',[
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
-    } else if ($.isArray(mutations)) {
-      $.each(mutations, function(evt, mutation) {
-        if (self._isChangeMutation(evt, mutation)) {
-          // We've found a change mutation.
-          // Let's escape from the loop and continue
-          changed = true;
-          return false;
-        }
-      });
     }
-    return changed;
-  };
-
-  Select2.prototype._syncSubtree = function (evt, mutations) {
-    var changed = this._isChangeMutation(evt, mutations);
-    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -5799,8 +5466,7 @@ S2.define('select2/core',[
       'open': 'opening',
       'close': 'closing',
       'select': 'selecting',
-      'unselect': 'unselecting',
-      'clear': 'clearing'
+      'unselect': 'unselecting'
     };
 
     if (args === undefined) {
@@ -5828,7 +5494,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.isDisabled()) {
+    if (this.options.get('disabled')) {
       return;
     }
 
@@ -5844,40 +5510,15 @@ S2.define('select2/core',[
       return;
     }
 
-    if (this.isDisabled()) {
-      return;
-    }
-
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function (evt) {
+  Select2.prototype.close = function () {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', { originalEvent : evt });
-  };
-
-  /**
-   * Helper method to abstract the "enabled" (not "disabled") state of this
-   * object.
-   *
-   * @return {true} if the instance is not disabled.
-   * @return {false} if the instance is disabled.
-   */
-  Select2.prototype.isEnabled = function () {
-    return !this.isDisabled();
-  };
-
-  /**
-   * Helper method to abstract the "disabled" state of this object.
-   *
-   * @return {true} if the disabled option is true.
-   * @return {false} if the disabled option is false.
-   */
-  Select2.prototype.isDisabled = function () {
-    return this.options.get('disabled');
+    this.trigger('close', {});
   };
 
   Select2.prototype.isOpen = function () {
@@ -5954,7 +5595,7 @@ S2.define('select2/core',[
       });
     }
 
-    this.$element.val(newVal).trigger('input').trigger('change');
+    this.$element.val(newVal).trigger('change');
   };
 
   Select2.prototype.destroy = function () {
@@ -5980,12 +5621,10 @@ S2.define('select2/core',[
     this._syncS = null;
 
     this.$element.off('.select2');
-    this.$element.attr('tabindex',
-    Utils.GetData(this.$element[0], 'old-tabindex'));
+    this.$element.attr('tabindex', this.$element.data('old-tabindex'));
 
     this.$element.removeClass('select2-hidden-accessible');
     this.$element.attr('aria-hidden', 'false');
-    Utils.RemoveData(this.$element[0]);
     this.$element.removeData('select2');
 
     this.dataAdapter.destroy();
@@ -6013,7 +5652,7 @@ S2.define('select2/core',[
 
     this.$container.addClass('select2-container--' + this.options.get('theme'));
 
-    Utils.StoreData($container[0], 'element', this.$element);
+    $container.data('element', this.$element);
 
     return $container;
   };
@@ -6223,9 +5862,8 @@ S2.define('select2/compat/initSelection',[
 });
 
 S2.define('select2/compat/inputData',[
-  'jquery',
-  '../utils'
-], function ($, Utils) {
+  'jquery'
+], function ($) {
   function InputData (decorated, $element, options) {
     this._currentData = [];
     this._valueSeparator = options.get('valueSeparator') || ',';
@@ -6289,13 +5927,13 @@ S2.define('select2/compat/inputData',[
       });
 
       this.$element.val(data.id);
-      this.$element.trigger('input').trigger('change');
+      this.$element.trigger('change');
     } else {
       var value = this.$element.val();
       value += this._valueSeparator + data.id;
 
       this.$element.val(value);
-      this.$element.trigger('input').trigger('change');
+      this.$element.trigger('change');
     }
   };
 
@@ -6318,7 +5956,7 @@ S2.define('select2/compat/inputData',[
       }
 
       self.$element.val(values.join(self._valueSeparator));
-      self.$element.trigger('input').trigger('change');
+      self.$element.trigger('change');
     });
   };
 
@@ -6342,7 +5980,7 @@ S2.define('select2/compat/inputData',[
 
   InputData.prototype.addOptions = function (_, $options) {
     var options = $.map($options, function ($option) {
-      return Utils.GetData($option[0], 'data');
+      return $.data($option[0], 'data');
     });
 
     this._currentData.push.apply(this._currentData, options);
@@ -6745,9 +6383,8 @@ S2.define('jquery.select2',[
   'jquery-mousewheel',
 
   './select2/core',
-  './select2/defaults',
-  './select2/utils'
-], function ($, _, Select2, Defaults, Utils) {
+  './select2/defaults'
+], function ($, _, Select2, Defaults) {
   if ($.fn.select2 == null) {
     // All methods that should return the element
     var thisMethods = ['open', 'close', 'destroy'];
@@ -6768,7 +6405,7 @@ S2.define('jquery.select2',[
         var args = Array.prototype.slice.call(arguments, 1);
 
         this.each(function () {
-          var instance = Utils.GetData(this, 'select2');
+          var instance = $(this).data('select2');
 
           if (instance == null && window.console && console.error) {
             console.error(
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js b/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js
index fa781916e8b..96ba80cd81b 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js
@@ -1,2 +1 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(d){var e=function(){if(d&&d.fn&&d.fn.select2&&d.fn.select2.amd)var e=d.fn.select2.amd;var t,n,i,h,o,s,f,g,m,v,y,_,r,a,w,l;function b(e,t){return r.call(e,t)}function c(e,t){var n,i,r,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&w.test(e[s])&&(e[s]=e[s].replace(w,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(i=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(r=(r=f[h.slice(0,d).join("/")])&&r[i]){o=r,a=u;break}if(o)break;!l&&g&&g[i]&&(l=g[i],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(b(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!b(m,e)&&!b(_,e))throw new Error("No "+e);return m[e]}function u(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?u(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},r=Object.prototype.hasOwnProperty,a=[].slice,w=/\.js$/,f=function(e,t){var n,i=u(e),r=i[0],o=t[1];return e=i[1],r&&(n=D(r=c(r,o))),r?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return c(e,t)}}(o)):c(e,o):(r=(i=u(e=c(e,o)))[0],e=i[1],r&&(n=D(r))),{f:r?r+"!"+e:e,n:e,pr:r,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,i){var r,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(i=i||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)r=d[l]=g.module(e);else if(b(m,o)||b(v,o)||b(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(i,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(r&&r.exports!==h&&r.exports!==m[e]?m[e]=r.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,i,r){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=i,i=r),i?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(i=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),b(m,e)||b(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=i),e.define("almond",function(){}),e.define("jquery",[],function(){var e=d||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var r={};function u(e){var t=e.prototype,n=[];for(var i in t){"function"==typeof t[i]&&"constructor"!==i&&n.push(i)}return n}r.Extend=function(e,t){var n={}.hasOwnProperty;function i(){this.constructor=e}for(var r in t)n.call(t,r)&&(e[r]=t[r]);return i.prototype=t.prototype,e.prototype=new i,e.__super__=t.prototype,e},r.Decorate=function(i,r){var e=u(r),t=u(i);function o(){var e=Array.prototype.unshift,t=r.prototype.constructor.length,n=i.prototype.constructor;0<t&&(e.call(arguments,i.prototype.constructor),n=r.prototype.constructor),n.apply(this,arguments)}r.displayName=i.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=i.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=r.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,i=e.length;n<i;n++)e[n].apply(this,t)},r.Observable=e,r.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},r.bind=function(e,t){return function(){e.apply(t,arguments)}},r._convertData=function(e){for(var t in e){var n=t.split("-"),i=e;if(1!==n.length){for(var r=0;r<n.length;r++){var o=n[r];(o=o.substring(0,1).toLowerCase()+o.substring(1))in i||(i[o]={}),r==n.length-1&&(i[o]=e[t]),i=i[o]}delete e[t]}}return e},r.hasScroll=function(e,t){var n=o(t),i=t.style.overflowX,r=t.style.overflowY;return(i!==r||"hidden"!==r&&"visible"!==r)&&("scroll"===i||"scroll"===r||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},r.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},r.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},r.__cache={};var n=0;return r.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},r.StoreData=function(e,t,n){var i=r.GetUniqueElementId(e);r.__cache[i]||(r.__cache[i]={}),r.__cache[i][t]=n},r.GetData=function(e,t){var n=r.GetUniqueElementId(e);return t?r.__cache[n]&&null!=r.__cache[n][t]?r.__cache[n][t]:o(e).data(t):r.__cache[n]},r.RemoveData=function(e){var t=r.GetUniqueElementId(e);null!=r.__cache[t]&&delete r.__cache[t],e.removeAttribute("data-select2-id")},r}),e.define("select2/results",["jquery","./utils"],function(h,f){function i(e,t,n){this.$element=e,this.data=n,this.options=t,i.__super__.constructor.call(this)}return f.Extend(i,f.Observable),i.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},i.prototype.clear=function(){this.$results.empty()},i.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),i=this.options.get("translations").get(e.message);n.append(t(i(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},i.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},i.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var i=e.results[n],r=this.option(i);t.push(r)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},i.prototype.position=function(e,t){t.find(".select2-results").append(e)},i.prototype.sort=function(e){return this.options.get("sorter")(e)},i.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},i.prototype.setClasses=function(){var t=this;this.data.current(function(e){var i=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,i)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},i.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},i.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},i.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},i=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var r in(null!=e.element&&i.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[r];t.setAttribute(r,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},i.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var i=n-1;0===e.length&&(i=0);var r=t.eq(i);r.trigger("mouseenter");var o=l.$results.offset().top,s=r.offset().top,a=l.$results.scrollTop()+(s-o);0===i?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var i=t.eq(n);i.trigger("mouseenter");var r=l.$results.offset().top+l.$results.outerHeight(!1),o=i.offset().top+i.outerHeight(!1),s=l.$results.scrollTop()+o-r;0===n?l.$results.scrollTop(0):r<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,i=0<e.deltaY&&t-e.deltaY<=0,r=e.deltaY<0&&n<=l.$results.height();i?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):r&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},i.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},i.prototype.destroy=function(){this.$results.remove()},i.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,i=e.offset().top,r=this.$results.scrollTop()+(i-n),o=i-n;r-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(r)}},i.prototype.template=function(e,t){var n=this.options.get("templateResult"),i=this.options.get("escapeMarkup"),r=n(e,t);null==r?t.style.display="none":"string"==typeof r?t.innerHTML=i(r):h(t).append(r)},i}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,i,r){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return i.Extend(o,i.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=i.GetData(this.$element[0],"old-tabindex")?this._tabindex=i.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,i=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===r.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",i),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&i.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,i){function r(){r.__super__.constructor.apply(this,arguments)}return n.Extend(r,t),r.prototype.render=function(){var e=r.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},r.prototype.bind=function(t,e){var n=this;r.__super__.bind.apply(this,arguments);var i=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",i).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",i),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},r.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},r.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},r.prototype.selectionContainer=function(){return e("<span></span>")},r.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),i=this.display(t,n);n.empty().append(i);var r=t.title||t.text;r?n.attr("title",r):n.removeAttr("title")}else this.clear()},r}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(r,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var i=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){i.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!i.isDisabled()){var t=r(this).parent(),n=l.GetData(t[0],"data");i.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return r('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var i=e[n],r=this.selectionContainer(),o=this.display(i,r);r.append(o);var s=i.title||i.text;s&&r.attr("title",s),l.StoreData(r[0],"data",i),t.push(r)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var i=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(i)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(r,i,a){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){i._handleClear(e)}),t.on("keypress",function(e){i._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var i=a.GetData(n[0],"data"),r=this.$element.val();this.$element.val(this.placeholder.id);var o={data:i};if(this.trigger("clear",o),o.prevented)this.$element.val(r);else{for(var s=0;s<i.length;s++)if(o={data:i[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(r);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=i.DELETE&&t.which!=i.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),i=r('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(i[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(i)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(i,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=i('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),t.on("open",function(){i.$search.attr("aria-controls",r),i.$search.trigger("focus")}),t.on("close",function(){i.$search.val(""),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.trigger("focus")}),t.on("enable",function(){i.$search.prop("disabled",!1),i._transferTabIndex()}),t.on("disable",function(){i.$search.prop("disabled",!0)}),t.on("focus",function(e){i.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){i.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){i._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===i.$search.val()){var t=i.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");i.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){i.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?i.$selection.off("input.search input.searchcheck"):i.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)i.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&i.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var i=this,r=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,r)){t=t||{};var n=s.Event("select2:"+e,{params:t});i.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function i(e){this.dict=e||{}}return i.prototype.all=function(){return this.dict},i.prototype.get=function(e){return this.dict[e]},i.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},i._cache={},i.loadPath=function(e){if(!(e in i._cache)){var t=n(e);i._cache[e]=t}return new i(i._cache[e])},i}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","�":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","�":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","�":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","�":"D","Ḓ":"D","Ḏ":"D","�":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","�":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","�":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","�":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","�":"G","�":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","�":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","�":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","�":"I","Ḯ":"I","Ỉ":"I","�":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","�":"K","�":"K","�":"K","Ꞣ":"K","�":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","�":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","�":"L","�":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","�":"N","�":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","�":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","�":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","�":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","�":"O","�":"O","Œ":"OE","Ƣ":"OI","�":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","�":"P","�":"P","�":"P","Ⓠ":"Q","Ｑ":"Q","�":"Q","�":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","�":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","�":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","�":"V","Ʌ":"V","�":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","�":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","�":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","�":"Z","Ｚ":"Z","Ź":"Z","�":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","�":"Z","�":"a","�":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","�":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","�":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","�":"a","ą":"a","ⱥ":"a","�":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","�":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","�":"d","�":"d","ḑ":"d","ḓ":"d","�":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","�":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","�":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","�":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","�":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","�":"f","ⓖ":"g","ｇ":"g","ǵ":"g","�":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","�":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","�":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","�":"k","�":"k","�":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","�":"l","�":"l","�":"l","lj":"lj","ⓜ":"m","�":"m","ḿ":"m","�":"m","ṃ":"m","ɱ":"m","ɯ":"m","�":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","�":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","�":"o","ȭ":"o","�":"o","�":"o","ṑ":"o","ṓ":"o","�":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","�":"o","ő":"o","ǒ":"o","�":"o","�":"o","ơ":"o","�":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","�":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","�":"o","�":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","�":"oo","ⓟ":"p","�":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","�":"p","�":"p","�":"p","ⓠ":"q","ｑ":"q","ɋ":"q","�":"q","�":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","�":"r","ŗ":"r","ṟ":"r","�":"r","ɽ":"r","�":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","�":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","�":"v","ʌ":"v","�":"vy","ⓦ":"w","ｗ":"w","�":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","�":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","�":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","�":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","�":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","�":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","�":"ι","ό":"ο","�":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(i){function n(e,t){n.__super__.constructor.call(this)}return i.Extend(n,i.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=i.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+i.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],i=this;this.$element.find(":selected").each(function(){var e=l(this),t=i.item(e);n.push(t)}),e(n)},n.prototype.select=function(r){var o=this;if(r.selected=!0,l(r.element).is("option"))return r.element.selected=!0,void this.$element.trigger("input").trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(r=[r]).push.apply(r,e);for(var n=0;n<r.length;n++){var i=r[n].id;-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("input").trigger("change")});else{var e=r.id;this.$element.val(e),this.$element.trigger("input").trigger("change")}},n.prototype.unselect=function(r){var o=this;if(this.$element.prop("multiple")){if(r.selected=!1,l(r.element).is("option"))return r.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n].id;i!==r.id&&-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(i,e){var r=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(i,t);null!==n&&r.push(n)}}),e({results:r})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),i=this._normalizeItem(e);return i.element=t,a.StoreData(t,"data",i),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),i=[],r=0;r<n.length;r++){var o=l(n[r]),s=this.item(o);i.push(s)}t.children=i}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function i(e,t){this._dataToConvert=t.get("data")||[],i.__super__.constructor.call(this,e,t)}return f.Extend(i,e),i.prototype.bind=function(e,t){i.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},i.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),i.__super__.select.call(this,n)},i.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),i=n.map(function(){return t.item(g(this)).id}).get(),r=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,i)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}r.push(p)}}return r},i}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var i=o.ajax(e);return i.then(t),i.fail(n),i}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,i){var r=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=r.processResults(e,n);r.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),i(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||r.trigger("results:message",{message:"errorLoading"})});r._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var i=n.get("tags"),r=n.get("createTag");void 0!==r&&(this.createTag=r);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(i))for(var s=0;s<i.length;s++){var a=i[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var i=t.results,r=0;r<i.length;r++){var o=i[r],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=i,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(i,a)}t.results=i,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var i=n.get("tokenizer");void 0!==i&&(this.tokenizer=i),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var i=this;t.term=t.term||"";var r=this.tokenizer(t,this.options,function(e){var t=i._normalizeItem(e);if(!i.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=i.option(t);n.attr("data-select2-tag",!0),i._removeOldTags(),i.addOptions([n])}!function(e){i.trigger("select",{data:e})}(t)});r.term!==t.term&&(this.$search.length&&(this.$search.val(r.term),this.$search.trigger("focus")),t.term=r.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,i){for(var r=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,r)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(i(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(){i._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var i=this;this._checkIfMaximumSelected(function(){e.call(i,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var i=this;this.current(function(e){var t=null!=e?e.length:0;0<i.maximumSelectionLength&&t>=i.maximumSelectionLength?i.trigger("results:message",{message:"maximumSelected",args:{maximum:i.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){i.handleSearch(e)}),t.on("open",function(){i.$search.attr("tabindex",0),i.$search.attr("aria-controls",r),i.$search.trigger("focus"),window.setTimeout(function(){i.$search.trigger("focus")},0)}),t.on("close",function(){i.$search.attr("tabindex",-1),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.val(""),i.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||i.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(i.showSearch(e)?i.$searchContainer.removeClass("select2-search--hide"):i.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,i){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,i)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),i=t.length-1;0<=i;i--){var r=t[i];this.placeholder.id===r.id&&n.splice(i,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,i){this.lastParams={},e.call(this,t,n,i),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("query",function(e){i.lastParams=e,i.loading=!0}),t.on("query:append",function(e){i.lastParams=e,i.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("open",function(){i._showDropdown(),i._attachPositioningHandler(t),i._bindContainerResultHandlers(t)}),t.on("close",function(){i._hideDropdown(),i._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,i="scroll.select2."+t.id,r="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(i,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(i+" "+r+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,i="resize.select2."+t.id,r="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+i+" "+r)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),i=null,r=this.$container.offset();r.bottom=r.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=r.top,o.bottom=r.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<r.top-s,u=l>r.bottom+s,d={left:r.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(i="below"),u||!c||t?!c&&u&&t&&(i="below"):i="above",("above"==i||t&&"below"!==i)&&(d.top=o.top-h.top-s),null!=i&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+i),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+i)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,i){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,i)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,i=0;i<t.length;i++){var r=t[i];r.children?n+=e(r.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("close",function(e){i._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var i=this.getHighlightedResults();if(!(i.length<1)){var r=o.GetData(i[0],"data");null!=r.element&&r.element.selected||null==r.element&&r.selected||this.trigger("select",{data:r})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(e){i._selectTriggered(e)}),t.on("unselect",function(e){i._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,w,$,b,A,x,D,S,C,E,O,T,q,j,L,I,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=$:null!=e.data?e.dataAdapter=w:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,b)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,L))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=C;else{var i=y.Decorate(C,E);e.dropdownAdapter=i}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,I)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var r=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,r)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var i=c.extend(!0,{},n),r=n.children.length-1;0<=r;r--)null==e(t,n.children[r])&&i.children.splice(r,1);return 0<i.children.length?i:e(t,i)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,i=this.defaults.language,r=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(r),this._resolveLanguage(n),this._resolveLanguage(i),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],i=0;i<t.length;i++)if(n.push(t[i]),"string"==typeof t[i]&&0<t[i].indexOf("-")){var r=t[i].split("-")[0];n.push(r)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,i=0;i<e.length;i++){var r=new s,o=e[i];if("string"==typeof o)try{r=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,r=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else r=c.isPlainObject(o)?new s(o):o;n.extend(r)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var i=y._convertData(n);c.extend(!0,this.defaults,i)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(i,d,r,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=r.applyFromElement(this.options,t)),this.options=r.apply(this.options),t&&t.is("input")){var n=i(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function i(e,t){return t.toUpperCase()}for(var r=0;r<e[0].attributes.length;r++){var o=e[0].attributes[r].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,i)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(o,c,u,i){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var i=this.options.get("dataAdapter");this.dataAdapter=new i(e,this.options);var r=this.render();this._placeContainer(r);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,r);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,r);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var i=this._resolveWidth(e,"style");return null!=i?i:this._resolveWidth(e,"element")}if("element"==t){var r=e.outerWidth(!1);return r<=0?"auto":r+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){t._syncA(),t._syncS(null,e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,i=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===o.inArray(e,i)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===i.ESC||t===i.TAB||t===i.UP&&e.altKey?(n.close(e),e.preventDefault()):t===i.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===i.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===i.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===i.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===i.ENTER||t===i.SPACE||t===i.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._isChangeMutation=function(e,t){var n=!1,i=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var r=0;r<t.addedNodes.length;r++){t.addedNodes[r].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length?n=!0:o.isArray(t)&&o.each(t,function(e,t){if(i._isChangeMutation(e,t))return!(n=!0)});else n=!0;return n}},d.prototype._syncSubtree=function(e,t){var n=this._isChangeMutation(e,t),i=this;n&&this.dataAdapter.current(function(e){i.trigger("selection:update",{data:e})})},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,i={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in i){var r=i[e],o={prevented:!1,name:e,args:t};if(n.call(this,r,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},d.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},d.prototype.isEnabled=function(){return!this.isDisabled()},d.prototype.isDisabled=function(){return this.options.get("disabled")},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];o.isArray(t)&&(t=o.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("input").trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=o('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("select2/compat/utils",["jquery"],function(s){return{syncCssClasses:function(e,t,n){var i,r,o=[];(i=s.trim(e.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0===this.indexOf("select2-")&&o.push(this)}),(i=s.trim(t.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&null!=(r=n(this))&&o.push(r)}),e.attr("class",o.join(" "))}}}),e.define("select2/compat/containerCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("containerCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptContainerCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("containerCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/dropdownCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("dropdownCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptDropdownCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("dropdownCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/initSelection",["jquery"],function(i){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=n.get("initSelection"),this._isInitialized=!1,e.call(this,t,n)}return e.prototype.current=function(e,t){var n=this;this._isInitialized?e.call(this,t):this.initSelection.call(null,this.$element,function(e){n._isInitialized=!0,i.isArray(e)||(e=[e]),t(e)})},e}),e.define("select2/compat/inputData",["jquery","../utils"],function(s,i){function e(e,t,n){this._currentData=[],this._valueSeparator=n.get("valueSeparator")||",","hidden"===t.prop("type")&&n.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),e.call(this,t,n)}return e.prototype.current=function(e,t){function i(e,t){var n=[];return e.selected||-1!==s.inArray(e.id,t)?(e.selected=!0,n.push(e)):e.selected=!1,e.children&&n.push.apply(n,i(e.children,t)),n}for(var n=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r];n.push.apply(n,i(o,this.$element.val().split(this._valueSeparator)))}t(n)},e.prototype.select=function(e,t){if(this.options.get("multiple")){var n=this.$element.val();n+=this._valueSeparator+t.id,this.$element.val(n),this.$element.trigger("input").trigger("change")}else this.current(function(e){s.map(e,function(e){e.selected=!1})}),this.$element.val(t.id),this.$element.trigger("input").trigger("change")},e.prototype.unselect=function(e,r){var o=this;r.selected=!1,this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n];r.id!=i.id&&t.push(i.id)}o.$element.val(t.join(o._valueSeparator)),o.$element.trigger("input").trigger("change")})},e.prototype.query=function(e,t,n){for(var i=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r],s=this.matches(t,o);null!==s&&i.push(s)}n({results:i})},e.prototype.addOptions=function(e,t){var n=s.map(t,function(e){return i.GetData(e[0],"data")});this._currentData.push.apply(this._currentData,n)},e}),e.define("select2/compat/matcher",["jquery"],function(s){return function(o){return function(e,t){var n=s.extend(!0,{},t);if(null==e.term||""===s.trim(e.term))return n;if(t.children){for(var i=t.children.length-1;0<=i;i--){var r=t.children[i];o(e.term,r.text,r)||n.children.splice(i,1)}if(0<n.children.length)return n}return o(e.term,t.text,t)?n:null}}}),e.define("select2/compat/query",[],function(){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.callback=n,this.options.get("query").call(null,t)},e}),e.define("select2/dropdown/attachContainer",[],function(){function e(e,t,n){e.call(this,t,n)}return e.prototype.position=function(e,t,n){n.find(".dropdown-wrapper").append(t),t.addClass("select2-dropdown--below"),n.addClass("select2-container--below")},e}),e.define("select2/dropdown/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$dropdown.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),e.define("select2/selection/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$selection.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),l=function(p){var h,f,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in document||9<=document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],g=Array.prototype.slice;if(p.event.fixHooks)for(var n=e.length;n;)p.event.fixHooks[e[--n]]=p.event.mouseHooks;var m=p.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],i,!1);else this.onmousewheel=i;p.data(this,"mousewheel-line-height",m.getLineHeight(this)),p.data(this,"mousewheel-page-height",m.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],i,!1);else this.onmousewheel=null;p.removeData(this,"mousewheel-line-height"),p.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=p(e),n=t["offsetParent"in p.fn?"offsetParent":"parent"]();return n.length||(n=p("body")),parseInt(n.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return p(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function i(e){var t,n=e||window.event,i=g.call(arguments,1),r=0,o=0,s=0,a=0,l=0;if((e=p.event.fix(n)).type="mousewheel","detail"in n&&(s=-1*n.detail),"wheelDelta"in n&&(s=n.wheelDelta),"wheelDeltaY"in n&&(s=n.wheelDeltaY),"wheelDeltaX"in n&&(o=-1*n.wheelDeltaX),"axis"in n&&n.axis===n.HORIZONTAL_AXIS&&(o=-1*s,s=0),r=0===s?o:s,"deltaY"in n&&(r=s=-1*n.deltaY),"deltaX"in n&&(o=n.deltaX,0===s&&(r=-1*o)),0!==s||0!==o){if(1===n.deltaMode){var c=p.data(this,"mousewheel-line-height");r*=c,s*=c,o*=c}else if(2===n.deltaMode){var u=p.data(this,"mousewheel-page-height");r*=u,s*=u,o*=u}if(t=Math.max(Math.abs(s),Math.abs(o)),(!f||t<f)&&y(n,f=t)&&(f/=40),y(n,t)&&(r/=40,o/=40,s/=40),r=Math[1<=r?"floor":"ceil"](r/f),o=Math[1<=o?"floor":"ceil"](o/f),s=Math[1<=s?"floor":"ceil"](s/f),m.settings.normalizeOffset&&this.getBoundingClientRect){var d=this.getBoundingClientRect();a=e.clientX-d.left,l=e.clientY-d.top}return e.deltaX=o,e.deltaY=s,e.deltaFactor=f,e.offsetX=a,e.offsetY=l,e.deltaMode=0,i.unshift(e,r,o,s),h&&clearTimeout(h),h=setTimeout(v,200),(p.event.dispatch||p.event.handle).apply(this,i)}}function v(){f=null}function y(e,t){return m.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120==0}p.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})},"function"==typeof e.define&&e.define.amd?e.define("jquery-mousewheel",["jquery"],l):"object"==typeof exports?module.exports=l:l(d),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(r,e,o,t,s){if(null==r.fn.select2){var a=["open","close","destroy"];r.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=r.extend(!0,{},t);new o(r(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,i=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,i)}),-1<r.inArray(t,a)?this:n}}return null==r.fn.select2.defaults&&(r.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return d.fn.select2.amd=e,t});
\ No newline at end of file
+/*! Select2 4.0.5 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return v.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n,o=b&&b.split("/"),p=t.map,q=p&&p["*"]||{};if(a){for(a=a.split("/"),g=a.length-1,t.nodeIdCompat&&x.test(a[g])&&(a[g]=a[g].replace(x,"")),"."===a[0].charAt(0)&&o&&(n=o.slice(0,o.length-1),a=n.concat(a)),k=0;k<a.length;k++)if("."===(m=a[k]))a.splice(k,1),k-=1;else if(".."===m){if(0===k||1===k&&".."===a[2]||".."===a[k-1])continue;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}if((o||q)&&p){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),o)for(l=o.length;l>0;l-=1)if((e=p[o.slice(0,l).join("/")])&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&q&&q[d]&&(i=q[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=w.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),o.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){r[a]=b}}function j(a){if(e(s,a)){var c=s[a];delete s[a],u[a]=!0,n.apply(b,c)}if(!e(r,a)&&!e(u,a))throw new Error("No "+a);return r[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return a?k(a):[]}function m(a){return function(){return t&&t.config&&t.config[a]||{}}}var n,o,p,q,r={},s={},t={},u={},v=Object.prototype.hasOwnProperty,w=[].slice,x=/\.js$/;p=function(a,b){var c,d=k(a),e=d[0],g=b[1];return a=d[1],e&&(e=f(e,g),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(g)):f(a,g):(a=f(a,g),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},q={require:function(a){return g(a)},exports:function(a){var b=r[a];return void 0!==b?b:r[a]={}},module:function(a){return{id:a,uri:"",exports:r[a],config:m(a)}}},n=function(a,c,d,f){var h,k,m,n,o,t,v,w=[],x=typeof d;if(f=f||a,t=l(f),"undefined"===x||"function"===x){for(c=!c.length&&d.length?["require","exports","module"]:c,o=0;o<c.length;o+=1)if(n=p(c[o],t),"require"===(k=n.f))w[o]=q.require(a);else if("exports"===k)w[o]=q.exports(a),v=!0;else if("module"===k)h=w[o]=q.module(a);else if(e(r,k)||e(s,k)||e(u,k))w[o]=j(k);else{if(!n.p)throw new Error(a+" missing "+k);n.p.load(n.n,g(f,!0),i(k),{}),w[o]=r[k]}m=d?d.apply(r[a],w):void 0,a&&(h&&h.exports!==b&&h.exports!==r[a]?r[a]=h.exports:m===b&&v||(r[a]=m))}else a&&(r[a]=d)},a=c=o=function(a,c,d,e,f){if("string"==typeof a)return q[a]?q[a](c):j(p(a,l(c)).f);if(!a.splice){if(t=a,t.deps&&o(t.deps,t.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?n(b,a,c,d):setTimeout(function(){n(b,a,c,d)},4),o},o.config=function(a){return o(a)},a._defined=r,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(r,a)||e(s,a)||(s[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){"function"==typeof b[d]&&("constructor"!==d&&c.push(d))}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){return Array.prototype.unshift.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};return d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;c<d;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;c<a;c++){b+=Math.floor(36*Math.random()).toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return(e!==f||"hidden"!==f&&"visible"!==f)&&("scroll"===e||"scroll"===f||(d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth))},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){b.find(".select2-results").append(a)},c.prototype.sort=function(a){return this.options.get("sorter")(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var b=this;this.data.current(function(c){var d=a.map(c,function(a){return a.id.toString()});b.$results.find(".select2-results__option[aria-selected]").each(function(){var b=a(this),c=a.data(this,"data"),e=""+c.id;null!=c.element&&c.element.selected||null==c.element&&a.inArray(e,d)>-1?b.attr("aria-selected","true"):b.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(b){var c=document.createElement("li");c.className="select2-results__option";var d={role:"treeitem","aria-selected":"false"};b.disabled&&(delete d["aria-selected"],d["aria-disabled"]="true"),null==b.id&&delete d["aria-selected"],null!=b._resultId&&(c.id=b._resultId),b.title&&(c.title=b.title),b.children&&(d.role="group",d["aria-label"]=b.text,delete d["aria-selected"]);for(var e in d){var f=d[e];c.setAttribute(e,f)}if(b.children){var g=a(c),h=document.createElement("strong");h.className="select2-results__group";a(h);this.template(b,h);for(var i=[],j=0;j<b.children.length;j++){var k=b.children[j],l=this.option(k);i.push(l)}var m=a("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});m.append(i),g.append(h),g.append(m)}else this.template(b,c);return a.data(c,"data",b),c},c.prototype.bind=function(b,c){var d=this,e=b.id+"-results";this.$results.attr("id",e),b.on("results:all",function(a){d.clear(),d.append(a.data),b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("results:append",function(a){d.append(a.data),b.isOpen()&&d.setClasses()}),b.on("query",function(a){d.hideMessages(),d.showLoading(a)}),b.on("select",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("unselect",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("open",function(){d.$results.attr("aria-expanded","true"),d.$results.attr("aria-hidden","false"),d.setClasses(),d.ensureHighlightVisible()}),b.on("close",function(){d.$results.attr("aria-expanded","false"),d.$results.attr("aria-hidden","true"),d.$results.removeAttr("aria-activedescendant")}),b.on("results:toggle",function(){var a=d.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),b.on("results:select",function(){var a=d.getHighlightedResults();if(0!==a.length){var b=a.data("data");"true"==a.attr("aria-selected")?d.trigger("close",{}):d.trigger("select",{data:b})}}),b.on("results:previous",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a);if(0!==c){var e=c-1;0===a.length&&(e=0);var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top,h=f.offset().top,i=d.$results.scrollTop()+(h-g);0===e?d.$results.scrollTop(0):h-g<0&&d.$results.scrollTop(i)}}),b.on("results:next",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a),e=c+1;if(!(e>=b.length)){var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top+d.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=d.$results.scrollTop()+h-g;0===e?d.$results.scrollTop(0):h>g&&d.$results.scrollTop(i)}}),b.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),b.on("results:message",function(a){d.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=d.$results.scrollTop(),c=d.$results.get(0).scrollHeight-b+a.deltaY,e=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=d.$results.height();e?(d.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(d.$results.scrollTop(d.$results.get(0).scrollHeight-d.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(b){var c=a(this),e=c.data("data");if("true"===c.attr("aria-selected"))return void(d.options.get("multiple")?d.trigger("unselect",{originalEvent:b,data:e}):d.trigger("close",{}));d.trigger("select",{originalEvent:b,data:e})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(b){var c=a(this).data("data");d.getHighlightedResults().removeClass("select2-results__option--highlighted"),d.trigger("results:focus",{data:c,element:a(this)})})},c.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),c<=2?this.$results.scrollTop(0):(g>this.$results.outerHeight()||g<0)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var b=a('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=this.$element.data("old-tabindex")?this._tabindex=this.$element.data("old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),b.attr("title",this.$element.attr("title")),b.attr("tabindex",this._tabindex),this.$selection=b,b},d.prototype.bind=function(a,b){var d=this,e=(a.id,a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),d.$selection.focus(),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(b){a(document.body).on("mousedown.select2."+b.id,function(b){var c=a(b.target),d=c.closest(".select2");a(".select2.select2-container--open").each(function(){var b=a(this);this!=d[0]&&b.data("element").select2("close")})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){b.find(".selection").append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()}),a.on("selection:update",function(a){c.update(a.data)})},e.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},e.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.prop("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,c){var e=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){e.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!e.options.get("disabled")){var c=a(this),d=c.parent(),f=d.data("data");e.trigger("unselect",{originalEvent:b,data:f})}})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},d.prototype.selectionContainer=function(){return a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.prop("title",e.title||e.text),f.data("data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id;if(b.length>1||c)return a.call(this,b);this.clear();var d=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(d)},b}),b.define("select2/selection/allowClear",["jquery","../keys"],function(a,b){function c(){}return c.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},c.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var c=this.$selection.find(".select2-selection__clear");if(0!==c.length){b.stopPropagation();for(var d=c.data("data"),e=0;e<d.length;e++){var f={data:d[e]};if(this.trigger("unselect",f),f.prevented)return}this.$element.val(this.placeholder.id).trigger("change"),this.trigger("toggle",{})}}},c.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||c.which!=b.DELETE&&c.which!=b.BACKSPACE||this._handleClear(c)},c.prototype.update=function(b,c){if(b.call(this,c),!(this.$selection.find(".select2-selection__placeholder").length>0||0===c.length)){var d=a('<span class="select2-selection__clear">&times;</span>');d.data("data",c),this.$selection.find(".select2-selection__rendered").prepend(d)}},c}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,b,d){var e=this;a.call(this,b,d),b.on("open",function(){e.$search.trigger("focus")}),b.on("close",function(){e.$search.val(""),e.$search.removeAttr("aria-activedescendant"),e.$search.trigger("focus")}),b.on("enable",function(){e.$search.prop("disabled",!1),e._transferTabIndex()}),b.on("disable",function(){e.$search.prop("disabled",!0)}),b.on("focus",function(a){e.$search.trigger("focus")}),b.on("results:focus",function(a){e.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){e.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){e._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){if(a.stopPropagation(),e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented(),a.which===c.BACKSPACE&&""===e.$search.val()){var b=e.$searchContainer.prev(".select2-selection__choice");if(b.length>0){var d=b.data("data");e.searchRemoveChoice(d),a.preventDefault()}}});var f=document.documentMode,g=f&&f<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){if(g)return void e.$selection.off("input.search input.searchcheck");e.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(g&&"input"===a.type)return void e.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&e.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c&&this.$search.focus()},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{a=.75*(this.$search.val().length+1)+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting"],g=["opening","closing","selecting","unselecting"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","�":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","�":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","�":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","�":"D","Ḓ":"D","Ḏ":"D","�":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","�":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","�":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","�":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","�":"G","�":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","�":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","�":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","�":"I","Ḯ":"I","Ỉ":"I","�":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","�":"K","�":"K","�":"K","Ꞣ":"K","�":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","�":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","�":"L","�":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","�":"N","�":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","�":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","�":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","�":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","�":"O","�":"O","Ƣ":"OI","�":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","�":"P","�":"P","�":"P","Ⓠ":"Q","Ｑ":"Q","�":"Q","�":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","�":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","�":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","�":"V","Ʌ":"V","�":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","�":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","�":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","�":"Z","Ｚ":"Z","Ź":"Z","�":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","�":"Z","�":"a","�":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","�":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","�":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","�":"a","ą":"a","ⱥ":"a","�":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","�":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","�":"d","�":"d","ḑ":"d","ḓ":"d","�":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","�":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","�":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","�":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","�":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","�":"f","ⓖ":"g","ｇ":"g","ǵ":"g","�":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","�":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","�":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","�":"k","�":"k","�":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","�":"l","�":"l","�":"l","lj":"lj","ⓜ":"m","�":"m","ḿ":"m","�":"m","ṃ":"m","ɱ":"m","ɯ":"m","�":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","�":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","�":"o","ȭ":"o","�":"o","�":"o","ṑ":"o","ṓ":"o","�":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","�":"o","ő":"o","ǒ":"o","�":"o","�":"o","ơ":"o","�":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","�":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","�":"o","�":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","�":"oo","ⓟ":"p","�":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","�":"p","�":"p","�":"p","ⓠ":"q","ｑ":"q","ɋ":"q","�":"q","�":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","�":"r","ŗ":"r","ṟ":"r","�":"r","ɽ":"r","�":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","�":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","�":"v","ʌ":"v","�":"vy","ⓦ":"w","ｗ":"w","�":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","�":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","�":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","�":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","�":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","�":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","�":"ι","ό":"ο","�":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"}}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),null!=c.id?d+="-"+c.id.toString():d+="-"+a.generateChars(4),d},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple")){if(a.selected=!1,c(a.element).is("option"))return a.element.selected=!1,void this.$element.trigger("change");this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})}},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){c.removeData(this,"data")})},d.prototype.query=function(a,b){var d=[],e=this;this.$element.children().each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var b;a.children?(b=document.createElement("optgroup"),b.label=a.text):(b=document.createElement("option"),void 0!==b.textContent?b.textContent=a.text:b.innerText=a.text),void 0!==a.id&&(b.value=a.id),a.disabled&&(b.disabled=!0),a.selected&&(b.selected=!0),a.title&&(b.title=a.title);var d=c(b),e=this._normalizeItem(a);return e.element=b,c.data(b,"data",e),d},d.prototype.item=function(a){var b={};if(null!=(b=c.data(a[0],"data")))return b;if(a.is("option"))b={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){b={text:a.prop("label"),children:[],title:a.prop("title")};for(var d=a.children("option"),e=[],f=0;f<d.length;f++){var g=c(d[f]),h=this.item(g);e.push(h)}b.children=e}return b=this._normalizeItem(b),b.element=a[0],c.data(a[0],"data",b),b},d.prototype._normalizeItem=function(a){c.isPlainObject(a)||(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){return this.options.get("matcher")(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){d.status&&"0"===d.status||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0);if((i.text||"").toUpperCase()===(b.term||"").toUpperCase()||j)return!f&&(a.data=g,void c(a))}if(f)return!0;var k=e.createTag(b);if(null!=k){var l=e.option(k);l.attr("data-select2-tag",!0),e.addOptions([l]),e.insertTag(g,k)}a.results=g,c(a)}var e=this;if(this._removeOldTags(),null==b.term||null!=b.page)return void a.call(this,b,c);a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){this._lastTag;this.$element.find("option[data-select2-tag]").each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b);if(!g.$element.find("option").filter(function(){return a(this).val()===c.id}).length){var d=g.option(c);d.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([d])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",b.term.length<this.minimumInputLength)return void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength)return void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;if(d.maximumSelectionLength>0&&f>=d.maximumSelectionLength)return void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}});a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val("")}),c.on("focus",function(){c.isOpen()||e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){e.showSearch(a)?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){e.$results.offset().top+e.$results.outerHeight(!1)+50>=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1)&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){a(this).data("select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(b){var c=a(this).data("select2-scroll-position");a(this).scrollTop(c.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id;this.$container.parents().filter(b.hasScroll).off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return!(a(c.data.results)<this.minimumResultsForSearch)&&b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},a.prototype._handleSelectOnClose=function(a,b){if(b&&null!=b.originalSelect2Event){var c=b.originalSelect2Event;if("select"===c._type||"unselect"===c._type)return}var d=this.getHighlightedResults();if(!(d.length<1)){var e=d.data("data");null!=e.element&&e.element.selected||null==e.element&&e.selected||this.trigger("select",{data:e})}},a}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){return"Please enter "+(a.minimum-a.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}return D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),null==l.tokenSeparators&&null==l.tokenizer||(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(a){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(a){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var O=k.loadPath(this.defaults.amdLanguageBase+"en"),P=new k(l.language);P.extend(O),l.translations=P}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){null==c(d,e.children[g])&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var h=b(e.text).toUpperCase(),i=b(d.term).toUpperCase();return h.indexOf(i)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(this.defaults,f)},new D}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),a.data("select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),a.data("data",a.data("select2Tags")),a.data("tags",!0)),a.data("ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",a.data("ajaxUrl")),a.data("ajax--url",a.data("ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,a.data()):a.data();var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,c){null!=a.data("select2")&&a.data("select2").destroy(),this.$element=a,this.id=this._generateId(a),c=c||{},this.options=new b(c,a),e.__super__.constructor.call(this);var d=a.attr("tabindex")||0;a.data("old-tabindex",d),a.attr("tabindex","-1");var f=this.options.get("dataAdapter");this.dataAdapter=new f(a,this.options);var g=this.render();this._placeContainer(g);var h=this.options.get("selectionAdapter");this.selection=new h(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,g);var i=this.options.get("dropdownAdapter");this.dropdown=new i(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,g);var j=this.options.get("resultsAdapter");this.results=new j(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var k=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){k.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return e<=0?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;h<i;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=a&&0!==a.length||(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",this.$element.data("old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),b.data("element",this.$element),b},e}),b.define("select2/compat/utils",["jquery"],function(a){function b(b,c,d){var e,f,g=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0===this.indexOf("select2-")&&g.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&null!=(f=d(this))&&g.push(f)})),b.attr("class",g.join(" "))}return{syncCssClasses:b}}),b.define("select2/compat/containerCss",["jquery","./utils"],function(a,b){function c(a){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("containerCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptContainerCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all:","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("containerCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/dropdownCss",["jquery","./utils"],function(a,b){function c(a){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("dropdownCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptDropdownCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all:","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("dropdownCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/initSelection",["jquery"],function(a){function b(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=c.get("initSelection"),this._isInitialized=!1,a.call(this,b,c)}return b.prototype.current=function(b,c){var d=this;if(this._isInitialized)return void b.call(this,c);this.initSelection.call(null,this.$element,function(b){d._isInitialized=!0,a.isArray(b)||(b=[b]),c(b)})},b}),b.define("select2/compat/inputData",["jquery"],function(a){function b(a,b,c){this._currentData=[],this._valueSeparator=c.get("valueSeparator")||",","hidden"===b.prop("type")&&c.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),a.call(this,b,c)}return b.prototype.current=function(b,c){function d(b,c){var e=[];return b.selected||-1!==a.inArray(b.id,c)?(b.selected=!0,e.push(b)):b.selected=!1,b.children&&e.push.apply(e,d(b.children,c)),e}for(var e=[],f=0;f<this._currentData.length;f++){var g=this._currentData[f];e.push.apply(e,d(g,this.$element.val().split(this._valueSeparator)))}c(e)},b.prototype.select=function(b,c){if(this.options.get("multiple")){var d=this.$element.val();d+=this._valueSeparator+c.id,this.$element.val(d),this.$element.trigger("change")}else this.current(function(b){a.map(b,function(a){a.selected=!1})}),this.$element.val(c.id),this.$element.trigger("change")},b.prototype.unselect=function(a,b){var c=this;b.selected=!1,this.current(function(a){for(var d=[],e=0;e<a.length;e++){var f=a[e];b.id!=f.id&&d.push(f.id)}c.$element.val(d.join(c._valueSeparator)),c.$element.trigger("change")})},b.prototype.query=function(a,b,c){for(var d=[],e=0;e<this._currentData.length;e++){var f=this._currentData[e],g=this.matches(b,f);null!==g&&d.push(g)}c({results:d})},b.prototype.addOptions=function(b,c){var d=a.map(c,function(b){return a.data(b[0],"data")});this._currentData.push.apply(this._currentData,d)},b}),b.define("select2/compat/matcher",["jquery"],function(a){function b(b){function c(c,d){var e=a.extend(!0,{},d);if(null==c.term||""===a.trim(c.term))return e;if(d.children){for(var f=d.children.length-1;f>=0;f--){var g=d.children[f];b(c.term,g.text,g)||e.children.splice(f,1)}if(e.children.length>0)return e}return b(c.term,d.text,d)?e:null}return c}return b}),b.define("select2/compat/query",[],function(){function a(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),a.call(this,b,c)}return a.prototype.query=function(a,b,c){b.callback=c,this.options.get("query").call(null,b)},a}),b.define("select2/dropdown/attachContainer",[],function(){function a(a,b,c){a.call(this,b,c)}return a.prototype.position=function(a,b,c){c.find(".dropdown-wrapper").append(b),b.addClass("select2-dropdown--below"),c.addClass("select2-container--below")},a}),b.define("select2/dropdown/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$dropdown.on(d.join(" "),function(a){a.stopPropagation()})},a}),b.define("select2/selection/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$selection.on(d.join(" "),function(a){a.stopPropagation()})},a}),function(c){"function"==typeof b.define&&b.define.amd?b.define("jquery-mousewheel",["jquery"],c):"object"==typeof exports?module.exports=c:c(a)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||n<f)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120==0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults"],function(a,b,c,d){if(null==a.fn.select2){var e=["open","close","destroy"];a.fn.select2=function(b){if("object"==typeof(b=b||{}))return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,f=Array.prototype.slice.call(arguments,1);return this.each(function(){var c=a(this).data("select2");null==c&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=c[b].apply(c,f)}),a.inArray(b,e)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/select2.js b/htdocs/includes/jquery/plugins/select2/dist/js/select2.js
index fcfb5ab49d8..a5e7d50de25 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/js/select2.js
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/select2.js
@@ -1,11 +1,11 @@
 /*!
- * Select2 4.0.13
+ * Select2 4.0.5
  * https://select2.github.io
  *
  * Released under the MIT license
  * https://github.com/select2/select2/blob/master/LICENSE.md
  */
-;(function (factory) {
+(function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
@@ -574,10 +574,10 @@ S2.define('select2/utils',[
     DecoratedClass.prototype = new ctr();
 
     for (var m = 0; m < superMethods.length; m++) {
-      var superMethod = superMethods[m];
+        var superMethod = superMethods[m];
 
-      DecoratedClass.prototype[superMethod] =
-        SuperClass.prototype[superMethod];
+        DecoratedClass.prototype[superMethod] =
+          SuperClass.prototype[superMethod];
     }
 
     var calledMethod = function (methodName) {
@@ -772,70 +772,6 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
-  // Cache objects in Utils.__cache instead of $.data (see #4346)
-  Utils.__cache = {};
-
-  var id = 0;
-  Utils.GetUniqueElementId = function (element) {
-    // Get a unique element Id. If element has no id,
-    // creates a new unique number, stores it in the id
-    // attribute and returns the new id.
-    // If an id already exists, it simply returns it.
-
-    var select2Id = element.getAttribute('data-select2-id');
-    if (select2Id == null) {
-      // If element has id, use it.
-      if (element.id) {
-        select2Id = element.id;
-        element.setAttribute('data-select2-id', select2Id);
-      } else {
-        element.setAttribute('data-select2-id', ++id);
-        select2Id = id.toString();
-      }
-    }
-    return select2Id;
-  };
-
-  Utils.StoreData = function (element, name, value) {
-    // Stores an item in the cache for a specified element.
-    // name is the cache key.
-    var id = Utils.GetUniqueElementId(element);
-    if (!Utils.__cache[id]) {
-      Utils.__cache[id] = {};
-    }
-
-    Utils.__cache[id][name] = value;
-  };
-
-  Utils.GetData = function (element, name) {
-    // Retrieves a value from the cache by its key (name)
-    // name is optional. If no name specified, return
-    // all cache items for the specified element.
-    // and for a specified element.
-    var id = Utils.GetUniqueElementId(element);
-    if (name) {
-      if (Utils.__cache[id]) {
-        if (Utils.__cache[id][name] != null) {
-          return Utils.__cache[id][name];
-        }
-        return $(element).data(name); // Fallback to HTML5 data attribs.
-      }
-      return $(element).data(name); // Fallback to HTML5 data attribs.
-    } else {
-      return Utils.__cache[id];
-    }
-  };
-
-  Utils.RemoveData = function (element) {
-    // Removes all cached items for a specified element.
-    var id = Utils.GetUniqueElementId(element);
-    if (Utils.__cache[id] != null) {
-      delete Utils.__cache[id];
-    }
-
-    element.removeAttribute('data-select2-id');
-  };
-
   return Utils;
 });
 
@@ -855,7 +791,7 @@ S2.define('select2/results',[
 
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="listbox"></ul>'
+      '<ul class="select2-results__options" role="tree"></ul>'
     );
 
     if (this.options.get('multiple')) {
@@ -878,7 +814,7 @@ S2.define('select2/results',[
     this.hideLoading();
 
     var $message = $(
-      '<li role="alert" aria-live="assertive"' +
+      '<li role="treeitem" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
 
@@ -971,7 +907,7 @@ S2.define('select2/results',[
       $options.each(function () {
         var $option = $(this);
 
-        var item = Utils.GetData(this, 'data');
+        var item = $.data(this, 'data');
 
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
@@ -1012,16 +948,11 @@ S2.define('select2/results',[
     option.className = 'select2-results__option';
 
     var attrs = {
-      'role': 'option',
+      'role': 'treeitem',
       'aria-selected': 'false'
     };
 
-    var matches = window.Element.prototype.matches ||
-      window.Element.prototype.msMatchesSelector ||
-      window.Element.prototype.webkitMatchesSelector;
-
-    if ((data.element != null && matches.call(data.element, ':disabled')) ||
-        (data.element == null && data.disabled)) {
+    if (data.disabled) {
       delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
     }
@@ -1081,7 +1012,7 @@ S2.define('select2/results',[
       this.template(data, option);
     }
 
-    Utils.StoreData(option, 'data', data);
+    $.data(option, 'data', data);
 
     return option;
   };
@@ -1122,10 +1053,7 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-
-      if (self.options.get('scrollAfterSelect')) {
-        self.highlightFirstItem();
-      }
+      self.highlightFirstItem();
     });
 
     container.on('unselect', function () {
@@ -1134,10 +1062,7 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-
-      if (self.options.get('scrollAfterSelect')) {
-        self.highlightFirstItem();
-      }
+      self.highlightFirstItem();
     });
 
     container.on('open', function () {
@@ -1173,7 +1098,7 @@ S2.define('select2/results',[
         return;
       }
 
-      var data = Utils.GetData($highlighted[0], 'data');
+      var data = $highlighted.data('data');
 
       if ($highlighted.attr('aria-selected') == 'true') {
         self.trigger('close', {});
@@ -1191,9 +1116,8 @@ S2.define('select2/results',[
 
       var currentIndex = $options.index($highlighted);
 
-      // If we are already at the top, don't move further
-      // If no options, currentIndex will be -1
-      if (currentIndex <= 0) {
+      // If we are already at te top, don't move further
+      if (currentIndex === 0) {
         return;
       }
 
@@ -1286,7 +1210,7 @@ S2.define('select2/results',[
       function (evt) {
       var $this = $(this);
 
-      var data = Utils.GetData(this, 'data');
+      var data = $this.data('data');
 
       if ($this.attr('aria-selected') === 'true') {
         if (self.options.get('multiple')) {
@@ -1309,7 +1233,7 @@ S2.define('select2/results',[
 
     this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
       function (evt) {
-      var data = Utils.GetData(this, 'data');
+      var data = $(this).data('data');
 
       self.getHighlightedResults()
           .removeClass('select2-results__option--highlighted');
@@ -1424,15 +1348,14 @@ S2.define('select2/selection/base',[
 
     this._tabindex = 0;
 
-    if (Utils.GetData(this.$element[0], 'old-tabindex') != null) {
-      this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex');
+    if (this.$element.data('old-tabindex') != null) {
+      this._tabindex = this.$element.data('old-tabindex');
     } else if (this.$element.attr('tabindex') != null) {
       this._tabindex = this.$element.attr('tabindex');
     }
 
     $selection.attr('title', this.$element.attr('title'));
     $selection.attr('tabindex', this._tabindex);
-    $selection.attr('aria-disabled', 'false');
 
     this.$selection = $selection;
 
@@ -1442,6 +1365,7 @@ S2.define('select2/selection/base',[
   BaseSelection.prototype.bind = function (container, $container) {
     var self = this;
 
+    var id = container.id + '-container';
     var resultsId = container.id + '-results';
 
     this.container = container;
@@ -1484,19 +1408,17 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.trigger('focus');
+      self.$selection.focus();
 
       self._detachCloseHandler(container);
     });
 
     container.on('enable', function () {
       self.$selection.attr('tabindex', self._tabindex);
-      self.$selection.attr('aria-disabled', 'false');
     });
 
     container.on('disable', function () {
       self.$selection.attr('tabindex', '-1');
-      self.$selection.attr('aria-disabled', 'true');
     });
   };
 
@@ -1519,6 +1441,7 @@ S2.define('select2/selection/base',[
   };
 
   BaseSelection.prototype._attachCloseHandler = function (container) {
+    var self = this;
 
     $(document.body).on('mousedown.select2.' + container.id, function (e) {
       var $target = $(e.target);
@@ -1528,11 +1451,13 @@ S2.define('select2/selection/base',[
       var $all = $('.select2.select2-container--open');
 
       $all.each(function () {
+        var $this = $(this);
+
         if (this == $select[0]) {
           return;
         }
 
-        var $element = Utils.GetData(this, 'element');
+        var $element = $this.data('element');
 
         $element.select2('close');
       });
@@ -1556,27 +1481,6 @@ S2.define('select2/selection/base',[
     throw new Error('The `update` method must be defined in child classes.');
   };
 
-  /**
-   * Helper method to abstract the "enabled" (not "disabled") state of this
-   * object.
-   *
-   * @return {true} if the instance is not disabled.
-   * @return {false} if the instance is disabled.
-   */
-  BaseSelection.prototype.isEnabled = function () {
-    return !this.isDisabled();
-  };
-
-  /**
-   * Helper method to abstract the "disabled" state of this object.
-   *
-   * @return {true} if the disabled option is true.
-   * @return {false} if the disabled option is false.
-   */
-  BaseSelection.prototype.isDisabled = function () {
-    return this.options.get('disabled');
-  };
-
   return BaseSelection;
 });
 
@@ -1614,10 +1518,7 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered')
-      .attr('id', id)
-      .attr('role', 'textbox')
-      .attr('aria-readonly', 'true');
+    this.$selection.find('.select2-selection__rendered').attr('id', id);
     this.$selection.attr('aria-labelledby', id);
 
     this.$selection.on('mousedown', function (evt) {
@@ -1641,15 +1542,17 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.trigger('focus');
+        self.$selection.focus();
       }
     });
+
+    container.on('selection:update', function (params) {
+      self.update(params.data);
+    });
   };
 
   SingleSelection.prototype.clear = function () {
-    var $rendered = this.$selection.find('.select2-selection__rendered');
-    $rendered.empty();
-    $rendered.removeAttr('title'); // clear tooltip on empty
+    this.$selection.find('.select2-selection__rendered').empty();
   };
 
   SingleSelection.prototype.display = function (data, container) {
@@ -1675,14 +1578,7 @@ S2.define('select2/selection/single',[
     var formatted = this.display(selection, $rendered);
 
     $rendered.empty().append(formatted);
-
-    var title = selection.title || selection.text;
-
-    if (title) {
-      $rendered.attr('title', title);
-    } else {
-      $rendered.removeAttr('title');
-    }
+    $rendered.prop('title', selection.title || selection.text);
   };
 
   return SingleSelection;
@@ -1727,14 +1623,14 @@ S2.define('select2/selection/multiple',[
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.isDisabled()) {
+        if (self.options.get('disabled')) {
           return;
         }
 
         var $remove = $(this);
         var $selection = $remove.parent();
 
-        var data = Utils.GetData($selection[0], 'data');
+        var data = $selection.data('data');
 
         self.trigger('unselect', {
           originalEvent: evt,
@@ -1745,9 +1641,7 @@ S2.define('select2/selection/multiple',[
   };
 
   MultipleSelection.prototype.clear = function () {
-    var $rendered = this.$selection.find('.select2-selection__rendered');
-    $rendered.empty();
-    $rendered.removeAttr('title');
+    this.$selection.find('.select2-selection__rendered').empty();
   };
 
   MultipleSelection.prototype.display = function (data, container) {
@@ -1785,14 +1679,9 @@ S2.define('select2/selection/multiple',[
       var formatted = this.display(selection, $selection);
 
       $selection.append(formatted);
+      $selection.prop('title', selection.title || selection.text);
 
-      var title = selection.title || selection.text;
-
-      if (title) {
-        $selection.attr('title', title);
-      }
-
-      Utils.StoreData($selection[0], 'data', selection);
+      $selection.data('data', selection);
 
       $selections.push($selection);
     }
@@ -1857,9 +1746,8 @@ S2.define('select2/selection/placeholder',[
 
 S2.define('select2/selection/allowClear',[
   'jquery',
-  '../keys',
-  '../utils'
-], function ($, KEYS, Utils) {
+  '../keys'
+], function ($, KEYS) {
   function AllowClear () { }
 
   AllowClear.prototype.bind = function (decorated, container, $container) {
@@ -1888,7 +1776,7 @@ S2.define('select2/selection/allowClear',[
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.isDisabled()) {
+    if (this.options.get('disabled')) {
       return;
     }
 
@@ -1901,22 +1789,10 @@ S2.define('select2/selection/allowClear',[
 
     evt.stopPropagation();
 
-    var data = Utils.GetData($clear[0], 'data');
-
-    var previousVal = this.$element.val();
-    this.$element.val(this.placeholder.id);
-
-    var unselectData = {
-      data: data
-    };
-    this.trigger('clear', unselectData);
-    if (unselectData.prevented) {
-      this.$element.val(previousVal);
-      return;
-    }
+    var data = $clear.data('data');
 
     for (var d = 0; d < data.length; d++) {
-      unselectData = {
+      var unselectData = {
         data: data[d]
       };
 
@@ -1926,12 +1802,11 @@ S2.define('select2/selection/allowClear',[
 
       // If the event was prevented, don't clear it out.
       if (unselectData.prevented) {
-        this.$element.val(previousVal);
         return;
       }
     }
 
-    this.$element.trigger('input').trigger('change');
+    this.$element.val(this.placeholder.id).trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -1954,14 +1829,12 @@ S2.define('select2/selection/allowClear',[
       return;
     }
 
-    var removeAll = this.options.get('translations').get('removeAllItems');
-
     var $remove = $(
-      '<span class="select2-selection__clear" title="' + removeAll() +'">' +
+      '<span class="select2-selection__clear">' +
         '&times;' +
       '</span>'
     );
-    Utils.StoreData($remove[0], 'data', data);
+    $remove.data('data', data);
 
     this.$selection.find('.select2-selection__rendered').prepend($remove);
   };
@@ -1983,7 +1856,7 @@ S2.define('select2/selection/search',[
       '<li class="select2-search select2-search--inline">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
       '</li>'
     );
 
@@ -2000,18 +1873,14 @@ S2.define('select2/selection/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
-    var resultsId = container.id + '-results';
-
     decorated.call(this, container, $container);
 
     container.on('open', function () {
-      self.$search.attr('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
-      self.$search.removeAttr('aria-controls');
       self.$search.removeAttr('aria-activedescendant');
       self.$search.trigger('focus');
     });
@@ -2031,11 +1900,7 @@ S2.define('select2/selection/search',[
     });
 
     container.on('results:focus', function (params) {
-      if (params.data._resultId) {
-        self.$search.attr('aria-activedescendant', params.data._resultId);
-      } else {
-        self.$search.removeAttr('aria-activedescendant');
-      }
+      self.$search.attr('aria-activedescendant', params.id);
     });
 
     this.$selection.on('focusin', '.select2-search--inline', function (evt) {
@@ -2060,7 +1925,7 @@ S2.define('select2/selection/search',[
           .prev('.select2-selection__choice');
 
         if ($previousChoice.length > 0) {
-          var item = Utils.GetData($previousChoice[0], 'data');
+          var item = $previousChoice.data('data');
 
           self.searchRemoveChoice(item);
 
@@ -2069,12 +1934,6 @@ S2.define('select2/selection/search',[
       }
     });
 
-    this.$selection.on('click', '.select2-search--inline', function (evt) {
-      if (self.$search.val()) {
-        evt.stopPropagation();
-      }
-    });
-
     // Try to detect the IE version should the `documentMode` property that
     // is stored on the document. This is only implemented in IE and is
     // slightly cleaner than doing a user agent check.
@@ -2160,7 +2019,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.trigger('focus');
+      this.$search.focus();
     }
   };
 
@@ -2193,7 +2052,7 @@ S2.define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.find('.select2-selection__rendered').width();
+      width = this.$selection.find('.select2-selection__rendered').innerWidth();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 
@@ -2217,13 +2076,10 @@ S2.define('select2/selection/eventRelay',[
       'open', 'opening',
       'close', 'closing',
       'select', 'selecting',
-      'unselect', 'unselecting',
-      'clear', 'clearing'
+      'unselect', 'unselecting'
     ];
 
-    var preventableEvents = [
-      'opening', 'closing', 'selecting', 'unselecting', 'clearing'
-    ];
+    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
 
     decorated.call(this, container, $container);
 
@@ -2556,7 +2412,6 @@ S2.define('select2/diacritics',[
     '\u019F': 'O',
     '\uA74A': 'O',
     '\uA74C': 'O',
-    '\u0152': 'OE',
     '\u01A2': 'OI',
     '\uA74E': 'OO',
     '\u0222': 'OU',
@@ -2966,7 +2821,6 @@ S2.define('select2/diacritics',[
     '\uA74B': 'o',
     '\uA74D': 'o',
     '\u0275': 'o',
-    '\u0153': 'oe',
     '\u01A3': 'oi',
     '\u0223': 'ou',
     '\uA74F': 'oo',
@@ -3135,9 +2989,8 @@ S2.define('select2/diacritics',[
     '\u03CD': '\u03C5',
     '\u03CB': '\u03C5',
     '\u03B0': '\u03C5',
-    '\u03CE': '\u03C9',
-    '\u03C2': '\u03C3',
-    '\u2019': '\''
+    '\u03C9': '\u03C9',
+    '\u03C2': '\u03C3'
   };
 
   return diacritics;
@@ -3222,7 +3075,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('input').trigger('change');
+      this.$element.trigger('change');
 
       return;
     }
@@ -3243,13 +3096,13 @@ S2.define('select2/data/select',[
         }
 
         self.$element.val(val);
-        self.$element.trigger('input').trigger('change');
+        self.$element.trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('input').trigger('change');
+      this.$element.trigger('change');
     }
   };
 
@@ -3265,7 +3118,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('input').trigger('change');
+      this.$element.trigger('change');
 
       return;
     }
@@ -3283,7 +3136,7 @@ S2.define('select2/data/select',[
 
       self.$element.val(val);
 
-      self.$element.trigger('input').trigger('change');
+      self.$element.trigger('change');
     });
   };
 
@@ -3305,7 +3158,7 @@ S2.define('select2/data/select',[
     // Remove anything added to child elements
     this.$element.find('*').each(function () {
       // Remove any custom data set by Select2
-      Utils.RemoveData(this);
+      $.removeData(this, 'data');
     });
   };
 
@@ -3378,7 +3231,7 @@ S2.define('select2/data/select',[
     normalizedData.element = option;
 
     // Override the option's data with the combined data
-    Utils.StoreData(option, 'data', normalizedData);
+    $.data(option, 'data', normalizedData);
 
     return $option;
   };
@@ -3386,7 +3239,7 @@ S2.define('select2/data/select',[
   SelectAdapter.prototype.item = function ($option) {
     var data = {};
 
-    data = Utils.GetData($option[0], 'data');
+    data = $.data($option[0], 'data');
 
     if (data != null) {
       return data;
@@ -3424,13 +3277,13 @@ S2.define('select2/data/select',[
     data = this._normalizeItem(data);
     data.element = $option[0];
 
-    Utils.StoreData($option[0], 'data', data);
+    $.data($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (item !== Object(item)) {
+    if (!$.isPlainObject(item)) {
       item = {
         id: item,
         text: item
@@ -3476,19 +3329,15 @@ S2.define('select2/data/array',[
   'jquery'
 ], function (SelectAdapter, Utils, $) {
   function ArrayAdapter ($element, options) {
-    this._dataToConvert = options.get('data') || [];
+    var data = options.get('data') || [];
 
     ArrayAdapter.__super__.constructor.call(this, $element, options);
+
+    this.addOptions(this.convertToOptions(data));
   }
 
   Utils.Extend(ArrayAdapter, SelectAdapter);
 
-  ArrayAdapter.prototype.bind = function (container, $container) {
-    ArrayAdapter.__super__.bind.call(this, container, $container);
-
-    this.addOptions(this.convertToOptions(this._dataToConvert));
-  };
-
   ArrayAdapter.prototype.select = function (data) {
     var $option = this.$element.find('option').filter(function (i, elm) {
       return elm.value == data.id.toString();
@@ -3638,8 +3487,7 @@ S2.define('select2/data/ajax',[
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
-        if ('status' in $request &&
-            ($request.status === 0 || $request.status === '0')) {
+        if ($request.status && $request.status === '0') {
           return;
         }
 
@@ -3778,6 +3626,8 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype._removeOldTags = function (_) {
+    var tag = this._lastTag;
+
     var $options = this.$element.find('option[data-select2-tag]');
 
     $options.each(function () {
@@ -3852,7 +3702,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.trigger('focus');
+        this.$search.focus();
       }
 
       params.term = tokenData.term;
@@ -3981,30 +3831,10 @@ S2.define('select2/data/maximumSelectionLength',[
     decorated.call(this, $e, options);
   }
 
-  MaximumSelectionLength.prototype.bind =
-    function (decorated, container, $container) {
-      var self = this;
-
-      decorated.call(this, container, $container);
-
-      container.on('select', function () {
-        self._checkIfMaximumSelected();
-      });
-  };
-
   MaximumSelectionLength.prototype.query =
     function (decorated, params, callback) {
       var self = this;
 
-      this._checkIfMaximumSelected(function () {
-        decorated.call(self, params, callback);
-      });
-  };
-
-  MaximumSelectionLength.prototype._checkIfMaximumSelected =
-    function (_, successCallback) {
-      var self = this;
-
       this.current(function (currentData) {
         var count = currentData != null ? currentData.length : 0;
         if (self.maximumSelectionLength > 0 &&
@@ -4017,10 +3847,7 @@ S2.define('select2/data/maximumSelectionLength',[
           });
           return;
         }
-
-        if (successCallback) {
-          successCallback();
-        }
+        decorated.call(self, params, callback);
       });
   };
 
@@ -4059,7 +3886,7 @@ S2.define('select2/dropdown',[
   };
 
   Dropdown.prototype.position = function ($dropdown, $container) {
-    // Should be implemented in subclasses
+    // Should be implmented in subclasses
   };
 
   Dropdown.prototype.destroy = function () {
@@ -4083,7 +3910,7 @@ S2.define('select2/dropdown/search',[
       '<span class="select2-search select2-search--dropdown">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="textbox" />' +
       '</span>'
     );
 
@@ -4098,8 +3925,6 @@ S2.define('select2/dropdown/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
-    var resultsId = container.id + '-results';
-
     decorated.call(this, container, $container);
 
     this.$search.on('keydown', function (evt) {
@@ -4122,27 +3947,23 @@ S2.define('select2/dropdown/search',[
 
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
-      self.$search.attr('aria-controls', resultsId);
 
-      self.$search.trigger('focus');
+      self.$search.focus();
 
       window.setTimeout(function () {
-        self.$search.trigger('focus');
+        self.$search.focus();
       }, 0);
     });
 
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
-      self.$search.removeAttr('aria-controls');
-      self.$search.removeAttr('aria-activedescendant');
 
       self.$search.val('');
-      self.$search.trigger('blur');
     });
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.trigger('focus');
+        self.$search.focus();
       }
     });
 
@@ -4157,14 +3978,6 @@ S2.define('select2/dropdown/search',[
         }
       }
     });
-
-    container.on('results:focus', function (params) {
-      if (params.data._resultId) {
-        self.$search.attr('aria-activedescendant', params.data._resultId);
-      } else {
-        self.$search.removeAttr('aria-activedescendant');
-      }
-    });
   };
 
   Search.prototype.handleSearch = function (evt) {
@@ -4249,7 +4062,6 @@ S2.define('select2/dropdown/infiniteScroll',[
 
     if (this.showLoadingMore(data)) {
       this.$results.append(this.$loadingMore);
-      this.loadMoreIfNeeded();
     }
   };
 
@@ -4268,27 +4080,25 @@ S2.define('select2/dropdown/infiniteScroll',[
       self.loading = true;
     });
 
-    this.$results.on('scroll', this.loadMoreIfNeeded.bind(this));
-  };
+    this.$results.on('scroll', function () {
+      var isLoadMoreVisible = $.contains(
+        document.documentElement,
+        self.$loadingMore[0]
+      );
 
-  InfiniteScroll.prototype.loadMoreIfNeeded = function () {
-    var isLoadMoreVisible = $.contains(
-      document.documentElement,
-      this.$loadingMore[0]
-    );
+      if (self.loading || !isLoadMoreVisible) {
+        return;
+      }
 
-    if (this.loading || !isLoadMoreVisible) {
-      return;
-    }
+      var currentOffset = self.$results.offset().top +
+        self.$results.outerHeight(false);
+      var loadingMoreOffset = self.$loadingMore.offset().top +
+        self.$loadingMore.outerHeight(false);
 
-    var currentOffset = this.$results.offset().top +
-      this.$results.outerHeight(false);
-    var loadingMoreOffset = this.$loadingMore.offset().top +
-      this.$loadingMore.outerHeight(false);
-
-    if (currentOffset + 50 >= loadingMoreOffset) {
-      this.loadMore();
-    }
+      if (currentOffset + 50 >= loadingMoreOffset) {
+        self.loadMore();
+      }
+    });
   };
 
   InfiniteScroll.prototype.loadMore = function () {
@@ -4309,7 +4119,7 @@ S2.define('select2/dropdown/infiniteScroll',[
     var $option = $(
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="option" aria-disabled="true"></li>'
+      'role="treeitem" aria-disabled="true"></li>'
     );
 
     var message = this.options.get('translations').get('loadingMore');
@@ -4327,7 +4137,7 @@ S2.define('select2/dropdown/attachBody',[
   '../utils'
 ], function ($, Utils) {
   function AttachBody (decorated, $element, options) {
-    this.$dropdownParent = $(options.get('dropdownParent') || document.body);
+    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
 
     decorated.call(this, $element, options);
   }
@@ -4335,14 +4145,27 @@ S2.define('select2/dropdown/attachBody',[
   AttachBody.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var setupResultsEvents = false;
+
     decorated.call(this, container, $container);
 
     container.on('open', function () {
       self._showDropdown();
       self._attachPositioningHandler(container);
 
-      // Must bind after the results handlers to ensure correct sizing
-      self._bindContainerResultHandlers(container);
+      if (!setupResultsEvents) {
+        setupResultsEvents = true;
+
+        container.on('results:all', function () {
+          self._positionDropdown();
+          self._resizeDropdown();
+        });
+
+        container.on('results:append', function () {
+          self._positionDropdown();
+          self._resizeDropdown();
+        });
+      }
     });
 
     container.on('close', function () {
@@ -4391,44 +4214,6 @@ S2.define('select2/dropdown/attachBody',[
     this.$dropdownContainer.detach();
   };
 
-  AttachBody.prototype._bindContainerResultHandlers =
-      function (decorated, container) {
-
-    // These should only be bound once
-    if (this._containerResultsHandlersBound) {
-      return;
-    }
-
-    var self = this;
-
-    container.on('results:all', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    container.on('results:append', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    container.on('results:message', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    container.on('select', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    container.on('unselect', function () {
-      self._positionDropdown();
-      self._resizeDropdown();
-    });
-
-    this._containerResultsHandlersBound = true;
-  };
-
   AttachBody.prototype._attachPositioningHandler =
       function (decorated, container) {
     var self = this;
@@ -4439,14 +4224,14 @@ S2.define('select2/dropdown/attachBody',[
 
     var $watchers = this.$container.parents().filter(Utils.hasScroll);
     $watchers.each(function () {
-      Utils.StoreData(this, 'select2-scroll-position', {
+      $(this).data('select2-scroll-position', {
         x: $(this).scrollLeft(),
         y: $(this).scrollTop()
       });
     });
 
     $watchers.on(scrollEvent, function (ev) {
-      var position = Utils.GetData(this, 'select2-scroll-position');
+      var position = $(this).data('select2-scroll-position');
       $(this).scrollTop(position.y);
     });
 
@@ -4505,26 +4290,16 @@ S2.define('select2/dropdown/attachBody',[
       top: container.bottom
     };
 
-    // Determine what the parent element is to use for calculating the offset
+    // Determine what the parent element is to use for calciulating the offset
     var $offsetParent = this.$dropdownParent;
 
-    // For statically positioned elements, we need to get the element
+    // For statically positoned elements, we need to get the element
     // that is determining the offset
     if ($offsetParent.css('position') === 'static') {
       $offsetParent = $offsetParent.offsetParent();
     }
 
-    var parentOffset = {
-      top: 0,
-      left: 0
-    };
-
-    if (
-      $.contains(document.body, $offsetParent[0]) ||
-      $offsetParent[0].isConnected
-      ) {
-      parentOffset = $offsetParent.offset();
-    }
+    var parentOffset = $offsetParent.offset();
 
     css.top -= parentOffset.top;
     css.left -= parentOffset.left;
@@ -4621,8 +4396,8 @@ S2.define('select2/dropdown/minimumResultsForSearch',[
 });
 
 S2.define('select2/dropdown/selectOnClose',[
-  '../utils'
-], function (Utils) {
+
+], function () {
   function SelectOnClose () { }
 
   SelectOnClose.prototype.bind = function (decorated, container, $container) {
@@ -4653,7 +4428,7 @@ S2.define('select2/dropdown/selectOnClose',[
       return;
     }
 
-    var data = Utils.GetData($highlightedResults[0], 'data');
+    var data = $highlightedResults.data('data');
 
     // Don't re-select already selected resulte
     if (
@@ -4694,7 +4469,7 @@ S2.define('select2/dropdown/closeOnSelect',[
     var originalEvent = evt.originalEvent;
 
     // Don't close if the control key is being held
-    if (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)) {
+    if (originalEvent && originalEvent.ctrlKey) {
       return;
     }
 
@@ -4748,9 +4523,6 @@ S2.define('select2/i18n/en',[],function () {
     },
     searching: function () {
       return 'Searching…';
-    },
-    removeAllItems: function () {
-      return 'Remove all items';
     }
   };
 });
@@ -4989,29 +4761,66 @@ S2.define('select2/defaults',[
       );
     }
 
-    // If the defaults were not previously applied from an element, it is
-    // possible for the language option to have not been resolved
-    options.language = this._resolveLanguage(options.language);
+    if (typeof options.language === 'string') {
+      // Check if the language is specified with a region
+      if (options.language.indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = options.language.split('-');
+        var baseLanguage = languageParts[0];
 
-    // Always fall back to English since it will always be complete
-    options.language.push('en');
-
-    var uniqueLanguages = [];
-
-    for (var l = 0; l < options.language.length; l++) {
-      var language = options.language[l];
-
-      if (uniqueLanguages.indexOf(language) === -1) {
-        uniqueLanguages.push(language);
+        options.language = [options.language, baseLanguage];
+      } else {
+        options.language = [options.language];
       }
     }
 
-    options.language = uniqueLanguages;
+    if ($.isArray(options.language)) {
+      var languages = new Translation();
+      options.language.push('en');
 
-    options.translations = this._processTranslations(
-      options.language,
-      options.debug
-    );
+      var languageNames = options.language;
+
+      for (var l = 0; l < languageNames.length; l++) {
+        var name = languageNames[l];
+        var language = {};
+
+        try {
+          // Try to load it with the original name
+          language = Translation.loadPath(name);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            name = this.defaults.amdLanguageBase + name;
+            language = Translation.loadPath(name);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files.
+            if (options.debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + name + '" could not be ' +
+                'automatically loaded. A fallback will be used instead.'
+              );
+            }
+
+            continue;
+          }
+        }
+
+        languages.extend(language);
+      }
+
+      options.translations = languages;
+    } else {
+      var baseTranslation = Translation.loadPath(
+        this.defaults.amdLanguageBase + 'en'
+      );
+      var customTranslation = new Translation(options.language);
+
+      customTranslation.extend(baseTranslation);
+
+      options.translations = customTranslation;
+    }
 
     return options;
   };
@@ -5078,14 +4887,13 @@ S2.define('select2/defaults',[
       debug: false,
       dropdownAutoWidth: false,
       escapeMarkup: Utils.escapeMarkup,
-      language: {},
+      language: EnglishTranslation,
       matcher: matcher,
       minimumInputLength: 0,
       maximumInputLength: 0,
       maximumSelectionLength: 0,
       minimumResultsForSearch: 0,
       selectOnClose: false,
-      scrollAfterSelect: false,
       sorter: function (data) {
         return data;
       },
@@ -5100,103 +4908,6 @@ S2.define('select2/defaults',[
     };
   };
 
-  Defaults.prototype.applyFromElement = function (options, $element) {
-    var optionLanguage = options.language;
-    var defaultLanguage = this.defaults.language;
-    var elementLanguage = $element.prop('lang');
-    var parentLanguage = $element.closest('[lang]').prop('lang');
-
-    var languages = Array.prototype.concat.call(
-      this._resolveLanguage(elementLanguage),
-      this._resolveLanguage(optionLanguage),
-      this._resolveLanguage(defaultLanguage),
-      this._resolveLanguage(parentLanguage)
-    );
-
-    options.language = languages;
-
-    return options;
-  };
-
-  Defaults.prototype._resolveLanguage = function (language) {
-    if (!language) {
-      return [];
-    }
-
-    if ($.isEmptyObject(language)) {
-      return [];
-    }
-
-    if ($.isPlainObject(language)) {
-      return [language];
-    }
-
-    var languages;
-
-    if (!$.isArray(language)) {
-      languages = [language];
-    } else {
-      languages = language;
-    }
-
-    var resolvedLanguages = [];
-
-    for (var l = 0; l < languages.length; l++) {
-      resolvedLanguages.push(languages[l]);
-
-      if (typeof languages[l] === 'string' && languages[l].indexOf('-') > 0) {
-        // Extract the region information if it is included
-        var languageParts = languages[l].split('-');
-        var baseLanguage = languageParts[0];
-
-        resolvedLanguages.push(baseLanguage);
-      }
-    }
-
-    return resolvedLanguages;
-  };
-
-  Defaults.prototype._processTranslations = function (languages, debug) {
-    var translations = new Translation();
-
-    for (var l = 0; l < languages.length; l++) {
-      var languageData = new Translation();
-
-      var language = languages[l];
-
-      if (typeof language === 'string') {
-        try {
-          // Try to load it with the original name
-          languageData = Translation.loadPath(language);
-        } catch (e) {
-          try {
-            // If we couldn't load it, check if it wasn't the full path
-            language = this.defaults.amdLanguageBase + language;
-            languageData = Translation.loadPath(language);
-          } catch (ex) {
-            // The translation could not be loaded at all. Sometimes this is
-            // because of a configuration problem, other times this can be
-            // because of how Select2 helps load all possible translation files
-            if (debug && window.console && console.warn) {
-              console.warn(
-                'Select2: The language file for "' + language + '" could ' +
-                'not be automatically loaded. A fallback will be used instead.'
-              );
-            }
-          }
-        }
-      } else if ($.isPlainObject(language)) {
-        languageData = new Translation(language);
-      } else {
-        languageData = language;
-      }
-
-      translations.extend(languageData);
-    }
-
-    return translations;
-  };
-
   Defaults.prototype.set = function (key, value) {
     var camelKey = $.camelCase(key);
 
@@ -5205,7 +4916,7 @@ S2.define('select2/defaults',[
 
     var convertedData = Utils._convertData(data);
 
-    $.extend(true, this.defaults, convertedData);
+    $.extend(this.defaults, convertedData);
   };
 
   var defaults = new Defaults();
@@ -5226,10 +4937,6 @@ S2.define('select2/options',[
       this.fromElement($element);
     }
 
-    if ($element != null) {
-      this.options = Defaults.applyFromElement(this.options, $element);
-    }
-
     this.options = Defaults.apply(this.options);
 
     if ($element && $element.is('input')) {
@@ -5253,6 +4960,14 @@ S2.define('select2/options',[
       this.options.disabled = $e.prop('disabled');
     }
 
+    if (this.options.language == null) {
+      if ($e.prop('lang')) {
+        this.options.language = $e.prop('lang').toLowerCase();
+      } else if ($e.closest('[lang]').prop('lang')) {
+        this.options.language = $e.closest('[lang]').prop('lang');
+      }
+    }
+
     if (this.options.dir == null) {
       if ($e.prop('dir')) {
         this.options.dir = $e.prop('dir');
@@ -5266,7 +4981,7 @@ S2.define('select2/options',[
     $e.prop('disabled', this.options.disabled);
     $e.prop('multiple', this.options.multiple);
 
-    if (Utils.GetData($e[0], 'select2Tags')) {
+    if ($e.data('select2Tags')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-select2-tags` attribute has been changed to ' +
@@ -5275,11 +4990,11 @@ S2.define('select2/options',[
         );
       }
 
-      Utils.StoreData($e[0], 'data', Utils.GetData($e[0], 'select2Tags'));
-      Utils.StoreData($e[0], 'tags', true);
+      $e.data('data', $e.data('select2Tags'));
+      $e.data('tags', true);
     }
 
-    if (Utils.GetData($e[0], 'ajaxUrl')) {
+    if ($e.data('ajaxUrl')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-ajax-url` attribute has been changed to ' +
@@ -5288,45 +5003,21 @@ S2.define('select2/options',[
         );
       }
 
-      $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
-      Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl'));
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
     }
 
     var dataset = {};
 
-    function upperCaseLetter(_, letter) {
-      return letter.toUpperCase();
-    }
-
-    // Pre-load all of the attributes which are prefixed with `data-`
-    for (var attr = 0; attr < $e[0].attributes.length; attr++) {
-      var attributeName = $e[0].attributes[attr].name;
-      var prefix = 'data-';
-
-      if (attributeName.substr(0, prefix.length) == prefix) {
-        // Get the contents of the attribute after `data-`
-        var dataName = attributeName.substring(prefix.length);
-
-        // Get the data contents from the consistent source
-        // This is more than likely the jQuery data helper
-        var dataValue = Utils.GetData($e[0], dataName);
-
-        // camelCase the attribute name to match the spec
-        var camelDataName = dataName.replace(/-([a-z])/g, upperCaseLetter);
-
-        // Store the data attribute contents into the dataset since
-        dataset[camelDataName] = dataValue;
-      }
-    }
-
     // Prefer the element's `dataset` attribute if it exists
     // jQuery 1.x does not correctly handle data attributes with multiple dashes
     if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
-      dataset = $.extend(true, {}, $e[0].dataset, dataset);
+      dataset = $.extend(true, {}, $e[0].dataset, $e.data());
+    } else {
+      dataset = $e.data();
     }
 
-    // Prefer our internal data cache if it exists
-    var data = $.extend(true, {}, Utils.GetData($e[0]), dataset);
+    var data = $.extend(true, {}, dataset);
 
     data = Utils._convertData(data);
 
@@ -5363,8 +5054,8 @@ S2.define('select2/core',[
   './keys'
 ], function ($, Options, Utils, KEYS) {
   var Select2 = function ($element, options) {
-    if (Utils.GetData($element[0], 'select2') != null) {
-      Utils.GetData($element[0], 'select2').destroy();
+    if ($element.data('select2') != null) {
+      $element.data('select2').destroy();
     }
 
     this.$element = $element;
@@ -5380,7 +5071,7 @@ S2.define('select2/core',[
     // Set up the tabindex
 
     var tabindex = $element.attr('tabindex') || 0;
-    Utils.StoreData($element[0], 'old-tabindex', tabindex);
+    $element.data('old-tabindex', tabindex);
     $element.attr('tabindex', '-1');
 
     // Set up containers and adapters
@@ -5441,9 +5132,6 @@ S2.define('select2/core',[
     // Synchronize any monitored attributes
     this._syncAttributes();
 
-    Utils.StoreData($element[0], 'select2', this);
-
-    // Ensure backwards compatibility with $element.data('select2').
     $element.data('select2', this);
   };
 
@@ -5520,12 +5208,6 @@ S2.define('select2/core',[
       return null;
     }
 
-    if (method == 'computedstyle') {
-      var computedStyle = window.getComputedStyle($element[0]);
-
-      return computedStyle.width;
-    }
-
     return method;
   };
 
@@ -5566,8 +5248,8 @@ S2.define('select2/core',[
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        self._syncA();
-        self._syncS(null, mutations);
+        $.each(mutations, self._syncA);
+        $.each(mutations, self._syncS);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -5689,7 +5371,7 @@ S2.define('select2/core',[
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close(evt);
+          self.close();
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -5723,7 +5405,7 @@ S2.define('select2/core',[
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.isDisabled()) {
+    if (this.options.get('disabled')) {
       if (this.isOpen()) {
         this.close();
       }
@@ -5734,7 +5416,7 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._isChangeMutation = function (evt, mutations) {
+  Select2.prototype._syncSubtree = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -5762,22 +5444,7 @@ S2.define('select2/core',[
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
-    } else if ($.isArray(mutations)) {
-      $.each(mutations, function(evt, mutation) {
-        if (self._isChangeMutation(evt, mutation)) {
-          // We've found a change mutation.
-          // Let's escape from the loop and continue
-          changed = true;
-          return false;
-        }
-      });
     }
-    return changed;
-  };
-
-  Select2.prototype._syncSubtree = function (evt, mutations) {
-    var changed = this._isChangeMutation(evt, mutations);
-    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -5799,8 +5466,7 @@ S2.define('select2/core',[
       'open': 'opening',
       'close': 'closing',
       'select': 'selecting',
-      'unselect': 'unselecting',
-      'clear': 'clearing'
+      'unselect': 'unselecting'
     };
 
     if (args === undefined) {
@@ -5828,7 +5494,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.isDisabled()) {
+    if (this.options.get('disabled')) {
       return;
     }
 
@@ -5844,40 +5510,15 @@ S2.define('select2/core',[
       return;
     }
 
-    if (this.isDisabled()) {
-      return;
-    }
-
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function (evt) {
+  Select2.prototype.close = function () {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', { originalEvent : evt });
-  };
-
-  /**
-   * Helper method to abstract the "enabled" (not "disabled") state of this
-   * object.
-   *
-   * @return {true} if the instance is not disabled.
-   * @return {false} if the instance is disabled.
-   */
-  Select2.prototype.isEnabled = function () {
-    return !this.isDisabled();
-  };
-
-  /**
-   * Helper method to abstract the "disabled" state of this object.
-   *
-   * @return {true} if the disabled option is true.
-   * @return {false} if the disabled option is false.
-   */
-  Select2.prototype.isDisabled = function () {
-    return this.options.get('disabled');
+    this.trigger('close', {});
   };
 
   Select2.prototype.isOpen = function () {
@@ -5954,7 +5595,7 @@ S2.define('select2/core',[
       });
     }
 
-    this.$element.val(newVal).trigger('input').trigger('change');
+    this.$element.val(newVal).trigger('change');
   };
 
   Select2.prototype.destroy = function () {
@@ -5980,12 +5621,10 @@ S2.define('select2/core',[
     this._syncS = null;
 
     this.$element.off('.select2');
-    this.$element.attr('tabindex',
-    Utils.GetData(this.$element[0], 'old-tabindex'));
+    this.$element.attr('tabindex', this.$element.data('old-tabindex'));
 
     this.$element.removeClass('select2-hidden-accessible');
     this.$element.attr('aria-hidden', 'false');
-    Utils.RemoveData(this.$element[0]);
     this.$element.removeData('select2');
 
     this.dataAdapter.destroy();
@@ -6013,7 +5652,7 @@ S2.define('select2/core',[
 
     this.$container.addClass('select2-container--' + this.options.get('theme'));
 
-    Utils.StoreData($container[0], 'element', this.$element);
+    $container.data('element', this.$element);
 
     return $container;
   };
@@ -6033,9 +5672,8 @@ S2.define('jquery.select2',[
   'jquery-mousewheel',
 
   './select2/core',
-  './select2/defaults',
-  './select2/utils'
-], function ($, _, Select2, Defaults, Utils) {
+  './select2/defaults'
+], function ($, _, Select2, Defaults) {
   if ($.fn.select2 == null) {
     // All methods that should return the element
     var thisMethods = ['open', 'close', 'destroy'];
@@ -6056,7 +5694,7 @@ S2.define('jquery.select2',[
         var args = Array.prototype.slice.call(arguments, 1);
 
         this.each(function () {
-          var instance = Utils.GetData(this, 'select2');
+          var instance = $(this).data('select2');
 
           if (instance == null && window.console && console.error) {
             console.error(
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js b/htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js
index e4214264342..7ef2fda809e 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js
@@ -1,2 +1 @@
-/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
-!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(u){var e=function(){if(u&&u.fn&&u.fn.select2&&u.fn.select2.amd)var e=u.fn.select2.amd;var t,n,r,h,o,s,f,g,m,v,y,_,i,a,b;function w(e,t){return i.call(e,t)}function l(e,t){var n,r,i,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&b.test(e[s])&&(e[s]=e[s].replace(b,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(r=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(i=(i=f[h.slice(0,d).join("/")])&&i[r]){o=i,a=u;break}if(o)break;!l&&g&&g[r]&&(l=g[r],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(w(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!w(m,e)&&!w(_,e))throw new Error("No "+e);return m[e]}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?c(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},i=Object.prototype.hasOwnProperty,a=[].slice,b=/\.js$/,f=function(e,t){var n,r=c(e),i=r[0],o=t[1];return e=r[1],i&&(n=D(i=l(i,o))),i?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return l(e,t)}}(o)):l(e,o):(i=(r=c(e=l(e,o)))[0],e=r[1],i&&(n=D(i))),{f:i?i+"!"+e:e,n:e,pr:i,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,r){var i,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(r=r||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)i=d[l]=g.module(e);else if(w(m,o)||w(v,o)||w(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(r,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(i&&i.exports!==h&&i.exports!==m[e]?m[e]=i.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,r,i){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=r,r=i),r?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(r=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),w(m,e)||w(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=r),e.define("almond",function(){}),e.define("jquery",[],function(){var e=u||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var i={};function u(e){var t=e.prototype,n=[];for(var r in t){"function"==typeof t[r]&&"constructor"!==r&&n.push(r)}return n}i.Extend=function(e,t){var n={}.hasOwnProperty;function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},i.Decorate=function(r,i){var e=u(i),t=u(r);function o(){var e=Array.prototype.unshift,t=i.prototype.constructor.length,n=r.prototype.constructor;0<t&&(e.call(arguments,r.prototype.constructor),n=i.prototype.constructor),n.apply(this,arguments)}i.displayName=r.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=r.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=i.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,r=e.length;n<r;n++)e[n].apply(this,t)},i.Observable=e,i.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},i.bind=function(e,t){return function(){e.apply(t,arguments)}},i._convertData=function(e){for(var t in e){var n=t.split("-"),r=e;if(1!==n.length){for(var i=0;i<n.length;i++){var o=n[i];(o=o.substring(0,1).toLowerCase()+o.substring(1))in r||(r[o]={}),i==n.length-1&&(r[o]=e[t]),r=r[o]}delete e[t]}}return e},i.hasScroll=function(e,t){var n=o(t),r=t.style.overflowX,i=t.style.overflowY;return(r!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===r||"scroll"===i||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},i.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},i.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},i.__cache={};var n=0;return i.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},i.StoreData=function(e,t,n){var r=i.GetUniqueElementId(e);i.__cache[r]||(i.__cache[r]={}),i.__cache[r][t]=n},i.GetData=function(e,t){var n=i.GetUniqueElementId(e);return t?i.__cache[n]&&null!=i.__cache[n][t]?i.__cache[n][t]:o(e).data(t):i.__cache[n]},i.RemoveData=function(e){var t=i.GetUniqueElementId(e);null!=i.__cache[t]&&delete i.__cache[t],e.removeAttribute("data-select2-id")},i}),e.define("select2/results",["jquery","./utils"],function(h,f){function r(e,t,n){this.$element=e,this.data=n,this.options=t,r.__super__.constructor.call(this)}return f.Extend(r,f.Observable),r.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},r.prototype.clear=function(){this.$results.empty()},r.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),r=this.options.get("translations").get(e.message);n.append(t(r(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},r.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},r.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var r=e.results[n],i=this.option(r);t.push(i)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},r.prototype.position=function(e,t){t.find(".select2-results").append(e)},r.prototype.sort=function(e){return this.options.get("sorter")(e)},r.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},r.prototype.setClasses=function(){var t=this;this.data.current(function(e){var r=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,r)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},r.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},r.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},r.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},r=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var i in(null!=e.element&&r.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[i];t.setAttribute(i,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},r.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var r=n-1;0===e.length&&(r=0);var i=t.eq(r);i.trigger("mouseenter");var o=l.$results.offset().top,s=i.offset().top,a=l.$results.scrollTop()+(s-o);0===r?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var r=t.eq(n);r.trigger("mouseenter");var i=l.$results.offset().top+l.$results.outerHeight(!1),o=r.offset().top+r.outerHeight(!1),s=l.$results.scrollTop()+o-i;0===n?l.$results.scrollTop(0):i<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,r=0<e.deltaY&&t-e.deltaY<=0,i=e.deltaY<0&&n<=l.$results.height();r?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):i&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},r.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},r.prototype.destroy=function(){this.$results.remove()},r.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,r=e.offset().top,i=this.$results.scrollTop()+(r-n),o=r-n;i-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(i)}},r.prototype.template=function(e,t){var n=this.options.get("templateResult"),r=this.options.get("escapeMarkup"),i=n(e,t);null==i?t.style.display="none":"string"==typeof i?t.innerHTML=r(i):h(t).append(i)},r}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,r,i){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return r.Extend(o,r.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=r.GetData(this.$element[0],"old-tabindex")?this._tabindex=r.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,r=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===i.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",r),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&r.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,r){function i(){i.__super__.constructor.apply(this,arguments)}return n.Extend(i,t),i.prototype.render=function(){var e=i.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},i.prototype.bind=function(t,e){var n=this;i.__super__.bind.apply(this,arguments);var r=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",r).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",r),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},i.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},i.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},i.prototype.selectionContainer=function(){return e("<span></span>")},i.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),r=this.display(t,n);n.empty().append(r);var i=t.title||t.text;i?n.attr("title",i):n.removeAttr("title")}else this.clear()},i}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(i,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var r=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){r.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!r.isDisabled()){var t=i(this).parent(),n=l.GetData(t[0],"data");r.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return i('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var r=e[n],i=this.selectionContainer(),o=this.display(r,i);i.append(o);var s=r.title||r.text;s&&i.attr("title",s),l.StoreData(i[0],"data",r),t.push(i)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var r=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(r)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(i,r,a){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){r._handleClear(e)}),t.on("keypress",function(e){r._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var r=a.GetData(n[0],"data"),i=this.$element.val();this.$element.val(this.placeholder.id);var o={data:r};if(this.trigger("clear",o),o.prevented)this.$element.val(i);else{for(var s=0;s<r.length;s++)if(o={data:r[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(i);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=r.DELETE&&t.which!=r.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),r=i('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(r[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(r)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(r,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=r('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),t.on("open",function(){r.$search.attr("aria-controls",i),r.$search.trigger("focus")}),t.on("close",function(){r.$search.val(""),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.trigger("focus")}),t.on("enable",function(){r.$search.prop("disabled",!1),r._transferTabIndex()}),t.on("disable",function(){r.$search.prop("disabled",!0)}),t.on("focus",function(e){r.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){r.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){r._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===r.$search.val()){var t=r.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");r.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){r.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?r.$selection.off("input.search input.searchcheck"):r.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)r.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&r.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var r=this,i=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,i)){t=t||{};var n=s.Event("select2:"+e,{params:t});r.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function r(e){this.dict=e||{}}return r.prototype.all=function(){return this.dict},r.prototype.get=function(e){return this.dict[e]},r.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},r._cache={},r.loadPath=function(e){if(!(e in r._cache)){var t=n(e);r._cache[e]=t}return new r(r._cache[e])},r}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","�":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","�":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","�":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","�":"D","Ḓ":"D","Ḏ":"D","�":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","�":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","�":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","�":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","�":"G","�":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","�":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","�":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","�":"I","Ḯ":"I","Ỉ":"I","�":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","�":"K","�":"K","�":"K","Ꞣ":"K","�":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","�":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","�":"L","�":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","�":"N","�":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","�":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","�":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","�":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","�":"O","�":"O","Œ":"OE","Ƣ":"OI","�":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","�":"P","�":"P","�":"P","Ⓠ":"Q","Ｑ":"Q","�":"Q","�":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","�":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","�":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","�":"V","Ʌ":"V","�":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","�":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","�":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","�":"Z","Ｚ":"Z","Ź":"Z","�":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","�":"Z","�":"a","�":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","�":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","�":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","�":"a","ą":"a","ⱥ":"a","�":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","�":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","�":"d","�":"d","ḑ":"d","ḓ":"d","�":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","�":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","�":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","�":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","�":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","�":"f","ⓖ":"g","ｇ":"g","ǵ":"g","�":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","�":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","�":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","�":"k","�":"k","�":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","�":"l","�":"l","�":"l","lj":"lj","ⓜ":"m","�":"m","ḿ":"m","�":"m","ṃ":"m","ɱ":"m","ɯ":"m","�":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","�":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","�":"o","ȭ":"o","�":"o","�":"o","ṑ":"o","ṓ":"o","�":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","�":"o","ő":"o","ǒ":"o","�":"o","�":"o","ơ":"o","�":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","�":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","�":"o","�":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","�":"oo","ⓟ":"p","�":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","�":"p","�":"p","�":"p","ⓠ":"q","ｑ":"q","ɋ":"q","�":"q","�":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","�":"r","ŗ":"r","ṟ":"r","�":"r","ɽ":"r","�":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","�":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","�":"v","ʌ":"v","�":"vy","ⓦ":"w","ｗ":"w","�":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","�":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","�":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","�":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","�":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","�":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","�":"ι","ό":"ο","�":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(r){function n(e,t){n.__super__.constructor.call(this)}return r.Extend(n,r.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=r.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+r.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],r=this;this.$element.find(":selected").each(function(){var e=l(this),t=r.item(e);n.push(t)}),e(n)},n.prototype.select=function(i){var o=this;if(i.selected=!0,l(i.element).is("option"))return i.element.selected=!0,void this.$element.trigger("input").trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(i=[i]).push.apply(i,e);for(var n=0;n<i.length;n++){var r=i[n].id;-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")});else{var e=i.id;this.$element.val(e),this.$element.trigger("input").trigger("change")}},n.prototype.unselect=function(i){var o=this;if(this.$element.prop("multiple")){if(i.selected=!1,l(i.element).is("option"))return i.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var r=e[n].id;r!==i.id&&-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(r,e){var i=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(r,t);null!==n&&i.push(n)}}),e({results:i})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),r=this._normalizeItem(e);return r.element=t,a.StoreData(t,"data",r),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),r=[],i=0;i<n.length;i++){var o=l(n[i]),s=this.item(o);r.push(s)}t.children=r}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function r(e,t){this._dataToConvert=t.get("data")||[],r.__super__.constructor.call(this,e,t)}return f.Extend(r,e),r.prototype.bind=function(e,t){r.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},r.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),r.__super__.select.call(this,n)},r.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),r=n.map(function(){return t.item(g(this)).id}).get(),i=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,r)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}i.push(p)}}return i},r}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var r=o.ajax(e);return r.then(t),r.fail(n),r}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,r){var i=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=i.processResults(e,n);i.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),r(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||i.trigger("results:message",{message:"errorLoading"})});i._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var r=n.get("tags"),i=n.get("createTag");void 0!==i&&(this.createTag=i);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(r))for(var s=0;s<r.length;s++){var a=r[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var r=t.results,i=0;i<r.length;i++){var o=r[i],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=r,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(r,a)}t.results=r,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var r=n.get("tokenizer");void 0!==r&&(this.tokenizer=r),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var r=this;t.term=t.term||"";var i=this.tokenizer(t,this.options,function(e){var t=r._normalizeItem(e);if(!r.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=r.option(t);n.attr("data-select2-tag",!0),r._removeOldTags(),r.addOptions([n])}!function(e){r.trigger("select",{data:e})}(t)});i.term!==t.term&&(this.$search.length&&(this.$search.val(i.term),this.$search.trigger("focus")),t.term=i.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,r){for(var i=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,i)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(r(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(){r._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var r=this;this._checkIfMaximumSelected(function(){e.call(r,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var r=this;this.current(function(e){var t=null!=e?e.length:0;0<r.maximumSelectionLength&&t>=r.maximumSelectionLength?r.trigger("results:message",{message:"maximumSelected",args:{maximum:r.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){r.handleSearch(e)}),t.on("open",function(){r.$search.attr("tabindex",0),r.$search.attr("aria-controls",i),r.$search.trigger("focus"),window.setTimeout(function(){r.$search.trigger("focus")},0)}),t.on("close",function(){r.$search.attr("tabindex",-1),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.val(""),r.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||r.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(r.showSearch(e)?r.$searchContainer.removeClass("select2-search--hide"):r.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,r){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,r)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),r=t.length-1;0<=r;r--){var i=t[r];this.placeholder.id===i.id&&n.splice(r,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,r){this.lastParams={},e.call(this,t,n,r),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("query",function(e){r.lastParams=e,r.loading=!0}),t.on("query:append",function(e){r.lastParams=e,r.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("open",function(){r._showDropdown(),r._attachPositioningHandler(t),r._bindContainerResultHandlers(t)}),t.on("close",function(){r._hideDropdown(),r._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,r="scroll.select2."+t.id,i="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(r,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(r+" "+i+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,r="resize.select2."+t.id,i="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+r+" "+i)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),r=null,i=this.$container.offset();i.bottom=i.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=i.top,o.bottom=i.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<i.top-s,u=l>i.bottom+s,d={left:i.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(r="below"),u||!c||t?!c&&u&&t&&(r="below"):r="above",("above"==r||t&&"below"!==r)&&(d.top=o.top-h.top-s),null!=r&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+r),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+r)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,r){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,r)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,r=0;r<t.length;r++){var i=t[r];i.children?n+=e(i.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("close",function(e){r._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var r=this.getHighlightedResults();if(!(r.length<1)){var i=o.GetData(r[0],"data");null!=i.element&&i.element.selected||null==i.element&&i.selected||this.trigger("select",{data:i})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(e){r._selectTriggered(e)}),t.on("unselect",function(e){r._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,$,b,w,A,x,D,S,E,C,O,T,q,L,I,j,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=b:null!=e.data?e.dataAdapter=$:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,w)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,I))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=E;else{var r=y.Decorate(E,C);e.dropdownAdapter=r}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,L)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var i=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,i)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var r=c.extend(!0,{},n),i=n.children.length-1;0<=i;i--)null==e(t,n.children[i])&&r.children.splice(i,1);return 0<r.children.length?r:e(t,r)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,r=this.defaults.language,i=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(i),this._resolveLanguage(n),this._resolveLanguage(r),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],r=0;r<t.length;r++)if(n.push(t[r]),"string"==typeof t[r]&&0<t[r].indexOf("-")){var i=t[r].split("-")[0];n.push(i)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,r=0;r<e.length;r++){var i=new s,o=e[r];if("string"==typeof o)try{i=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,i=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else i=c.isPlainObject(o)?new s(o):o;n.extend(i)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var r=y._convertData(n);c.extend(!0,this.defaults,r)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(r,d,i,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=i.applyFromElement(this.options,t)),this.options=i.apply(this.options),t&&t.is("input")){var n=r(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function r(e,t){return t.toUpperCase()}for(var i=0;i<e[0].attributes.length;i++){var o=e[0].attributes[i].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,r)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(o,c,u,r){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var r=this.options.get("dataAdapter");this.dataAdapter=new r(e,this.options);var i=this.render();this._placeContainer(i);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,i);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,i);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var r=this._resolveWidth(e,"style");return null!=r?r:this._resolveWidth(e,"element")}if("element"==t){var i=e.outerWidth(!1);return i<=0?"auto":i+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){t._syncA(),t._syncS(null,e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,r=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===o.inArray(e,r)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===r.ESC||t===r.TAB||t===r.UP&&e.altKey?(n.close(e),e.preventDefault()):t===r.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===r.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===r.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===r.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===r.ENTER||t===r.SPACE||t===r.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._isChangeMutation=function(e,t){var n=!1,r=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var i=0;i<t.addedNodes.length;i++){t.addedNodes[i].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length?n=!0:o.isArray(t)&&o.each(t,function(e,t){if(r._isChangeMutation(e,t))return!(n=!0)});else n=!0;return n}},d.prototype._syncSubtree=function(e,t){var n=this._isChangeMutation(e,t),r=this;n&&this.dataAdapter.current(function(e){r.trigger("selection:update",{data:e})})},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,r={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in r){var i=r[e],o={prevented:!1,name:e,args:t};if(n.call(this,i,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},d.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},d.prototype.isEnabled=function(){return!this.isDisabled()},d.prototype.isDisabled=function(){return this.options.get("disabled")},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];o.isArray(t)&&(t=o.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("input").trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=o('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("jquery-mousewheel",["jquery"],function(e){return e}),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(i,e,o,t,s){if(null==i.fn.select2){var a=["open","close","destroy"];i.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=i.extend(!0,{},t);new o(i(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,r=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,r)}),-1<i.inArray(t,a)?this:n}}return null==i.fn.select2.defaults&&(i.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return u.fn.select2.amd=e,t});
\ No newline at end of file
+/*! Select2 4.0.5 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return v.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n,o=b&&b.split("/"),p=t.map,q=p&&p["*"]||{};if(a){for(a=a.split("/"),g=a.length-1,t.nodeIdCompat&&x.test(a[g])&&(a[g]=a[g].replace(x,"")),"."===a[0].charAt(0)&&o&&(n=o.slice(0,o.length-1),a=n.concat(a)),k=0;k<a.length;k++)if("."===(m=a[k]))a.splice(k,1),k-=1;else if(".."===m){if(0===k||1===k&&".."===a[2]||".."===a[k-1])continue;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}if((o||q)&&p){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),o)for(l=o.length;l>0;l-=1)if((e=p[o.slice(0,l).join("/")])&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&q&&q[d]&&(i=q[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=w.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),o.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){r[a]=b}}function j(a){if(e(s,a)){var c=s[a];delete s[a],u[a]=!0,n.apply(b,c)}if(!e(r,a)&&!e(u,a))throw new Error("No "+a);return r[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return a?k(a):[]}function m(a){return function(){return t&&t.config&&t.config[a]||{}}}var n,o,p,q,r={},s={},t={},u={},v=Object.prototype.hasOwnProperty,w=[].slice,x=/\.js$/;p=function(a,b){var c,d=k(a),e=d[0],g=b[1];return a=d[1],e&&(e=f(e,g),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(g)):f(a,g):(a=f(a,g),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},q={require:function(a){return g(a)},exports:function(a){var b=r[a];return void 0!==b?b:r[a]={}},module:function(a){return{id:a,uri:"",exports:r[a],config:m(a)}}},n=function(a,c,d,f){var h,k,m,n,o,t,v,w=[],x=typeof d;if(f=f||a,t=l(f),"undefined"===x||"function"===x){for(c=!c.length&&d.length?["require","exports","module"]:c,o=0;o<c.length;o+=1)if(n=p(c[o],t),"require"===(k=n.f))w[o]=q.require(a);else if("exports"===k)w[o]=q.exports(a),v=!0;else if("module"===k)h=w[o]=q.module(a);else if(e(r,k)||e(s,k)||e(u,k))w[o]=j(k);else{if(!n.p)throw new Error(a+" missing "+k);n.p.load(n.n,g(f,!0),i(k),{}),w[o]=r[k]}m=d?d.apply(r[a],w):void 0,a&&(h&&h.exports!==b&&h.exports!==r[a]?r[a]=h.exports:m===b&&v||(r[a]=m))}else a&&(r[a]=d)},a=c=o=function(a,c,d,e,f){if("string"==typeof a)return q[a]?q[a](c):j(p(a,l(c)).f);if(!a.splice){if(t=a,t.deps&&o(t.deps,t.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?n(b,a,c,d):setTimeout(function(){n(b,a,c,d)},4),o},o.config=function(a){return o(a)},a._defined=r,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(r,a)||e(s,a)||(s[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){"function"==typeof b[d]&&("constructor"!==d&&c.push(d))}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){return Array.prototype.unshift.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};return d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;c<d;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;c<a;c++){b+=Math.floor(36*Math.random()).toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return(e!==f||"hidden"!==f&&"visible"!==f)&&("scroll"===e||"scroll"===f||(d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth))},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){b.find(".select2-results").append(a)},c.prototype.sort=function(a){return this.options.get("sorter")(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var b=this;this.data.current(function(c){var d=a.map(c,function(a){return a.id.toString()});b.$results.find(".select2-results__option[aria-selected]").each(function(){var b=a(this),c=a.data(this,"data"),e=""+c.id;null!=c.element&&c.element.selected||null==c.element&&a.inArray(e,d)>-1?b.attr("aria-selected","true"):b.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(b){var c=document.createElement("li");c.className="select2-results__option";var d={role:"treeitem","aria-selected":"false"};b.disabled&&(delete d["aria-selected"],d["aria-disabled"]="true"),null==b.id&&delete d["aria-selected"],null!=b._resultId&&(c.id=b._resultId),b.title&&(c.title=b.title),b.children&&(d.role="group",d["aria-label"]=b.text,delete d["aria-selected"]);for(var e in d){var f=d[e];c.setAttribute(e,f)}if(b.children){var g=a(c),h=document.createElement("strong");h.className="select2-results__group";a(h);this.template(b,h);for(var i=[],j=0;j<b.children.length;j++){var k=b.children[j],l=this.option(k);i.push(l)}var m=a("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});m.append(i),g.append(h),g.append(m)}else this.template(b,c);return a.data(c,"data",b),c},c.prototype.bind=function(b,c){var d=this,e=b.id+"-results";this.$results.attr("id",e),b.on("results:all",function(a){d.clear(),d.append(a.data),b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("results:append",function(a){d.append(a.data),b.isOpen()&&d.setClasses()}),b.on("query",function(a){d.hideMessages(),d.showLoading(a)}),b.on("select",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("unselect",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("open",function(){d.$results.attr("aria-expanded","true"),d.$results.attr("aria-hidden","false"),d.setClasses(),d.ensureHighlightVisible()}),b.on("close",function(){d.$results.attr("aria-expanded","false"),d.$results.attr("aria-hidden","true"),d.$results.removeAttr("aria-activedescendant")}),b.on("results:toggle",function(){var a=d.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),b.on("results:select",function(){var a=d.getHighlightedResults();if(0!==a.length){var b=a.data("data");"true"==a.attr("aria-selected")?d.trigger("close",{}):d.trigger("select",{data:b})}}),b.on("results:previous",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a);if(0!==c){var e=c-1;0===a.length&&(e=0);var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top,h=f.offset().top,i=d.$results.scrollTop()+(h-g);0===e?d.$results.scrollTop(0):h-g<0&&d.$results.scrollTop(i)}}),b.on("results:next",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a),e=c+1;if(!(e>=b.length)){var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top+d.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=d.$results.scrollTop()+h-g;0===e?d.$results.scrollTop(0):h>g&&d.$results.scrollTop(i)}}),b.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),b.on("results:message",function(a){d.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=d.$results.scrollTop(),c=d.$results.get(0).scrollHeight-b+a.deltaY,e=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=d.$results.height();e?(d.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(d.$results.scrollTop(d.$results.get(0).scrollHeight-d.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(b){var c=a(this),e=c.data("data");if("true"===c.attr("aria-selected"))return void(d.options.get("multiple")?d.trigger("unselect",{originalEvent:b,data:e}):d.trigger("close",{}));d.trigger("select",{originalEvent:b,data:e})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(b){var c=a(this).data("data");d.getHighlightedResults().removeClass("select2-results__option--highlighted"),d.trigger("results:focus",{data:c,element:a(this)})})},c.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),c<=2?this.$results.scrollTop(0):(g>this.$results.outerHeight()||g<0)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var b=a('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=this.$element.data("old-tabindex")?this._tabindex=this.$element.data("old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),b.attr("title",this.$element.attr("title")),b.attr("tabindex",this._tabindex),this.$selection=b,b},d.prototype.bind=function(a,b){var d=this,e=(a.id,a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),d.$selection.focus(),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(b){a(document.body).on("mousedown.select2."+b.id,function(b){var c=a(b.target),d=c.closest(".select2");a(".select2.select2-container--open").each(function(){var b=a(this);this!=d[0]&&b.data("element").select2("close")})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){b.find(".selection").append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()}),a.on("selection:update",function(a){c.update(a.data)})},e.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},e.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.prop("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,c){var e=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){e.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!e.options.get("disabled")){var c=a(this),d=c.parent(),f=d.data("data");e.trigger("unselect",{originalEvent:b,data:f})}})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},d.prototype.selectionContainer=function(){return a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.prop("title",e.title||e.text),f.data("data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id;if(b.length>1||c)return a.call(this,b);this.clear();var d=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(d)},b}),b.define("select2/selection/allowClear",["jquery","../keys"],function(a,b){function c(){}return c.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},c.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var c=this.$selection.find(".select2-selection__clear");if(0!==c.length){b.stopPropagation();for(var d=c.data("data"),e=0;e<d.length;e++){var f={data:d[e]};if(this.trigger("unselect",f),f.prevented)return}this.$element.val(this.placeholder.id).trigger("change"),this.trigger("toggle",{})}}},c.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||c.which!=b.DELETE&&c.which!=b.BACKSPACE||this._handleClear(c)},c.prototype.update=function(b,c){if(b.call(this,c),!(this.$selection.find(".select2-selection__placeholder").length>0||0===c.length)){var d=a('<span class="select2-selection__clear">&times;</span>');d.data("data",c),this.$selection.find(".select2-selection__rendered").prepend(d)}},c}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,b,d){var e=this;a.call(this,b,d),b.on("open",function(){e.$search.trigger("focus")}),b.on("close",function(){e.$search.val(""),e.$search.removeAttr("aria-activedescendant"),e.$search.trigger("focus")}),b.on("enable",function(){e.$search.prop("disabled",!1),e._transferTabIndex()}),b.on("disable",function(){e.$search.prop("disabled",!0)}),b.on("focus",function(a){e.$search.trigger("focus")}),b.on("results:focus",function(a){e.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){e.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){e._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){if(a.stopPropagation(),e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented(),a.which===c.BACKSPACE&&""===e.$search.val()){var b=e.$searchContainer.prev(".select2-selection__choice");if(b.length>0){var d=b.data("data");e.searchRemoveChoice(d),a.preventDefault()}}});var f=document.documentMode,g=f&&f<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){if(g)return void e.$selection.off("input.search input.searchcheck");e.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(g&&"input"===a.type)return void e.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&e.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c&&this.$search.focus()},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{a=.75*(this.$search.val().length+1)+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting"],g=["opening","closing","selecting","unselecting"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","�":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","�":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","�":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","�":"D","Ḓ":"D","Ḏ":"D","�":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","�":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","�":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","�":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","�":"G","�":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","�":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","�":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","�":"I","Ḯ":"I","Ỉ":"I","�":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","�":"K","�":"K","�":"K","Ꞣ":"K","�":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","�":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","�":"L","�":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","�":"N","�":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","�":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","�":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","�":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","�":"O","�":"O","Ƣ":"OI","�":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","�":"P","�":"P","�":"P","Ⓠ":"Q","Ｑ":"Q","�":"Q","�":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","�":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","�":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","�":"V","Ʌ":"V","�":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","�":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","�":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","�":"Z","Ｚ":"Z","Ź":"Z","�":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","�":"Z","�":"a","�":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","�":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","�":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","�":"a","ą":"a","ⱥ":"a","�":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","�":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","�":"d","�":"d","ḑ":"d","ḓ":"d","�":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","�":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","�":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","�":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","�":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","�":"f","ⓖ":"g","ｇ":"g","ǵ":"g","�":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","�":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","�":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","�":"k","�":"k","�":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","�":"l","�":"l","�":"l","lj":"lj","ⓜ":"m","�":"m","ḿ":"m","�":"m","ṃ":"m","ɱ":"m","ɯ":"m","�":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","�":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","�":"o","ȭ":"o","�":"o","�":"o","ṑ":"o","ṓ":"o","�":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","�":"o","ő":"o","ǒ":"o","�":"o","�":"o","ơ":"o","�":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","�":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","�":"o","�":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","�":"oo","ⓟ":"p","�":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","�":"p","�":"p","�":"p","ⓠ":"q","ｑ":"q","ɋ":"q","�":"q","�":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","�":"r","ŗ":"r","ṟ":"r","�":"r","ɽ":"r","�":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","�":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","�":"v","ʌ":"v","�":"vy","ⓦ":"w","ｗ":"w","�":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","�":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","�":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","�":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","�":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","�":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","�":"ι","ό":"ο","�":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"}}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),null!=c.id?d+="-"+c.id.toString():d+="-"+a.generateChars(4),d},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple")){if(a.selected=!1,c(a.element).is("option"))return a.element.selected=!1,void this.$element.trigger("change");this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})}},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){c.removeData(this,"data")})},d.prototype.query=function(a,b){var d=[],e=this;this.$element.children().each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var b;a.children?(b=document.createElement("optgroup"),b.label=a.text):(b=document.createElement("option"),void 0!==b.textContent?b.textContent=a.text:b.innerText=a.text),void 0!==a.id&&(b.value=a.id),a.disabled&&(b.disabled=!0),a.selected&&(b.selected=!0),a.title&&(b.title=a.title);var d=c(b),e=this._normalizeItem(a);return e.element=b,c.data(b,"data",e),d},d.prototype.item=function(a){var b={};if(null!=(b=c.data(a[0],"data")))return b;if(a.is("option"))b={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){b={text:a.prop("label"),children:[],title:a.prop("title")};for(var d=a.children("option"),e=[],f=0;f<d.length;f++){var g=c(d[f]),h=this.item(g);e.push(h)}b.children=e}return b=this._normalizeItem(b),b.element=a[0],c.data(a[0],"data",b),b},d.prototype._normalizeItem=function(a){c.isPlainObject(a)||(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){return this.options.get("matcher")(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){d.status&&"0"===d.status||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0);if((i.text||"").toUpperCase()===(b.term||"").toUpperCase()||j)return!f&&(a.data=g,void c(a))}if(f)return!0;var k=e.createTag(b);if(null!=k){var l=e.option(k);l.attr("data-select2-tag",!0),e.addOptions([l]),e.insertTag(g,k)}a.results=g,c(a)}var e=this;if(this._removeOldTags(),null==b.term||null!=b.page)return void a.call(this,b,c);a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){this._lastTag;this.$element.find("option[data-select2-tag]").each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b);if(!g.$element.find("option").filter(function(){return a(this).val()===c.id}).length){var d=g.option(c);d.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([d])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",b.term.length<this.minimumInputLength)return void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength)return void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;if(d.maximumSelectionLength>0&&f>=d.maximumSelectionLength)return void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}});a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val("")}),c.on("focus",function(){c.isOpen()||e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){e.showSearch(a)?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){e.$results.offset().top+e.$results.outerHeight(!1)+50>=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1)&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){a(this).data("select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(b){var c=a(this).data("select2-scroll-position");a(this).scrollTop(c.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id;this.$container.parents().filter(b.hasScroll).off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return!(a(c.data.results)<this.minimumResultsForSearch)&&b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},a.prototype._handleSelectOnClose=function(a,b){if(b&&null!=b.originalSelect2Event){var c=b.originalSelect2Event;if("select"===c._type||"unselect"===c._type)return}var d=this.getHighlightedResults();if(!(d.length<1)){var e=d.data("data");null!=e.element&&e.element.selected||null==e.element&&e.selected||this.trigger("select",{data:e})}},a}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){return"Please enter "+(a.minimum-a.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}return D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),null==l.tokenSeparators&&null==l.tokenizer||(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(a){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(a){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var O=k.loadPath(this.defaults.amdLanguageBase+"en"),P=new k(l.language);P.extend(O),l.translations=P}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){null==c(d,e.children[g])&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var h=b(e.text).toUpperCase(),i=b(d.term).toUpperCase();return h.indexOf(i)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(this.defaults,f)},new D}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),a.data("select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),a.data("data",a.data("select2Tags")),a.data("tags",!0)),a.data("ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",a.data("ajaxUrl")),a.data("ajax--url",a.data("ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,a.data()):a.data();var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,c){null!=a.data("select2")&&a.data("select2").destroy(),this.$element=a,this.id=this._generateId(a),c=c||{},this.options=new b(c,a),e.__super__.constructor.call(this);var d=a.attr("tabindex")||0;a.data("old-tabindex",d),a.attr("tabindex","-1");var f=this.options.get("dataAdapter");this.dataAdapter=new f(a,this.options);var g=this.render();this._placeContainer(g);var h=this.options.get("selectionAdapter");this.selection=new h(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,g);var i=this.options.get("dropdownAdapter");this.dropdown=new i(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,g);var j=this.options.get("resultsAdapter");this.results=new j(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var k=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){k.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return e<=0?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;h<i;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=a&&0!==a.length||(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",this.$element.data("old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),b.data("element",this.$element),b},e}),b.define("jquery-mousewheel",["jquery"],function(a){return a}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults"],function(a,b,c,d){if(null==a.fn.select2){var e=["open","close","destroy"];a.fn.select2=function(b){if("object"==typeof(b=b||{}))return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,f=Array.prototype.slice.call(arguments,1);return this.each(function(){var c=a(this).data("select2");null==c&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=c[b].apply(c,f)}),a.inArray(b,e)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/package.json b/htdocs/includes/jquery/plugins/select2/package.json
index 30135ba94ee..69423b397dd 100644
--- a/htdocs/includes/jquery/plugins/select2/package.json
+++ b/htdocs/includes/jquery/plugins/select2/package.json
@@ -34,12 +34,11 @@
   ],
   "license": "MIT",
   "main": "dist/js/select2.js",
-  "style": "dist/css/select2.css",
   "files": [
     "src",
     "dist"
   ],
-  "version": "4.0.13",
+  "version": "4.0.4",
   "jspm": {
     "main": "js/select2",
     "directories": {
@@ -47,19 +46,28 @@
     }
   },
   "devDependencies": {
-    "almond": "~0.3.1",
-    "grunt": "^1.0.4",
-    "grunt-cli": "^1.3.2",
-    "grunt-contrib-concat": "^1.0.1",
-    "grunt-contrib-connect": "^2.0.0",
-    "grunt-contrib-jshint": "^1.1.0",
-    "grunt-contrib-qunit": "^1.3.0",
-    "grunt-contrib-requirejs": "^1.0.0",
-    "grunt-contrib-uglify": "~4.0.1",
-    "grunt-contrib-watch": "~1.1.0",
-    "grunt-sass": "^2.1.0",
-    "jquery-mousewheel": "~3.1.13",
-    "node-sass": "^4.12.0"
+    "grunt": "^0.4.5",
+    "grunt-cli": "^0.1.13",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-concat": "^0.4.0",
+    "grunt-contrib-connect": "^0.9.0",
+    "grunt-contrib-jshint": "^0.10.0",
+    "grunt-contrib-nodeunit": "~0.3.3",
+    "grunt-contrib-qunit": "~0.4.0",
+    "grunt-contrib-requirejs": "^0.4.4",
+    "grunt-contrib-symlink": "^0.3.0",
+    "grunt-contrib-uglify": "~0.4.0",
+    "grunt-contrib-watch": "~0.6.0",
+    "grunt-gh-pages": "^0.9.1",
+    "grunt-jekyll": "^0.4.2",
+    "grunt-sass": "^1.0.0",
+    "grunt-saucelabs": "^9.0.0",
+    "node-sass": "^4.5.3",
+    "request": "<=2.81.0",
+    "shrinkwrap": "^0.4.0"
   },
-  "dependencies": {}
+  "dependencies": {
+    "almond": "~0.3.1",
+    "jquery-mousewheel": "~3.1.13"
+  }
 }

From 5c184040836197a09f27687ec7984069fbf16cca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 15:11:38 +0200
Subject: [PATCH 029/144] Move to jquery 4.0.13 with fix in reponsive Restore
 some files modified by error.

---
 COPYRIGHT                                     |   2 +-
 dev/dolibarr_changes.txt                      |  12 +
 htdocs/comm/propal/list.php                   | 164 ++--
 htdocs/core/class/html.form.class.php         | 399 ++++-----
 .../jquery/plugins/select2/.editorconfig      |   6 +
 .../jquery/plugins/select2/.gitignore         |   3 +
 .../jquery/plugins/select2/.jshintignore      |   4 +
 .../includes/jquery/plugins/select2/.jshintrc |  25 +
 .../jquery/plugins/select2/CHANGELOG.md       | 173 ++++
 .../jquery/plugins/select2/Gruntfile.js       | 125 +--
 .../includes/jquery/plugins/select2/README.md |  64 +-
 .../jquery/plugins/select2/component.json     |   2 +-
 .../jquery/plugins/select2/composer.json      |   3 -
 .../plugins/select2/dist/css/select2.css      |  18 +-
 .../plugins/select2/dist/css/select2.min.css  |   2 +-
 .../select2/dist/js/compat/containerCss.js    |  56 --
 .../jquery/plugins/select2/dist/js/i18n/af.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ar.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/az.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/bg.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/bn.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/bs.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ca.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/cs.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/da.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/de.js |   3 +
 .../plugins/select2/dist/js/i18n/dsb.js       |   3 +
 .../jquery/plugins/select2/dist/js/i18n/el.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/en.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/es.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/et.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/eu.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/fa.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/fi.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/fr.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/gl.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/he.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/hi.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/hr.js |   3 +
 .../plugins/select2/dist/js/i18n/hsb.js       |   3 +
 .../jquery/plugins/select2/dist/js/i18n/hu.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/hy.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/id.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/is.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/it.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ja.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ka.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/km.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ko.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/lt.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/lv.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/mk.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ms.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/nb.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ne.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/nl.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/pl.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ps.js |   3 +
 .../plugins/select2/dist/js/i18n/pt-BR.js     |   3 +
 .../jquery/plugins/select2/dist/js/i18n/pt.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ro.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/ru.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/sk.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/sl.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/sq.js |   3 +
 .../plugins/select2/dist/js/i18n/sr-Cyrl.js   |   3 +
 .../jquery/plugins/select2/dist/js/i18n/sr.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/sv.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/th.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/tk.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/tr.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/uk.js |   3 +
 .../jquery/plugins/select2/dist/js/i18n/vi.js |   3 +
 .../plugins/select2/dist/js/i18n/zh-CN.js     |   3 +
 .../plugins/select2/dist/js/i18n/zh-TW.js     |   3 +
 .../plugins/select2/dist/js/select2.full.js   | 803 +++++++++++++-----
 .../select2/dist/js/select2.full.min.js       |   3 +-
 .../jquery/plugins/select2/dist/js/select2.js | 790 ++++++++++++-----
 .../plugins/select2/dist/js/select2.min.js    |   3 +-
 .../jquery/plugins/select2/package.json       |  40 +-
 .../plugins/select2/select2.jquery.json       |  32 -
 81 files changed, 1932 insertions(+), 974 deletions(-)
 create mode 100644 htdocs/includes/jquery/plugins/select2/.editorconfig
 create mode 100644 htdocs/includes/jquery/plugins/select2/.gitignore
 create mode 100644 htdocs/includes/jquery/plugins/select2/.jshintignore
 create mode 100644 htdocs/includes/jquery/plugins/select2/.jshintrc
 delete mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/compat/containerCss.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/af.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ar.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/az.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/bg.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/bn.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/bs.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ca.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/cs.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/da.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/de.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/dsb.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/el.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/en.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/es.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/et.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/eu.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/fa.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/fi.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/fr.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/gl.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/he.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hi.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hr.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hsb.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hu.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/hy.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/id.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/is.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/it.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ja.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ka.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/km.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ko.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/lt.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/lv.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/mk.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ms.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/nb.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ne.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/nl.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/pl.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ps.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt-BR.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ro.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/ru.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sk.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sl.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sq.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr-Cyrl.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/sv.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/th.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/tk.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/tr.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/uk.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/vi.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-CN.js
 create mode 100644 htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-TW.js
 delete mode 100644 htdocs/includes/jquery/plugins/select2/select2.jquery.json

diff --git a/COPYRIGHT b/COPYRIGHT
index 42241a47d37..2964c915ec1 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -41,7 +41,7 @@ Ace                    1.4.8         BSD                         Yes
 ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
 jQuery                 3.4.1         MIT License                 Yes             JS library
 jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles with responsive
+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)
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 9cfec54bd5e..79f927160ee 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -298,3 +298,15 @@ JEDITABLE.JS
 * <button type="submit" />  =>  <button class="button" type="submit" />
 * <button type="cancel" />  =>  <button class="button" type="cancel" />
 
+
+
+SELECT2
+-------
+
+Edit CSS to restore line removed between 4.0.5 and 4.0.6. It generates this bug: https://github.com/select2/select2/issues/5832
+
+.select2-hidden-accessible {
+  margin: -1px !important;                /* line to restore */
+}
+
+
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 10dcf49b426..716f2fdd060 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -155,8 +155,8 @@ $arrayfields = array(
 	'p.ref'=>array('label'=>"Ref", 'checked'=>1),
 	'p.ref_client'=>array('label'=>"RefCustomer", 'checked'=>1),
 	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
-    'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
-    's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
+	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
+	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
 	's.town'=>array('label'=>"Town", 'checked'=>1),
 	's.zip'=>array('label'=>"Zip", 'checked'=>1),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
@@ -408,7 +408,7 @@ if ($resql)
 	$objectstatic = new Propal($db);
 	$userstatic = new User($db);
 
- 	if ($socid > 0)
+	if ($socid > 0)
 	{
 		$soc = new Societe($db);
 		$soc->fetch($socid);
@@ -473,7 +473,7 @@ if ($resql)
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
-	    'presend'=>$langs->trans("SendByMail"),
+		'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->propal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if ($user->rights->propal->cloturer) $arrayofmassactions['closed'] = $langs->trans("Close");
@@ -483,8 +483,8 @@ if ($resql)
 	$newcardbutton = '';
 	if ($user->rights->propal->creer)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/propal/card.php?action=create');
-    }
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/propal/card.php?action=create');
+	}
 
 	// Fields title search
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -496,7 +496,7 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-//	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$topicmail = "SendPropalRef";
 	$modelmail = "proposal_send";
@@ -514,19 +514,19 @@ if ($resql)
 
 	$moreforfilter = '';
 
- 	// If the user can view prospects other than his'
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
- 		$langs->load("commercial");
-	 	$moreforfilter .= '<div class="divsearchfield">';
- 		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
-		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
-	 	$moreforfilter .= '</div>';
- 	}
 	// If the user can view prospects other than his'
 	if ($user->rights->societe->client->voir || $socid)
 	{
-	 	$moreforfilter .= '<div class="divsearchfield">';
+		$langs->load("commercial");
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
+		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
+		$moreforfilter .= '</div>';
+	}
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid)
+	{
+		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
 		$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 		$moreforfilter .= '</div>';
@@ -545,9 +545,9 @@ if ($resql)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
-	 	$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+		$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
 		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1);
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -562,8 +562,7 @@ if ($resql)
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-///////////
-//	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$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">';
@@ -574,31 +573,31 @@ if ($resql)
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
- 		print '</td>';
+		print '</td>';
 	}
 	if (!empty($arrayfields['p.ref_client']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
-	    print '</td>';
+		print '</td>';
 	}
 	if (!empty($arrayfields['pr.ref']['checked']))
 	{
-    	print '<td class="liste_titre">';
-    	print '<input class="flat maxwidth50" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat maxwidth50" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['pr.title']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '<input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat maxwidth100" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
-	    print '</td>';
+		print '</td>';
 	}
 	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
 	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
@@ -766,7 +765,6 @@ if ($resql)
 		print '<td class="liste_titre"></td>';
 	}
 	// Extra fields
-////////////
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
@@ -785,7 +783,7 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-    // Date cloture
+	// Date cloture
 	if (!empty($arrayfields['p.date_cloture']['checked']))
 	{
 		print '<td class="liste_titre">';
@@ -941,24 +939,24 @@ if ($resql)
 
 		if (!empty($arrayfields['pr.ref']['checked']))
 		{
-    		// Project ref
-    		print '<td class="nowrap">';
-    		if ($obj->project_id > 0) {
+			// Project ref
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0) {
 				print $projectstatic->getNomUrl(1);
 			}
-    		print '</td>';
-    		if (!$i) $totalarray['nbfield']++;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		if (!empty($arrayfields['pr.title']['checked']))
 		{
-		    // Project label
-		    print '<td class="nowrap">';
-		    if ($obj->project_id > 0) {
-		        print $projectstatic->title;
-		    }
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			// Project label
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0) {
+				print $projectstatic->title;
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Thirdparty
@@ -1061,10 +1059,10 @@ if ($resql)
 		// Amount HT
 		if (!empty($arrayfields['p.total_ht']['checked']))
 		{
-			  print '<td class="nowrap right">'.price($obj->total_ht)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
-			  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
-			  $totalarray['val']['p.total_ht'] += $obj->total_ht;
+			print '<td class="nowrap right">'.price($obj->total_ht)."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
+			$totalarray['val']['p.total_ht'] += $obj->total_ht;
 		}
 		// Amount VAT
 		if (!empty($arrayfields['p.total_vat']['checked']))
@@ -1083,42 +1081,42 @@ if ($resql)
 			$totalarray['val']['p.total_ttc'] += $obj->total_ttc;
 		}
 		// Amount invoiced
-        if (!empty($arrayfields['p.total_ht_invoiced']['checked']))
-        {
-            print '<td class="nowrap right">'.price($totalInvoicedHT)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
-            $totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
-        }
-        // Amount invoiced
-        if (!empty($arrayfields['p.total_invoiced']['checked']))
-        {
-            print '<td class="nowrap right">'.price($totalInvoicedTTC)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
-            $totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
-        }
+		if (!empty($arrayfields['p.total_ht_invoiced']['checked']))
+		{
+			print '<td class="nowrap right">'.price($totalInvoicedHT)."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
+			$totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
+		}
+		// Amount invoiced
+		if (!empty($arrayfields['p.total_invoiced']['checked']))
+		{
+			print '<td class="nowrap right">'.price($totalInvoicedTTC)."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
+			$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
+		}
 
 		// Currency
 		if (!empty($arrayfields['p.multicurrency_code']['checked']))
 		{
-			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Currency rate
 		if (!empty($arrayfields['p.multicurrency_tx']['checked']))
 		{
-			  print '<td class="nowrap">';
-			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-			  print "</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			print '<td class="nowrap">';
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Amount HT
 		if (!empty($arrayfields['p.multicurrency_total_ht']['checked']))
 		{
-			  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Amount VAT
 		if (!empty($arrayfields['p.multicurrency_total_vat']['checked']))
@@ -1133,17 +1131,17 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 		// Amount invoiced
-        if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked']))
-        {
-            print '<td class="nowrap right">'.price($multicurrency_totalInvoicedHT)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-        }
-        // Amount invoiced
-        if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked']))
-        {
-            print '<td class="nowrap right">'.price($multicurrency_totalInvoicedTTC)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-        }
+		if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked']))
+		{
+			print '<td class="nowrap right">'.price($multicurrency_totalInvoicedHT)."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Amount invoiced
+		if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked']))
+		{
+			print '<td class="nowrap right">'.price($multicurrency_totalInvoicedTTC)."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		$userstatic->id = $obj->fk_user_author;
 		$userstatic->login = $obj->login;
@@ -1223,7 +1221,7 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-    	// Date cloture
+		// Date cloture
 		if (!empty($arrayfields['p.date_cloture']['checked']))
 		{
 			print '<td align="center" class="nowrap">';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ee2ae092420..9a8ade00367 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -52,19 +52,19 @@
 class Form
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
-     * @var string[]    Array of error strings
-     */
-    public $errors = array();
+	/**
+	 * @var string[]    Array of error strings
+	 */
+	public $errors = array();
 
 	public $num;
 
@@ -103,8 +103,8 @@ class Form
 	 * @param	string	$help			Tooltip help
 	 * @return	string					HTML edit field
 	 */
-    public function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata = 'string', $moreparam = '', $fieldrequired = 0, $notabletag = 0, $paramid = 'id', $help = '')
-    {
+	public function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata = 'string', $moreparam = '', $fieldrequired = 0, $notabletag = 0, $paramid = 'id', $help = '')
+	{
 		global $conf, $langs;
 
 		$ret = '';
@@ -157,7 +157,7 @@ class Form
 		}
 
 		return $ret;
-    }
+	}
 
 	/**
 	 * Output value of a field for an editable field
@@ -177,7 +177,7 @@ class Form
 	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')
 	 * @return  string					HTML edit field
 	 */
-    public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id')
+	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id')
 	{
 		global $conf, $langs, $db;
 
@@ -243,7 +243,7 @@ class Form
 				elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
-                    $arraylist = array();
+					$arraylist = array();
 					foreach ($arraydata as $val)
 					{
 						$tmp = explode(':', $val);
@@ -254,7 +254,7 @@ class Form
 				}
 				elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
-				    $tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
+					$tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					$doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), (isset($tmp[8]) ? ($tmp[8] ?true:false) : true), true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));
 					$ret .= $doleditor->Create(1);
@@ -263,12 +263,12 @@ class Form
 
 				if (empty($notabletag)) $ret .= '<td class="left">';
 				//else $ret.='<div class="clearboth"></div>';
-			   	$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';
-			   	if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) $ret .= '<br>'."\n";
-			   	$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
-			   	if (empty($notabletag)) $ret .= '</td>';
+				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';
+				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) $ret .= '<br>'."\n";
+				$ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';
+				if (empty($notabletag)) $ret .= '</td>';
 
-			   	if (empty($notabletag)) $ret .= '</tr></table>'."\n";
+				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
 				$ret .= '</form>'."\n";
 			}
 			else
@@ -282,7 +282,7 @@ class Form
 				elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
-                    $arraylist = array();
+					$arraylist = array();
 					foreach ($arraydata as $val)
 					{
 						$tmp = explode(':', $val);
@@ -492,8 +492,8 @@ class Form
 				{
 					if (!empty($custommsg['success']))
 						$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
-					if (!empty($custommsg['error']))
-						$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
+						if (!empty($custommsg['error']))
+							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
 				}
 				else
 					$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
@@ -532,7 +532,7 @@ class Form
 	 *	@see	textwithpicto() Use thisfunction if you can.
 	 *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
 	 */
-    public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
+	public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
 	{
 		if ($incbefore) $text = $incbefore.$text;
 		if (!$htmltext) return $text;
@@ -613,7 +613,7 @@ class Form
 	 *  @param	int		$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)
 	 * 	@return	string						HTML code of text, picto, tooltip
 	 */
-    public function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 3, $tooltiptrigger = '', $forcenowrap = 0)
+	public function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 3, $tooltiptrigger = '', $forcenowrap = 0)
 	{
 		global $conf, $langs;
 
@@ -643,7 +643,7 @@ class Form
 		// If info or help with smartphone, show only text (tooltip on click does not works with dialog on smaprtphone)
 		//if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger))
 		//{
-			//if ($type == 'info' || $type == 'help') return '<a href="'..'">'.$text.''</a>';
+		//if ($type == 'info' || $type == 'help') return '<a href="'..'">'.$text.''</a>';
 		//}
 
 		$img = '';
@@ -666,7 +666,7 @@ class Form
 	 * @param   int     $alwaysvisible  1=select button always visible
 	 * @return	string|void					Select list
 	 */
-    public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0)
+	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0)
 	{
 		global $conf, $langs, $hookmanager;
 
@@ -760,7 +760,7 @@ class Form
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return combo list of activated countries, into language of user
 	 *
@@ -776,9 +776,9 @@ class Form
 	 *  @param	array	$exclude_country_code	Array of country code (iso2) to exclude
 	 *  @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())
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $mysoc;
 
 		$langs->load("dict");
@@ -878,7 +878,7 @@ class Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return select list of incoterms
 	 *
@@ -891,9 +891,9 @@ class Form
 	 *  @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_incoterms($selected = '', $location_incoterms = '', $page = '', $htmlname = 'incoterm_id', $htmloption = '', $forcecombo = 1, $events = array())
+	public function select_incoterms($selected = '', $location_incoterms = '', $page = '', $htmlname = 'incoterm_id', $htmloption = '', $forcecombo = 1, $events = array())
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$langs->load("dict");
@@ -972,7 +972,7 @@ class Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of types of lines (product or service)
 	 * 	Example: 0=product, 1=service, 9=other (for external module)
@@ -984,14 +984,14 @@ class Form
 	 * 	@param	integer	$forceall		1=Force to show products and services in combo list, whatever are activated modules, 0=No force, 2=Force to show only Products, 3=Force to show only services, -1=Force none (and set hidden field to 'service')
 	 *  @return	void
 	 */
-    public function select_type_of_lines($selected = '', $htmlname = 'type', $showempty = 0, $hidetext = 0, $forceall = 0)
+	public function select_type_of_lines($selected = '', $htmlname = 'type', $showempty = 0, $hidetext = 0, $forceall = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $db, $langs, $user, $conf;
 
 		// If product & services are enabled or both disabled.
 		if ($forceall == 1 || (empty($forceall) && !empty($conf->product->enabled) && !empty($conf->service->enabled))
-		|| (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled)))
+			|| (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled)))
 		{
 			if (empty($hidetext)) print $langs->trans("Type").': ';
 			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
@@ -1029,15 +1029,15 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load into cache cache_types_fees, array of types of fees
 	 *
 	 *	@return     int             Nb of lines loaded, <0 if KO
 	 */
-    public function load_cache_types_fees()
+	public function load_cache_types_fees()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_types_fees);
@@ -1078,7 +1078,7 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of types of notes
 	 *
@@ -1087,9 +1087,9 @@ class Form
 	 * 	@param	int			$showempty		Add an empty field
 	 * 	@return	void
 	 */
-    public function select_type_fees($selected = '', $htmlname = 'type', $showempty = 0)
+	public function select_type_fees($selected = '', $htmlname = 'type', $showempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs;
 
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
@@ -1118,7 +1118,7 @@ class Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return HTML code to select a company.
 	 *
@@ -1131,13 +1131,13 @@ class Form
 	 *  @return		string								Return select box for thirdparty.
 	 *  @deprecated	3.8 Use select_company instead. For exemple $form->select_thirdparty(GETPOST('socid'),'socid','',0) => $form->select_company(GETPOST('socid'),'socid','',1,0,0,array(),0)
 	 */
-    public function select_thirdparty($selected = '', $htmlname = 'socid', $filter = '', $limit = 20, $ajaxoptions = array(), $forcecombo = 0)
+	public function select_thirdparty($selected = '', $htmlname = 'socid', $filter = '', $limit = 20, $ajaxoptions = array(), $forcecombo = 0)
 	{
-        // phpcs:enable
-   		return $this->select_thirdparty_list($selected, $htmlname, $filter, 1, 0, $forcecombo, array(), '', 0, $limit);
+		// phpcs:enable
+		return $this->select_thirdparty_list($selected, $htmlname, $filter, 1, 0, $forcecombo, array(), '', 0, $limit);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output html form to select a third party
 	 *
@@ -1157,9 +1157,9 @@ class Form
 	 * 	@param  bool	$multiple				add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
 	 * 	@return	string							HTML string with select box for thirdparty.
 	 */
-    public function select_company($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $limit = 0, $morecss = 'minwidth100', $moreparam = '', $selected_input_value = '', $hidelabel = 1, $ajaxoptions = array(), $multiple = false)
+	public function select_company($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $limit = 0, $morecss = 'minwidth100', $moreparam = '', $selected_input_value = '', $hidelabel = 1, $ajaxoptions = array(), $multiple = false)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		$out = '';
@@ -1201,7 +1201,7 @@ class Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output html form to select a third party.
 	 *  Note, you must use the select_company to get the component to select a third party. This function must only be called by select_company.
@@ -1221,9 +1221,9 @@ class Form
 	 *	@param  bool	$multiple       add [] in the name of element and add 'multiple' attribut
 	 * 	@return	string					HTML string with
 	 */
-    public function select_thirdparty_list($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $filterkey = '', $outputmode = 0, $limit = 0, $morecss = 'minwidth100', $moreparam = '', $multiple = false)
+	public function select_thirdparty_list($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $filterkey = '', $outputmode = 0, $limit = 0, $morecss = 'minwidth100', $moreparam = '', $multiple = false)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		$out = '';
@@ -1245,7 +1245,7 @@ class Form
 
 		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
 			$sql .= ", s.address, s.zip, s.town";
-		 	$sql .= ", dictp.code as country_code";
+			$sql .= ", dictp.code as country_code";
 		}
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -1288,7 +1288,7 @@ class Form
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-		   	if (!$forcecombo)
+			if (!$forcecombo)
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
@@ -1383,7 +1383,7 @@ class Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return HTML combo list of absolute discounts
 	 *
@@ -1394,9 +1394,9 @@ class Form
 	 *  @param	int		$maxvalue		Max value for lines that can be selected
 	 *  @return	int						Return number of qualifed lines in list
 	 */
-    public function select_remises($selected, $htmlname, $filter, $socid, $maxvalue = 0)
+	public function select_remises($selected, $htmlname, $filter, $socid, $maxvalue = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		// On recherche les remises
@@ -1460,7 +1460,7 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of all contacts (for a third party or all)
 	 *
@@ -1481,12 +1481,12 @@ class Form
 	 *  @return	int						<0 if KO, Nb of contact in list if OK
 	 *  @deprected						You can use selectcontacts directly (warning order of param was changed)
 	 */
-    public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')
-    {
-        // phpcs:enable
+	public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')
+	{
+		// phpcs:enable
 		print $this->selectcontacts($socid, $selected, $htmlname, $showempty, $exclude, $limitto, $showfunction, $moreclass, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);
 		return $this->num;
-    }
+	}
 
 	/**
 	 *	Return HTML code of the SELECT of list of all contacts (for a third party or all).
@@ -1511,8 +1511,8 @@ class Form
 	 *  @param	bool		$multiple		add [] in the name of element and add 'multiple' attribut
 	 *	@return	 int						<0 if KO, Nb of contact in list if OK
 	 */
-    public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false)
-    {
+	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false)
+	{
 		global $conf, $langs, $hookmanager, $action;
 
 		$langs->load('companies');
@@ -1570,42 +1570,42 @@ class Form
 					$contactstatic->lastname = $obj->lastname;
 					$contactstatic->firstname = $obj->firstname;
 					if ($obj->statut == 1) {
-					    if ($htmlname != 'none')
-					    {
-						    $disabled = 0;
-						    if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) $disabled = 1;
-						    if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;
-						    if (!empty($selected) && in_array($obj->rowid, $selected))
-						    {
-							    $out .= '<option value="'.$obj->rowid.'"';
-							    if ($disabled) $out .= ' disabled';
-							    $out .= ' selected>';
-							    $out .= $contactstatic->getFullName($langs);
-							    if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-							    if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
-							    $out .= '</option>';
-						    }
-						    else
-						    {
-							    $out .= '<option value="'.$obj->rowid.'"';
-							    if ($disabled) $out .= ' disabled';
-							    $out .= '>';
-							    $out .= $contactstatic->getFullName($langs);
-							    if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-							    if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
-							    $out .= '</option>';
-						    }
-					    }
-					    else
-					    {
-						    if (in_array($obj->rowid, $selected))
-						    {
-							    $out .= $contactstatic->getFullName($langs);
-							    if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
-							    if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
-						    }
-					    }
-				    }
+						if ($htmlname != 'none')
+						{
+							$disabled = 0;
+							if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) $disabled = 1;
+							if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;
+							if (!empty($selected) && in_array($obj->rowid, $selected))
+							{
+								$out .= '<option value="'.$obj->rowid.'"';
+								if ($disabled) $out .= ' disabled';
+								$out .= ' selected>';
+								$out .= $contactstatic->getFullName($langs);
+								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
+								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+								$out .= '</option>';
+							}
+							else
+							{
+								$out .= '<option value="'.$obj->rowid.'"';
+								if ($disabled) $out .= ' disabled';
+								$out .= '>';
+								$out .= $contactstatic->getFullName($langs);
+								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
+								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+								$out .= '</option>';
+							}
+						}
+						else
+						{
+							if (in_array($obj->rowid, $selected))
+							{
+								$out .= $contactstatic->getFullName($langs);
+								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
+								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
+							}
+						}
+					}
 					$i++;
 				}
 			}
@@ -1642,7 +1642,7 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return select list of users
 	 *
@@ -1658,13 +1658,13 @@ class Form
 	 *  @deprecated		Use select_dolusers instead
 	 *  @see select_dolusers()
 	 */
-    public function select_users($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0')
+	public function select_users($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		print $this->select_dolusers($selected, $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return select list of users
 	 *
@@ -1688,9 +1688,9 @@ class Form
 	 * 	@return	string					HTML select string
 	 *  @see select_dolgroups()
 	 */
-    public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false)
+	public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs, $hookmanager;
 
 		// If no preselected user defined, we take current user
@@ -1773,7 +1773,7 @@ class Form
 			$i = 0;
 			if ($num)
 			{
-		   		// Enhance with select2
+				// Enhance with select2
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname);
 
@@ -1847,7 +1847,7 @@ class Form
 						{
 							$out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));
 							$moreinfo++;
-					 	}
+						}
 					}
 					$out .= ($moreinfo ? ')' : '');
 					if ($disableline && $disableline != '1')
@@ -1877,7 +1877,7 @@ class Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return select list of users. Selected users are stored into session.
 	 *  List of users are provided into $_SESSION['assignedtouser'].
@@ -1900,9 +1900,9 @@ class Form
 	 * 	@return	string					HTML select string
 	 *  @see select_dolgroups()
 	 */
-    public function select_dolusers_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofuserid = array(), $listofcontactid = array(), $listofotherid = array())
+	public function select_dolusers_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofuserid = array(), $listofcontactid = array(), $listofotherid = array())
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		$userstatic = new User($this->db);
@@ -1967,7 +1967,7 @@ class Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of products for customer in Ajax if Ajax activated or go to select_produits_list
 	 *
@@ -1993,9 +1993,9 @@ class Form
 	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
 	 *  @return		void
 	 */
-    public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array())
+	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array())
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		// check parameters
@@ -6120,11 +6120,11 @@ class Form
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
 		}
-		else
-		{
+        else
+        {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
-		}
+        }
 
 		if (empty($fieldstoshow))
 		{
@@ -6146,100 +6146,107 @@ class Form
 
 		// Search data
 		$sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX.$objecttmp->table_element." as t";
-		if ($objecttmp->ismultientitymanaged == 2)
+		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {
+			$tmparray = explode('@', $objecttmp->ismultientitymanaged);
+			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON parenttable.rowid = t.'.$tmparray[0];
+		}
+		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe')
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql .= " WHERE 1=1";
-			if (!empty($objecttmp->ismultientitymanaged)) $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
-			if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {
-				if ($objecttmp->element == 'societe') $sql .= " AND t.rowid = ".$user->socid;
-				else $sql .= " AND t.fk_soc = ".$user->socid;
-			}
-			if ($searchkey != '') $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
-			if ($objecttmp->ismultientitymanaged == 2) {
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			}
-			if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-				/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
-				 {
-				 throw new RestException(503, 'Error when validating parameter sqlfilters '.$objecttmp->filter);
-				 }*/
-				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-				$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";
-			}
-			$sql .= $this->db->order($fieldstoshow, "ASC");
-			//$sql.=$this->db->plimit($limit, 0);
-			//print $sql;
-
-			// Build output string
-			$resql = $this->db->query($sql);
-			if ($resql)
+		$sql .= " WHERE 1=1";
+		if (isset($objecttmp->ismultientitymanaged) && $objecttmp->ismultientitymanaged == 1) $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";
+		if (isset($objecttmp->ismultientitymanaged) && !is_numeric($objecttmp->ismultientitymanaged)) {
+			$sql .= ' AND parenttable.entity = t.'.$tmparray[0];
+		}
+		if ($objecttmp->ismultientitymanaged == 1 && !empty($user->socid)) {
+			if ($objecttmp->element == 'societe') $sql .= " AND t.rowid = ".$user->socid;
+			else $sql .= " AND t.fk_soc = ".$user->socid;
+		}
+		if ($searchkey != '') $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
+		if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+			/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
 			{
-				if (!$forcecombo)
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$objecttmp->filter);
+			}*/
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";
+		}
+		$sql .= $this->db->order($fieldstoshow, "ASC");
+		//$sql.=$this->db->plimit($limit, 0);
+		//print $sql;
+
+		// Build output string
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!$forcecombo)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
+			}
+
+			// Construct $out and $outarray
+			$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";
+
+			// Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4
+			$textifempty = '&nbsp;';
+
+			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			if (!empty($conf->global->$confkeyforautocompletemode))
+			{
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				else $textifempty .= $langs->trans("All");
+			}
+			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
+
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
 				{
-					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-					$out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
-				}
-
-				// Construct $out and $outarray
-				$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";
-
-				// Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4
-				$textifempty = '&nbsp;';
-
-				//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-				if (!empty($conf->global->$confkeyforautocompletemode))
-				{
-					if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-					else $textifempty .= $langs->trans("All");
-				}
-				if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
-
-				$num = $this->db->num_rows($resql);
-				$i = 0;
-				if ($num)
-				{
-					while ($i < $num)
+					$obj = $this->db->fetch_object($resql);
+					$label = '';
+					$tmparray = explode(',', $fieldstoshow);
+					foreach ($tmparray as $key => $val)
 					{
-						$obj = $this->db->fetch_object($resql);
-						$label = '';
-						$tmparray = explode(',', $fieldstoshow);
-						foreach ($tmparray as $key => $val)
+						$val = preg_replace('/t\./', '', $val);
+						$label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;
+					}
+					if (empty($outputmode))
+					{
+						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
 						{
-							$val = preg_replace('/t\./', '', $val);
-							$label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;
-						}
-						if (empty($outputmode))
-						{
-							if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
-							{
-								$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-							}
-							else
-							{
-								$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
-							}
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
 						}
 						else
 						{
-							array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
+							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-
-						$i++;
-						if (($i % 10) == 0) $out .= "\n";
 					}
+					else
+					{
+						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
+					}
+
+					$i++;
+					if (($i % 10) == 0) $out .= "\n";
 				}
-
-				$out .= '</select>'."\n";
-			}
-			else
-			{
-				dol_print_error($this->db);
 			}
 
-			$this->result = array('nbofelement'=>$num);
+			$out .= '</select>'."\n";
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
 
-			if ($outputmode) return $outarray;
-			return $out;
+		$this->result = array('nbofelement'=>$num);
+
+		if ($outputmode) return $outarray;
+		return $out;
 	}
 
 
diff --git a/htdocs/includes/jquery/plugins/select2/.editorconfig b/htdocs/includes/jquery/plugins/select2/.editorconfig
new file mode 100644
index 00000000000..54f4d3beedb
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/.editorconfig
@@ -0,0 +1,6 @@
+[*]
+indent_style = space
+end_of_line = lf
+
+[*.js]
+indent_size = 2
diff --git a/htdocs/includes/jquery/plugins/select2/.gitignore b/htdocs/includes/jquery/plugins/select2/.gitignore
new file mode 100644
index 00000000000..aa970da6518
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+dist/js/i18n/build.txt
+.sass-cache
diff --git a/htdocs/includes/jquery/plugins/select2/.jshintignore b/htdocs/includes/jquery/plugins/select2/.jshintignore
new file mode 100644
index 00000000000..ba5a30f8c38
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/.jshintignore
@@ -0,0 +1,4 @@
+src/js/banner.*.js
+src/js/wrapper.*.js
+tests/vendor/*.js
+tests/helpers.js
diff --git a/htdocs/includes/jquery/plugins/select2/.jshintrc b/htdocs/includes/jquery/plugins/select2/.jshintrc
new file mode 100644
index 00000000000..94299268771
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/.jshintrc
@@ -0,0 +1,25 @@
+{
+  "bitwise": true,
+  "camelcase": true,
+  "curly": true,
+  "es3": true,
+  "eqnull": true,
+  "freeze": true,
+  "globals": {
+    "console": false,
+    "define": false,
+    "document": false,
+    "MockContainer": false,
+    "module": false,
+    "QUnit": false,
+    "require": false,
+    "test": false,
+    "window": false
+  },
+  "indent": 2,
+  "maxlen": 80,
+  "noarg": true,
+  "nonew": true,
+  "quotmark": "single",
+  "undef": true
+}
diff --git a/htdocs/includes/jquery/plugins/select2/CHANGELOG.md b/htdocs/includes/jquery/plugins/select2/CHANGELOG.md
index 3ae60aff255..d6b2a7587dd 100644
--- a/htdocs/includes/jquery/plugins/select2/CHANGELOG.md
+++ b/htdocs/includes/jquery/plugins/select2/CHANGELOG.md
@@ -1,5 +1,178 @@
 # Change Log
 
+## 4.0.13
+
+### New features / improvements
+
+* Trigger `input` event before `change` events (#4649)
+* Feed back the keypress code that was responsible for the 'close' event (#5513)
+* Only trigger `selection:update` once on DOM change events (#5734)
+
+### Bug fixes
+
+* Prevent opening of disabled elements (#5751)
+
+### Documentation
+
+* Fix "edit this page" links in docs (#5689)
+
+### Miscellaneous
+
+* Registered Select2 on Open Collective (#5700, #5721, #5741)
+
+## 4.0.12
+
+### Bug fixes
+
+* Fixes incorrect offset when using the Shadow DOM and styling the `<html>` element (#5682)
+
+### Miscellaneous
+
+* Replace cdnjs with jsDelivr in the documentation (#5687)
+* Fix incorrect provider for the automated NPM deployment (#5686)
+
+## 4.0.11
+
+### Bug fixes
+
+* Fixes jQuery migrate error when getting offset when dropdownParent not in document (#5584)
+
+### Miscellaneous
+
+* Enable GitHub actions for CI (#5591)
+* Documentation has been moved into and is deployed from the code repository (#5638)
+* Remove Travis CI integration (#5665)
+
+## 4.0.10
+
+### New features / improvements
+
+* Support passing in a selector for `dropdownParent` option (#5622)
+
+### Bug fixes
+
+* Fix bug where dropdowns pointing upwards were incorrectly positioned (#5621)
+
+## 4.0.9
+
+### New features / improvements
+
+* Mirror disabled state through aria-disabled on selection (#5579)
+* Select2 now clears the internal ID when it is destroyed (#5587)
+* Set the main ARIA 1.1 roles and properties for comboboxes (#5582)
+* The `language` option now has a clearly defined fallback chain (#5602)
+
+### Bug fixes
+
+* Do not propagate click when search box is not empty (#5580)
+* Fix `maximumSelectionLength` being ignored by `closeOnSelect` (#5581)
+* Fix generated options not receiving result IDs (#5586)
+* Remove selection title attribute if text is empty (#5589)
+* Reposition dropdown whenever items are selected (#5590)
+* Fix dropdown positioning when displayed above with messages (#5592)
+* Fix search box expanding width of container (#5595)
+* `allowClear` no longer shifts selections to a new line (#5603)
+
+### Translations
+
+* Fix error in German translations (#5604)
+
+### Miscellaneous
+
+* Updated development grunt version so it no longer shows as vulnerable (#5597)
+* Remove unused variables (#5554)
+
+## 4.0.8
+
+### New features / improvements
+
+* Test against and fix compatibility with jQuery 3.4.1 (#5531)
+* Results respect disabled state of `<option>` (#5560)
+* Add `computedstyle` option for calculating the width (#5559)
+
+### Bug fixes
+
+* Fix tag creation being broken in 4.0.7 (#5558)
+* Fix infinite scroll when the scrollbar is not visible (#5575)
+* Revert change to focusing behaviour in 4.0.6 (#5576)
+
+### Translations
+
+* Fix wording in French translations (#5521)
+
+### Miscellaneous
+
+* Update grunt-contrib-qunit to latest version (#5530)
+* Removed unused `.select2-selection__placeholder` CSS definitions for multiple selects (#5508)
+* Remove deprecated jQuery shorthand (#5564)
+
+## 4.0.7
+
+### New features/improvements
+- Do not close on select if Ctrl or Meta (Cmd) keys being held (#5222)
+
+### Bug fixes
+- Fixed issue where single select boxes would automatically reopen when they were closed (#5490, #5492)
+
+### Miscellaneous
+- Move almost and jquery-mousewheel to devDependencies (#5489)
+
+## 4.0.6
+
+### New features/improvements
+- Add style property to package.json (#5019)
+- Implement `clear` and `clearing` events (#5058)
+- Add `scrollAfterSelect` option (#5150)
+- Add missing diacritics (#4118, #4337, #5464)
+
+### Bug fixes
+- Fix up arrow error when there are no options in dropdown (#5127)
+- Add `;` before beginning of factory wrapper (#5089)
+- Fix IE11 issue with select losing focus after selecting an item (#4860)
+- Clear tooltip from `select2-selection__rendered` when selection is cleared (#4640, #4746)
+- Fix keyboard not closing when closing dropdown on iOS 10 (#4680)
+- User-defined types not normalized properly when passed in as data (#4632)
+- Perform deep merge for `Defaults.set()` (#4364)
+- Fix "the results could not be loaded" displaying during AJAX request (#4356)
+- Cache objects in `Utils.__cache` instead of using `$.data` (#4346, #5486)
+- Removing the double event binding registration of `selection:update` (#4306)
+
+#### Accessibility
+- Improve `.select2-hidden-accessible` (#4908)
+- Add role and aria-readonly attributes to single selection dropdown value (#4881)
+
+### Translations
+- Add Turkmen translations (`tk`) (#5125)
+- Fix error in French translations (#5122)
+- Add Albanian translation (`sq`) (#5199)
+- Add Georgian translation (`ka`) (#5179)
+- Add Nepali translation (`ne`) (#5295)
+- Add Bangla translation (`bn`) (#5248)
+- Add `removeAllItems` translation for clear "x" title (#5291)
+- Fix wording in Vietnamese translations (#5387)
+- Fix error in Russian translation (#5401)
+
+### Miscellaneous
+-  Remove duplicate CSS selector in classic theme (#5115)
+
+## 4.0.5
+
+### Bug fixes
+- Replace `autocapitalize=off` with `autocapitalize=none` (#4994)
+
+### Translations
+- Vietnamese: remove an unnecessary quote mark (#5059)
+- Czech: Add missing commas and periods (#5052)
+- Spanish: Update the 'errorLoading' message (#5032)
+- Fix typo in Romanian (#5005)
+- Improve French translation (#4988)
+- Add Pashto translation (`ps`) (#4960)
+- Add translations for lower and upper Sorbian (`dsb` and `hsb`) (#4949)
+- Updates to Slovak (#4915)
+- Fixed Norwegian `inputTooShort` message (#4817, 4896)
+- Add Afrikaans translation (`af`) (#4850)
+- Add Bosnian translation (`bs`) (#4504)
+
 ## 4.0.4
 
 ### New features / Improvements
diff --git a/htdocs/includes/jquery/plugins/select2/Gruntfile.js b/htdocs/includes/jquery/plugins/select2/Gruntfile.js
index bf0f38d4303..23ef3d9cf50 100644
--- a/htdocs/includes/jquery/plugins/select2/Gruntfile.js
+++ b/htdocs/includes/jquery/plugins/select2/Gruntfile.js
@@ -1,3 +1,5 @@
+const sass = require('node-sass');
+
 module.exports = function (grunt) {
   // Full list of files that must be included by RequireJS
   includes = [
@@ -62,10 +64,6 @@ module.exports = function (grunt) {
   grunt.initConfig({
     package: grunt.file.readJSON('package.json'),
 
-    clean: {
-      docs: ['docs/_site']
-    },
-
     concat: {
       'dist': {
         options: {
@@ -124,81 +122,10 @@ module.exports = function (grunt) {
       }
     },
 
-    'saucelabs-qunit': {
-      all: {
-        options: {
-          build: testBuildNumber,
-          tags: ['tests', 'qunit'],
-          urls: testUrls,
-          testname: 'QUnit test for Select2',
-          browsers: [
-            {
-              browserName: 'internet explorer',
-              version: '8'
-            },
-            {
-              browserName: 'internet explorer',
-              version: '9'
-            },
-            {
-              browserName: 'internet explorer',
-              version: '10'
-            },
-            {
-              browserName: 'internet explorer',
-              version: '11'
-            },
-
-            {
-              browserName: 'firefox',
-              platform: 'linux'
-            },
-
-            {
-              browserName: 'chrome'
-            },
-
-            {
-              browserName: 'opera',
-              version: '12',
-              platform: 'linux'
-            }
-          ]
-        }
-      }
-    },
-
-    'gh-pages': {
-      options: {
-        base: 'docs',
-        branch: 'master',
-        clone: 'node_modules/grunt-gh-pages/repo',
-        message: 'Updated docs with master',
-        push: true,
-        repo: 'git@github.com:select2/select2.github.io.git'
-      },
-      src: '**'
-    },
-
-    jekyll: {
-      options: {
-        src: 'docs',
-        dest: 'docs/_site'
-      },
-      build: {
-        d: null
-      },
-      serve: {
-        options: {
-          serve: true,
-          watch: true
-        }
-      }
-    },
-
     jshint: {
       options: {
-        jshintrc: true
+        jshintrc: true,
+        reporterOutput: ''
       },
       code: {
         src: ['src/js/**/*.js']
@@ -211,6 +138,7 @@ module.exports = function (grunt) {
     sass: {
       dist: {
         options: {
+          implementation: sass,
           outputStyle: 'compressed'
         },
         files: {
@@ -222,6 +150,7 @@ module.exports = function (grunt) {
       },
       dev: {
         options: {
+          implementation: sass,
           outputStyle: 'nested'
         },
         files: {
@@ -233,19 +162,6 @@ module.exports = function (grunt) {
       }
     },
 
-    symlink: {
-      docs: {
-        cwd: 'dist',
-        expand: true,
-        overwrite: false,
-        src: [
-          '*'
-        ],
-        dest: 'docs/dist',
-        filter: 'isDirectory'
-      }
-    },
-
     requirejs: {
       'dist': {
         options: {
@@ -324,22 +240,17 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-qunit');
   grunt.loadNpmTasks('grunt-contrib-requirejs');
-  grunt.loadNpmTasks('grunt-contrib-symlink');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
 
-  grunt.loadNpmTasks('grunt-gh-pages');
-  grunt.loadNpmTasks('grunt-jekyll');
-  grunt.loadNpmTasks('grunt-saucelabs');
   grunt.loadNpmTasks('grunt-sass');
 
-  grunt.registerTask('default', ['compile', 'test', 'minify']);
+  grunt.registerTask('default', ['compile', 'test', 'lint', 'minify']);
 
   grunt.registerTask('compile', [
     'requirejs:dist', 'requirejs:dist.full', 'requirejs:i18n',
@@ -347,24 +258,6 @@ module.exports = function (grunt) {
     'sass:dev'
   ]);
   grunt.registerTask('minify', ['uglify', 'sass:dist']);
-  grunt.registerTask('test', ['connect:tests', 'qunit', 'jshint']);
-
-  var ciTasks = [];
-
-  ciTasks.push('compile');
-  ciTasks.push('connect:tests');
-
-  // Can't run Sauce Labs tests in pull requests
-  if (process.env.TRAVIS_PULL_REQUEST == 'false') {
-    ciTasks.push('saucelabs-qunit');
-  }
-
-  ciTasks.push('qunit');
-  ciTasks.push('jshint');
-
-  grunt.registerTask('ci', ciTasks);
-
-  grunt.registerTask('docs', ['symlink:docs', 'jekyll:serve']);
-
-  grunt.registerTask('docs-release', ['default', 'clean:docs', 'gh-pages']);
+  grunt.registerTask('lint', ['jshint']);
+  grunt.registerTask('test', ['connect:tests', 'qunit']);
 };
diff --git a/htdocs/includes/jquery/plugins/select2/README.md b/htdocs/includes/jquery/plugins/select2/README.md
index 6ee975d6ee0..a27484fa40c 100644
--- a/htdocs/includes/jquery/plugins/select2/README.md
+++ b/htdocs/includes/jquery/plugins/select2/README.md
@@ -1,6 +1,8 @@
 Select2
 =======
-[![Build Status][travis-ci-image]][travis-ci-status]
+![Build Status][github-actions-image]
+[![Financial Contributors on Open Collective](https://opencollective.com/select2/all/badge.svg?label=financial+contributors)](https://opencollective.com/select2) [![cdnjs](https://img.shields.io/cdnjs/v/select2.svg)][cdnjs]
+[![jsdelivr](https://data.jsdelivr.com/v1/package/npm/select2/badge)][jsdelivr]
 
 Select2 is a jQuery-based replacement for select boxes. It supports searching,
 remote data sets, and pagination of results.
@@ -31,14 +33,10 @@ Browser compatibility
 * Safari 3+
 * Opera 10.6+
 
-Select2 is automatically tested on the following browsers.
-
-[![Sauce Labs Test Status][saucelabs-matrix]][saucelabs-status]
-
 Usage
 -----
-You can source Select2 directly from a CDN like [JSDliver][jsdelivr] or
-[CDNJS][cdnjs], [download it from this GitHub repo][releases], or use one of
+You can source Select2 directly from a CDN like [jsDelivr][jsdelivr] or
+[cdnjs][cdnjs], [download it from this GitHub repo][releases], or use one of
 the integrations below.
 
 Integrations
@@ -51,14 +49,17 @@ Plugins
   - [django-autocomplete-light]
   - [django-easy-select2]
   - [django-select2]
+* [Drupal] - [drupal-select2]
 * [Meteor] - [meteor-select2]
 * [Ruby on Rails][ruby-on-rails] - [select2-rails]
 * [Wicket] - [wicketstuff-select2]
 * [Yii 2][yii2] - [yii2-widget-select2]
+* [Angularjs][angularjs] - [mdr-angular-select2]
 
 Themes
 
 - [Bootstrap 3][bootstrap3] - [select2-bootstrap-theme]
+- [Bootstrap 4][bootstrap4] - [select2-bootstrap4-theme]
 - [Flat UI][flat-ui] - [select2-flat-theme]
 - [Metro UI][metro-ui] - [select2-metro]
 
@@ -76,8 +77,8 @@ make a pull request back to Select2 here on GitHub.
 Documentation
 -------------
 The documentation for Select2 is available
-[through GitHub Pages][documentation] and is located within this repository
-in the [`docs` folder][documentation-folder].
+[online at the documentation website][documentation] and is located within the
+[`docs` directory of this repository][documentation-directory].
 
 Community
 ---------
@@ -91,28 +92,31 @@ The license is available within the repository in the [LICENSE][license] file.
 [cdnjs]: http://www.cdnjs.com/libraries/select2
 [community]: https://select2.org/getting-help
 [documentation]: https://select2.org
-[documentation-folder]: https://github.com/select2/select2/tree/master/docs
+[documentation-directory]: https://github.com/select2/select2/tree/develop/docs
 [freenode]: https://freenode.net/
-[jsdelivr]: http://www.jsdelivr.com/#!select2
+[github-actions-image]: https://github.com/select2/select2/workflows/CI/badge.svg
+[jsdelivr]: https://www.jsdelivr.com/package/npm/select2
 [license]: LICENSE.md
 [releases]: https://github.com/select2/select2/releases
-[saucelabs-matrix]: https://saucelabs.com/browser-matrix/select2.svg
-[saucelabs-status]: https://saucelabs.com/u/select2
-[travis-ci-image]: https://img.shields.io/travis/select2/select2/master.svg
-[travis-ci-status]: https://travis-ci.org/select2/select2
 
+[angularjs]: https://angularjs.org/
 [bootstrap3]: https://getbootstrap.com/
+[bootstrap4]: https://getbootstrap.com/
 [django]: https://www.djangoproject.com/
 [django-autocomplete-light]: https://github.com/yourlabs/django-autocomplete-light
 [django-easy-select2]: https://github.com/asyncee/django-easy-select2
 [django-select2]: https://github.com/applegrew/django-select2
+[drupal]: https://www.drupal.org/
+[drupal-select2]: https://www.drupal.org/project/select2
 [flat-ui]: http://designmodo.github.io/Flat-UI/
+[mdr-angular-select2]: https://github.com/modulr/mdr-angular-select2
 [meteor]: https://www.meteor.com/
 [meteor-select2]: https://github.com/nate-strauser/meteor-select2
 [metro-ui]: http://metroui.org.ua/
 [select2-metro]: http://metroui.org.ua/select2.html
 [ruby-on-rails]: http://rubyonrails.org/
 [select2-bootstrap-theme]: https://github.com/select2/select2-bootstrap-theme
+[select2-bootstrap4-theme]: https://github.com/ttskch/select2-bootstrap4-theme
 [select2-flat-theme]: https://github.com/techhysahil/select2-Flat_Theme
 [select2-rails]: https://github.com/argerim/select2-rails
 [vue.js]: http://vuejs.org/
@@ -121,3 +125,33 @@ The license is available within the repository in the [LICENSE][license] file.
 [wicketstuff-select2]: https://github.com/wicketstuff/core/tree/master/select2-parent
 [yii2]: http://www.yiiframework.com/
 [yii2-widget-select2]: https://github.com/kartik-v/yii2-widget-select2
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](.github/CONTRIBUTING.md)].
+<a href="https://github.com/select2/select2/graphs/contributors"><img src="https://opencollective.com/select2/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/select2/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/select2"><img src="https://opencollective.com/select2/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/select2/contribute)]
+
+<a href="https://opencollective.com/select2/organization/0/website"><img src="https://opencollective.com/select2/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/1/website"><img src="https://opencollective.com/select2/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/2/website"><img src="https://opencollective.com/select2/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/3/website"><img src="https://opencollective.com/select2/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/4/website"><img src="https://opencollective.com/select2/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/5/website"><img src="https://opencollective.com/select2/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/6/website"><img src="https://opencollective.com/select2/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/7/website"><img src="https://opencollective.com/select2/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/8/website"><img src="https://opencollective.com/select2/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/9/website"><img src="https://opencollective.com/select2/organization/9/avatar.svg"></a>
diff --git a/htdocs/includes/jquery/plugins/select2/component.json b/htdocs/includes/jquery/plugins/select2/component.json
index 078338b59d3..a8e74c52499 100644
--- a/htdocs/includes/jquery/plugins/select2/component.json
+++ b/htdocs/includes/jquery/plugins/select2/component.json
@@ -2,7 +2,7 @@
   "name": "select2",
   "repo": "select/select2",
   "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-  "version": "4.0.4",
+  "version": "4.0.13",
   "demo": "https://select2.org/",
   "keywords": [
     "jquery"
diff --git a/htdocs/includes/jquery/plugins/select2/composer.json b/htdocs/includes/jquery/plugins/select2/composer.json
index 141f4e14155..5ef2db2b1db 100644
--- a/htdocs/includes/jquery/plugins/select2/composer.json
+++ b/htdocs/includes/jquery/plugins/select2/composer.json
@@ -4,9 +4,6 @@
   "type": "component",
   "homepage": "https://select2.org/",
   "license": "MIT",
-  "require": {
-    "robloach/component-installer": "*"
-  },
   "extra": {
     "component": {
       "scripts": [
diff --git a/htdocs/includes/jquery/plugins/select2/dist/css/select2.css b/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
index 447b2b86cc0..c4c42ea3cc6 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
+++ b/htdocs/includes/jquery/plugins/select2/dist/css/select2.css
@@ -118,12 +118,15 @@
 .select2-hidden-accessible {
   border: 0 !important;
   clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(50%) !important;
+  clip-path: inset(50%) !important;
   height: 1px !important;
   margin: -1px !important;
   overflow: hidden !important;
   padding: 0 !important;
   position: absolute !important;
-  width: 1px !important; }
+  width: 1px !important;
+  white-space: nowrap !important; }
 
 .select2-container--default .select2-selection--single {
   background-color: #fff;
@@ -186,16 +189,13 @@
     width: 100%; }
     .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
       list-style: none; }
-  .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
-    color: #999;
-    margin-top: 5px;
-    float: left; }
   .select2-container--default .select2-selection--multiple .select2-selection__clear {
     cursor: pointer;
     float: right;
     font-weight: bold;
     margin-top: 5px;
-    margin-right: 10px; }
+    margin-right: 10px;
+    padding: 1px; }
   .select2-container--default .select2-selection--multiple .select2-selection__choice {
     background-color: #e4e4e4;
     border: 1px solid #aaa;
@@ -214,7 +214,7 @@
     .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
       color: #333; }
 
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
   float: right; }
 
 .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
@@ -420,9 +420,7 @@
       color: #555; }
 
 .select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
-  float: right; }
-
-.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  float: right;
   margin-left: 5px;
   margin-right: auto; }
 
diff --git a/htdocs/includes/jquery/plugins/select2/dist/css/select2.min.css b/htdocs/includes/jquery/plugins/select2/dist/css/select2.min.css
index 76de04d9233..7c18ad59dfc 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/css/select2.min.css
+++ b/htdocs/includes/jquery/plugins/select2/dist/css/select2.min.css
@@ -1 +1 @@
-.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;height:1px !important;margin:-1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/compat/containerCss.js b/htdocs/includes/jquery/plugins/select2/dist/js/compat/containerCss.js
deleted file mode 100644
index 45703ac8d01..00000000000
--- a/htdocs/includes/jquery/plugins/select2/dist/js/compat/containerCss.js
+++ /dev/null
@@ -1,56 +0,0 @@
-define([
-  'jquery',
-  './utils'
-], function ($, CompatUtils) {
-  // No-op CSS adapter that discards all classes by default
-  function _containerAdapter (clazz) {
-    return null;
-  }
-
-  function ContainerCSS () { }
-
-  ContainerCSS.prototype.render = function (decorated) {
-    var $container = decorated.call(this);
-
-    var containerCssClass = this.options.get('containerCssClass') || '';
-
-    if ($.isFunction(containerCssClass)) {
-      containerCssClass = containerCssClass(this.$element);
-    }
-
-    var containerCssAdapter = this.options.get('adaptContainerCssClass');
-    containerCssAdapter = containerCssAdapter || _containerAdapter;
-
-    if (containerCssClass.indexOf(':all:') !== -1) {
-      containerCssClass = containerCssClass.replace(':all:', '');
-
-      var _cssAdapter = containerCssAdapter;
-
-      containerCssAdapter = function (clazz) {
-        var adapted = _cssAdapter(clazz);
-
-        if (adapted != null) {
-          // Append the old one along with the adapted one
-          return adapted + ' ' + clazz;
-        }
-
-        return clazz;
-      };
-    }
-
-    var containerCss = this.options.get('containerCss') || {};
-
-    if ($.isFunction(containerCss)) {
-      containerCss = containerCss(this.$element);
-    }
-
-    CompatUtils.syncCssClasses($container, this.$element, containerCssAdapter);
-
-    $container.css(containerCss);
-    $container.addClass(containerCssClass);
-
-    return $container;
-  };
-
-  return ContainerCSS;
-});
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/af.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/af.js
new file mode 100644
index 00000000000..32e5ac7de89
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/af.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/af",[],function(){return{errorLoading:function(){return"Die resultate kon nie gelaai word nie."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Verwyders asseblief "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Voer asseblief "+(e.minimum-e.input.length)+" of meer karakters"},loadingMore:function(){return"Meer resultate word gelaai…"},maximumSelected:function(e){var n="Kies asseblief net "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"Geen resultate gevind"},searching:function(){return"Besig…"},removeAllItems:function(){return"Verwyder alle items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ar.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ar.js
new file mode 100644
index 00000000000..64e1caad34d
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ar.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ar",[],function(){return{errorLoading:function(){return"لا يمكن تحميل النتائج"},inputTooLong:function(n){return"الرجاء حذ� "+(n.input.length-n.maximum)+" عناصر"},inputTooShort:function(n){return"الرجاء إضا�ة "+(n.minimum-n.input.length)+" عناصر"},loadingMore:function(){return"جاري تحميل نتائج إضا�ية..."},maximumSelected:function(n){return"تستطيع إختيار "+n.maximum+" بنود �قط"},noResults:function(){return"لم يتم العثور على أي نتائج"},searching:function(){return"جاري البحث…"},removeAllItems:function(){return"قم بإزالة كل العناصر"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/az.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/az.js
new file mode 100644
index 00000000000..1d52c260f29
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/az.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/az",[],function(){return{inputTooLong:function(n){return n.input.length-n.maximum+" simvol silin"},inputTooShort:function(n){return n.minimum-n.input.length+" simvol daxil edin"},loadingMore:function(){return"Daha çox nəticə yüklənir…"},maximumSelected:function(n){return"Sadəcə "+n.maximum+" element seçə bilərsiniz"},noResults:function(){return"Nəticə tapılmadı"},searching:function(){return"Axtarılır…"},removeAllItems:function(){return"Bütün elementləri sil"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bg.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bg.js
new file mode 100644
index 00000000000..73b730a705a
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bg.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/bg",[],function(){return{inputTooLong:function(n){var e=n.input.length-n.maximum,u="Мол� въведете � "+e+" по-малко �имвол";return e>1&&(u+="a"),u},inputTooShort:function(n){var e=n.minimum-n.input.length,u="Мол� въведете още "+e+" �имвол";return e>1&&(u+="a"),u},loadingMore:function(){return"Зареждат �е още…"},maximumSelected:function(n){var e="Можете да направите до "+n.maximum+" ";return n.maximum>1?e+="избора":e+="избор",e},noResults:function(){return"��ма намерени �ъвпадени�"},searching:function(){return"Тър�ене…"},removeAllItems:function(){return"Премахнете в�ички елементи"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bn.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bn.js
new file mode 100644
index 00000000000..2d17b9d8e05
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bn.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/bn",[],function(){return{errorLoading:function(){return"ফলাফলগ�লি লোড করা যায়নি।"},inputTooLong:function(n){var e=n.input.length-n.maximum,u="অন�গ�রহ করে "+e+" টি অক�ষর ম�ছে দিন।";return 1!=e&&(u="অন�গ�রহ করে "+e+" টি অক�ষর ম�ছে দিন।"),u},inputTooShort:function(n){return n.minimum-n.input.length+" টি অক�ষর অথবা অধিক অক�ষর লিখ�ন।"},loadingMore:function(){return"আরো ফলাফল লোড হচ�ছে ..."},maximumSelected:function(n){var e=n.maximum+" টি আইটেম নির�বাচন করতে পারবেন।";return 1!=n.maximum&&(e=n.maximum+" টি আইটেম নির�বাচন করতে পারবেন।"),e},noResults:function(){return"কোন ফলাফল পাওয়া যায়নি।"},searching:function(){return"অন�সন�ধান করা হচ�ছে ..."}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bs.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bs.js
new file mode 100644
index 00000000000..46b084d7583
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/bs.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/bs",[],function(){function e(e,n,r,t){return e%10==1&&e%100!=11?n:e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?r:t}return{errorLoading:function(){return"Preuzimanje nije uspijelo."},inputTooLong:function(n){var r=n.input.length-n.maximum,t="Obrišite "+r+" simbol";return t+=e(r,"","a","a")},inputTooShort:function(n){var r=n.minimum-n.input.length,t="Ukucajte bar još "+r+" simbol";return t+=e(r,"","a","a")},loadingMore:function(){return"Preuzimanje još rezultata…"},maximumSelected:function(n){var r="Možete izabrati samo "+n.maximum+" stavk";return r+=e(n.maximum,"u","e","i")},noResults:function(){return"Ništa nije pronađeno"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Uklonite sve stavke"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ca.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ca.js
new file mode 100644
index 00000000000..82dbbb7a212
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ca.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/ca",[],function(){return{errorLoading:function(){return"La càrrega ha fallat"},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Si us plau, elimina "+n+" car";return r+=1==n?"àcter":"àcters"},inputTooShort:function(e){var n=e.minimum-e.input.length,r="Si us plau, introdueix "+n+" car";return r+=1==n?"àcter":"àcters"},loadingMore:function(){return"Carregant més resultats…"},maximumSelected:function(e){var n="Només es pot seleccionar "+e.maximum+" element";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No s'han trobat resultats"},searching:function(){return"Cercant…"},removeAllItems:function(){return"Treu tots els elements"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/cs.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/cs.js
new file mode 100644
index 00000000000..7116d6c1dfd
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/cs.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/cs",[],function(){function e(e,n){switch(e){case 2:return n?"dva":"dvě";case 3:return"tři";case 4:return"�tyři"}return""}return{errorLoading:function(){return"Výsledky nemohly být na�teny."},inputTooLong:function(n){var t=n.input.length-n.maximum;return 1==t?"Prosím, zadejte o jeden znak méně.":t<=4?"Prosím, zadejte o "+e(t,!0)+" znaky méně.":"Prosím, zadejte o "+t+" znaků méně."},inputTooShort:function(n){var t=n.minimum-n.input.length;return 1==t?"Prosím, zadejte ještě jeden znak.":t<=4?"Prosím, zadejte ještě další "+e(t,!0)+" znaky.":"Prosím, zadejte ještě dalších "+t+" znaků."},loadingMore:function(){return"Na�ítají se další výsledky…"},maximumSelected:function(n){var t=n.maximum;return 1==t?"Můžete zvolit jen jednu položku.":t<=4?"Můžete zvolit maximálně "+e(t,!1)+" položky.":"Můžete zvolit maximálně "+t+" položek."},noResults:function(){return"Nenalezeny žádné položky."},searching:function(){return"Vyhledávání…"},removeAllItems:function(){return"Odstraňte všechny položky"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/da.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/da.js
new file mode 100644
index 00000000000..cda32c34aaa
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/da.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/da",[],function(){return{errorLoading:function(){return"Resultaterne kunne ikke indlæses."},inputTooLong:function(e){return"Angiv venligst "+(e.input.length-e.maximum)+" tegn mindre"},inputTooShort:function(e){return"Angiv venligst "+(e.minimum-e.input.length)+" tegn mere"},loadingMore:function(){return"Indlæser flere resultater…"},maximumSelected:function(e){var n="Du kan kun vælge "+e.maximum+" emne";return 1!=e.maximum&&(n+="r"),n},noResults:function(){return"Ingen resultater fundet"},searching:function(){return"Søger…"},removeAllItems:function(){return"Fjern alle elementer"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/de.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/de.js
new file mode 100644
index 00000000000..c2e61e5800b
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/de.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/de",[],function(){return{errorLoading:function(){return"Die Ergebnisse konnten nicht geladen werden."},inputTooLong:function(e){return"Bitte "+(e.input.length-e.maximum)+" Zeichen weniger eingeben"},inputTooShort:function(e){return"Bitte "+(e.minimum-e.input.length)+" Zeichen mehr eingeben"},loadingMore:function(){return"Lade mehr Ergebnisse…"},maximumSelected:function(e){var n="Sie können nur "+e.maximum+" Element";return 1!=e.maximum&&(n+="e"),n+=" auswählen"},noResults:function(){return"Keine Übereinstimmungen gefunden"},searching:function(){return"Suche…"},removeAllItems:function(){return"Entferne alle Elemente"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/dsb.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/dsb.js
new file mode 100644
index 00000000000..02f283abada
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/dsb.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/dsb",[],function(){var n=["znamuško","znamušce","znamuška","znamuškow"],e=["zapisk","zapiska","zapiski","zapiskow"],u=function(n,e){return 1===n?e[0]:2===n?e[1]:n>2&&n<=4?e[2]:n>=5?e[3]:void 0};return{errorLoading:function(){return"Wuslědki njejsu se dali zacytaś."},inputTooLong:function(e){var a=e.input.length-e.maximum;return"Pšosym lašuj "+a+" "+u(a,n)},inputTooShort:function(e){var a=e.minimum-e.input.length;return"Pšosym zapódaj nanejmjenjej "+a+" "+u(a,n)},loadingMore:function(){return"Dalšne wuslědki se zacytaju…"},maximumSelected:function(n){return"Móžoš jano "+n.maximum+" "+u(n.maximum,e)+"wubraś."},noResults:function(){return"Žedne wuslědki namakane"},searching:function(){return"Pyta se…"},removeAllItems:function(){return"Remove all items"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/el.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/el.js
new file mode 100644
index 00000000000..d4922a1df5b
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/el.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/el",[],function(){return{errorLoading:function(){return"Τα αποτελέσματα δεν μπό�εσαν να φο�τώσουν."},inputTooLong:function(n){var e=n.input.length-n.maximum,u="Πα�ακαλώ διαγ�άψτε "+e+" χα�ακτή�";return 1==e&&(u+="α"),1!=e&&(u+="ες"),u},inputTooShort:function(n){return"Πα�ακαλώ συμπλη�ώστε "+(n.minimum-n.input.length)+" ή πε�ισσότε�ους χα�ακτή�ες"},loadingMore:function(){return"Φό�τωση πε�ισσότε�ων αποτελεσμάτων…"},maximumSelected:function(n){var e="Μπο�είτε να επιλέξετε μόνο "+n.maximum+" επιλογ";return 1==n.maximum&&(e+="ή"),1!=n.maximum&&(e+="ές"),e},noResults:function(){return"Δεν β�έθηκαν αποτελέσματα"},searching:function(){return"Αναζήτηση…"},removeAllItems:function(){return"Κατα�γήστε όλα τα στοιχεία"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/en.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/en.js
new file mode 100644
index 00000000000..3b192857342
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/en.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Please delete "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var n="You can only select "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/es.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/es.js
new file mode 100644
index 00000000000..68afd6d2592
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/es.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/es",[],function(){return{errorLoading:function(){return"No se pudieron cargar los resultados"},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Por favor, elimine "+n+" car";return r+=1==n?"ácter":"acteres"},inputTooShort:function(e){var n=e.minimum-e.input.length,r="Por favor, introduzca "+n+" car";return r+=1==n?"ácter":"acteres"},loadingMore:function(){return"Cargando más resultados…"},maximumSelected:function(e){var n="Sólo puede seleccionar "+e.maximum+" elemento";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No se encontraron resultados"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Eliminar todos los elementos"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/et.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/et.js
new file mode 100644
index 00000000000..070b61a26dd
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/et.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/et",[],function(){return{inputTooLong:function(e){var n=e.input.length-e.maximum,t="Sisesta "+n+" täht";return 1!=n&&(t+="e"),t+=" vähem"},inputTooShort:function(e){var n=e.minimum-e.input.length,t="Sisesta "+n+" täht";return 1!=n&&(t+="e"),t+=" rohkem"},loadingMore:function(){return"Laen tulemusi…"},maximumSelected:function(e){var n="Saad vaid "+e.maximum+" tulemus";return 1==e.maximum?n+="e":n+="t",n+=" valida"},noResults:function(){return"Tulemused puuduvad"},searching:function(){return"Otsin…"},removeAllItems:function(){return"Eemalda kõik esemed"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/eu.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/eu.js
new file mode 100644
index 00000000000..90d5e73f8a8
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/eu.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/eu",[],function(){return{inputTooLong:function(e){var t=e.input.length-e.maximum,n="Idatzi ";return n+=1==t?"karaktere bat":t+" karaktere",n+=" gutxiago"},inputTooShort:function(e){var t=e.minimum-e.input.length,n="Idatzi ";return n+=1==t?"karaktere bat":t+" karaktere",n+=" gehiago"},loadingMore:function(){return"Emaitza gehiago kargatzen…"},maximumSelected:function(e){return 1===e.maximum?"Elementu bakarra hauta dezakezu":e.maximum+" elementu hauta ditzakezu soilik"},noResults:function(){return"Ez da bat datorrenik aurkitu"},searching:function(){return"Bilatzen…"},removeAllItems:function(){return"Kendu elementu guztiak"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fa.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fa.js
new file mode 100644
index 00000000000..e1ffdbed0d8
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fa.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/fa",[],function(){return{errorLoading:function(){return"امکان بارگذاری نتایج وجود ندارد."},inputTooLong:function(n){return"لط�اً "+(n.input.length-n.maximum)+" کاراکتر را حذ� نمایید"},inputTooShort:function(n){return"لط�اً تعداد "+(n.minimum-n.input.length)+" کاراکتر یا بیشتر وارد نمایید"},loadingMore:function(){return"در حال بارگذاری نتایج بیشتر..."},maximumSelected:function(n){return"شما تنها می‌توانید "+n.maximum+" آیتم را انتخاب نمایید"},noResults:function(){return"هیچ نتیجه‌ای یا�ت نشد"},searching:function(){return"در حال جستجو..."},removeAllItems:function(){return"همه موارد را حذ� کنید"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fi.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fi.js
new file mode 100644
index 00000000000..ffed1247dd0
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fi.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/fi",[],function(){return{errorLoading:function(){return"Tuloksia ei saatu ladattua."},inputTooLong:function(n){return"Ole hyvä ja anna "+(n.input.length-n.maximum)+" merkkiä vähemmän"},inputTooShort:function(n){return"Ole hyvä ja anna "+(n.minimum-n.input.length)+" merkkiä lisää"},loadingMore:function(){return"Ladataan lisää tuloksia…"},maximumSelected:function(n){return"Voit valita ainoastaan "+n.maximum+" kpl"},noResults:function(){return"Ei tuloksia"},searching:function(){return"Haetaan…"},removeAllItems:function(){return"Poista kaikki kohteet"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fr.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fr.js
new file mode 100644
index 00000000000..dd02f973ffa
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/fr.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/fr",[],function(){return{errorLoading:function(){return"Les résultats ne peuvent pas être chargés."},inputTooLong:function(e){var n=e.input.length-e.maximum;return"Supprimez "+n+" caractère"+(n>1?"s":"")},inputTooShort:function(e){var n=e.minimum-e.input.length;return"Saisissez au moins "+n+" caractère"+(n>1?"s":"")},loadingMore:function(){return"Chargement de résultats supplémentaires…"},maximumSelected:function(e){return"Vous pouvez seulement sélectionner "+e.maximum+" élément"+(e.maximum>1?"s":"")},noResults:function(){return"Aucun résultat trouvé"},searching:function(){return"Recherche en cours…"},removeAllItems:function(){return"Supprimer tous les éléments"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/gl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/gl.js
new file mode 100644
index 00000000000..208a0057057
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/gl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/gl",[],function(){return{errorLoading:function(){return"Non foi posíbel cargar os resultados."},inputTooLong:function(e){var n=e.input.length-e.maximum;return 1===n?"Elimine un carácter":"Elimine "+n+" caracteres"},inputTooShort:function(e){var n=e.minimum-e.input.length;return 1===n?"Engada un carácter":"Engada "+n+" caracteres"},loadingMore:function(){return"Cargando máis resultados…"},maximumSelected:function(e){return 1===e.maximum?"Só pode seleccionar un elemento":"Só pode seleccionar "+e.maximum+" elementos"},noResults:function(){return"Non se atoparon resultados"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Elimina todos os elementos"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/he.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/he.js
new file mode 100644
index 00000000000..25a8805aa02
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/he.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/he",[],function(){return{errorLoading:function(){return"שגי�ה בטעינת התוצ�ות"},inputTooLong:function(n){var e=n.input.length-n.maximum,r="נ� למחוק ";return r+=1===e?"תו �חד":e+" תווי�"},inputTooShort:function(n){var e=n.minimum-n.input.length,r="נ� להכניס ";return r+=1===e?"תו �חד":e+" תווי�",r+=" �ו יותר"},loadingMore:function(){return"טוען תוצ�ות נוספות…"},maximumSelected:function(n){var e="ב�פשרותך לבחור עד ";return 1===n.maximum?e+="פריט �חד":e+=n.maximum+" פריטי�",e},noResults:function(){return"ל� נמצ�ו תוצ�ות"},searching:function(){return"מחפש…"},removeAllItems:function(){return"הסר �ת כל הפריטי�"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hi.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hi.js
new file mode 100644
index 00000000000..f3ed798434b
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hi.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hi",[],function(){return{errorLoading:function(){return"परिणामों को लोड नहीं किया जा सका।"},inputTooLong:function(n){var e=n.input.length-n.maximum,r=e+" अक�षर को हटा दें";return e>1&&(r=e+" अक�षरों को हटा दें "),r},inputTooShort:function(n){return"कृपया "+(n.minimum-n.input.length)+" या अधिक अक�षर दर�ज करें"},loadingMore:function(){return"अधिक परिणाम लोड हो रहे है..."},maximumSelected:function(n){return"आप केवल "+n.maximum+" आइटम का चयन कर सकते हैं"},noResults:function(){return"कोई परिणाम नहीं मिला"},searching:function(){return"खोज रहा है..."},removeAllItems:function(){return"सभी वस�त�ओं को हटा दें"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hr.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hr.js
new file mode 100644
index 00000000000..cb3268db161
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hr.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hr",[],function(){function n(n){var e=" "+n+" znak";return n%10<5&&n%10>0&&(n%100<5||n%100>19)?n%10>1&&(e+="a"):e+="ova",e}return{errorLoading:function(){return"Preuzimanje nije uspjelo."},inputTooLong:function(e){return"Unesite "+n(e.input.length-e.maximum)},inputTooShort:function(e){return"Unesite još "+n(e.minimum-e.input.length)},loadingMore:function(){return"U�itavanje rezultata…"},maximumSelected:function(n){return"Maksimalan broj odabranih stavki je "+n.maximum},noResults:function(){return"Nema rezultata"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Ukloni sve stavke"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hsb.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hsb.js
new file mode 100644
index 00000000000..3d5bf09dbd5
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hsb.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hsb",[],function(){var n=["znamješko","znamješce","znamješka","znamješkow"],e=["zapisk","zapiskaj","zapiski","zapiskow"],u=function(n,e){return 1===n?e[0]:2===n?e[1]:n>2&&n<=4?e[2]:n>=5?e[3]:void 0};return{errorLoading:function(){return"Wuslědki njedachu so za�itać."},inputTooLong:function(e){var a=e.input.length-e.maximum;return"Prošu zhašej "+a+" "+u(a,n)},inputTooShort:function(e){var a=e.minimum-e.input.length;return"Prošu zapodaj znajmjeńša "+a+" "+u(a,n)},loadingMore:function(){return"Dalše wuslědki so za�itaja…"},maximumSelected:function(n){return"Móžeš jenož "+n.maximum+" "+u(n.maximum,e)+"wubrać"},noResults:function(){return"Žane wuslědki namakane"},searching:function(){return"Pyta so…"},removeAllItems:function(){return"Remove all items"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hu.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hu.js
new file mode 100644
index 00000000000..4893aa2f70d
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hu.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/hu",[],function(){return{errorLoading:function(){return"Az eredmények betöltése nem sikerült."},inputTooLong:function(e){return"Túl hosszú. "+(e.input.length-e.maximum)+" karakterrel több, mint kellene."},inputTooShort:function(e){return"Túl rövid. Még "+(e.minimum-e.input.length)+" karakter hiányzik."},loadingMore:function(){return"Töltés…"},maximumSelected:function(e){return"Csak "+e.maximum+" elemet lehet kiválasztani."},noResults:function(){return"Nincs találat."},searching:function(){return"Keresés…"},removeAllItems:function(){return"Távolítson el minden elemet"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hy.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hy.js
new file mode 100644
index 00000000000..8230007141a
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/hy.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hy",[],function(){return{errorLoading:function(){return"Արդյունքները հնարավոր չէ բեռնել։"},inputTooLong:function(n){return"Խնդրում ենք հեռա�նել "+(n.input.length-n.maximum)+" նշան"},inputTooShort:function(n){return"Խնդրում ենք մուտքագրել "+(n.minimum-n.input.length)+" կամ ավել նշաններ"},loadingMore:function(){return"Բեռնվում են նոր արդյունքներ․․․"},maximumSelected:function(n){return"Դուք կարող եք ընտրել առավելագույնը "+n.maximum+" կետ"},noResults:function(){return"Արդյունքներ չեն գտնվել"},searching:function(){return"Որոնում․․․"},removeAllItems:function(){return"Հեռա�նել բոլոր տարրերը"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/id.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/id.js
new file mode 100644
index 00000000000..4a0b3bf009d
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/id.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/id",[],function(){return{errorLoading:function(){return"Data tidak boleh diambil."},inputTooLong:function(n){return"Hapuskan "+(n.input.length-n.maximum)+" huruf"},inputTooShort:function(n){return"Masukkan "+(n.minimum-n.input.length)+" huruf lagi"},loadingMore:function(){return"Mengambil data…"},maximumSelected:function(n){return"Anda hanya dapat memilih "+n.maximum+" pilihan"},noResults:function(){return"Tidak ada data yang sesuai"},searching:function(){return"Mencari…"},removeAllItems:function(){return"Hapus semua item"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/is.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/is.js
new file mode 100644
index 00000000000..cca5bbecf02
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/is.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/is",[],function(){return{inputTooLong:function(n){var t=n.input.length-n.maximum,e="Vinsamlegast styttið texta um "+t+" staf";return t<=1?e:e+"i"},inputTooShort:function(n){var t=n.minimum-n.input.length,e="Vinsamlegast skrifið "+t+" staf";return t>1&&(e+="i"),e+=" í viðbót"},loadingMore:function(){return"Sæki fleiri niðurstöður…"},maximumSelected:function(n){return"Þú getur aðeins valið "+n.maximum+" atriði"},noResults:function(){return"Ekkert fannst"},searching:function(){return"Leita…"},removeAllItems:function(){return"Fjarlægðu öll atriði"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/it.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/it.js
new file mode 100644
index 00000000000..507c7d9f293
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/it.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/it",[],function(){return{errorLoading:function(){return"I risultati non possono essere caricati."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Per favore cancella "+n+" caratter";return t+=1!==n?"i":"e"},inputTooShort:function(e){return"Per favore inserisci "+(e.minimum-e.input.length)+" o più caratteri"},loadingMore:function(){return"Caricando più risultati…"},maximumSelected:function(e){var n="Puoi selezionare solo "+e.maximum+" element";return 1!==e.maximum?n+="i":n+="o",n},noResults:function(){return"Nessun risultato trovato"},searching:function(){return"Sto cercando…"},removeAllItems:function(){return"Rimuovi tutti gli oggetti"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ja.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ja.js
new file mode 100644
index 00000000000..451025e2c7d
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ja.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ja",[],function(){return{errorLoading:function(){return"�果�読�込�れ��ん���"},inputTooLong:function(n){return n.input.length-n.maximum+" 文字を削除������"},inputTooShort:function(n){return"少���も "+(n.minimum-n.input.length)+" 文字を入力������"},loadingMore:function(){return"読�込�中…"},maximumSelected:function(n){return n.maximum+" 件���択����ん"},noResults:function(){return"対象�見��り��ん"},searching:function(){return"検索�����…"},removeAllItems:function(){return"����アイテムを削除"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ka.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ka.js
new file mode 100644
index 00000000000..60c593b705d
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ka.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ka",[],function(){return{errorLoading:function(){return"მ�ნ�ცემების ჩ�ტვირთვ� შეუძლებელი�."},inputTooLong:function(n){return"გთხ�ვთ �კრიფეთ "+(n.input.length-n.maximum)+" სიმბ�ლ�თი ნ�კლები"},inputTooShort:function(n){return"გთხ�ვთ �კრიფეთ "+(n.minimum-n.input.length)+" სიმბ�ლ� �ნ მეტი"},loadingMore:function(){return"მ�ნ�ცემების ჩ�ტვირთვ�…"},maximumSelected:function(n){return"თქვენ შეგიძლი�თ �ირჩი�თ �რ�უმეტეს "+n.maximum+" ელემენტი"},noResults:function(){return"რეზულტ�ტი �რ მ�იძებნ�"},searching:function(){return"ძიებ�…"},removeAllItems:function(){return"�მ�იღე ყველ� ელემენტი"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/km.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/km.js
new file mode 100644
index 00000000000..4dca94f414e
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/km.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/km",[],function(){return{errorLoading:function(){return"មិនអាចទាញយកទិន្នន�យ"},inputTooLong:function(n){return"សូមលុបច�ញ  "+(n.input.length-n.maximum)+" អក្សរ"},inputTooShort:function(n){return"សូមបញ្ចូល"+(n.minimum-n.input.length)+" អក្សរ រឺ ច្រើនជាងន�ះ"},loadingMore:function(){return"កំពុងទាញយកទិន្នន�យបន្�ែម..."},maximumSelected:function(n){return"អ្នកអាចជ្រើសរើសបាន�ែ "+n.maximum+" ជម្រើសប៉ុណ្ណោះ"},noResults:function(){return"មិនមានលទ្ធផល"},searching:function(){return"កំពុងស្វែងរក..."},removeAllItems:function(){return"លុបធា�ុទាំងអស់"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ko.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ko.js
new file mode 100644
index 00000000000..f2880fb0043
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ko.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(n){return"너무 �니다. "+(n.input.length-n.maximum)+" 글� 지워주세요."},inputTooShort:function(n){return"너무 짧습니다. "+(n.minimum-n.input.length)+" 글� � 입력해주세요."},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(n){return"최대 "+n.maximum+"개까지만 선� 가능합니다."},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"},removeAllItems:function(){return"모든 항목 삭제"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lt.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lt.js
new file mode 100644
index 00000000000..f6a42155ad8
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lt.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/lt",[],function(){function n(n,e,i,t){return n%10==1&&(n%100<11||n%100>19)?e:n%10>=2&&n%10<=9&&(n%100<11||n%100>19)?i:t}return{inputTooLong:function(e){var i=e.input.length-e.maximum,t="Pašalinkite "+i+" simbol";return t+=n(i,"į","ius","ių")},inputTooShort:function(e){var i=e.minimum-e.input.length,t="Įrašykite dar "+i+" simbol";return t+=n(i,"į","ius","ių")},loadingMore:function(){return"Kraunama daugiau rezultatų…"},maximumSelected:function(e){var i="Jūs galite pasirinkti tik "+e.maximum+" element";return i+=n(e.maximum,"ą","us","ų")},noResults:function(){return"Atitikmenų nerasta"},searching:function(){return"Ieškoma…"},removeAllItems:function(){return"Pašalinti visus elementus"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lv.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lv.js
new file mode 100644
index 00000000000..806dc5c4339
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/lv.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/lv",[],function(){function e(e,n,u,i){return 11===e?n:e%10==1?u:i}return{inputTooLong:function(n){var u=n.input.length-n.maximum,i="Lūdzu ievadiet par  "+u;return(i+=" simbol"+e(u,"iem","u","iem"))+" maz�k"},inputTooShort:function(n){var u=n.minimum-n.input.length,i="Lūdzu ievadiet vēl "+u;return i+=" simbol"+e(u,"us","u","us")},loadingMore:function(){return"Datu iel�de…"},maximumSelected:function(n){var u="Jūs varat izvēlēties ne vair�k k� "+n.maximum;return u+=" element"+e(n.maximum,"us","u","us")},noResults:function(){return"Sakritību nav"},searching:function(){return"Meklēšana…"},removeAllItems:function(){return"Noņemt visus vienumus"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/mk.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/mk.js
new file mode 100644
index 00000000000..cb7b84a2634
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/mk.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/mk",[],function(){return{inputTooLong:function(n){var e=(n.input.length,n.maximum,"Ве молиме вне�ете "+n.maximum+" помалку карактер");return 1!==n.maximum&&(e+="и"),e},inputTooShort:function(n){var e=(n.minimum,n.input.length,"Ве молиме вне�ете уште "+n.maximum+" карактер");return 1!==n.maximum&&(e+="и"),e},loadingMore:function(){return"Вчитување резултати…"},maximumSelected:function(n){var e="Можете да изберете �амо "+n.maximum+" �тавк";return 1===n.maximum?e+="а":e+="и",e},noResults:function(){return"�ема пронајдено �овпаѓања"},searching:function(){return"Пребарување…"},removeAllItems:function(){return"От�трани ги �ите предмети"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ms.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ms.js
new file mode 100644
index 00000000000..6bd7eaa3e02
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ms.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ms",[],function(){return{errorLoading:function(){return"Keputusan tidak berjaya dimuatkan."},inputTooLong:function(n){return"Sila hapuskan "+(n.input.length-n.maximum)+" aksara"},inputTooShort:function(n){return"Sila masukkan "+(n.minimum-n.input.length)+" atau lebih aksara"},loadingMore:function(){return"Sedang memuatkan keputusan…"},maximumSelected:function(n){return"Anda hanya boleh memilih "+n.maximum+" pilihan"},noResults:function(){return"Tiada padanan yang ditemui"},searching:function(){return"Mencari…"},removeAllItems:function(){return"Keluarkan semua item"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nb.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nb.js
new file mode 100644
index 00000000000..25d89c68704
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nb.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/nb",[],function(){return{errorLoading:function(){return"Kunne ikke hente resultater."},inputTooLong:function(e){return"Vennligst fjern "+(e.input.length-e.maximum)+" tegn"},inputTooShort:function(e){return"Vennligst skriv inn "+(e.minimum-e.input.length)+" tegn til"},loadingMore:function(){return"Laster flere resultater…"},maximumSelected:function(e){return"Du kan velge maks "+e.maximum+" elementer"},noResults:function(){return"Ingen treff"},searching:function(){return"Søker…"},removeAllItems:function(){return"Fjern alle elementer"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ne.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ne.js
new file mode 100644
index 00000000000..1c39f672103
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ne.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ne",[],function(){return{errorLoading:function(){return"नतिजाहर� देखाउन सकि�न।"},inputTooLong:function(n){var e=n.input.length-n.maximum,u="कृपया "+e+" अक�षर मेटाउन�होस�।";return 1!=e&&(u+="कृपया "+e+" अक�षरहर� मेटाउन�होस�।"),u},inputTooShort:function(n){return"कृपया बा�की रहेका "+(n.minimum-n.input.length)+" वा अर� धेरै अक�षरहर� भर�न�होस�।"},loadingMore:function(){return"अर� नतिजाहर� भरि�दैछन� …"},maximumSelected:function(n){var e="त�पाई "+n.maximum+" वस�त� मात�र छान�न पाउ�न�ह�न�छ।";return 1!=n.maximum&&(e="त�पाई "+n.maximum+" वस�त�हर� मात�र छान�न पाउ�न�ह�न�छ।"),e},noResults:function(){return"क�नै पनि नतिजा भेटि�न।"},searching:function(){return"खोजि ह��दैछ…"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nl.js
new file mode 100644
index 00000000000..2b74058d237
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/nl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/nl",[],function(){return{errorLoading:function(){return"De resultaten konden niet worden geladen."},inputTooLong:function(e){return"Gelieve "+(e.input.length-e.maximum)+" karakters te verwijderen"},inputTooShort:function(e){return"Gelieve "+(e.minimum-e.input.length)+" of meer karakters in te voeren"},loadingMore:function(){return"Meer resultaten laden…"},maximumSelected:function(e){var n=1==e.maximum?"kan":"kunnen",r="Er "+n+" maar "+e.maximum+" item";return 1!=e.maximum&&(r+="s"),r+=" worden geselecteerd"},noResults:function(){return"Geen resultaten gevonden…"},searching:function(){return"Zoeken…"},removeAllItems:function(){return"Verwijder alle items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pl.js
new file mode 100644
index 00000000000..4ca5748c386
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/pl",[],function(){var n=["znak","znaki","znaków"],e=["element","elementy","elementów"],r=function(n,e){return 1===n?e[0]:n>1&&n<=4?e[1]:n>=5?e[2]:void 0};return{errorLoading:function(){return"Nie można załadować wyników."},inputTooLong:function(e){var t=e.input.length-e.maximum;return"Usuń "+t+" "+r(t,n)},inputTooShort:function(e){var t=e.minimum-e.input.length;return"Podaj przynajmniej "+t+" "+r(t,n)},loadingMore:function(){return"Trwa ładowanie…"},maximumSelected:function(n){return"Możesz zaznaczyć tylko "+n.maximum+" "+r(n.maximum,e)},noResults:function(){return"Brak wyników"},searching:function(){return"Trwa wyszukiwanie…"},removeAllItems:function(){return"Usuń wszystkie przedmioty"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ps.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ps.js
new file mode 100644
index 00000000000..9b008e4c145
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ps.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ps",[],function(){return{errorLoading:function(){return"پايلي نه سي ترلاسه ک�دای"},inputTooLong:function(n){var e=n.input.length-n.maximum,r="د مهربان� لمخي "+e+" توری ړنګ کړئ";return 1!=e&&(r=r.replace("توری","توري")),r},inputTooShort:function(n){return"لږ تر لږه "+(n.minimum-n.input.length)+" يا ډ�ر توري وليکئ"},loadingMore:function(){return"نوري پايلي ترلاسه کيږي..."},maximumSelected:function(n){var e="تاسو يوازي "+n.maximum+" قلم په نښه کولای سی";return 1!=n.maximum&&(e=e.replace("قلم","قلمونه")),e},noResults:function(){return"پايلي و نه موندل سو�"},searching:function(){return"لټول کيږي..."},removeAllItems:function(){return"ټول توکي لر� کړئ"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt-BR.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt-BR.js
new file mode 100644
index 00000000000..c991e2550ae
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt-BR.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/pt-BR",[],function(){return{errorLoading:function(){return"Os resultados não puderam ser carregados."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Apague "+n+" caracter";return 1!=n&&(r+="es"),r},inputTooShort:function(e){return"Digite "+(e.minimum-e.input.length)+" ou mais caracteres"},loadingMore:function(){return"Carregando mais resultados…"},maximumSelected:function(e){var n="Você só pode selecionar "+e.maximum+" ite";return 1==e.maximum?n+="m":n+="ns",n},noResults:function(){return"Nenhum resultado encontrado"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Remover todos os itens"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt.js
new file mode 100644
index 00000000000..b5da1a6b496
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/pt.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/pt",[],function(){return{errorLoading:function(){return"Os resultados não puderam ser carregados."},inputTooLong:function(e){var r=e.input.length-e.maximum,n="Por favor apague "+r+" ";return n+=1!=r?"caracteres":"caractere"},inputTooShort:function(e){return"Introduza "+(e.minimum-e.input.length)+" ou mais caracteres"},loadingMore:function(){return"A carregar mais resultados…"},maximumSelected:function(e){var r="Apenas pode seleccionar "+e.maximum+" ";return r+=1!=e.maximum?"itens":"item"},noResults:function(){return"Sem resultados"},searching:function(){return"A procurar…"},removeAllItems:function(){return"Remover todos os itens"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ro.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ro.js
new file mode 100644
index 00000000000..1ba7b40bef7
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ro.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/ro",[],function(){return{errorLoading:function(){return"Rezultatele nu au putut fi incărcate."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Vă rugăm să ștergeți"+t+" caracter";return 1!==t&&(n+="e"),n},inputTooShort:function(e){return"Vă rugăm să introduceți "+(e.minimum-e.input.length)+" sau mai multe caractere"},loadingMore:function(){return"Se încarcă mai multe rezultate…"},maximumSelected:function(e){var t="Aveți voie să selectați cel mult "+e.maximum;return t+=" element",1!==e.maximum&&(t+="e"),t},noResults:function(){return"Nu au fost găsite rezultate"},searching:function(){return"Căutare…"},removeAllItems:function(){return"Eliminați toate elementele"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ru.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ru.js
new file mode 100644
index 00000000000..63a7d66c3b4
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/ru.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ru",[],function(){function n(n,e,r,u){return n%10<5&&n%10>0&&n%100<5||n%100>20?n%10>1?r:e:u}return{errorLoading:function(){return"�евозможно загрузить результаты"},inputTooLong:function(e){var r=e.input.length-e.maximum,u="Пожалуй�та, введите на "+r+" �имвол";return u+=n(r,"","a","ов"),u+=" меньше"},inputTooShort:function(e){var r=e.minimum-e.input.length,u="Пожалуй�та, введите ещё хот� бы "+r+" �имвол";return u+=n(r,"","a","ов")},loadingMore:function(){return"Загрузка данных…"},maximumSelected:function(e){var r="Вы можете выбрать не более "+e.maximum+" �лемент";return r+=n(e.maximum,"","a","ов")},noResults:function(){return"Совпадений не найдено"},searching:function(){return"Пои�к…"},removeAllItems:function(){return"Удалить в�е �лементы"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sk.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sk.js
new file mode 100644
index 00000000000..5049528ad0d
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sk.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sk",[],function(){var e={2:function(e){return e?"dva":"dve"},3:function(){return"tri"},4:function(){return"štyri"}};return{errorLoading:function(){return"Výsledky sa nepodarilo na�ítať."},inputTooLong:function(n){var t=n.input.length-n.maximum;return 1==t?"Prosím, zadajte o jeden znak menej":t>=2&&t<=4?"Prosím, zadajte o "+e[t](!0)+" znaky menej":"Prosím, zadajte o "+t+" znakov menej"},inputTooShort:function(n){var t=n.minimum-n.input.length;return 1==t?"Prosím, zadajte ešte jeden znak":t<=4?"Prosím, zadajte ešte �alšie "+e[t](!0)+" znaky":"Prosím, zadajte ešte �alších "+t+" znakov"},loadingMore:function(){return"Na�ítanie �alších výsledkov…"},maximumSelected:function(n){return 1==n.maximum?"Môžete zvoliť len jednu položku":n.maximum>=2&&n.maximum<=4?"Môžete zvoliť najviac "+e[n.maximum](!1)+" položky":"Môžete zvoliť najviac "+n.maximum+" položiek"},noResults:function(){return"Nenašli sa žiadne položky"},searching:function(){return"Vyhľadávanie…"},removeAllItems:function(){return"Odstráňte všetky položky"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sl.js
new file mode 100644
index 00000000000..4d0b7d3e345
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sl",[],function(){return{errorLoading:function(){return"Zadetkov iskanja ni bilo mogo�e naložiti."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Prosim zbrišite "+n+" znak";return 2==n?t+="a":1!=n&&(t+="e"),t},inputTooShort:function(e){var n=e.minimum-e.input.length,t="Prosim vpišite še "+n+" znak";return 2==n?t+="a":1!=n&&(t+="e"),t},loadingMore:function(){return"Nalagam ve� zadetkov…"},maximumSelected:function(e){var n="Ozna�ite lahko najve� "+e.maximum+" predmet";return 2==e.maximum?n+="a":1!=e.maximum&&(n+="e"),n},noResults:function(){return"Ni zadetkov."},searching:function(){return"Iš�em…"},removeAllItems:function(){return"Odstranite vse elemente"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sq.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sq.js
new file mode 100644
index 00000000000..59162024ed3
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sq.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sq",[],function(){return{errorLoading:function(){return"Rezultatet nuk mund të ngarkoheshin."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Të lutem fshi "+n+" karakter";return 1!=n&&(t+="e"),t},inputTooShort:function(e){return"Të lutem shkruaj "+(e.minimum-e.input.length)+" ose më shumë karaktere"},loadingMore:function(){return"Duke ngarkuar më shumë rezultate…"},maximumSelected:function(e){var n="Mund të zgjedhësh vetëm "+e.maximum+" element";return 1!=e.maximum&&(n+="e"),n},noResults:function(){return"Nuk u gjet asnjë rezultat"},searching:function(){return"Duke kërkuar…"},removeAllItems:function(){return"Hiq të gjitha sendet"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr-Cyrl.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr-Cyrl.js
new file mode 100644
index 00000000000..ce13ce8f9a1
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr-Cyrl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sr-Cyrl",[],function(){function n(n,e,r,u){return n%10==1&&n%100!=11?e:n%10>=2&&n%10<=4&&(n%100<12||n%100>14)?r:u}return{errorLoading:function(){return"Преузимање није у�пело."},inputTooLong:function(e){var r=e.input.length-e.maximum,u="Обришите "+r+" �имбол";return u+=n(r,"","а","а")},inputTooShort:function(e){var r=e.minimum-e.input.length,u="Укуцајте бар још "+r+" �имбол";return u+=n(r,"","а","а")},loadingMore:function(){return"Преузимање још резултата…"},maximumSelected:function(e){var r="Можете изабрати �амо "+e.maximum+" �тавк";return r+=n(e.maximum,"у","е","и")},noResults:function(){return"�ишта није пронађено"},searching:function(){return"Претрага…"},removeAllItems:function(){return"Уклоните �ве �тавке"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr.js
new file mode 100644
index 00000000000..dd407a06dc4
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sr.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sr",[],function(){function n(n,e,r,t){return n%10==1&&n%100!=11?e:n%10>=2&&n%10<=4&&(n%100<12||n%100>14)?r:t}return{errorLoading:function(){return"Preuzimanje nije uspelo."},inputTooLong:function(e){var r=e.input.length-e.maximum,t="Obrišite "+r+" simbol";return t+=n(r,"","a","a")},inputTooShort:function(e){var r=e.minimum-e.input.length,t="Ukucajte bar još "+r+" simbol";return t+=n(r,"","a","a")},loadingMore:function(){return"Preuzimanje još rezultata…"},maximumSelected:function(e){var r="Možete izabrati samo "+e.maximum+" stavk";return r+=n(e.maximum,"u","e","i")},noResults:function(){return"Ništa nije pronađeno"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Уклоните �ве �тавке"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sv.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sv.js
new file mode 100644
index 00000000000..1bc8724a79a
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/sv.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sv",[],function(){return{errorLoading:function(){return"Resultat kunde inte laddas."},inputTooLong:function(n){return"Vänligen sudda ut "+(n.input.length-n.maximum)+" tecken"},inputTooShort:function(n){return"Vänligen skriv in "+(n.minimum-n.input.length)+" eller fler tecken"},loadingMore:function(){return"Laddar fler resultat…"},maximumSelected:function(n){return"Du kan max välja "+n.maximum+" element"},noResults:function(){return"Inga träffar"},searching:function(){return"Söker…"},removeAllItems:function(){return"Ta bort alla objekt"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/th.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/th.js
new file mode 100644
index 00000000000..63eab7114b0
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/th.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/th",[],function(){return{errorLoading:function(){return"ไม่สามารถค้นข้อมูลได้"},inputTooLong:function(n){return"โปรดลบออ� "+(n.input.length-n.maximum)+" ตัวอั�ษร"},inputTooShort:function(n){return"โปรดพิมพ์เพิ่มอี� "+(n.minimum-n.input.length)+" ตัวอั�ษร"},loadingMore:function(){return"�ำลังค้นข้อมูลเพิ่ม…"},maximumSelected:function(n){return"คุณสามารถเลือ�ได้ไม่เ�ิน "+n.maximum+" ราย�าร"},noResults:function(){return"ไม่พบข้อมูล"},searching:function(){return"�ำลังค้นข้อมูล…"},removeAllItems:function(){return"ลบราย�ารทั้งหมด"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tk.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tk.js
new file mode 100644
index 00000000000..30255ff3777
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tk.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/tk",[],function(){return{errorLoading:function(){return"Netije ýüklenmedi."},inputTooLong:function(e){return e.input.length-e.maximum+" harp bozuň."},inputTooShort:function(e){return"�ene-de iň az "+(e.minimum-e.input.length)+" harp ýazyň."},loadingMore:function(){return"Köpräk netije görkezilýär…"},maximumSelected:function(e){return"Diňe "+e.maximum+" sanysyny saýlaň."},noResults:function(){return"Netije tapylmady."},searching:function(){return"Gözlenýär…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tr.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tr.js
new file mode 100644
index 00000000000..fc4c0bf0512
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/tr.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/tr",[],function(){return{errorLoading:function(){return"Sonuç yüklenemedi"},inputTooLong:function(n){return n.input.length-n.maximum+" karakter daha girmelisiniz"},inputTooShort:function(n){return"En az "+(n.minimum-n.input.length)+" karakter daha girmelisiniz"},loadingMore:function(){return"Daha fazla…"},maximumSelected:function(n){return"Sadece "+n.maximum+" seçim yapabilirsiniz"},noResults:function(){return"Sonuç bulunamadı"},searching:function(){return"Aranıyor…"},removeAllItems:function(){return"Tüm öğeleri kaldır"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/uk.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/uk.js
new file mode 100644
index 00000000000..63697e38849
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/uk.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/uk",[],function(){function n(n,e,u,r){return n%100>10&&n%100<15?r:n%10==1?e:n%10>1&&n%10<5?u:r}return{errorLoading:function(){return"�еможливо завантажити результати"},inputTooLong:function(e){return"Будь ла�ка, видаліть "+(e.input.length-e.maximum)+" "+n(e.maximum,"літеру","літери","літер")},inputTooShort:function(n){return"Будь ла�ка, введіть "+(n.minimum-n.input.length)+" або більше літер"},loadingMore:function(){return"Завантаженн� інших результатів…"},maximumSelected:function(e){return"Ви можете вибрати лише "+e.maximum+" "+n(e.maximum,"пункт","пункти","пунктів")},noResults:function(){return"�ічого не знайдено"},searching:function(){return"Пошук…"},removeAllItems:function(){return"Видалити в�і елементи"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/vi.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/vi.js
new file mode 100644
index 00000000000..24f3bc2d61a
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/vi.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/vi",[],function(){return{inputTooLong:function(n){return"Vui lòng xóa bớt "+(n.input.length-n.maximum)+" ký tự"},inputTooShort:function(n){return"Vui lòng nhập thêm từ "+(n.minimum-n.input.length)+" ký tự trở lên"},loadingMore:function(){return"�ang lấy thêm kết quả…"},maximumSelected:function(n){return"Chỉ có thể ch�n được "+n.maximum+" lựa ch�n"},noResults:function(){return"Không tìm thấy kết quả"},searching:function(){return"�ang tìm…"},removeAllItems:function(){return"Xóa tất cả các mục"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-CN.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-CN.js
new file mode 100644
index 00000000000..2c5649d3108
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-CN.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/zh-CN",[],function(){return{errorLoading:function(){return"无法载入结果。"},inputTooLong:function(n){return"请删除"+(n.input.length-n.maximum)+"个字符"},inputTooShort:function(n){return"请�输入至少"+(n.minimum-n.input.length)+"个字符"},loadingMore:function(){return"载入更多结果…"},maximumSelected:function(n){return"最多�能选择"+n.maximum+"个项目"},noResults:function(){return"未找到结果"},searching:function(){return"�索中…"},removeAllItems:function(){return"删除所有项目"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-TW.js b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-TW.js
new file mode 100644
index 00000000000..570a5669374
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/i18n/zh-TW.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/zh-TW",[],function(){return{inputTooLong:function(n){return"請刪掉"+(n.input.length-n.maximum)+"個字元"},inputTooShort:function(n){return"請�輸入"+(n.minimum-n.input.length)+"個字元"},loadingMore:function(){return"載入中…"},maximumSelected:function(n){return"你�能�擇最多"+n.maximum+"項"},noResults:function(){return"沒有找到相符的項目"},searching:function(){return"�尋中…"},removeAllItems:function(){return"刪除所有項目"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js b/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js
index 608642bf64e..358572a6576 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.js
@@ -1,11 +1,11 @@
 /*!
- * Select2 4.0.5
+ * Select2 4.0.13
  * https://select2.github.io
  *
  * Released under the MIT license
  * https://github.com/select2/select2/blob/master/LICENSE.md
  */
-(function (factory) {
+;(function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
@@ -574,10 +574,10 @@ S2.define('select2/utils',[
     DecoratedClass.prototype = new ctr();
 
     for (var m = 0; m < superMethods.length; m++) {
-        var superMethod = superMethods[m];
+      var superMethod = superMethods[m];
 
-        DecoratedClass.prototype[superMethod] =
-          SuperClass.prototype[superMethod];
+      DecoratedClass.prototype[superMethod] =
+        SuperClass.prototype[superMethod];
     }
 
     var calledMethod = function (methodName) {
@@ -772,6 +772,70 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Cache objects in Utils.__cache instead of $.data (see #4346)
+  Utils.__cache = {};
+
+  var id = 0;
+  Utils.GetUniqueElementId = function (element) {
+    // Get a unique element Id. If element has no id,
+    // creates a new unique number, stores it in the id
+    // attribute and returns the new id.
+    // If an id already exists, it simply returns it.
+
+    var select2Id = element.getAttribute('data-select2-id');
+    if (select2Id == null) {
+      // If element has id, use it.
+      if (element.id) {
+        select2Id = element.id;
+        element.setAttribute('data-select2-id', select2Id);
+      } else {
+        element.setAttribute('data-select2-id', ++id);
+        select2Id = id.toString();
+      }
+    }
+    return select2Id;
+  };
+
+  Utils.StoreData = function (element, name, value) {
+    // Stores an item in the cache for a specified element.
+    // name is the cache key.
+    var id = Utils.GetUniqueElementId(element);
+    if (!Utils.__cache[id]) {
+      Utils.__cache[id] = {};
+    }
+
+    Utils.__cache[id][name] = value;
+  };
+
+  Utils.GetData = function (element, name) {
+    // Retrieves a value from the cache by its key (name)
+    // name is optional. If no name specified, return
+    // all cache items for the specified element.
+    // and for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (name) {
+      if (Utils.__cache[id]) {
+        if (Utils.__cache[id][name] != null) {
+          return Utils.__cache[id][name];
+        }
+        return $(element).data(name); // Fallback to HTML5 data attribs.
+      }
+      return $(element).data(name); // Fallback to HTML5 data attribs.
+    } else {
+      return Utils.__cache[id];
+    }
+  };
+
+  Utils.RemoveData = function (element) {
+    // Removes all cached items for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (Utils.__cache[id] != null) {
+      delete Utils.__cache[id];
+    }
+
+    element.removeAttribute('data-select2-id');
+  };
+
   return Utils;
 });
 
@@ -791,7 +855,7 @@ S2.define('select2/results',[
 
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="tree"></ul>'
+      '<ul class="select2-results__options" role="listbox"></ul>'
     );
 
     if (this.options.get('multiple')) {
@@ -814,7 +878,7 @@ S2.define('select2/results',[
     this.hideLoading();
 
     var $message = $(
-      '<li role="treeitem" aria-live="assertive"' +
+      '<li role="alert" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
 
@@ -907,7 +971,7 @@ S2.define('select2/results',[
       $options.each(function () {
         var $option = $(this);
 
-        var item = $.data(this, 'data');
+        var item = Utils.GetData(this, 'data');
 
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
@@ -948,11 +1012,16 @@ S2.define('select2/results',[
     option.className = 'select2-results__option';
 
     var attrs = {
-      'role': 'treeitem',
+      'role': 'option',
       'aria-selected': 'false'
     };
 
-    if (data.disabled) {
+    var matches = window.Element.prototype.matches ||
+      window.Element.prototype.msMatchesSelector ||
+      window.Element.prototype.webkitMatchesSelector;
+
+    if ((data.element != null && matches.call(data.element, ':disabled')) ||
+        (data.element == null && data.disabled)) {
       delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
     }
@@ -1012,7 +1081,7 @@ S2.define('select2/results',[
       this.template(data, option);
     }
 
-    $.data(option, 'data', data);
+    Utils.StoreData(option, 'data', data);
 
     return option;
   };
@@ -1053,7 +1122,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('unselect', function () {
@@ -1062,7 +1134,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('open', function () {
@@ -1098,7 +1173,7 @@ S2.define('select2/results',[
         return;
       }
 
-      var data = $highlighted.data('data');
+      var data = Utils.GetData($highlighted[0], 'data');
 
       if ($highlighted.attr('aria-selected') == 'true') {
         self.trigger('close', {});
@@ -1116,8 +1191,9 @@ S2.define('select2/results',[
 
       var currentIndex = $options.index($highlighted);
 
-      // If we are already at te top, don't move further
-      if (currentIndex === 0) {
+      // If we are already at the top, don't move further
+      // If no options, currentIndex will be -1
+      if (currentIndex <= 0) {
         return;
       }
 
@@ -1210,7 +1286,7 @@ S2.define('select2/results',[
       function (evt) {
       var $this = $(this);
 
-      var data = $this.data('data');
+      var data = Utils.GetData(this, 'data');
 
       if ($this.attr('aria-selected') === 'true') {
         if (self.options.get('multiple')) {
@@ -1233,7 +1309,7 @@ S2.define('select2/results',[
 
     this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
       function (evt) {
-      var data = $(this).data('data');
+      var data = Utils.GetData(this, 'data');
 
       self.getHighlightedResults()
           .removeClass('select2-results__option--highlighted');
@@ -1348,14 +1424,15 @@ S2.define('select2/selection/base',[
 
     this._tabindex = 0;
 
-    if (this.$element.data('old-tabindex') != null) {
-      this._tabindex = this.$element.data('old-tabindex');
+    if (Utils.GetData(this.$element[0], 'old-tabindex') != null) {
+      this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex');
     } else if (this.$element.attr('tabindex') != null) {
       this._tabindex = this.$element.attr('tabindex');
     }
 
     $selection.attr('title', this.$element.attr('title'));
     $selection.attr('tabindex', this._tabindex);
+    $selection.attr('aria-disabled', 'false');
 
     this.$selection = $selection;
 
@@ -1365,7 +1442,6 @@ S2.define('select2/selection/base',[
   BaseSelection.prototype.bind = function (container, $container) {
     var self = this;
 
-    var id = container.id + '-container';
     var resultsId = container.id + '-results';
 
     this.container = container;
@@ -1408,17 +1484,19 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      self.$selection.trigger('focus');
 
       self._detachCloseHandler(container);
     });
 
     container.on('enable', function () {
       self.$selection.attr('tabindex', self._tabindex);
+      self.$selection.attr('aria-disabled', 'false');
     });
 
     container.on('disable', function () {
       self.$selection.attr('tabindex', '-1');
+      self.$selection.attr('aria-disabled', 'true');
     });
   };
 
@@ -1441,7 +1519,6 @@ S2.define('select2/selection/base',[
   };
 
   BaseSelection.prototype._attachCloseHandler = function (container) {
-    var self = this;
 
     $(document.body).on('mousedown.select2.' + container.id, function (e) {
       var $target = $(e.target);
@@ -1451,13 +1528,11 @@ S2.define('select2/selection/base',[
       var $all = $('.select2.select2-container--open');
 
       $all.each(function () {
-        var $this = $(this);
-
         if (this == $select[0]) {
           return;
         }
 
-        var $element = $this.data('element');
+        var $element = Utils.GetData(this, 'element');
 
         $element.select2('close');
       });
@@ -1481,6 +1556,27 @@ S2.define('select2/selection/base',[
     throw new Error('The `update` method must be defined in child classes.');
   };
 
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  BaseSelection.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  BaseSelection.prototype.isDisabled = function () {
+    return this.options.get('disabled');
+  };
+
   return BaseSelection;
 });
 
@@ -1518,7 +1614,10 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered').attr('id', id);
+    this.$selection.find('.select2-selection__rendered')
+      .attr('id', id)
+      .attr('role', 'textbox')
+      .attr('aria-readonly', 'true');
     this.$selection.attr('aria-labelledby', id);
 
     this.$selection.on('mousedown', function (evt) {
@@ -1542,17 +1641,15 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger('focus');
       }
     });
-
-    container.on('selection:update', function (params) {
-      self.update(params.data);
-    });
   };
 
   SingleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title'); // clear tooltip on empty
   };
 
   SingleSelection.prototype.display = function (data, container) {
@@ -1578,7 +1675,14 @@ S2.define('select2/selection/single',[
     var formatted = this.display(selection, $rendered);
 
     $rendered.empty().append(formatted);
-    $rendered.prop('title', selection.title || selection.text);
+
+    var title = selection.title || selection.text;
+
+    if (title) {
+      $rendered.attr('title', title);
+    } else {
+      $rendered.removeAttr('title');
+    }
   };
 
   return SingleSelection;
@@ -1623,14 +1727,14 @@ S2.define('select2/selection/multiple',[
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.options.get('disabled')) {
+        if (self.isDisabled()) {
           return;
         }
 
         var $remove = $(this);
         var $selection = $remove.parent();
 
-        var data = $selection.data('data');
+        var data = Utils.GetData($selection[0], 'data');
 
         self.trigger('unselect', {
           originalEvent: evt,
@@ -1641,7 +1745,9 @@ S2.define('select2/selection/multiple',[
   };
 
   MultipleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title');
   };
 
   MultipleSelection.prototype.display = function (data, container) {
@@ -1679,9 +1785,14 @@ S2.define('select2/selection/multiple',[
       var formatted = this.display(selection, $selection);
 
       $selection.append(formatted);
-      $selection.prop('title', selection.title || selection.text);
 
-      $selection.data('data', selection);
+      var title = selection.title || selection.text;
+
+      if (title) {
+        $selection.attr('title', title);
+      }
+
+      Utils.StoreData($selection[0], 'data', selection);
 
       $selections.push($selection);
     }
@@ -1746,8 +1857,9 @@ S2.define('select2/selection/placeholder',[
 
 S2.define('select2/selection/allowClear',[
   'jquery',
-  '../keys'
-], function ($, KEYS) {
+  '../keys',
+  '../utils'
+], function ($, KEYS, Utils) {
   function AllowClear () { }
 
   AllowClear.prototype.bind = function (decorated, container, $container) {
@@ -1776,7 +1888,7 @@ S2.define('select2/selection/allowClear',[
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -1789,10 +1901,22 @@ S2.define('select2/selection/allowClear',[
 
     evt.stopPropagation();
 
-    var data = $clear.data('data');
+    var data = Utils.GetData($clear[0], 'data');
+
+    var previousVal = this.$element.val();
+    this.$element.val(this.placeholder.id);
+
+    var unselectData = {
+      data: data
+    };
+    this.trigger('clear', unselectData);
+    if (unselectData.prevented) {
+      this.$element.val(previousVal);
+      return;
+    }
 
     for (var d = 0; d < data.length; d++) {
-      var unselectData = {
+      unselectData = {
         data: data[d]
       };
 
@@ -1802,11 +1926,12 @@ S2.define('select2/selection/allowClear',[
 
       // If the event was prevented, don't clear it out.
       if (unselectData.prevented) {
+        this.$element.val(previousVal);
         return;
       }
     }
 
-    this.$element.val(this.placeholder.id).trigger('change');
+    this.$element.trigger('input').trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -1829,12 +1954,14 @@ S2.define('select2/selection/allowClear',[
       return;
     }
 
+    var removeAll = this.options.get('translations').get('removeAllItems');
+
     var $remove = $(
-      '<span class="select2-selection__clear">' +
+      '<span class="select2-selection__clear" title="' + removeAll() +'">' +
         '&times;' +
       '</span>'
     );
-    $remove.data('data', data);
+    Utils.StoreData($remove[0], 'data', data);
 
     this.$selection.find('.select2-selection__rendered').prepend($remove);
   };
@@ -1856,7 +1983,7 @@ S2.define('select2/selection/search',[
       '<li class="select2-search select2-search--inline">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</li>'
     );
 
@@ -1873,14 +2000,18 @@ S2.define('select2/selection/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     container.on('open', function () {
+      self.$search.attr('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
+      self.$search.removeAttr('aria-controls');
       self.$search.removeAttr('aria-activedescendant');
       self.$search.trigger('focus');
     });
@@ -1900,7 +2031,11 @@ S2.define('select2/selection/search',[
     });
 
     container.on('results:focus', function (params) {
-      self.$search.attr('aria-activedescendant', params.id);
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
     });
 
     this.$selection.on('focusin', '.select2-search--inline', function (evt) {
@@ -1925,7 +2060,7 @@ S2.define('select2/selection/search',[
           .prev('.select2-selection__choice');
 
         if ($previousChoice.length > 0) {
-          var item = $previousChoice.data('data');
+          var item = Utils.GetData($previousChoice[0], 'data');
 
           self.searchRemoveChoice(item);
 
@@ -1934,6 +2069,12 @@ S2.define('select2/selection/search',[
       }
     });
 
+    this.$selection.on('click', '.select2-search--inline', function (evt) {
+      if (self.$search.val()) {
+        evt.stopPropagation();
+      }
+    });
+
     // Try to detect the IE version should the `documentMode` property that
     // is stored on the document. This is only implemented in IE and is
     // slightly cleaner than doing a user agent check.
@@ -2019,7 +2160,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger('focus');
     }
   };
 
@@ -2052,7 +2193,7 @@ S2.define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.find('.select2-selection__rendered').innerWidth();
+      width = this.$selection.find('.select2-selection__rendered').width();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 
@@ -2076,10 +2217,13 @@ S2.define('select2/selection/eventRelay',[
       'open', 'opening',
       'close', 'closing',
       'select', 'selecting',
-      'unselect', 'unselecting'
+      'unselect', 'unselecting',
+      'clear', 'clearing'
     ];
 
-    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
+    var preventableEvents = [
+      'opening', 'closing', 'selecting', 'unselecting', 'clearing'
+    ];
 
     decorated.call(this, container, $container);
 
@@ -2412,6 +2556,7 @@ S2.define('select2/diacritics',[
     '\u019F': 'O',
     '\uA74A': 'O',
     '\uA74C': 'O',
+    '\u0152': 'OE',
     '\u01A2': 'OI',
     '\uA74E': 'OO',
     '\u0222': 'OU',
@@ -2821,6 +2966,7 @@ S2.define('select2/diacritics',[
     '\uA74B': 'o',
     '\uA74D': 'o',
     '\u0275': 'o',
+    '\u0153': 'oe',
     '\u01A3': 'oi',
     '\u0223': 'ou',
     '\uA74F': 'oo',
@@ -2989,8 +3135,9 @@ S2.define('select2/diacritics',[
     '\u03CD': '\u03C5',
     '\u03CB': '\u03C5',
     '\u03B0': '\u03C5',
-    '\u03C9': '\u03C9',
-    '\u03C2': '\u03C3'
+    '\u03CE': '\u03C9',
+    '\u03C2': '\u03C3',
+    '\u2019': '\''
   };
 
   return diacritics;
@@ -3075,7 +3222,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3096,13 +3243,13 @@ S2.define('select2/data/select',[
         }
 
         self.$element.val(val);
-        self.$element.trigger('change');
+        self.$element.trigger('input').trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -3118,7 +3265,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3136,7 +3283,7 @@ S2.define('select2/data/select',[
 
       self.$element.val(val);
 
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
@@ -3158,7 +3305,7 @@ S2.define('select2/data/select',[
     // Remove anything added to child elements
     this.$element.find('*').each(function () {
       // Remove any custom data set by Select2
-      $.removeData(this, 'data');
+      Utils.RemoveData(this);
     });
   };
 
@@ -3231,7 +3378,7 @@ S2.define('select2/data/select',[
     normalizedData.element = option;
 
     // Override the option's data with the combined data
-    $.data(option, 'data', normalizedData);
+    Utils.StoreData(option, 'data', normalizedData);
 
     return $option;
   };
@@ -3239,7 +3386,7 @@ S2.define('select2/data/select',[
   SelectAdapter.prototype.item = function ($option) {
     var data = {};
 
-    data = $.data($option[0], 'data');
+    data = Utils.GetData($option[0], 'data');
 
     if (data != null) {
       return data;
@@ -3277,13 +3424,13 @@ S2.define('select2/data/select',[
     data = this._normalizeItem(data);
     data.element = $option[0];
 
-    $.data($option[0], 'data', data);
+    Utils.StoreData($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (!$.isPlainObject(item)) {
+    if (item !== Object(item)) {
       item = {
         id: item,
         text: item
@@ -3329,15 +3476,19 @@ S2.define('select2/data/array',[
   'jquery'
 ], function (SelectAdapter, Utils, $) {
   function ArrayAdapter ($element, options) {
-    var data = options.get('data') || [];
+    this._dataToConvert = options.get('data') || [];
 
     ArrayAdapter.__super__.constructor.call(this, $element, options);
-
-    this.addOptions(this.convertToOptions(data));
   }
 
   Utils.Extend(ArrayAdapter, SelectAdapter);
 
+  ArrayAdapter.prototype.bind = function (container, $container) {
+    ArrayAdapter.__super__.bind.call(this, container, $container);
+
+    this.addOptions(this.convertToOptions(this._dataToConvert));
+  };
+
   ArrayAdapter.prototype.select = function (data) {
     var $option = this.$element.find('option').filter(function (i, elm) {
       return elm.value == data.id.toString();
@@ -3487,7 +3638,8 @@ S2.define('select2/data/ajax',[
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
-        if ($request.status && $request.status === '0') {
+        if ('status' in $request &&
+            ($request.status === 0 || $request.status === '0')) {
           return;
         }
 
@@ -3626,8 +3778,6 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype._removeOldTags = function (_) {
-    var tag = this._lastTag;
-
     var $options = this.$element.find('option[data-select2-tag]');
 
     $options.each(function () {
@@ -3702,7 +3852,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger('focus');
       }
 
       params.term = tokenData.term;
@@ -3831,10 +3981,30 @@ S2.define('select2/data/maximumSelectionLength',[
     decorated.call(this, $e, options);
   }
 
+  MaximumSelectionLength.prototype.bind =
+    function (decorated, container, $container) {
+      var self = this;
+
+      decorated.call(this, container, $container);
+
+      container.on('select', function () {
+        self._checkIfMaximumSelected();
+      });
+  };
+
   MaximumSelectionLength.prototype.query =
     function (decorated, params, callback) {
       var self = this;
 
+      this._checkIfMaximumSelected(function () {
+        decorated.call(self, params, callback);
+      });
+  };
+
+  MaximumSelectionLength.prototype._checkIfMaximumSelected =
+    function (_, successCallback) {
+      var self = this;
+
       this.current(function (currentData) {
         var count = currentData != null ? currentData.length : 0;
         if (self.maximumSelectionLength > 0 &&
@@ -3847,7 +4017,10 @@ S2.define('select2/data/maximumSelectionLength',[
           });
           return;
         }
-        decorated.call(self, params, callback);
+
+        if (successCallback) {
+          successCallback();
+        }
       });
   };
 
@@ -3886,7 +4059,7 @@ S2.define('select2/dropdown',[
   };
 
   Dropdown.prototype.position = function ($dropdown, $container) {
-    // Should be implmented in subclasses
+    // Should be implemented in subclasses
   };
 
   Dropdown.prototype.destroy = function () {
@@ -3910,7 +4083,7 @@ S2.define('select2/dropdown/search',[
       '<span class="select2-search select2-search--dropdown">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</span>'
     );
 
@@ -3925,6 +4098,8 @@ S2.define('select2/dropdown/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     this.$search.on('keydown', function (evt) {
@@ -3947,23 +4122,27 @@ S2.define('select2/dropdown/search',[
 
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
+      self.$search.attr('aria-controls', resultsId);
 
-      self.$search.focus();
+      self.$search.trigger('focus');
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }, 0);
     });
 
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
+      self.$search.removeAttr('aria-controls');
+      self.$search.removeAttr('aria-activedescendant');
 
       self.$search.val('');
+      self.$search.trigger('blur');
     });
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }
     });
 
@@ -3978,6 +4157,14 @@ S2.define('select2/dropdown/search',[
         }
       }
     });
+
+    container.on('results:focus', function (params) {
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
+    });
   };
 
   Search.prototype.handleSearch = function (evt) {
@@ -4062,6 +4249,7 @@ S2.define('select2/dropdown/infiniteScroll',[
 
     if (this.showLoadingMore(data)) {
       this.$results.append(this.$loadingMore);
+      this.loadMoreIfNeeded();
     }
   };
 
@@ -4080,25 +4268,27 @@ S2.define('select2/dropdown/infiniteScroll',[
       self.loading = true;
     });
 
-    this.$results.on('scroll', function () {
-      var isLoadMoreVisible = $.contains(
-        document.documentElement,
-        self.$loadingMore[0]
-      );
+    this.$results.on('scroll', this.loadMoreIfNeeded.bind(this));
+  };
 
-      if (self.loading || !isLoadMoreVisible) {
-        return;
-      }
+  InfiniteScroll.prototype.loadMoreIfNeeded = function () {
+    var isLoadMoreVisible = $.contains(
+      document.documentElement,
+      this.$loadingMore[0]
+    );
 
-      var currentOffset = self.$results.offset().top +
-        self.$results.outerHeight(false);
-      var loadingMoreOffset = self.$loadingMore.offset().top +
-        self.$loadingMore.outerHeight(false);
+    if (this.loading || !isLoadMoreVisible) {
+      return;
+    }
 
-      if (currentOffset + 50 >= loadingMoreOffset) {
-        self.loadMore();
-      }
-    });
+    var currentOffset = this.$results.offset().top +
+      this.$results.outerHeight(false);
+    var loadingMoreOffset = this.$loadingMore.offset().top +
+      this.$loadingMore.outerHeight(false);
+
+    if (currentOffset + 50 >= loadingMoreOffset) {
+      this.loadMore();
+    }
   };
 
   InfiniteScroll.prototype.loadMore = function () {
@@ -4119,7 +4309,7 @@ S2.define('select2/dropdown/infiniteScroll',[
     var $option = $(
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="treeitem" aria-disabled="true"></li>'
+      'role="option" aria-disabled="true"></li>'
     );
 
     var message = this.options.get('translations').get('loadingMore');
@@ -4137,7 +4327,7 @@ S2.define('select2/dropdown/attachBody',[
   '../utils'
 ], function ($, Utils) {
   function AttachBody (decorated, $element, options) {
-    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
+    this.$dropdownParent = $(options.get('dropdownParent') || document.body);
 
     decorated.call(this, $element, options);
   }
@@ -4145,27 +4335,14 @@ S2.define('select2/dropdown/attachBody',[
   AttachBody.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
-    var setupResultsEvents = false;
-
     decorated.call(this, container, $container);
 
     container.on('open', function () {
       self._showDropdown();
       self._attachPositioningHandler(container);
 
-      if (!setupResultsEvents) {
-        setupResultsEvents = true;
-
-        container.on('results:all', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-
-        container.on('results:append', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-      }
+      // Must bind after the results handlers to ensure correct sizing
+      self._bindContainerResultHandlers(container);
     });
 
     container.on('close', function () {
@@ -4214,6 +4391,44 @@ S2.define('select2/dropdown/attachBody',[
     this.$dropdownContainer.detach();
   };
 
+  AttachBody.prototype._bindContainerResultHandlers =
+      function (decorated, container) {
+
+    // These should only be bound once
+    if (this._containerResultsHandlersBound) {
+      return;
+    }
+
+    var self = this;
+
+    container.on('results:all', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:append', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:message', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('select', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('unselect', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    this._containerResultsHandlersBound = true;
+  };
+
   AttachBody.prototype._attachPositioningHandler =
       function (decorated, container) {
     var self = this;
@@ -4224,14 +4439,14 @@ S2.define('select2/dropdown/attachBody',[
 
     var $watchers = this.$container.parents().filter(Utils.hasScroll);
     $watchers.each(function () {
-      $(this).data('select2-scroll-position', {
+      Utils.StoreData(this, 'select2-scroll-position', {
         x: $(this).scrollLeft(),
         y: $(this).scrollTop()
       });
     });
 
     $watchers.on(scrollEvent, function (ev) {
-      var position = $(this).data('select2-scroll-position');
+      var position = Utils.GetData(this, 'select2-scroll-position');
       $(this).scrollTop(position.y);
     });
 
@@ -4290,16 +4505,26 @@ S2.define('select2/dropdown/attachBody',[
       top: container.bottom
     };
 
-    // Determine what the parent element is to use for calciulating the offset
+    // Determine what the parent element is to use for calculating the offset
     var $offsetParent = this.$dropdownParent;
 
-    // For statically positoned elements, we need to get the element
+    // For statically positioned elements, we need to get the element
     // that is determining the offset
     if ($offsetParent.css('position') === 'static') {
       $offsetParent = $offsetParent.offsetParent();
     }
 
-    var parentOffset = $offsetParent.offset();
+    var parentOffset = {
+      top: 0,
+      left: 0
+    };
+
+    if (
+      $.contains(document.body, $offsetParent[0]) ||
+      $offsetParent[0].isConnected
+      ) {
+      parentOffset = $offsetParent.offset();
+    }
 
     css.top -= parentOffset.top;
     css.left -= parentOffset.left;
@@ -4396,8 +4621,8 @@ S2.define('select2/dropdown/minimumResultsForSearch',[
 });
 
 S2.define('select2/dropdown/selectOnClose',[
-
-], function () {
+  '../utils'
+], function (Utils) {
   function SelectOnClose () { }
 
   SelectOnClose.prototype.bind = function (decorated, container, $container) {
@@ -4428,7 +4653,7 @@ S2.define('select2/dropdown/selectOnClose',[
       return;
     }
 
-    var data = $highlightedResults.data('data');
+    var data = Utils.GetData($highlightedResults[0], 'data');
 
     // Don't re-select already selected resulte
     if (
@@ -4469,7 +4694,7 @@ S2.define('select2/dropdown/closeOnSelect',[
     var originalEvent = evt.originalEvent;
 
     // Don't close if the control key is being held
-    if (originalEvent && originalEvent.ctrlKey) {
+    if (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)) {
       return;
     }
 
@@ -4523,6 +4748,9 @@ S2.define('select2/i18n/en',[],function () {
     },
     searching: function () {
       return 'Searching…';
+    },
+    removeAllItems: function () {
+      return 'Remove all items';
     }
   };
 });
@@ -4761,66 +4989,29 @@ S2.define('select2/defaults',[
       );
     }
 
-    if (typeof options.language === 'string') {
-      // Check if the language is specified with a region
-      if (options.language.indexOf('-') > 0) {
-        // Extract the region information if it is included
-        var languageParts = options.language.split('-');
-        var baseLanguage = languageParts[0];
+    // If the defaults were not previously applied from an element, it is
+    // possible for the language option to have not been resolved
+    options.language = this._resolveLanguage(options.language);
 
-        options.language = [options.language, baseLanguage];
-      } else {
-        options.language = [options.language];
+    // Always fall back to English since it will always be complete
+    options.language.push('en');
+
+    var uniqueLanguages = [];
+
+    for (var l = 0; l < options.language.length; l++) {
+      var language = options.language[l];
+
+      if (uniqueLanguages.indexOf(language) === -1) {
+        uniqueLanguages.push(language);
       }
     }
 
-    if ($.isArray(options.language)) {
-      var languages = new Translation();
-      options.language.push('en');
+    options.language = uniqueLanguages;
 
-      var languageNames = options.language;
-
-      for (var l = 0; l < languageNames.length; l++) {
-        var name = languageNames[l];
-        var language = {};
-
-        try {
-          // Try to load it with the original name
-          language = Translation.loadPath(name);
-        } catch (e) {
-          try {
-            // If we couldn't load it, check if it wasn't the full path
-            name = this.defaults.amdLanguageBase + name;
-            language = Translation.loadPath(name);
-          } catch (ex) {
-            // The translation could not be loaded at all. Sometimes this is
-            // because of a configuration problem, other times this can be
-            // because of how Select2 helps load all possible translation files.
-            if (options.debug && window.console && console.warn) {
-              console.warn(
-                'Select2: The language file for "' + name + '" could not be ' +
-                'automatically loaded. A fallback will be used instead.'
-              );
-            }
-
-            continue;
-          }
-        }
-
-        languages.extend(language);
-      }
-
-      options.translations = languages;
-    } else {
-      var baseTranslation = Translation.loadPath(
-        this.defaults.amdLanguageBase + 'en'
-      );
-      var customTranslation = new Translation(options.language);
-
-      customTranslation.extend(baseTranslation);
-
-      options.translations = customTranslation;
-    }
+    options.translations = this._processTranslations(
+      options.language,
+      options.debug
+    );
 
     return options;
   };
@@ -4887,13 +5078,14 @@ S2.define('select2/defaults',[
       debug: false,
       dropdownAutoWidth: false,
       escapeMarkup: Utils.escapeMarkup,
-      language: EnglishTranslation,
+      language: {},
       matcher: matcher,
       minimumInputLength: 0,
       maximumInputLength: 0,
       maximumSelectionLength: 0,
       minimumResultsForSearch: 0,
       selectOnClose: false,
+      scrollAfterSelect: false,
       sorter: function (data) {
         return data;
       },
@@ -4908,6 +5100,103 @@ S2.define('select2/defaults',[
     };
   };
 
+  Defaults.prototype.applyFromElement = function (options, $element) {
+    var optionLanguage = options.language;
+    var defaultLanguage = this.defaults.language;
+    var elementLanguage = $element.prop('lang');
+    var parentLanguage = $element.closest('[lang]').prop('lang');
+
+    var languages = Array.prototype.concat.call(
+      this._resolveLanguage(elementLanguage),
+      this._resolveLanguage(optionLanguage),
+      this._resolveLanguage(defaultLanguage),
+      this._resolveLanguage(parentLanguage)
+    );
+
+    options.language = languages;
+
+    return options;
+  };
+
+  Defaults.prototype._resolveLanguage = function (language) {
+    if (!language) {
+      return [];
+    }
+
+    if ($.isEmptyObject(language)) {
+      return [];
+    }
+
+    if ($.isPlainObject(language)) {
+      return [language];
+    }
+
+    var languages;
+
+    if (!$.isArray(language)) {
+      languages = [language];
+    } else {
+      languages = language;
+    }
+
+    var resolvedLanguages = [];
+
+    for (var l = 0; l < languages.length; l++) {
+      resolvedLanguages.push(languages[l]);
+
+      if (typeof languages[l] === 'string' && languages[l].indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = languages[l].split('-');
+        var baseLanguage = languageParts[0];
+
+        resolvedLanguages.push(baseLanguage);
+      }
+    }
+
+    return resolvedLanguages;
+  };
+
+  Defaults.prototype._processTranslations = function (languages, debug) {
+    var translations = new Translation();
+
+    for (var l = 0; l < languages.length; l++) {
+      var languageData = new Translation();
+
+      var language = languages[l];
+
+      if (typeof language === 'string') {
+        try {
+          // Try to load it with the original name
+          languageData = Translation.loadPath(language);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            language = this.defaults.amdLanguageBase + language;
+            languageData = Translation.loadPath(language);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files
+            if (debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + language + '" could ' +
+                'not be automatically loaded. A fallback will be used instead.'
+              );
+            }
+          }
+        }
+      } else if ($.isPlainObject(language)) {
+        languageData = new Translation(language);
+      } else {
+        languageData = language;
+      }
+
+      translations.extend(languageData);
+    }
+
+    return translations;
+  };
+
   Defaults.prototype.set = function (key, value) {
     var camelKey = $.camelCase(key);
 
@@ -4916,7 +5205,7 @@ S2.define('select2/defaults',[
 
     var convertedData = Utils._convertData(data);
 
-    $.extend(this.defaults, convertedData);
+    $.extend(true, this.defaults, convertedData);
   };
 
   var defaults = new Defaults();
@@ -4937,6 +5226,10 @@ S2.define('select2/options',[
       this.fromElement($element);
     }
 
+    if ($element != null) {
+      this.options = Defaults.applyFromElement(this.options, $element);
+    }
+
     this.options = Defaults.apply(this.options);
 
     if ($element && $element.is('input')) {
@@ -4960,14 +5253,6 @@ S2.define('select2/options',[
       this.options.disabled = $e.prop('disabled');
     }
 
-    if (this.options.language == null) {
-      if ($e.prop('lang')) {
-        this.options.language = $e.prop('lang').toLowerCase();
-      } else if ($e.closest('[lang]').prop('lang')) {
-        this.options.language = $e.closest('[lang]').prop('lang');
-      }
-    }
-
     if (this.options.dir == null) {
       if ($e.prop('dir')) {
         this.options.dir = $e.prop('dir');
@@ -4981,7 +5266,7 @@ S2.define('select2/options',[
     $e.prop('disabled', this.options.disabled);
     $e.prop('multiple', this.options.multiple);
 
-    if ($e.data('select2Tags')) {
+    if (Utils.GetData($e[0], 'select2Tags')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-select2-tags` attribute has been changed to ' +
@@ -4990,11 +5275,11 @@ S2.define('select2/options',[
         );
       }
 
-      $e.data('data', $e.data('select2Tags'));
-      $e.data('tags', true);
+      Utils.StoreData($e[0], 'data', Utils.GetData($e[0], 'select2Tags'));
+      Utils.StoreData($e[0], 'tags', true);
     }
 
-    if ($e.data('ajaxUrl')) {
+    if (Utils.GetData($e[0], 'ajaxUrl')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-ajax-url` attribute has been changed to ' +
@@ -5003,21 +5288,45 @@ S2.define('select2/options',[
         );
       }
 
-      $e.attr('ajax--url', $e.data('ajaxUrl'));
-      $e.data('ajax--url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
+      Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl'));
     }
 
     var dataset = {};
 
+    function upperCaseLetter(_, letter) {
+      return letter.toUpperCase();
+    }
+
+    // Pre-load all of the attributes which are prefixed with `data-`
+    for (var attr = 0; attr < $e[0].attributes.length; attr++) {
+      var attributeName = $e[0].attributes[attr].name;
+      var prefix = 'data-';
+
+      if (attributeName.substr(0, prefix.length) == prefix) {
+        // Get the contents of the attribute after `data-`
+        var dataName = attributeName.substring(prefix.length);
+
+        // Get the data contents from the consistent source
+        // This is more than likely the jQuery data helper
+        var dataValue = Utils.GetData($e[0], dataName);
+
+        // camelCase the attribute name to match the spec
+        var camelDataName = dataName.replace(/-([a-z])/g, upperCaseLetter);
+
+        // Store the data attribute contents into the dataset since
+        dataset[camelDataName] = dataValue;
+      }
+    }
+
     // Prefer the element's `dataset` attribute if it exists
     // jQuery 1.x does not correctly handle data attributes with multiple dashes
     if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
-      dataset = $.extend(true, {}, $e[0].dataset, $e.data());
-    } else {
-      dataset = $e.data();
+      dataset = $.extend(true, {}, $e[0].dataset, dataset);
     }
 
-    var data = $.extend(true, {}, dataset);
+    // Prefer our internal data cache if it exists
+    var data = $.extend(true, {}, Utils.GetData($e[0]), dataset);
 
     data = Utils._convertData(data);
 
@@ -5054,8 +5363,8 @@ S2.define('select2/core',[
   './keys'
 ], function ($, Options, Utils, KEYS) {
   var Select2 = function ($element, options) {
-    if ($element.data('select2') != null) {
-      $element.data('select2').destroy();
+    if (Utils.GetData($element[0], 'select2') != null) {
+      Utils.GetData($element[0], 'select2').destroy();
     }
 
     this.$element = $element;
@@ -5071,7 +5380,7 @@ S2.define('select2/core',[
     // Set up the tabindex
 
     var tabindex = $element.attr('tabindex') || 0;
-    $element.data('old-tabindex', tabindex);
+    Utils.StoreData($element[0], 'old-tabindex', tabindex);
     $element.attr('tabindex', '-1');
 
     // Set up containers and adapters
@@ -5132,6 +5441,9 @@ S2.define('select2/core',[
     // Synchronize any monitored attributes
     this._syncAttributes();
 
+    Utils.StoreData($element[0], 'select2', this);
+
+    // Ensure backwards compatibility with $element.data('select2').
     $element.data('select2', this);
   };
 
@@ -5208,6 +5520,12 @@ S2.define('select2/core',[
       return null;
     }
 
+    if (method == 'computedstyle') {
+      var computedStyle = window.getComputedStyle($element[0]);
+
+      return computedStyle.width;
+    }
+
     return method;
   };
 
@@ -5248,8 +5566,8 @@ S2.define('select2/core',[
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        $.each(mutations, self._syncA);
-        $.each(mutations, self._syncS);
+        self._syncA();
+        self._syncS(null, mutations);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -5371,7 +5689,7 @@ S2.define('select2/core',[
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close();
+          self.close(evt);
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -5405,7 +5723,7 @@ S2.define('select2/core',[
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       if (this.isOpen()) {
         this.close();
       }
@@ -5416,7 +5734,7 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
+  Select2.prototype._isChangeMutation = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -5444,7 +5762,22 @@ S2.define('select2/core',[
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
+    } else if ($.isArray(mutations)) {
+      $.each(mutations, function(evt, mutation) {
+        if (self._isChangeMutation(evt, mutation)) {
+          // We've found a change mutation.
+          // Let's escape from the loop and continue
+          changed = true;
+          return false;
+        }
+      });
     }
+    return changed;
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = this._isChangeMutation(evt, mutations);
+    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -5466,7 +5799,8 @@ S2.define('select2/core',[
       'open': 'opening',
       'close': 'closing',
       'select': 'selecting',
-      'unselect': 'unselecting'
+      'unselect': 'unselecting',
+      'clear': 'clearing'
     };
 
     if (args === undefined) {
@@ -5494,7 +5828,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -5510,15 +5844,40 @@ S2.define('select2/core',[
       return;
     }
 
+    if (this.isDisabled()) {
+      return;
+    }
+
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function () {
+  Select2.prototype.close = function (evt) {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', {});
+    this.trigger('close', { originalEvent : evt });
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  Select2.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  Select2.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
   Select2.prototype.isOpen = function () {
@@ -5595,7 +5954,7 @@ S2.define('select2/core',[
       });
     }
 
-    this.$element.val(newVal).trigger('change');
+    this.$element.val(newVal).trigger('input').trigger('change');
   };
 
   Select2.prototype.destroy = function () {
@@ -5621,10 +5980,12 @@ S2.define('select2/core',[
     this._syncS = null;
 
     this.$element.off('.select2');
-    this.$element.attr('tabindex', this.$element.data('old-tabindex'));
+    this.$element.attr('tabindex',
+    Utils.GetData(this.$element[0], 'old-tabindex'));
 
     this.$element.removeClass('select2-hidden-accessible');
     this.$element.attr('aria-hidden', 'false');
+    Utils.RemoveData(this.$element[0]);
     this.$element.removeData('select2');
 
     this.dataAdapter.destroy();
@@ -5652,7 +6013,7 @@ S2.define('select2/core',[
 
     this.$container.addClass('select2-container--' + this.options.get('theme'));
 
-    $container.data('element', this.$element);
+    Utils.StoreData($container[0], 'element', this.$element);
 
     return $container;
   };
@@ -5862,8 +6223,9 @@ S2.define('select2/compat/initSelection',[
 });
 
 S2.define('select2/compat/inputData',[
-  'jquery'
-], function ($) {
+  'jquery',
+  '../utils'
+], function ($, Utils) {
   function InputData (decorated, $element, options) {
     this._currentData = [];
     this._valueSeparator = options.get('valueSeparator') || ',';
@@ -5927,13 +6289,13 @@ S2.define('select2/compat/inputData',[
       });
 
       this.$element.val(data.id);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     } else {
       var value = this.$element.val();
       value += this._valueSeparator + data.id;
 
       this.$element.val(value);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -5956,7 +6318,7 @@ S2.define('select2/compat/inputData',[
       }
 
       self.$element.val(values.join(self._valueSeparator));
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
@@ -5980,7 +6342,7 @@ S2.define('select2/compat/inputData',[
 
   InputData.prototype.addOptions = function (_, $options) {
     var options = $.map($options, function ($option) {
-      return $.data($option[0], 'data');
+      return Utils.GetData($option[0], 'data');
     });
 
     this._currentData.push.apply(this._currentData, options);
@@ -6383,8 +6745,9 @@ S2.define('jquery.select2',[
   'jquery-mousewheel',
 
   './select2/core',
-  './select2/defaults'
-], function ($, _, Select2, Defaults) {
+  './select2/defaults',
+  './select2/utils'
+], function ($, _, Select2, Defaults, Utils) {
   if ($.fn.select2 == null) {
     // All methods that should return the element
     var thisMethods = ['open', 'close', 'destroy'];
@@ -6405,7 +6768,7 @@ S2.define('jquery.select2',[
         var args = Array.prototype.slice.call(arguments, 1);
 
         this.each(function () {
-          var instance = $(this).data('select2');
+          var instance = Utils.GetData(this, 'select2');
 
           if (instance == null && window.console && console.error) {
             console.error(
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js b/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js
index 96ba80cd81b..fa781916e8b 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/select2.full.min.js
@@ -1 +1,2 @@
-/*! Select2 4.0.5 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return v.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n,o=b&&b.split("/"),p=t.map,q=p&&p["*"]||{};if(a){for(a=a.split("/"),g=a.length-1,t.nodeIdCompat&&x.test(a[g])&&(a[g]=a[g].replace(x,"")),"."===a[0].charAt(0)&&o&&(n=o.slice(0,o.length-1),a=n.concat(a)),k=0;k<a.length;k++)if("."===(m=a[k]))a.splice(k,1),k-=1;else if(".."===m){if(0===k||1===k&&".."===a[2]||".."===a[k-1])continue;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}if((o||q)&&p){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),o)for(l=o.length;l>0;l-=1)if((e=p[o.slice(0,l).join("/")])&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&q&&q[d]&&(i=q[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=w.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),o.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){r[a]=b}}function j(a){if(e(s,a)){var c=s[a];delete s[a],u[a]=!0,n.apply(b,c)}if(!e(r,a)&&!e(u,a))throw new Error("No "+a);return r[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return a?k(a):[]}function m(a){return function(){return t&&t.config&&t.config[a]||{}}}var n,o,p,q,r={},s={},t={},u={},v=Object.prototype.hasOwnProperty,w=[].slice,x=/\.js$/;p=function(a,b){var c,d=k(a),e=d[0],g=b[1];return a=d[1],e&&(e=f(e,g),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(g)):f(a,g):(a=f(a,g),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},q={require:function(a){return g(a)},exports:function(a){var b=r[a];return void 0!==b?b:r[a]={}},module:function(a){return{id:a,uri:"",exports:r[a],config:m(a)}}},n=function(a,c,d,f){var h,k,m,n,o,t,v,w=[],x=typeof d;if(f=f||a,t=l(f),"undefined"===x||"function"===x){for(c=!c.length&&d.length?["require","exports","module"]:c,o=0;o<c.length;o+=1)if(n=p(c[o],t),"require"===(k=n.f))w[o]=q.require(a);else if("exports"===k)w[o]=q.exports(a),v=!0;else if("module"===k)h=w[o]=q.module(a);else if(e(r,k)||e(s,k)||e(u,k))w[o]=j(k);else{if(!n.p)throw new Error(a+" missing "+k);n.p.load(n.n,g(f,!0),i(k),{}),w[o]=r[k]}m=d?d.apply(r[a],w):void 0,a&&(h&&h.exports!==b&&h.exports!==r[a]?r[a]=h.exports:m===b&&v||(r[a]=m))}else a&&(r[a]=d)},a=c=o=function(a,c,d,e,f){if("string"==typeof a)return q[a]?q[a](c):j(p(a,l(c)).f);if(!a.splice){if(t=a,t.deps&&o(t.deps,t.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?n(b,a,c,d):setTimeout(function(){n(b,a,c,d)},4),o},o.config=function(a){return o(a)},a._defined=r,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(r,a)||e(s,a)||(s[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){"function"==typeof b[d]&&("constructor"!==d&&c.push(d))}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){return Array.prototype.unshift.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};return d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;c<d;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;c<a;c++){b+=Math.floor(36*Math.random()).toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return(e!==f||"hidden"!==f&&"visible"!==f)&&("scroll"===e||"scroll"===f||(d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth))},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){b.find(".select2-results").append(a)},c.prototype.sort=function(a){return this.options.get("sorter")(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var b=this;this.data.current(function(c){var d=a.map(c,function(a){return a.id.toString()});b.$results.find(".select2-results__option[aria-selected]").each(function(){var b=a(this),c=a.data(this,"data"),e=""+c.id;null!=c.element&&c.element.selected||null==c.element&&a.inArray(e,d)>-1?b.attr("aria-selected","true"):b.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(b){var c=document.createElement("li");c.className="select2-results__option";var d={role:"treeitem","aria-selected":"false"};b.disabled&&(delete d["aria-selected"],d["aria-disabled"]="true"),null==b.id&&delete d["aria-selected"],null!=b._resultId&&(c.id=b._resultId),b.title&&(c.title=b.title),b.children&&(d.role="group",d["aria-label"]=b.text,delete d["aria-selected"]);for(var e in d){var f=d[e];c.setAttribute(e,f)}if(b.children){var g=a(c),h=document.createElement("strong");h.className="select2-results__group";a(h);this.template(b,h);for(var i=[],j=0;j<b.children.length;j++){var k=b.children[j],l=this.option(k);i.push(l)}var m=a("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});m.append(i),g.append(h),g.append(m)}else this.template(b,c);return a.data(c,"data",b),c},c.prototype.bind=function(b,c){var d=this,e=b.id+"-results";this.$results.attr("id",e),b.on("results:all",function(a){d.clear(),d.append(a.data),b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("results:append",function(a){d.append(a.data),b.isOpen()&&d.setClasses()}),b.on("query",function(a){d.hideMessages(),d.showLoading(a)}),b.on("select",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("unselect",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("open",function(){d.$results.attr("aria-expanded","true"),d.$results.attr("aria-hidden","false"),d.setClasses(),d.ensureHighlightVisible()}),b.on("close",function(){d.$results.attr("aria-expanded","false"),d.$results.attr("aria-hidden","true"),d.$results.removeAttr("aria-activedescendant")}),b.on("results:toggle",function(){var a=d.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),b.on("results:select",function(){var a=d.getHighlightedResults();if(0!==a.length){var b=a.data("data");"true"==a.attr("aria-selected")?d.trigger("close",{}):d.trigger("select",{data:b})}}),b.on("results:previous",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a);if(0!==c){var e=c-1;0===a.length&&(e=0);var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top,h=f.offset().top,i=d.$results.scrollTop()+(h-g);0===e?d.$results.scrollTop(0):h-g<0&&d.$results.scrollTop(i)}}),b.on("results:next",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a),e=c+1;if(!(e>=b.length)){var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top+d.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=d.$results.scrollTop()+h-g;0===e?d.$results.scrollTop(0):h>g&&d.$results.scrollTop(i)}}),b.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),b.on("results:message",function(a){d.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=d.$results.scrollTop(),c=d.$results.get(0).scrollHeight-b+a.deltaY,e=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=d.$results.height();e?(d.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(d.$results.scrollTop(d.$results.get(0).scrollHeight-d.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(b){var c=a(this),e=c.data("data");if("true"===c.attr("aria-selected"))return void(d.options.get("multiple")?d.trigger("unselect",{originalEvent:b,data:e}):d.trigger("close",{}));d.trigger("select",{originalEvent:b,data:e})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(b){var c=a(this).data("data");d.getHighlightedResults().removeClass("select2-results__option--highlighted"),d.trigger("results:focus",{data:c,element:a(this)})})},c.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),c<=2?this.$results.scrollTop(0):(g>this.$results.outerHeight()||g<0)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var b=a('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=this.$element.data("old-tabindex")?this._tabindex=this.$element.data("old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),b.attr("title",this.$element.attr("title")),b.attr("tabindex",this._tabindex),this.$selection=b,b},d.prototype.bind=function(a,b){var d=this,e=(a.id,a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),d.$selection.focus(),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(b){a(document.body).on("mousedown.select2."+b.id,function(b){var c=a(b.target),d=c.closest(".select2");a(".select2.select2-container--open").each(function(){var b=a(this);this!=d[0]&&b.data("element").select2("close")})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){b.find(".selection").append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()}),a.on("selection:update",function(a){c.update(a.data)})},e.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},e.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.prop("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,c){var e=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){e.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!e.options.get("disabled")){var c=a(this),d=c.parent(),f=d.data("data");e.trigger("unselect",{originalEvent:b,data:f})}})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},d.prototype.selectionContainer=function(){return a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.prop("title",e.title||e.text),f.data("data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id;if(b.length>1||c)return a.call(this,b);this.clear();var d=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(d)},b}),b.define("select2/selection/allowClear",["jquery","../keys"],function(a,b){function c(){}return c.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},c.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var c=this.$selection.find(".select2-selection__clear");if(0!==c.length){b.stopPropagation();for(var d=c.data("data"),e=0;e<d.length;e++){var f={data:d[e]};if(this.trigger("unselect",f),f.prevented)return}this.$element.val(this.placeholder.id).trigger("change"),this.trigger("toggle",{})}}},c.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||c.which!=b.DELETE&&c.which!=b.BACKSPACE||this._handleClear(c)},c.prototype.update=function(b,c){if(b.call(this,c),!(this.$selection.find(".select2-selection__placeholder").length>0||0===c.length)){var d=a('<span class="select2-selection__clear">&times;</span>');d.data("data",c),this.$selection.find(".select2-selection__rendered").prepend(d)}},c}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,b,d){var e=this;a.call(this,b,d),b.on("open",function(){e.$search.trigger("focus")}),b.on("close",function(){e.$search.val(""),e.$search.removeAttr("aria-activedescendant"),e.$search.trigger("focus")}),b.on("enable",function(){e.$search.prop("disabled",!1),e._transferTabIndex()}),b.on("disable",function(){e.$search.prop("disabled",!0)}),b.on("focus",function(a){e.$search.trigger("focus")}),b.on("results:focus",function(a){e.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){e.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){e._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){if(a.stopPropagation(),e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented(),a.which===c.BACKSPACE&&""===e.$search.val()){var b=e.$searchContainer.prev(".select2-selection__choice");if(b.length>0){var d=b.data("data");e.searchRemoveChoice(d),a.preventDefault()}}});var f=document.documentMode,g=f&&f<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){if(g)return void e.$selection.off("input.search input.searchcheck");e.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(g&&"input"===a.type)return void e.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&e.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c&&this.$search.focus()},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{a=.75*(this.$search.val().length+1)+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting"],g=["opening","closing","selecting","unselecting"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","�":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","�":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","�":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","�":"D","Ḓ":"D","Ḏ":"D","�":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","�":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","�":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","�":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","�":"G","�":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","�":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","�":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","�":"I","Ḯ":"I","Ỉ":"I","�":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","�":"K","�":"K","�":"K","Ꞣ":"K","�":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","�":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","�":"L","�":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","�":"N","�":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","�":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","�":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","�":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","�":"O","�":"O","Ƣ":"OI","�":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","�":"P","�":"P","�":"P","Ⓠ":"Q","Ｑ":"Q","�":"Q","�":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","�":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","�":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","�":"V","Ʌ":"V","�":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","�":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","�":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","�":"Z","Ｚ":"Z","Ź":"Z","�":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","�":"Z","�":"a","�":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","�":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","�":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","�":"a","ą":"a","ⱥ":"a","�":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","�":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","�":"d","�":"d","ḑ":"d","ḓ":"d","�":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","�":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","�":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","�":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","�":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","�":"f","ⓖ":"g","ｇ":"g","ǵ":"g","�":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","�":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","�":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","�":"k","�":"k","�":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","�":"l","�":"l","�":"l","lj":"lj","ⓜ":"m","�":"m","ḿ":"m","�":"m","ṃ":"m","ɱ":"m","ɯ":"m","�":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","�":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","�":"o","ȭ":"o","�":"o","�":"o","ṑ":"o","ṓ":"o","�":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","�":"o","ő":"o","ǒ":"o","�":"o","�":"o","ơ":"o","�":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","�":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","�":"o","�":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","�":"oo","ⓟ":"p","�":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","�":"p","�":"p","�":"p","ⓠ":"q","ｑ":"q","ɋ":"q","�":"q","�":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","�":"r","ŗ":"r","ṟ":"r","�":"r","ɽ":"r","�":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","�":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","�":"v","ʌ":"v","�":"vy","ⓦ":"w","ｗ":"w","�":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","�":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","�":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","�":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","�":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","�":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","�":"ι","ό":"ο","�":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"}}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),null!=c.id?d+="-"+c.id.toString():d+="-"+a.generateChars(4),d},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple")){if(a.selected=!1,c(a.element).is("option"))return a.element.selected=!1,void this.$element.trigger("change");this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})}},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){c.removeData(this,"data")})},d.prototype.query=function(a,b){var d=[],e=this;this.$element.children().each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var b;a.children?(b=document.createElement("optgroup"),b.label=a.text):(b=document.createElement("option"),void 0!==b.textContent?b.textContent=a.text:b.innerText=a.text),void 0!==a.id&&(b.value=a.id),a.disabled&&(b.disabled=!0),a.selected&&(b.selected=!0),a.title&&(b.title=a.title);var d=c(b),e=this._normalizeItem(a);return e.element=b,c.data(b,"data",e),d},d.prototype.item=function(a){var b={};if(null!=(b=c.data(a[0],"data")))return b;if(a.is("option"))b={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){b={text:a.prop("label"),children:[],title:a.prop("title")};for(var d=a.children("option"),e=[],f=0;f<d.length;f++){var g=c(d[f]),h=this.item(g);e.push(h)}b.children=e}return b=this._normalizeItem(b),b.element=a[0],c.data(a[0],"data",b),b},d.prototype._normalizeItem=function(a){c.isPlainObject(a)||(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){return this.options.get("matcher")(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){d.status&&"0"===d.status||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0);if((i.text||"").toUpperCase()===(b.term||"").toUpperCase()||j)return!f&&(a.data=g,void c(a))}if(f)return!0;var k=e.createTag(b);if(null!=k){var l=e.option(k);l.attr("data-select2-tag",!0),e.addOptions([l]),e.insertTag(g,k)}a.results=g,c(a)}var e=this;if(this._removeOldTags(),null==b.term||null!=b.page)return void a.call(this,b,c);a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){this._lastTag;this.$element.find("option[data-select2-tag]").each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b);if(!g.$element.find("option").filter(function(){return a(this).val()===c.id}).length){var d=g.option(c);d.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([d])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",b.term.length<this.minimumInputLength)return void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength)return void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;if(d.maximumSelectionLength>0&&f>=d.maximumSelectionLength)return void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}});a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val("")}),c.on("focus",function(){c.isOpen()||e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){e.showSearch(a)?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){e.$results.offset().top+e.$results.outerHeight(!1)+50>=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1)&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){a(this).data("select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(b){var c=a(this).data("select2-scroll-position");a(this).scrollTop(c.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id;this.$container.parents().filter(b.hasScroll).off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return!(a(c.data.results)<this.minimumResultsForSearch)&&b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},a.prototype._handleSelectOnClose=function(a,b){if(b&&null!=b.originalSelect2Event){var c=b.originalSelect2Event;if("select"===c._type||"unselect"===c._type)return}var d=this.getHighlightedResults();if(!(d.length<1)){var e=d.data("data");null!=e.element&&e.element.selected||null==e.element&&e.selected||this.trigger("select",{data:e})}},a}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){return"Please enter "+(a.minimum-a.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}return D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),null==l.tokenSeparators&&null==l.tokenizer||(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(a){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(a){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var O=k.loadPath(this.defaults.amdLanguageBase+"en"),P=new k(l.language);P.extend(O),l.translations=P}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){null==c(d,e.children[g])&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var h=b(e.text).toUpperCase(),i=b(d.term).toUpperCase();return h.indexOf(i)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(this.defaults,f)},new D}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),a.data("select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),a.data("data",a.data("select2Tags")),a.data("tags",!0)),a.data("ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",a.data("ajaxUrl")),a.data("ajax--url",a.data("ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,a.data()):a.data();var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,c){null!=a.data("select2")&&a.data("select2").destroy(),this.$element=a,this.id=this._generateId(a),c=c||{},this.options=new b(c,a),e.__super__.constructor.call(this);var d=a.attr("tabindex")||0;a.data("old-tabindex",d),a.attr("tabindex","-1");var f=this.options.get("dataAdapter");this.dataAdapter=new f(a,this.options);var g=this.render();this._placeContainer(g);var h=this.options.get("selectionAdapter");this.selection=new h(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,g);var i=this.options.get("dropdownAdapter");this.dropdown=new i(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,g);var j=this.options.get("resultsAdapter");this.results=new j(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var k=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){k.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return e<=0?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;h<i;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=a&&0!==a.length||(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",this.$element.data("old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),b.data("element",this.$element),b},e}),b.define("select2/compat/utils",["jquery"],function(a){function b(b,c,d){var e,f,g=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0===this.indexOf("select2-")&&g.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&null!=(f=d(this))&&g.push(f)})),b.attr("class",g.join(" "))}return{syncCssClasses:b}}),b.define("select2/compat/containerCss",["jquery","./utils"],function(a,b){function c(a){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("containerCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptContainerCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all:","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("containerCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/dropdownCss",["jquery","./utils"],function(a,b){function c(a){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("dropdownCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptDropdownCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all:","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("dropdownCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/initSelection",["jquery"],function(a){function b(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=c.get("initSelection"),this._isInitialized=!1,a.call(this,b,c)}return b.prototype.current=function(b,c){var d=this;if(this._isInitialized)return void b.call(this,c);this.initSelection.call(null,this.$element,function(b){d._isInitialized=!0,a.isArray(b)||(b=[b]),c(b)})},b}),b.define("select2/compat/inputData",["jquery"],function(a){function b(a,b,c){this._currentData=[],this._valueSeparator=c.get("valueSeparator")||",","hidden"===b.prop("type")&&c.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),a.call(this,b,c)}return b.prototype.current=function(b,c){function d(b,c){var e=[];return b.selected||-1!==a.inArray(b.id,c)?(b.selected=!0,e.push(b)):b.selected=!1,b.children&&e.push.apply(e,d(b.children,c)),e}for(var e=[],f=0;f<this._currentData.length;f++){var g=this._currentData[f];e.push.apply(e,d(g,this.$element.val().split(this._valueSeparator)))}c(e)},b.prototype.select=function(b,c){if(this.options.get("multiple")){var d=this.$element.val();d+=this._valueSeparator+c.id,this.$element.val(d),this.$element.trigger("change")}else this.current(function(b){a.map(b,function(a){a.selected=!1})}),this.$element.val(c.id),this.$element.trigger("change")},b.prototype.unselect=function(a,b){var c=this;b.selected=!1,this.current(function(a){for(var d=[],e=0;e<a.length;e++){var f=a[e];b.id!=f.id&&d.push(f.id)}c.$element.val(d.join(c._valueSeparator)),c.$element.trigger("change")})},b.prototype.query=function(a,b,c){for(var d=[],e=0;e<this._currentData.length;e++){var f=this._currentData[e],g=this.matches(b,f);null!==g&&d.push(g)}c({results:d})},b.prototype.addOptions=function(b,c){var d=a.map(c,function(b){return a.data(b[0],"data")});this._currentData.push.apply(this._currentData,d)},b}),b.define("select2/compat/matcher",["jquery"],function(a){function b(b){function c(c,d){var e=a.extend(!0,{},d);if(null==c.term||""===a.trim(c.term))return e;if(d.children){for(var f=d.children.length-1;f>=0;f--){var g=d.children[f];b(c.term,g.text,g)||e.children.splice(f,1)}if(e.children.length>0)return e}return b(c.term,d.text,d)?e:null}return c}return b}),b.define("select2/compat/query",[],function(){function a(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),a.call(this,b,c)}return a.prototype.query=function(a,b,c){b.callback=c,this.options.get("query").call(null,b)},a}),b.define("select2/dropdown/attachContainer",[],function(){function a(a,b,c){a.call(this,b,c)}return a.prototype.position=function(a,b,c){c.find(".dropdown-wrapper").append(b),b.addClass("select2-dropdown--below"),c.addClass("select2-container--below")},a}),b.define("select2/dropdown/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$dropdown.on(d.join(" "),function(a){a.stopPropagation()})},a}),b.define("select2/selection/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$selection.on(d.join(" "),function(a){a.stopPropagation()})},a}),function(c){"function"==typeof b.define&&b.define.amd?b.define("jquery-mousewheel",["jquery"],c):"object"==typeof exports?module.exports=c:c(a)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||n<f)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120==0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults"],function(a,b,c,d){if(null==a.fn.select2){var e=["open","close","destroy"];a.fn.select2=function(b){if("object"==typeof(b=b||{}))return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,f=Array.prototype.slice.call(arguments,1);return this.each(function(){var c=a(this).data("select2");null==c&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=c[b].apply(c,f)}),a.inArray(b,e)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
\ No newline at end of file
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(d){var e=function(){if(d&&d.fn&&d.fn.select2&&d.fn.select2.amd)var e=d.fn.select2.amd;var t,n,i,h,o,s,f,g,m,v,y,_,r,a,w,l;function b(e,t){return r.call(e,t)}function c(e,t){var n,i,r,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&w.test(e[s])&&(e[s]=e[s].replace(w,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(i=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(r=(r=f[h.slice(0,d).join("/")])&&r[i]){o=r,a=u;break}if(o)break;!l&&g&&g[i]&&(l=g[i],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(b(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!b(m,e)&&!b(_,e))throw new Error("No "+e);return m[e]}function u(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?u(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},r=Object.prototype.hasOwnProperty,a=[].slice,w=/\.js$/,f=function(e,t){var n,i=u(e),r=i[0],o=t[1];return e=i[1],r&&(n=D(r=c(r,o))),r?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return c(e,t)}}(o)):c(e,o):(r=(i=u(e=c(e,o)))[0],e=i[1],r&&(n=D(r))),{f:r?r+"!"+e:e,n:e,pr:r,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,i){var r,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(i=i||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)r=d[l]=g.module(e);else if(b(m,o)||b(v,o)||b(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(i,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(r&&r.exports!==h&&r.exports!==m[e]?m[e]=r.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,i,r){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=i,i=r),i?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(i=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),b(m,e)||b(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=i),e.define("almond",function(){}),e.define("jquery",[],function(){var e=d||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var r={};function u(e){var t=e.prototype,n=[];for(var i in t){"function"==typeof t[i]&&"constructor"!==i&&n.push(i)}return n}r.Extend=function(e,t){var n={}.hasOwnProperty;function i(){this.constructor=e}for(var r in t)n.call(t,r)&&(e[r]=t[r]);return i.prototype=t.prototype,e.prototype=new i,e.__super__=t.prototype,e},r.Decorate=function(i,r){var e=u(r),t=u(i);function o(){var e=Array.prototype.unshift,t=r.prototype.constructor.length,n=i.prototype.constructor;0<t&&(e.call(arguments,i.prototype.constructor),n=r.prototype.constructor),n.apply(this,arguments)}r.displayName=i.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=i.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=r.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,i=e.length;n<i;n++)e[n].apply(this,t)},r.Observable=e,r.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},r.bind=function(e,t){return function(){e.apply(t,arguments)}},r._convertData=function(e){for(var t in e){var n=t.split("-"),i=e;if(1!==n.length){for(var r=0;r<n.length;r++){var o=n[r];(o=o.substring(0,1).toLowerCase()+o.substring(1))in i||(i[o]={}),r==n.length-1&&(i[o]=e[t]),i=i[o]}delete e[t]}}return e},r.hasScroll=function(e,t){var n=o(t),i=t.style.overflowX,r=t.style.overflowY;return(i!==r||"hidden"!==r&&"visible"!==r)&&("scroll"===i||"scroll"===r||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},r.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},r.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},r.__cache={};var n=0;return r.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},r.StoreData=function(e,t,n){var i=r.GetUniqueElementId(e);r.__cache[i]||(r.__cache[i]={}),r.__cache[i][t]=n},r.GetData=function(e,t){var n=r.GetUniqueElementId(e);return t?r.__cache[n]&&null!=r.__cache[n][t]?r.__cache[n][t]:o(e).data(t):r.__cache[n]},r.RemoveData=function(e){var t=r.GetUniqueElementId(e);null!=r.__cache[t]&&delete r.__cache[t],e.removeAttribute("data-select2-id")},r}),e.define("select2/results",["jquery","./utils"],function(h,f){function i(e,t,n){this.$element=e,this.data=n,this.options=t,i.__super__.constructor.call(this)}return f.Extend(i,f.Observable),i.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},i.prototype.clear=function(){this.$results.empty()},i.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),i=this.options.get("translations").get(e.message);n.append(t(i(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},i.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},i.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var i=e.results[n],r=this.option(i);t.push(r)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},i.prototype.position=function(e,t){t.find(".select2-results").append(e)},i.prototype.sort=function(e){return this.options.get("sorter")(e)},i.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},i.prototype.setClasses=function(){var t=this;this.data.current(function(e){var i=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,i)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},i.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},i.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},i.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},i=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var r in(null!=e.element&&i.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[r];t.setAttribute(r,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},i.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var i=n-1;0===e.length&&(i=0);var r=t.eq(i);r.trigger("mouseenter");var o=l.$results.offset().top,s=r.offset().top,a=l.$results.scrollTop()+(s-o);0===i?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var i=t.eq(n);i.trigger("mouseenter");var r=l.$results.offset().top+l.$results.outerHeight(!1),o=i.offset().top+i.outerHeight(!1),s=l.$results.scrollTop()+o-r;0===n?l.$results.scrollTop(0):r<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,i=0<e.deltaY&&t-e.deltaY<=0,r=e.deltaY<0&&n<=l.$results.height();i?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):r&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},i.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},i.prototype.destroy=function(){this.$results.remove()},i.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,i=e.offset().top,r=this.$results.scrollTop()+(i-n),o=i-n;r-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(r)}},i.prototype.template=function(e,t){var n=this.options.get("templateResult"),i=this.options.get("escapeMarkup"),r=n(e,t);null==r?t.style.display="none":"string"==typeof r?t.innerHTML=i(r):h(t).append(r)},i}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,i,r){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return i.Extend(o,i.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=i.GetData(this.$element[0],"old-tabindex")?this._tabindex=i.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,i=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===r.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",i),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&i.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,i){function r(){r.__super__.constructor.apply(this,arguments)}return n.Extend(r,t),r.prototype.render=function(){var e=r.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},r.prototype.bind=function(t,e){var n=this;r.__super__.bind.apply(this,arguments);var i=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",i).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",i),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},r.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},r.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},r.prototype.selectionContainer=function(){return e("<span></span>")},r.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),i=this.display(t,n);n.empty().append(i);var r=t.title||t.text;r?n.attr("title",r):n.removeAttr("title")}else this.clear()},r}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(r,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var i=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){i.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!i.isDisabled()){var t=r(this).parent(),n=l.GetData(t[0],"data");i.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return r('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var i=e[n],r=this.selectionContainer(),o=this.display(i,r);r.append(o);var s=i.title||i.text;s&&r.attr("title",s),l.StoreData(r[0],"data",i),t.push(r)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var i=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(i)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(r,i,a){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){i._handleClear(e)}),t.on("keypress",function(e){i._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var i=a.GetData(n[0],"data"),r=this.$element.val();this.$element.val(this.placeholder.id);var o={data:i};if(this.trigger("clear",o),o.prevented)this.$element.val(r);else{for(var s=0;s<i.length;s++)if(o={data:i[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(r);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=i.DELETE&&t.which!=i.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),i=r('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(i[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(i)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(i,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=i('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),t.on("open",function(){i.$search.attr("aria-controls",r),i.$search.trigger("focus")}),t.on("close",function(){i.$search.val(""),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.trigger("focus")}),t.on("enable",function(){i.$search.prop("disabled",!1),i._transferTabIndex()}),t.on("disable",function(){i.$search.prop("disabled",!0)}),t.on("focus",function(e){i.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){i.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){i._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===i.$search.val()){var t=i.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");i.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){i.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?i.$selection.off("input.search input.searchcheck"):i.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)i.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&i.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var i=this,r=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,r)){t=t||{};var n=s.Event("select2:"+e,{params:t});i.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function i(e){this.dict=e||{}}return i.prototype.all=function(){return this.dict},i.prototype.get=function(e){return this.dict[e]},i.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},i._cache={},i.loadPath=function(e){if(!(e in i._cache)){var t=n(e);i._cache[e]=t}return new i(i._cache[e])},i}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","�":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","�":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","�":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","�":"D","Ḓ":"D","Ḏ":"D","�":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","�":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","�":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","�":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","�":"G","�":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","�":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","�":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","�":"I","Ḯ":"I","Ỉ":"I","�":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","�":"K","�":"K","�":"K","Ꞣ":"K","�":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","�":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","�":"L","�":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","�":"N","�":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","�":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","�":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","�":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","�":"O","�":"O","Œ":"OE","Ƣ":"OI","�":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","�":"P","�":"P","�":"P","Ⓠ":"Q","Ｑ":"Q","�":"Q","�":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","�":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","�":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","�":"V","Ʌ":"V","�":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","�":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","�":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","�":"Z","Ｚ":"Z","Ź":"Z","�":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","�":"Z","�":"a","�":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","�":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","�":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","�":"a","ą":"a","ⱥ":"a","�":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","�":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","�":"d","�":"d","ḑ":"d","ḓ":"d","�":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","�":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","�":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","�":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","�":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","�":"f","ⓖ":"g","ｇ":"g","ǵ":"g","�":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","�":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","�":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","�":"k","�":"k","�":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","�":"l","�":"l","�":"l","lj":"lj","ⓜ":"m","�":"m","ḿ":"m","�":"m","ṃ":"m","ɱ":"m","ɯ":"m","�":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","�":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","�":"o","ȭ":"o","�":"o","�":"o","ṑ":"o","ṓ":"o","�":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","�":"o","ő":"o","ǒ":"o","�":"o","�":"o","ơ":"o","�":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","�":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","�":"o","�":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","�":"oo","ⓟ":"p","�":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","�":"p","�":"p","�":"p","ⓠ":"q","ｑ":"q","ɋ":"q","�":"q","�":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","�":"r","ŗ":"r","ṟ":"r","�":"r","ɽ":"r","�":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","�":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","�":"v","ʌ":"v","�":"vy","ⓦ":"w","ｗ":"w","�":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","�":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","�":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","�":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","�":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","�":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","�":"ι","ό":"ο","�":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(i){function n(e,t){n.__super__.constructor.call(this)}return i.Extend(n,i.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=i.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+i.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],i=this;this.$element.find(":selected").each(function(){var e=l(this),t=i.item(e);n.push(t)}),e(n)},n.prototype.select=function(r){var o=this;if(r.selected=!0,l(r.element).is("option"))return r.element.selected=!0,void this.$element.trigger("input").trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(r=[r]).push.apply(r,e);for(var n=0;n<r.length;n++){var i=r[n].id;-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("input").trigger("change")});else{var e=r.id;this.$element.val(e),this.$element.trigger("input").trigger("change")}},n.prototype.unselect=function(r){var o=this;if(this.$element.prop("multiple")){if(r.selected=!1,l(r.element).is("option"))return r.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n].id;i!==r.id&&-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(i,e){var r=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(i,t);null!==n&&r.push(n)}}),e({results:r})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),i=this._normalizeItem(e);return i.element=t,a.StoreData(t,"data",i),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),i=[],r=0;r<n.length;r++){var o=l(n[r]),s=this.item(o);i.push(s)}t.children=i}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function i(e,t){this._dataToConvert=t.get("data")||[],i.__super__.constructor.call(this,e,t)}return f.Extend(i,e),i.prototype.bind=function(e,t){i.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},i.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),i.__super__.select.call(this,n)},i.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),i=n.map(function(){return t.item(g(this)).id}).get(),r=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,i)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}r.push(p)}}return r},i}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var i=o.ajax(e);return i.then(t),i.fail(n),i}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,i){var r=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=r.processResults(e,n);r.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),i(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||r.trigger("results:message",{message:"errorLoading"})});r._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var i=n.get("tags"),r=n.get("createTag");void 0!==r&&(this.createTag=r);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(i))for(var s=0;s<i.length;s++){var a=i[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var i=t.results,r=0;r<i.length;r++){var o=i[r],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=i,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(i,a)}t.results=i,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var i=n.get("tokenizer");void 0!==i&&(this.tokenizer=i),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var i=this;t.term=t.term||"";var r=this.tokenizer(t,this.options,function(e){var t=i._normalizeItem(e);if(!i.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=i.option(t);n.attr("data-select2-tag",!0),i._removeOldTags(),i.addOptions([n])}!function(e){i.trigger("select",{data:e})}(t)});r.term!==t.term&&(this.$search.length&&(this.$search.val(r.term),this.$search.trigger("focus")),t.term=r.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,i){for(var r=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,r)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(i(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(){i._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var i=this;this._checkIfMaximumSelected(function(){e.call(i,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var i=this;this.current(function(e){var t=null!=e?e.length:0;0<i.maximumSelectionLength&&t>=i.maximumSelectionLength?i.trigger("results:message",{message:"maximumSelected",args:{maximum:i.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){i.handleSearch(e)}),t.on("open",function(){i.$search.attr("tabindex",0),i.$search.attr("aria-controls",r),i.$search.trigger("focus"),window.setTimeout(function(){i.$search.trigger("focus")},0)}),t.on("close",function(){i.$search.attr("tabindex",-1),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.val(""),i.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||i.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(i.showSearch(e)?i.$searchContainer.removeClass("select2-search--hide"):i.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,i){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,i)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),i=t.length-1;0<=i;i--){var r=t[i];this.placeholder.id===r.id&&n.splice(i,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,i){this.lastParams={},e.call(this,t,n,i),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("query",function(e){i.lastParams=e,i.loading=!0}),t.on("query:append",function(e){i.lastParams=e,i.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("open",function(){i._showDropdown(),i._attachPositioningHandler(t),i._bindContainerResultHandlers(t)}),t.on("close",function(){i._hideDropdown(),i._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,i="scroll.select2."+t.id,r="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(i,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(i+" "+r+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,i="resize.select2."+t.id,r="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+i+" "+r)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),i=null,r=this.$container.offset();r.bottom=r.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=r.top,o.bottom=r.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<r.top-s,u=l>r.bottom+s,d={left:r.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(i="below"),u||!c||t?!c&&u&&t&&(i="below"):i="above",("above"==i||t&&"below"!==i)&&(d.top=o.top-h.top-s),null!=i&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+i),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+i)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,i){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,i)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,i=0;i<t.length;i++){var r=t[i];r.children?n+=e(r.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("close",function(e){i._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var i=this.getHighlightedResults();if(!(i.length<1)){var r=o.GetData(i[0],"data");null!=r.element&&r.element.selected||null==r.element&&r.selected||this.trigger("select",{data:r})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(e){i._selectTriggered(e)}),t.on("unselect",function(e){i._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,w,$,b,A,x,D,S,C,E,O,T,q,j,L,I,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=$:null!=e.data?e.dataAdapter=w:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,b)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,L))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=C;else{var i=y.Decorate(C,E);e.dropdownAdapter=i}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,I)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var r=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,r)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var i=c.extend(!0,{},n),r=n.children.length-1;0<=r;r--)null==e(t,n.children[r])&&i.children.splice(r,1);return 0<i.children.length?i:e(t,i)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,i=this.defaults.language,r=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(r),this._resolveLanguage(n),this._resolveLanguage(i),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],i=0;i<t.length;i++)if(n.push(t[i]),"string"==typeof t[i]&&0<t[i].indexOf("-")){var r=t[i].split("-")[0];n.push(r)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,i=0;i<e.length;i++){var r=new s,o=e[i];if("string"==typeof o)try{r=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,r=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else r=c.isPlainObject(o)?new s(o):o;n.extend(r)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var i=y._convertData(n);c.extend(!0,this.defaults,i)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(i,d,r,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=r.applyFromElement(this.options,t)),this.options=r.apply(this.options),t&&t.is("input")){var n=i(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function i(e,t){return t.toUpperCase()}for(var r=0;r<e[0].attributes.length;r++){var o=e[0].attributes[r].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,i)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(o,c,u,i){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var i=this.options.get("dataAdapter");this.dataAdapter=new i(e,this.options);var r=this.render();this._placeContainer(r);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,r);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,r);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var i=this._resolveWidth(e,"style");return null!=i?i:this._resolveWidth(e,"element")}if("element"==t){var r=e.outerWidth(!1);return r<=0?"auto":r+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){t._syncA(),t._syncS(null,e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,i=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===o.inArray(e,i)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===i.ESC||t===i.TAB||t===i.UP&&e.altKey?(n.close(e),e.preventDefault()):t===i.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===i.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===i.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===i.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===i.ENTER||t===i.SPACE||t===i.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._isChangeMutation=function(e,t){var n=!1,i=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var r=0;r<t.addedNodes.length;r++){t.addedNodes[r].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length?n=!0:o.isArray(t)&&o.each(t,function(e,t){if(i._isChangeMutation(e,t))return!(n=!0)});else n=!0;return n}},d.prototype._syncSubtree=function(e,t){var n=this._isChangeMutation(e,t),i=this;n&&this.dataAdapter.current(function(e){i.trigger("selection:update",{data:e})})},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,i={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in i){var r=i[e],o={prevented:!1,name:e,args:t};if(n.call(this,r,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},d.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},d.prototype.isEnabled=function(){return!this.isDisabled()},d.prototype.isDisabled=function(){return this.options.get("disabled")},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];o.isArray(t)&&(t=o.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("input").trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=o('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("select2/compat/utils",["jquery"],function(s){return{syncCssClasses:function(e,t,n){var i,r,o=[];(i=s.trim(e.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0===this.indexOf("select2-")&&o.push(this)}),(i=s.trim(t.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&null!=(r=n(this))&&o.push(r)}),e.attr("class",o.join(" "))}}}),e.define("select2/compat/containerCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("containerCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptContainerCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("containerCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/dropdownCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("dropdownCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptDropdownCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("dropdownCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/initSelection",["jquery"],function(i){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=n.get("initSelection"),this._isInitialized=!1,e.call(this,t,n)}return e.prototype.current=function(e,t){var n=this;this._isInitialized?e.call(this,t):this.initSelection.call(null,this.$element,function(e){n._isInitialized=!0,i.isArray(e)||(e=[e]),t(e)})},e}),e.define("select2/compat/inputData",["jquery","../utils"],function(s,i){function e(e,t,n){this._currentData=[],this._valueSeparator=n.get("valueSeparator")||",","hidden"===t.prop("type")&&n.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),e.call(this,t,n)}return e.prototype.current=function(e,t){function i(e,t){var n=[];return e.selected||-1!==s.inArray(e.id,t)?(e.selected=!0,n.push(e)):e.selected=!1,e.children&&n.push.apply(n,i(e.children,t)),n}for(var n=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r];n.push.apply(n,i(o,this.$element.val().split(this._valueSeparator)))}t(n)},e.prototype.select=function(e,t){if(this.options.get("multiple")){var n=this.$element.val();n+=this._valueSeparator+t.id,this.$element.val(n),this.$element.trigger("input").trigger("change")}else this.current(function(e){s.map(e,function(e){e.selected=!1})}),this.$element.val(t.id),this.$element.trigger("input").trigger("change")},e.prototype.unselect=function(e,r){var o=this;r.selected=!1,this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n];r.id!=i.id&&t.push(i.id)}o.$element.val(t.join(o._valueSeparator)),o.$element.trigger("input").trigger("change")})},e.prototype.query=function(e,t,n){for(var i=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r],s=this.matches(t,o);null!==s&&i.push(s)}n({results:i})},e.prototype.addOptions=function(e,t){var n=s.map(t,function(e){return i.GetData(e[0],"data")});this._currentData.push.apply(this._currentData,n)},e}),e.define("select2/compat/matcher",["jquery"],function(s){return function(o){return function(e,t){var n=s.extend(!0,{},t);if(null==e.term||""===s.trim(e.term))return n;if(t.children){for(var i=t.children.length-1;0<=i;i--){var r=t.children[i];o(e.term,r.text,r)||n.children.splice(i,1)}if(0<n.children.length)return n}return o(e.term,t.text,t)?n:null}}}),e.define("select2/compat/query",[],function(){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.callback=n,this.options.get("query").call(null,t)},e}),e.define("select2/dropdown/attachContainer",[],function(){function e(e,t,n){e.call(this,t,n)}return e.prototype.position=function(e,t,n){n.find(".dropdown-wrapper").append(t),t.addClass("select2-dropdown--below"),n.addClass("select2-container--below")},e}),e.define("select2/dropdown/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$dropdown.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),e.define("select2/selection/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$selection.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),l=function(p){var h,f,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in document||9<=document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],g=Array.prototype.slice;if(p.event.fixHooks)for(var n=e.length;n;)p.event.fixHooks[e[--n]]=p.event.mouseHooks;var m=p.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],i,!1);else this.onmousewheel=i;p.data(this,"mousewheel-line-height",m.getLineHeight(this)),p.data(this,"mousewheel-page-height",m.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],i,!1);else this.onmousewheel=null;p.removeData(this,"mousewheel-line-height"),p.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=p(e),n=t["offsetParent"in p.fn?"offsetParent":"parent"]();return n.length||(n=p("body")),parseInt(n.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return p(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function i(e){var t,n=e||window.event,i=g.call(arguments,1),r=0,o=0,s=0,a=0,l=0;if((e=p.event.fix(n)).type="mousewheel","detail"in n&&(s=-1*n.detail),"wheelDelta"in n&&(s=n.wheelDelta),"wheelDeltaY"in n&&(s=n.wheelDeltaY),"wheelDeltaX"in n&&(o=-1*n.wheelDeltaX),"axis"in n&&n.axis===n.HORIZONTAL_AXIS&&(o=-1*s,s=0),r=0===s?o:s,"deltaY"in n&&(r=s=-1*n.deltaY),"deltaX"in n&&(o=n.deltaX,0===s&&(r=-1*o)),0!==s||0!==o){if(1===n.deltaMode){var c=p.data(this,"mousewheel-line-height");r*=c,s*=c,o*=c}else if(2===n.deltaMode){var u=p.data(this,"mousewheel-page-height");r*=u,s*=u,o*=u}if(t=Math.max(Math.abs(s),Math.abs(o)),(!f||t<f)&&y(n,f=t)&&(f/=40),y(n,t)&&(r/=40,o/=40,s/=40),r=Math[1<=r?"floor":"ceil"](r/f),o=Math[1<=o?"floor":"ceil"](o/f),s=Math[1<=s?"floor":"ceil"](s/f),m.settings.normalizeOffset&&this.getBoundingClientRect){var d=this.getBoundingClientRect();a=e.clientX-d.left,l=e.clientY-d.top}return e.deltaX=o,e.deltaY=s,e.deltaFactor=f,e.offsetX=a,e.offsetY=l,e.deltaMode=0,i.unshift(e,r,o,s),h&&clearTimeout(h),h=setTimeout(v,200),(p.event.dispatch||p.event.handle).apply(this,i)}}function v(){f=null}function y(e,t){return m.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120==0}p.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})},"function"==typeof e.define&&e.define.amd?e.define("jquery-mousewheel",["jquery"],l):"object"==typeof exports?module.exports=l:l(d),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(r,e,o,t,s){if(null==r.fn.select2){var a=["open","close","destroy"];r.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=r.extend(!0,{},t);new o(r(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,i=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,i)}),-1<r.inArray(t,a)?this:n}}return null==r.fn.select2.defaults&&(r.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return d.fn.select2.amd=e,t});
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/select2.js b/htdocs/includes/jquery/plugins/select2/dist/js/select2.js
index a5e7d50de25..fcfb5ab49d8 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/js/select2.js
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/select2.js
@@ -1,11 +1,11 @@
 /*!
- * Select2 4.0.5
+ * Select2 4.0.13
  * https://select2.github.io
  *
  * Released under the MIT license
  * https://github.com/select2/select2/blob/master/LICENSE.md
  */
-(function (factory) {
+;(function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
@@ -574,10 +574,10 @@ S2.define('select2/utils',[
     DecoratedClass.prototype = new ctr();
 
     for (var m = 0; m < superMethods.length; m++) {
-        var superMethod = superMethods[m];
+      var superMethod = superMethods[m];
 
-        DecoratedClass.prototype[superMethod] =
-          SuperClass.prototype[superMethod];
+      DecoratedClass.prototype[superMethod] =
+        SuperClass.prototype[superMethod];
     }
 
     var calledMethod = function (methodName) {
@@ -772,6 +772,70 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Cache objects in Utils.__cache instead of $.data (see #4346)
+  Utils.__cache = {};
+
+  var id = 0;
+  Utils.GetUniqueElementId = function (element) {
+    // Get a unique element Id. If element has no id,
+    // creates a new unique number, stores it in the id
+    // attribute and returns the new id.
+    // If an id already exists, it simply returns it.
+
+    var select2Id = element.getAttribute('data-select2-id');
+    if (select2Id == null) {
+      // If element has id, use it.
+      if (element.id) {
+        select2Id = element.id;
+        element.setAttribute('data-select2-id', select2Id);
+      } else {
+        element.setAttribute('data-select2-id', ++id);
+        select2Id = id.toString();
+      }
+    }
+    return select2Id;
+  };
+
+  Utils.StoreData = function (element, name, value) {
+    // Stores an item in the cache for a specified element.
+    // name is the cache key.
+    var id = Utils.GetUniqueElementId(element);
+    if (!Utils.__cache[id]) {
+      Utils.__cache[id] = {};
+    }
+
+    Utils.__cache[id][name] = value;
+  };
+
+  Utils.GetData = function (element, name) {
+    // Retrieves a value from the cache by its key (name)
+    // name is optional. If no name specified, return
+    // all cache items for the specified element.
+    // and for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (name) {
+      if (Utils.__cache[id]) {
+        if (Utils.__cache[id][name] != null) {
+          return Utils.__cache[id][name];
+        }
+        return $(element).data(name); // Fallback to HTML5 data attribs.
+      }
+      return $(element).data(name); // Fallback to HTML5 data attribs.
+    } else {
+      return Utils.__cache[id];
+    }
+  };
+
+  Utils.RemoveData = function (element) {
+    // Removes all cached items for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (Utils.__cache[id] != null) {
+      delete Utils.__cache[id];
+    }
+
+    element.removeAttribute('data-select2-id');
+  };
+
   return Utils;
 });
 
@@ -791,7 +855,7 @@ S2.define('select2/results',[
 
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="tree"></ul>'
+      '<ul class="select2-results__options" role="listbox"></ul>'
     );
 
     if (this.options.get('multiple')) {
@@ -814,7 +878,7 @@ S2.define('select2/results',[
     this.hideLoading();
 
     var $message = $(
-      '<li role="treeitem" aria-live="assertive"' +
+      '<li role="alert" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
 
@@ -907,7 +971,7 @@ S2.define('select2/results',[
       $options.each(function () {
         var $option = $(this);
 
-        var item = $.data(this, 'data');
+        var item = Utils.GetData(this, 'data');
 
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
@@ -948,11 +1012,16 @@ S2.define('select2/results',[
     option.className = 'select2-results__option';
 
     var attrs = {
-      'role': 'treeitem',
+      'role': 'option',
       'aria-selected': 'false'
     };
 
-    if (data.disabled) {
+    var matches = window.Element.prototype.matches ||
+      window.Element.prototype.msMatchesSelector ||
+      window.Element.prototype.webkitMatchesSelector;
+
+    if ((data.element != null && matches.call(data.element, ':disabled')) ||
+        (data.element == null && data.disabled)) {
       delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
     }
@@ -1012,7 +1081,7 @@ S2.define('select2/results',[
       this.template(data, option);
     }
 
-    $.data(option, 'data', data);
+    Utils.StoreData(option, 'data', data);
 
     return option;
   };
@@ -1053,7 +1122,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('unselect', function () {
@@ -1062,7 +1134,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('open', function () {
@@ -1098,7 +1173,7 @@ S2.define('select2/results',[
         return;
       }
 
-      var data = $highlighted.data('data');
+      var data = Utils.GetData($highlighted[0], 'data');
 
       if ($highlighted.attr('aria-selected') == 'true') {
         self.trigger('close', {});
@@ -1116,8 +1191,9 @@ S2.define('select2/results',[
 
       var currentIndex = $options.index($highlighted);
 
-      // If we are already at te top, don't move further
-      if (currentIndex === 0) {
+      // If we are already at the top, don't move further
+      // If no options, currentIndex will be -1
+      if (currentIndex <= 0) {
         return;
       }
 
@@ -1210,7 +1286,7 @@ S2.define('select2/results',[
       function (evt) {
       var $this = $(this);
 
-      var data = $this.data('data');
+      var data = Utils.GetData(this, 'data');
 
       if ($this.attr('aria-selected') === 'true') {
         if (self.options.get('multiple')) {
@@ -1233,7 +1309,7 @@ S2.define('select2/results',[
 
     this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
       function (evt) {
-      var data = $(this).data('data');
+      var data = Utils.GetData(this, 'data');
 
       self.getHighlightedResults()
           .removeClass('select2-results__option--highlighted');
@@ -1348,14 +1424,15 @@ S2.define('select2/selection/base',[
 
     this._tabindex = 0;
 
-    if (this.$element.data('old-tabindex') != null) {
-      this._tabindex = this.$element.data('old-tabindex');
+    if (Utils.GetData(this.$element[0], 'old-tabindex') != null) {
+      this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex');
     } else if (this.$element.attr('tabindex') != null) {
       this._tabindex = this.$element.attr('tabindex');
     }
 
     $selection.attr('title', this.$element.attr('title'));
     $selection.attr('tabindex', this._tabindex);
+    $selection.attr('aria-disabled', 'false');
 
     this.$selection = $selection;
 
@@ -1365,7 +1442,6 @@ S2.define('select2/selection/base',[
   BaseSelection.prototype.bind = function (container, $container) {
     var self = this;
 
-    var id = container.id + '-container';
     var resultsId = container.id + '-results';
 
     this.container = container;
@@ -1408,17 +1484,19 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      self.$selection.trigger('focus');
 
       self._detachCloseHandler(container);
     });
 
     container.on('enable', function () {
       self.$selection.attr('tabindex', self._tabindex);
+      self.$selection.attr('aria-disabled', 'false');
     });
 
     container.on('disable', function () {
       self.$selection.attr('tabindex', '-1');
+      self.$selection.attr('aria-disabled', 'true');
     });
   };
 
@@ -1441,7 +1519,6 @@ S2.define('select2/selection/base',[
   };
 
   BaseSelection.prototype._attachCloseHandler = function (container) {
-    var self = this;
 
     $(document.body).on('mousedown.select2.' + container.id, function (e) {
       var $target = $(e.target);
@@ -1451,13 +1528,11 @@ S2.define('select2/selection/base',[
       var $all = $('.select2.select2-container--open');
 
       $all.each(function () {
-        var $this = $(this);
-
         if (this == $select[0]) {
           return;
         }
 
-        var $element = $this.data('element');
+        var $element = Utils.GetData(this, 'element');
 
         $element.select2('close');
       });
@@ -1481,6 +1556,27 @@ S2.define('select2/selection/base',[
     throw new Error('The `update` method must be defined in child classes.');
   };
 
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  BaseSelection.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  BaseSelection.prototype.isDisabled = function () {
+    return this.options.get('disabled');
+  };
+
   return BaseSelection;
 });
 
@@ -1518,7 +1614,10 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered').attr('id', id);
+    this.$selection.find('.select2-selection__rendered')
+      .attr('id', id)
+      .attr('role', 'textbox')
+      .attr('aria-readonly', 'true');
     this.$selection.attr('aria-labelledby', id);
 
     this.$selection.on('mousedown', function (evt) {
@@ -1542,17 +1641,15 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger('focus');
       }
     });
-
-    container.on('selection:update', function (params) {
-      self.update(params.data);
-    });
   };
 
   SingleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title'); // clear tooltip on empty
   };
 
   SingleSelection.prototype.display = function (data, container) {
@@ -1578,7 +1675,14 @@ S2.define('select2/selection/single',[
     var formatted = this.display(selection, $rendered);
 
     $rendered.empty().append(formatted);
-    $rendered.prop('title', selection.title || selection.text);
+
+    var title = selection.title || selection.text;
+
+    if (title) {
+      $rendered.attr('title', title);
+    } else {
+      $rendered.removeAttr('title');
+    }
   };
 
   return SingleSelection;
@@ -1623,14 +1727,14 @@ S2.define('select2/selection/multiple',[
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.options.get('disabled')) {
+        if (self.isDisabled()) {
           return;
         }
 
         var $remove = $(this);
         var $selection = $remove.parent();
 
-        var data = $selection.data('data');
+        var data = Utils.GetData($selection[0], 'data');
 
         self.trigger('unselect', {
           originalEvent: evt,
@@ -1641,7 +1745,9 @@ S2.define('select2/selection/multiple',[
   };
 
   MultipleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title');
   };
 
   MultipleSelection.prototype.display = function (data, container) {
@@ -1679,9 +1785,14 @@ S2.define('select2/selection/multiple',[
       var formatted = this.display(selection, $selection);
 
       $selection.append(formatted);
-      $selection.prop('title', selection.title || selection.text);
 
-      $selection.data('data', selection);
+      var title = selection.title || selection.text;
+
+      if (title) {
+        $selection.attr('title', title);
+      }
+
+      Utils.StoreData($selection[0], 'data', selection);
 
       $selections.push($selection);
     }
@@ -1746,8 +1857,9 @@ S2.define('select2/selection/placeholder',[
 
 S2.define('select2/selection/allowClear',[
   'jquery',
-  '../keys'
-], function ($, KEYS) {
+  '../keys',
+  '../utils'
+], function ($, KEYS, Utils) {
   function AllowClear () { }
 
   AllowClear.prototype.bind = function (decorated, container, $container) {
@@ -1776,7 +1888,7 @@ S2.define('select2/selection/allowClear',[
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -1789,10 +1901,22 @@ S2.define('select2/selection/allowClear',[
 
     evt.stopPropagation();
 
-    var data = $clear.data('data');
+    var data = Utils.GetData($clear[0], 'data');
+
+    var previousVal = this.$element.val();
+    this.$element.val(this.placeholder.id);
+
+    var unselectData = {
+      data: data
+    };
+    this.trigger('clear', unselectData);
+    if (unselectData.prevented) {
+      this.$element.val(previousVal);
+      return;
+    }
 
     for (var d = 0; d < data.length; d++) {
-      var unselectData = {
+      unselectData = {
         data: data[d]
       };
 
@@ -1802,11 +1926,12 @@ S2.define('select2/selection/allowClear',[
 
       // If the event was prevented, don't clear it out.
       if (unselectData.prevented) {
+        this.$element.val(previousVal);
         return;
       }
     }
 
-    this.$element.val(this.placeholder.id).trigger('change');
+    this.$element.trigger('input').trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -1829,12 +1954,14 @@ S2.define('select2/selection/allowClear',[
       return;
     }
 
+    var removeAll = this.options.get('translations').get('removeAllItems');
+
     var $remove = $(
-      '<span class="select2-selection__clear">' +
+      '<span class="select2-selection__clear" title="' + removeAll() +'">' +
         '&times;' +
       '</span>'
     );
-    $remove.data('data', data);
+    Utils.StoreData($remove[0], 'data', data);
 
     this.$selection.find('.select2-selection__rendered').prepend($remove);
   };
@@ -1856,7 +1983,7 @@ S2.define('select2/selection/search',[
       '<li class="select2-search select2-search--inline">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</li>'
     );
 
@@ -1873,14 +2000,18 @@ S2.define('select2/selection/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     container.on('open', function () {
+      self.$search.attr('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
+      self.$search.removeAttr('aria-controls');
       self.$search.removeAttr('aria-activedescendant');
       self.$search.trigger('focus');
     });
@@ -1900,7 +2031,11 @@ S2.define('select2/selection/search',[
     });
 
     container.on('results:focus', function (params) {
-      self.$search.attr('aria-activedescendant', params.id);
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
     });
 
     this.$selection.on('focusin', '.select2-search--inline', function (evt) {
@@ -1925,7 +2060,7 @@ S2.define('select2/selection/search',[
           .prev('.select2-selection__choice');
 
         if ($previousChoice.length > 0) {
-          var item = $previousChoice.data('data');
+          var item = Utils.GetData($previousChoice[0], 'data');
 
           self.searchRemoveChoice(item);
 
@@ -1934,6 +2069,12 @@ S2.define('select2/selection/search',[
       }
     });
 
+    this.$selection.on('click', '.select2-search--inline', function (evt) {
+      if (self.$search.val()) {
+        evt.stopPropagation();
+      }
+    });
+
     // Try to detect the IE version should the `documentMode` property that
     // is stored on the document. This is only implemented in IE and is
     // slightly cleaner than doing a user agent check.
@@ -2019,7 +2160,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger('focus');
     }
   };
 
@@ -2052,7 +2193,7 @@ S2.define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.find('.select2-selection__rendered').innerWidth();
+      width = this.$selection.find('.select2-selection__rendered').width();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 
@@ -2076,10 +2217,13 @@ S2.define('select2/selection/eventRelay',[
       'open', 'opening',
       'close', 'closing',
       'select', 'selecting',
-      'unselect', 'unselecting'
+      'unselect', 'unselecting',
+      'clear', 'clearing'
     ];
 
-    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
+    var preventableEvents = [
+      'opening', 'closing', 'selecting', 'unselecting', 'clearing'
+    ];
 
     decorated.call(this, container, $container);
 
@@ -2412,6 +2556,7 @@ S2.define('select2/diacritics',[
     '\u019F': 'O',
     '\uA74A': 'O',
     '\uA74C': 'O',
+    '\u0152': 'OE',
     '\u01A2': 'OI',
     '\uA74E': 'OO',
     '\u0222': 'OU',
@@ -2821,6 +2966,7 @@ S2.define('select2/diacritics',[
     '\uA74B': 'o',
     '\uA74D': 'o',
     '\u0275': 'o',
+    '\u0153': 'oe',
     '\u01A3': 'oi',
     '\u0223': 'ou',
     '\uA74F': 'oo',
@@ -2989,8 +3135,9 @@ S2.define('select2/diacritics',[
     '\u03CD': '\u03C5',
     '\u03CB': '\u03C5',
     '\u03B0': '\u03C5',
-    '\u03C9': '\u03C9',
-    '\u03C2': '\u03C3'
+    '\u03CE': '\u03C9',
+    '\u03C2': '\u03C3',
+    '\u2019': '\''
   };
 
   return diacritics;
@@ -3075,7 +3222,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3096,13 +3243,13 @@ S2.define('select2/data/select',[
         }
 
         self.$element.val(val);
-        self.$element.trigger('change');
+        self.$element.trigger('input').trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -3118,7 +3265,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3136,7 +3283,7 @@ S2.define('select2/data/select',[
 
       self.$element.val(val);
 
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
@@ -3158,7 +3305,7 @@ S2.define('select2/data/select',[
     // Remove anything added to child elements
     this.$element.find('*').each(function () {
       // Remove any custom data set by Select2
-      $.removeData(this, 'data');
+      Utils.RemoveData(this);
     });
   };
 
@@ -3231,7 +3378,7 @@ S2.define('select2/data/select',[
     normalizedData.element = option;
 
     // Override the option's data with the combined data
-    $.data(option, 'data', normalizedData);
+    Utils.StoreData(option, 'data', normalizedData);
 
     return $option;
   };
@@ -3239,7 +3386,7 @@ S2.define('select2/data/select',[
   SelectAdapter.prototype.item = function ($option) {
     var data = {};
 
-    data = $.data($option[0], 'data');
+    data = Utils.GetData($option[0], 'data');
 
     if (data != null) {
       return data;
@@ -3277,13 +3424,13 @@ S2.define('select2/data/select',[
     data = this._normalizeItem(data);
     data.element = $option[0];
 
-    $.data($option[0], 'data', data);
+    Utils.StoreData($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (!$.isPlainObject(item)) {
+    if (item !== Object(item)) {
       item = {
         id: item,
         text: item
@@ -3329,15 +3476,19 @@ S2.define('select2/data/array',[
   'jquery'
 ], function (SelectAdapter, Utils, $) {
   function ArrayAdapter ($element, options) {
-    var data = options.get('data') || [];
+    this._dataToConvert = options.get('data') || [];
 
     ArrayAdapter.__super__.constructor.call(this, $element, options);
-
-    this.addOptions(this.convertToOptions(data));
   }
 
   Utils.Extend(ArrayAdapter, SelectAdapter);
 
+  ArrayAdapter.prototype.bind = function (container, $container) {
+    ArrayAdapter.__super__.bind.call(this, container, $container);
+
+    this.addOptions(this.convertToOptions(this._dataToConvert));
+  };
+
   ArrayAdapter.prototype.select = function (data) {
     var $option = this.$element.find('option').filter(function (i, elm) {
       return elm.value == data.id.toString();
@@ -3487,7 +3638,8 @@ S2.define('select2/data/ajax',[
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
-        if ($request.status && $request.status === '0') {
+        if ('status' in $request &&
+            ($request.status === 0 || $request.status === '0')) {
           return;
         }
 
@@ -3626,8 +3778,6 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype._removeOldTags = function (_) {
-    var tag = this._lastTag;
-
     var $options = this.$element.find('option[data-select2-tag]');
 
     $options.each(function () {
@@ -3702,7 +3852,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger('focus');
       }
 
       params.term = tokenData.term;
@@ -3831,10 +3981,30 @@ S2.define('select2/data/maximumSelectionLength',[
     decorated.call(this, $e, options);
   }
 
+  MaximumSelectionLength.prototype.bind =
+    function (decorated, container, $container) {
+      var self = this;
+
+      decorated.call(this, container, $container);
+
+      container.on('select', function () {
+        self._checkIfMaximumSelected();
+      });
+  };
+
   MaximumSelectionLength.prototype.query =
     function (decorated, params, callback) {
       var self = this;
 
+      this._checkIfMaximumSelected(function () {
+        decorated.call(self, params, callback);
+      });
+  };
+
+  MaximumSelectionLength.prototype._checkIfMaximumSelected =
+    function (_, successCallback) {
+      var self = this;
+
       this.current(function (currentData) {
         var count = currentData != null ? currentData.length : 0;
         if (self.maximumSelectionLength > 0 &&
@@ -3847,7 +4017,10 @@ S2.define('select2/data/maximumSelectionLength',[
           });
           return;
         }
-        decorated.call(self, params, callback);
+
+        if (successCallback) {
+          successCallback();
+        }
       });
   };
 
@@ -3886,7 +4059,7 @@ S2.define('select2/dropdown',[
   };
 
   Dropdown.prototype.position = function ($dropdown, $container) {
-    // Should be implmented in subclasses
+    // Should be implemented in subclasses
   };
 
   Dropdown.prototype.destroy = function () {
@@ -3910,7 +4083,7 @@ S2.define('select2/dropdown/search',[
       '<span class="select2-search select2-search--dropdown">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</span>'
     );
 
@@ -3925,6 +4098,8 @@ S2.define('select2/dropdown/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     this.$search.on('keydown', function (evt) {
@@ -3947,23 +4122,27 @@ S2.define('select2/dropdown/search',[
 
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
+      self.$search.attr('aria-controls', resultsId);
 
-      self.$search.focus();
+      self.$search.trigger('focus');
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }, 0);
     });
 
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
+      self.$search.removeAttr('aria-controls');
+      self.$search.removeAttr('aria-activedescendant');
 
       self.$search.val('');
+      self.$search.trigger('blur');
     });
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }
     });
 
@@ -3978,6 +4157,14 @@ S2.define('select2/dropdown/search',[
         }
       }
     });
+
+    container.on('results:focus', function (params) {
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
+    });
   };
 
   Search.prototype.handleSearch = function (evt) {
@@ -4062,6 +4249,7 @@ S2.define('select2/dropdown/infiniteScroll',[
 
     if (this.showLoadingMore(data)) {
       this.$results.append(this.$loadingMore);
+      this.loadMoreIfNeeded();
     }
   };
 
@@ -4080,25 +4268,27 @@ S2.define('select2/dropdown/infiniteScroll',[
       self.loading = true;
     });
 
-    this.$results.on('scroll', function () {
-      var isLoadMoreVisible = $.contains(
-        document.documentElement,
-        self.$loadingMore[0]
-      );
+    this.$results.on('scroll', this.loadMoreIfNeeded.bind(this));
+  };
 
-      if (self.loading || !isLoadMoreVisible) {
-        return;
-      }
+  InfiniteScroll.prototype.loadMoreIfNeeded = function () {
+    var isLoadMoreVisible = $.contains(
+      document.documentElement,
+      this.$loadingMore[0]
+    );
 
-      var currentOffset = self.$results.offset().top +
-        self.$results.outerHeight(false);
-      var loadingMoreOffset = self.$loadingMore.offset().top +
-        self.$loadingMore.outerHeight(false);
+    if (this.loading || !isLoadMoreVisible) {
+      return;
+    }
 
-      if (currentOffset + 50 >= loadingMoreOffset) {
-        self.loadMore();
-      }
-    });
+    var currentOffset = this.$results.offset().top +
+      this.$results.outerHeight(false);
+    var loadingMoreOffset = this.$loadingMore.offset().top +
+      this.$loadingMore.outerHeight(false);
+
+    if (currentOffset + 50 >= loadingMoreOffset) {
+      this.loadMore();
+    }
   };
 
   InfiniteScroll.prototype.loadMore = function () {
@@ -4119,7 +4309,7 @@ S2.define('select2/dropdown/infiniteScroll',[
     var $option = $(
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="treeitem" aria-disabled="true"></li>'
+      'role="option" aria-disabled="true"></li>'
     );
 
     var message = this.options.get('translations').get('loadingMore');
@@ -4137,7 +4327,7 @@ S2.define('select2/dropdown/attachBody',[
   '../utils'
 ], function ($, Utils) {
   function AttachBody (decorated, $element, options) {
-    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
+    this.$dropdownParent = $(options.get('dropdownParent') || document.body);
 
     decorated.call(this, $element, options);
   }
@@ -4145,27 +4335,14 @@ S2.define('select2/dropdown/attachBody',[
   AttachBody.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
-    var setupResultsEvents = false;
-
     decorated.call(this, container, $container);
 
     container.on('open', function () {
       self._showDropdown();
       self._attachPositioningHandler(container);
 
-      if (!setupResultsEvents) {
-        setupResultsEvents = true;
-
-        container.on('results:all', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-
-        container.on('results:append', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-      }
+      // Must bind after the results handlers to ensure correct sizing
+      self._bindContainerResultHandlers(container);
     });
 
     container.on('close', function () {
@@ -4214,6 +4391,44 @@ S2.define('select2/dropdown/attachBody',[
     this.$dropdownContainer.detach();
   };
 
+  AttachBody.prototype._bindContainerResultHandlers =
+      function (decorated, container) {
+
+    // These should only be bound once
+    if (this._containerResultsHandlersBound) {
+      return;
+    }
+
+    var self = this;
+
+    container.on('results:all', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:append', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:message', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('select', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('unselect', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    this._containerResultsHandlersBound = true;
+  };
+
   AttachBody.prototype._attachPositioningHandler =
       function (decorated, container) {
     var self = this;
@@ -4224,14 +4439,14 @@ S2.define('select2/dropdown/attachBody',[
 
     var $watchers = this.$container.parents().filter(Utils.hasScroll);
     $watchers.each(function () {
-      $(this).data('select2-scroll-position', {
+      Utils.StoreData(this, 'select2-scroll-position', {
         x: $(this).scrollLeft(),
         y: $(this).scrollTop()
       });
     });
 
     $watchers.on(scrollEvent, function (ev) {
-      var position = $(this).data('select2-scroll-position');
+      var position = Utils.GetData(this, 'select2-scroll-position');
       $(this).scrollTop(position.y);
     });
 
@@ -4290,16 +4505,26 @@ S2.define('select2/dropdown/attachBody',[
       top: container.bottom
     };
 
-    // Determine what the parent element is to use for calciulating the offset
+    // Determine what the parent element is to use for calculating the offset
     var $offsetParent = this.$dropdownParent;
 
-    // For statically positoned elements, we need to get the element
+    // For statically positioned elements, we need to get the element
     // that is determining the offset
     if ($offsetParent.css('position') === 'static') {
       $offsetParent = $offsetParent.offsetParent();
     }
 
-    var parentOffset = $offsetParent.offset();
+    var parentOffset = {
+      top: 0,
+      left: 0
+    };
+
+    if (
+      $.contains(document.body, $offsetParent[0]) ||
+      $offsetParent[0].isConnected
+      ) {
+      parentOffset = $offsetParent.offset();
+    }
 
     css.top -= parentOffset.top;
     css.left -= parentOffset.left;
@@ -4396,8 +4621,8 @@ S2.define('select2/dropdown/minimumResultsForSearch',[
 });
 
 S2.define('select2/dropdown/selectOnClose',[
-
-], function () {
+  '../utils'
+], function (Utils) {
   function SelectOnClose () { }
 
   SelectOnClose.prototype.bind = function (decorated, container, $container) {
@@ -4428,7 +4653,7 @@ S2.define('select2/dropdown/selectOnClose',[
       return;
     }
 
-    var data = $highlightedResults.data('data');
+    var data = Utils.GetData($highlightedResults[0], 'data');
 
     // Don't re-select already selected resulte
     if (
@@ -4469,7 +4694,7 @@ S2.define('select2/dropdown/closeOnSelect',[
     var originalEvent = evt.originalEvent;
 
     // Don't close if the control key is being held
-    if (originalEvent && originalEvent.ctrlKey) {
+    if (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)) {
       return;
     }
 
@@ -4523,6 +4748,9 @@ S2.define('select2/i18n/en',[],function () {
     },
     searching: function () {
       return 'Searching…';
+    },
+    removeAllItems: function () {
+      return 'Remove all items';
     }
   };
 });
@@ -4761,66 +4989,29 @@ S2.define('select2/defaults',[
       );
     }
 
-    if (typeof options.language === 'string') {
-      // Check if the language is specified with a region
-      if (options.language.indexOf('-') > 0) {
-        // Extract the region information if it is included
-        var languageParts = options.language.split('-');
-        var baseLanguage = languageParts[0];
+    // If the defaults were not previously applied from an element, it is
+    // possible for the language option to have not been resolved
+    options.language = this._resolveLanguage(options.language);
 
-        options.language = [options.language, baseLanguage];
-      } else {
-        options.language = [options.language];
+    // Always fall back to English since it will always be complete
+    options.language.push('en');
+
+    var uniqueLanguages = [];
+
+    for (var l = 0; l < options.language.length; l++) {
+      var language = options.language[l];
+
+      if (uniqueLanguages.indexOf(language) === -1) {
+        uniqueLanguages.push(language);
       }
     }
 
-    if ($.isArray(options.language)) {
-      var languages = new Translation();
-      options.language.push('en');
+    options.language = uniqueLanguages;
 
-      var languageNames = options.language;
-
-      for (var l = 0; l < languageNames.length; l++) {
-        var name = languageNames[l];
-        var language = {};
-
-        try {
-          // Try to load it with the original name
-          language = Translation.loadPath(name);
-        } catch (e) {
-          try {
-            // If we couldn't load it, check if it wasn't the full path
-            name = this.defaults.amdLanguageBase + name;
-            language = Translation.loadPath(name);
-          } catch (ex) {
-            // The translation could not be loaded at all. Sometimes this is
-            // because of a configuration problem, other times this can be
-            // because of how Select2 helps load all possible translation files.
-            if (options.debug && window.console && console.warn) {
-              console.warn(
-                'Select2: The language file for "' + name + '" could not be ' +
-                'automatically loaded. A fallback will be used instead.'
-              );
-            }
-
-            continue;
-          }
-        }
-
-        languages.extend(language);
-      }
-
-      options.translations = languages;
-    } else {
-      var baseTranslation = Translation.loadPath(
-        this.defaults.amdLanguageBase + 'en'
-      );
-      var customTranslation = new Translation(options.language);
-
-      customTranslation.extend(baseTranslation);
-
-      options.translations = customTranslation;
-    }
+    options.translations = this._processTranslations(
+      options.language,
+      options.debug
+    );
 
     return options;
   };
@@ -4887,13 +5078,14 @@ S2.define('select2/defaults',[
       debug: false,
       dropdownAutoWidth: false,
       escapeMarkup: Utils.escapeMarkup,
-      language: EnglishTranslation,
+      language: {},
       matcher: matcher,
       minimumInputLength: 0,
       maximumInputLength: 0,
       maximumSelectionLength: 0,
       minimumResultsForSearch: 0,
       selectOnClose: false,
+      scrollAfterSelect: false,
       sorter: function (data) {
         return data;
       },
@@ -4908,6 +5100,103 @@ S2.define('select2/defaults',[
     };
   };
 
+  Defaults.prototype.applyFromElement = function (options, $element) {
+    var optionLanguage = options.language;
+    var defaultLanguage = this.defaults.language;
+    var elementLanguage = $element.prop('lang');
+    var parentLanguage = $element.closest('[lang]').prop('lang');
+
+    var languages = Array.prototype.concat.call(
+      this._resolveLanguage(elementLanguage),
+      this._resolveLanguage(optionLanguage),
+      this._resolveLanguage(defaultLanguage),
+      this._resolveLanguage(parentLanguage)
+    );
+
+    options.language = languages;
+
+    return options;
+  };
+
+  Defaults.prototype._resolveLanguage = function (language) {
+    if (!language) {
+      return [];
+    }
+
+    if ($.isEmptyObject(language)) {
+      return [];
+    }
+
+    if ($.isPlainObject(language)) {
+      return [language];
+    }
+
+    var languages;
+
+    if (!$.isArray(language)) {
+      languages = [language];
+    } else {
+      languages = language;
+    }
+
+    var resolvedLanguages = [];
+
+    for (var l = 0; l < languages.length; l++) {
+      resolvedLanguages.push(languages[l]);
+
+      if (typeof languages[l] === 'string' && languages[l].indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = languages[l].split('-');
+        var baseLanguage = languageParts[0];
+
+        resolvedLanguages.push(baseLanguage);
+      }
+    }
+
+    return resolvedLanguages;
+  };
+
+  Defaults.prototype._processTranslations = function (languages, debug) {
+    var translations = new Translation();
+
+    for (var l = 0; l < languages.length; l++) {
+      var languageData = new Translation();
+
+      var language = languages[l];
+
+      if (typeof language === 'string') {
+        try {
+          // Try to load it with the original name
+          languageData = Translation.loadPath(language);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            language = this.defaults.amdLanguageBase + language;
+            languageData = Translation.loadPath(language);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files
+            if (debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + language + '" could ' +
+                'not be automatically loaded. A fallback will be used instead.'
+              );
+            }
+          }
+        }
+      } else if ($.isPlainObject(language)) {
+        languageData = new Translation(language);
+      } else {
+        languageData = language;
+      }
+
+      translations.extend(languageData);
+    }
+
+    return translations;
+  };
+
   Defaults.prototype.set = function (key, value) {
     var camelKey = $.camelCase(key);
 
@@ -4916,7 +5205,7 @@ S2.define('select2/defaults',[
 
     var convertedData = Utils._convertData(data);
 
-    $.extend(this.defaults, convertedData);
+    $.extend(true, this.defaults, convertedData);
   };
 
   var defaults = new Defaults();
@@ -4937,6 +5226,10 @@ S2.define('select2/options',[
       this.fromElement($element);
     }
 
+    if ($element != null) {
+      this.options = Defaults.applyFromElement(this.options, $element);
+    }
+
     this.options = Defaults.apply(this.options);
 
     if ($element && $element.is('input')) {
@@ -4960,14 +5253,6 @@ S2.define('select2/options',[
       this.options.disabled = $e.prop('disabled');
     }
 
-    if (this.options.language == null) {
-      if ($e.prop('lang')) {
-        this.options.language = $e.prop('lang').toLowerCase();
-      } else if ($e.closest('[lang]').prop('lang')) {
-        this.options.language = $e.closest('[lang]').prop('lang');
-      }
-    }
-
     if (this.options.dir == null) {
       if ($e.prop('dir')) {
         this.options.dir = $e.prop('dir');
@@ -4981,7 +5266,7 @@ S2.define('select2/options',[
     $e.prop('disabled', this.options.disabled);
     $e.prop('multiple', this.options.multiple);
 
-    if ($e.data('select2Tags')) {
+    if (Utils.GetData($e[0], 'select2Tags')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-select2-tags` attribute has been changed to ' +
@@ -4990,11 +5275,11 @@ S2.define('select2/options',[
         );
       }
 
-      $e.data('data', $e.data('select2Tags'));
-      $e.data('tags', true);
+      Utils.StoreData($e[0], 'data', Utils.GetData($e[0], 'select2Tags'));
+      Utils.StoreData($e[0], 'tags', true);
     }
 
-    if ($e.data('ajaxUrl')) {
+    if (Utils.GetData($e[0], 'ajaxUrl')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-ajax-url` attribute has been changed to ' +
@@ -5003,21 +5288,45 @@ S2.define('select2/options',[
         );
       }
 
-      $e.attr('ajax--url', $e.data('ajaxUrl'));
-      $e.data('ajax--url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
+      Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl'));
     }
 
     var dataset = {};
 
+    function upperCaseLetter(_, letter) {
+      return letter.toUpperCase();
+    }
+
+    // Pre-load all of the attributes which are prefixed with `data-`
+    for (var attr = 0; attr < $e[0].attributes.length; attr++) {
+      var attributeName = $e[0].attributes[attr].name;
+      var prefix = 'data-';
+
+      if (attributeName.substr(0, prefix.length) == prefix) {
+        // Get the contents of the attribute after `data-`
+        var dataName = attributeName.substring(prefix.length);
+
+        // Get the data contents from the consistent source
+        // This is more than likely the jQuery data helper
+        var dataValue = Utils.GetData($e[0], dataName);
+
+        // camelCase the attribute name to match the spec
+        var camelDataName = dataName.replace(/-([a-z])/g, upperCaseLetter);
+
+        // Store the data attribute contents into the dataset since
+        dataset[camelDataName] = dataValue;
+      }
+    }
+
     // Prefer the element's `dataset` attribute if it exists
     // jQuery 1.x does not correctly handle data attributes with multiple dashes
     if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
-      dataset = $.extend(true, {}, $e[0].dataset, $e.data());
-    } else {
-      dataset = $e.data();
+      dataset = $.extend(true, {}, $e[0].dataset, dataset);
     }
 
-    var data = $.extend(true, {}, dataset);
+    // Prefer our internal data cache if it exists
+    var data = $.extend(true, {}, Utils.GetData($e[0]), dataset);
 
     data = Utils._convertData(data);
 
@@ -5054,8 +5363,8 @@ S2.define('select2/core',[
   './keys'
 ], function ($, Options, Utils, KEYS) {
   var Select2 = function ($element, options) {
-    if ($element.data('select2') != null) {
-      $element.data('select2').destroy();
+    if (Utils.GetData($element[0], 'select2') != null) {
+      Utils.GetData($element[0], 'select2').destroy();
     }
 
     this.$element = $element;
@@ -5071,7 +5380,7 @@ S2.define('select2/core',[
     // Set up the tabindex
 
     var tabindex = $element.attr('tabindex') || 0;
-    $element.data('old-tabindex', tabindex);
+    Utils.StoreData($element[0], 'old-tabindex', tabindex);
     $element.attr('tabindex', '-1');
 
     // Set up containers and adapters
@@ -5132,6 +5441,9 @@ S2.define('select2/core',[
     // Synchronize any monitored attributes
     this._syncAttributes();
 
+    Utils.StoreData($element[0], 'select2', this);
+
+    // Ensure backwards compatibility with $element.data('select2').
     $element.data('select2', this);
   };
 
@@ -5208,6 +5520,12 @@ S2.define('select2/core',[
       return null;
     }
 
+    if (method == 'computedstyle') {
+      var computedStyle = window.getComputedStyle($element[0]);
+
+      return computedStyle.width;
+    }
+
     return method;
   };
 
@@ -5248,8 +5566,8 @@ S2.define('select2/core',[
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        $.each(mutations, self._syncA);
-        $.each(mutations, self._syncS);
+        self._syncA();
+        self._syncS(null, mutations);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -5371,7 +5689,7 @@ S2.define('select2/core',[
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close();
+          self.close(evt);
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -5405,7 +5723,7 @@ S2.define('select2/core',[
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       if (this.isOpen()) {
         this.close();
       }
@@ -5416,7 +5734,7 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
+  Select2.prototype._isChangeMutation = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -5444,7 +5762,22 @@ S2.define('select2/core',[
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
+    } else if ($.isArray(mutations)) {
+      $.each(mutations, function(evt, mutation) {
+        if (self._isChangeMutation(evt, mutation)) {
+          // We've found a change mutation.
+          // Let's escape from the loop and continue
+          changed = true;
+          return false;
+        }
+      });
     }
+    return changed;
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = this._isChangeMutation(evt, mutations);
+    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -5466,7 +5799,8 @@ S2.define('select2/core',[
       'open': 'opening',
       'close': 'closing',
       'select': 'selecting',
-      'unselect': 'unselecting'
+      'unselect': 'unselecting',
+      'clear': 'clearing'
     };
 
     if (args === undefined) {
@@ -5494,7 +5828,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -5510,15 +5844,40 @@ S2.define('select2/core',[
       return;
     }
 
+    if (this.isDisabled()) {
+      return;
+    }
+
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function () {
+  Select2.prototype.close = function (evt) {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', {});
+    this.trigger('close', { originalEvent : evt });
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  Select2.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  Select2.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
   Select2.prototype.isOpen = function () {
@@ -5595,7 +5954,7 @@ S2.define('select2/core',[
       });
     }
 
-    this.$element.val(newVal).trigger('change');
+    this.$element.val(newVal).trigger('input').trigger('change');
   };
 
   Select2.prototype.destroy = function () {
@@ -5621,10 +5980,12 @@ S2.define('select2/core',[
     this._syncS = null;
 
     this.$element.off('.select2');
-    this.$element.attr('tabindex', this.$element.data('old-tabindex'));
+    this.$element.attr('tabindex',
+    Utils.GetData(this.$element[0], 'old-tabindex'));
 
     this.$element.removeClass('select2-hidden-accessible');
     this.$element.attr('aria-hidden', 'false');
+    Utils.RemoveData(this.$element[0]);
     this.$element.removeData('select2');
 
     this.dataAdapter.destroy();
@@ -5652,7 +6013,7 @@ S2.define('select2/core',[
 
     this.$container.addClass('select2-container--' + this.options.get('theme'));
 
-    $container.data('element', this.$element);
+    Utils.StoreData($container[0], 'element', this.$element);
 
     return $container;
   };
@@ -5672,8 +6033,9 @@ S2.define('jquery.select2',[
   'jquery-mousewheel',
 
   './select2/core',
-  './select2/defaults'
-], function ($, _, Select2, Defaults) {
+  './select2/defaults',
+  './select2/utils'
+], function ($, _, Select2, Defaults, Utils) {
   if ($.fn.select2 == null) {
     // All methods that should return the element
     var thisMethods = ['open', 'close', 'destroy'];
@@ -5694,7 +6056,7 @@ S2.define('jquery.select2',[
         var args = Array.prototype.slice.call(arguments, 1);
 
         this.each(function () {
-          var instance = $(this).data('select2');
+          var instance = Utils.GetData(this, 'select2');
 
           if (instance == null && window.console && console.error) {
             console.error(
diff --git a/htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js b/htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js
index 7ef2fda809e..e4214264342 100644
--- a/htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js
+++ b/htdocs/includes/jquery/plugins/select2/dist/js/select2.min.js
@@ -1 +1,2 @@
-/*! Select2 4.0.5 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return v.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n,o=b&&b.split("/"),p=t.map,q=p&&p["*"]||{};if(a){for(a=a.split("/"),g=a.length-1,t.nodeIdCompat&&x.test(a[g])&&(a[g]=a[g].replace(x,"")),"."===a[0].charAt(0)&&o&&(n=o.slice(0,o.length-1),a=n.concat(a)),k=0;k<a.length;k++)if("."===(m=a[k]))a.splice(k,1),k-=1;else if(".."===m){if(0===k||1===k&&".."===a[2]||".."===a[k-1])continue;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}if((o||q)&&p){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),o)for(l=o.length;l>0;l-=1)if((e=p[o.slice(0,l).join("/")])&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&q&&q[d]&&(i=q[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){var d=w.call(arguments,0);return"string"!=typeof d[0]&&1===d.length&&d.push(null),o.apply(b,d.concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){r[a]=b}}function j(a){if(e(s,a)){var c=s[a];delete s[a],u[a]=!0,n.apply(b,c)}if(!e(r,a)&&!e(u,a))throw new Error("No "+a);return r[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return a?k(a):[]}function m(a){return function(){return t&&t.config&&t.config[a]||{}}}var n,o,p,q,r={},s={},t={},u={},v=Object.prototype.hasOwnProperty,w=[].slice,x=/\.js$/;p=function(a,b){var c,d=k(a),e=d[0],g=b[1];return a=d[1],e&&(e=f(e,g),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(g)):f(a,g):(a=f(a,g),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},q={require:function(a){return g(a)},exports:function(a){var b=r[a];return void 0!==b?b:r[a]={}},module:function(a){return{id:a,uri:"",exports:r[a],config:m(a)}}},n=function(a,c,d,f){var h,k,m,n,o,t,v,w=[],x=typeof d;if(f=f||a,t=l(f),"undefined"===x||"function"===x){for(c=!c.length&&d.length?["require","exports","module"]:c,o=0;o<c.length;o+=1)if(n=p(c[o],t),"require"===(k=n.f))w[o]=q.require(a);else if("exports"===k)w[o]=q.exports(a),v=!0;else if("module"===k)h=w[o]=q.module(a);else if(e(r,k)||e(s,k)||e(u,k))w[o]=j(k);else{if(!n.p)throw new Error(a+" missing "+k);n.p.load(n.n,g(f,!0),i(k),{}),w[o]=r[k]}m=d?d.apply(r[a],w):void 0,a&&(h&&h.exports!==b&&h.exports!==r[a]?r[a]=h.exports:m===b&&v||(r[a]=m))}else a&&(r[a]=d)},a=c=o=function(a,c,d,e,f){if("string"==typeof a)return q[a]?q[a](c):j(p(a,l(c)).f);if(!a.splice){if(t=a,t.deps&&o(t.deps,t.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?n(b,a,c,d):setTimeout(function(){n(b,a,c,d)},4),o},o.config=function(a){return o(a)},a._defined=r,d=function(a,b,c){if("string"!=typeof a)throw new Error("See almond README: incorrect module build, no module name");b.splice||(c=b,b=[]),e(r,a)||e(s,a)||(s[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){"function"==typeof b[d]&&("constructor"!==d&&c.push(d))}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){return Array.prototype.unshift.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};return d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice,c=b.call(arguments,1);this.listeners=this.listeners||{},null==c&&(c=[]),0===c.length&&c.push({}),c[0]._type=a,a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;c<d;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;c<a;c++){b+=Math.floor(36*Math.random()).toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return(e!==f||"hidden"!==f&&"visible"!==f)&&("scroll"===e||"scroll"===f||(d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth))},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" aria-live="assertive" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),d[0].className+=" select2-results__message",this.$results.append(d)},c.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){b.find(".select2-results").append(a)},c.prototype.sort=function(a){return this.options.get("sorter")(a)},c.prototype.highlightFirstItem=function(){var a=this.$results.find(".select2-results__option[aria-selected]"),b=a.filter("[aria-selected=true]");b.length>0?b.first().trigger("mouseenter"):a.first().trigger("mouseenter"),this.ensureHighlightVisible()},c.prototype.setClasses=function(){var b=this;this.data.current(function(c){var d=a.map(c,function(a){return a.id.toString()});b.$results.find(".select2-results__option[aria-selected]").each(function(){var b=a(this),c=a.data(this,"data"),e=""+c.id;null!=c.element&&c.element.selected||null==c.element&&a.inArray(e,d)>-1?b.attr("aria-selected","true"):b.attr("aria-selected","false")})})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(b){var c=document.createElement("li");c.className="select2-results__option";var d={role:"treeitem","aria-selected":"false"};b.disabled&&(delete d["aria-selected"],d["aria-disabled"]="true"),null==b.id&&delete d["aria-selected"],null!=b._resultId&&(c.id=b._resultId),b.title&&(c.title=b.title),b.children&&(d.role="group",d["aria-label"]=b.text,delete d["aria-selected"]);for(var e in d){var f=d[e];c.setAttribute(e,f)}if(b.children){var g=a(c),h=document.createElement("strong");h.className="select2-results__group";a(h);this.template(b,h);for(var i=[],j=0;j<b.children.length;j++){var k=b.children[j],l=this.option(k);i.push(l)}var m=a("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});m.append(i),g.append(h),g.append(m)}else this.template(b,c);return a.data(c,"data",b),c},c.prototype.bind=function(b,c){var d=this,e=b.id+"-results";this.$results.attr("id",e),b.on("results:all",function(a){d.clear(),d.append(a.data),b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("results:append",function(a){d.append(a.data),b.isOpen()&&d.setClasses()}),b.on("query",function(a){d.hideMessages(),d.showLoading(a)}),b.on("select",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("unselect",function(){b.isOpen()&&(d.setClasses(),d.highlightFirstItem())}),b.on("open",function(){d.$results.attr("aria-expanded","true"),d.$results.attr("aria-hidden","false"),d.setClasses(),d.ensureHighlightVisible()}),b.on("close",function(){d.$results.attr("aria-expanded","false"),d.$results.attr("aria-hidden","true"),d.$results.removeAttr("aria-activedescendant")}),b.on("results:toggle",function(){var a=d.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),b.on("results:select",function(){var a=d.getHighlightedResults();if(0!==a.length){var b=a.data("data");"true"==a.attr("aria-selected")?d.trigger("close",{}):d.trigger("select",{data:b})}}),b.on("results:previous",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a);if(0!==c){var e=c-1;0===a.length&&(e=0);var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top,h=f.offset().top,i=d.$results.scrollTop()+(h-g);0===e?d.$results.scrollTop(0):h-g<0&&d.$results.scrollTop(i)}}),b.on("results:next",function(){var a=d.getHighlightedResults(),b=d.$results.find("[aria-selected]"),c=b.index(a),e=c+1;if(!(e>=b.length)){var f=b.eq(e);f.trigger("mouseenter");var g=d.$results.offset().top+d.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=d.$results.scrollTop()+h-g;0===e?d.$results.scrollTop(0):h>g&&d.$results.scrollTop(i)}}),b.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),b.on("results:message",function(a){d.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=d.$results.scrollTop(),c=d.$results.get(0).scrollHeight-b+a.deltaY,e=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&c<=d.$results.height();e?(d.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(d.$results.scrollTop(d.$results.get(0).scrollHeight-d.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(b){var c=a(this),e=c.data("data");if("true"===c.attr("aria-selected"))return void(d.options.get("multiple")?d.trigger("unselect",{originalEvent:b,data:e}):d.trigger("close",{}));d.trigger("select",{originalEvent:b,data:e})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(b){var c=a(this).data("data");d.getHighlightedResults().removeClass("select2-results__option--highlighted"),d.trigger("results:focus",{data:c,element:a(this)})})},c.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),c<=2?this.$results.scrollTop(0):(g>this.$results.outerHeight()||g<0)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b,c);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var b=a('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=this.$element.data("old-tabindex")?this._tabindex=this.$element.data("old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),b.attr("title",this.$element.attr("title")),b.attr("tabindex",this._tabindex),this.$selection=b,b},d.prototype.bind=function(a,b){var d=this,e=(a.id,a.id+"-results");this.container=a,this.$selection.on("focus",function(a){d.trigger("focus",a)}),this.$selection.on("blur",function(a){d._handleBlur(a)}),this.$selection.on("keydown",function(a){d.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){d.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){d.update(a.data)}),a.on("open",function(){d.$selection.attr("aria-expanded","true"),d.$selection.attr("aria-owns",e),d._attachCloseHandler(a)}),a.on("close",function(){d.$selection.attr("aria-expanded","false"),d.$selection.removeAttr("aria-activedescendant"),d.$selection.removeAttr("aria-owns"),d.$selection.focus(),d._detachCloseHandler(a)}),a.on("enable",function(){d.$selection.attr("tabindex",d._tabindex)}),a.on("disable",function(){d.$selection.attr("tabindex","-1")})},d.prototype._handleBlur=function(b){var c=this;window.setTimeout(function(){document.activeElement==c.$selection[0]||a.contains(c.$selection[0],document.activeElement)||c.trigger("blur",b)},1)},d.prototype._attachCloseHandler=function(b){a(document.body).on("mousedown.select2."+b.id,function(b){var c=a(b.target),d=c.closest(".select2");a(".select2.select2-container--open").each(function(){var b=a(this);this!=d[0]&&b.data("element").select2("close")})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){b.find(".selection").append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(a){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c,d){function e(){e.__super__.constructor.apply(this,arguments)}return c.Extend(e,b),e.prototype.render=function(){var a=e.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),a},e.prototype.bind=function(a,b){var c=this;e.__super__.bind.apply(this,arguments);var d=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",d),this.$selection.attr("aria-labelledby",d),this.$selection.on("mousedown",function(a){1===a.which&&c.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(a){}),this.$selection.on("blur",function(a){}),a.on("focus",function(b){a.isOpen()||c.$selection.focus()}),a.on("selection:update",function(a){c.update(a.data)})},e.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},e.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},e.prototype.selectionContainer=function(){return a("<span></span>")},e.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.$selection.find(".select2-selection__rendered"),d=this.display(b,c);c.empty().append(d),c.prop("title",b.title||b.text)},e}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(a,b){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(b,c){var e=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){e.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(b){if(!e.options.get("disabled")){var c=a(this),d=c.parent(),f=d.data("data");e.trigger("unselect",{originalEvent:b,data:f})}})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a,b){var c=this.options.get("templateSelection");return this.options.get("escapeMarkup")(c(a,b))},d.prototype.selectionContainer=function(){return a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.selectionContainer(),g=this.display(e,f);f.append(g),f.prop("title",e.title||e.text),f.data("data",e),b.push(f)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(a){function b(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return b.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},b.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},b.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id;if(b.length>1||c)return a.call(this,b);this.clear();var d=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(d)},b}),b.define("select2/selection/allowClear",["jquery","../keys"],function(a,b){function c(){}return c.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},c.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var c=this.$selection.find(".select2-selection__clear");if(0!==c.length){b.stopPropagation();for(var d=c.data("data"),e=0;e<d.length;e++){var f={data:d[e]};if(this.trigger("unselect",f),f.prevented)return}this.$element.val(this.placeholder.id).trigger("change"),this.trigger("toggle",{})}}},c.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||c.which!=b.DELETE&&c.which!=b.BACKSPACE||this._handleClear(c)},c.prototype.update=function(b,c){if(b.call(this,c),!(this.$selection.find(".select2-selection__placeholder").length>0||0===c.length)){var d=a('<span class="select2-selection__clear">&times;</span>');d.data("data",c),this.$selection.find(".select2-selection__rendered").prepend(d)}},c}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" aria-autocomplete="list" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return this._transferTabIndex(),d},d.prototype.bind=function(a,b,d){var e=this;a.call(this,b,d),b.on("open",function(){e.$search.trigger("focus")}),b.on("close",function(){e.$search.val(""),e.$search.removeAttr("aria-activedescendant"),e.$search.trigger("focus")}),b.on("enable",function(){e.$search.prop("disabled",!1),e._transferTabIndex()}),b.on("disable",function(){e.$search.prop("disabled",!0)}),b.on("focus",function(a){e.$search.trigger("focus")}),b.on("results:focus",function(a){e.$search.attr("aria-activedescendant",a.id)}),this.$selection.on("focusin",".select2-search--inline",function(a){e.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){e._handleBlur(a)}),this.$selection.on("keydown",".select2-search--inline",function(a){if(a.stopPropagation(),e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented(),a.which===c.BACKSPACE&&""===e.$search.val()){var b=e.$searchContainer.prev(".select2-selection__choice");if(b.length>0){var d=b.data("data");e.searchRemoveChoice(d),a.preventDefault()}}});var f=document.documentMode,g=f&&f<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(a){if(g)return void e.$selection.off("input.search input.searchcheck");e.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(a){if(g&&"input"===a.type)return void e.$selection.off("input.search input.searchcheck");var b=a.which;b!=c.SHIFT&&b!=c.CTRL&&b!=c.ALT&&b!=c.TAB&&e.handleSearch(a)})},d.prototype._transferTabIndex=function(a){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){var c=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),c&&this.$search.focus()},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.$search.val(b.text),this.handleSearch()},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{a=.75*(this.$search.val().length+1)+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting"],g=["opening","closing","selecting","unselecting"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","�":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","�":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","�":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","�":"D","Ḓ":"D","Ḏ":"D","�":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","�":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","�":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","�":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","�":"G","�":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","�":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","�":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","�":"I","Ḯ":"I","Ỉ":"I","�":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","�":"K","�":"K","�":"K","Ꞣ":"K","�":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","�":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","�":"L","�":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","�":"N","�":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","�":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","�":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","�":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","�":"O","�":"O","Ƣ":"OI","�":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","�":"P","�":"P","�":"P","Ⓠ":"Q","Ｑ":"Q","�":"Q","�":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","�":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","�":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","�":"V","Ʌ":"V","�":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","�":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","�":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","�":"Z","Ｚ":"Z","Ź":"Z","�":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","�":"Z","�":"a","�":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","�":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","�":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","�":"a","ą":"a","ⱥ":"a","�":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","�":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","�":"d","�":"d","ḑ":"d","ḓ":"d","�":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","�":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","�":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","�":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","�":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","�":"f","ⓖ":"g","ｇ":"g","ǵ":"g","�":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","�":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","�":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","�":"k","�":"k","�":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","�":"l","�":"l","�":"l","lj":"lj","ⓜ":"m","�":"m","ḿ":"m","�":"m","ṃ":"m","ɱ":"m","ɯ":"m","�":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","�":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","�":"o","ȭ":"o","�":"o","�":"o","ṑ":"o","ṓ":"o","�":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","�":"o","ő":"o","ǒ":"o","�":"o","�":"o","ơ":"o","�":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","�":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","�":"o","�":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","�":"oo","ⓟ":"p","�":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","�":"p","�":"p","�":"p","ⓠ":"q","ｑ":"q","ɋ":"q","�":"q","�":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","�":"r","ŗ":"r","ṟ":"r","�":"r","ɽ":"r","�":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","�":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","�":"v","ʌ":"v","�":"vy","ⓦ":"w","ｗ":"w","�":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","�":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","�":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","�":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","�":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","�":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","�":"ι","ό":"ο","�":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"}}),b.define("select2/data/base",["../utils"],function(a){function b(a,c){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(a){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(a,b){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(a,b){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),null!=c.id?d+="-"+c.id.toString():d+="-"+a.generateChars(4),d},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple")){if(a.selected=!1,c(a.element).is("option"))return a.element.selected=!1,void this.$element.trigger("change");this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})}},d.prototype.bind=function(a,b){var c=this;this.container=a,a.on("select",function(a){c.select(a.data)}),a.on("unselect",function(a){c.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){c.removeData(this,"data")})},d.prototype.query=function(a,b){var d=[],e=this;this.$element.children().each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var b;a.children?(b=document.createElement("optgroup"),b.label=a.text):(b=document.createElement("option"),void 0!==b.textContent?b.textContent=a.text:b.innerText=a.text),void 0!==a.id&&(b.value=a.id),a.disabled&&(b.disabled=!0),a.selected&&(b.selected=!0),a.title&&(b.title=a.title);var d=c(b),e=this._normalizeItem(a);return e.element=b,c.data(b,"data",e),d},d.prototype.item=function(a){var b={};if(null!=(b=c.data(a[0],"data")))return b;if(a.is("option"))b={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){b={text:a.prop("label"),children:[],title:a.prop("title")};for(var d=a.children("option"),e=[],f=0;f<d.length;f++){var g=c(d[f]),h=this.item(g);e.push(h)}b.children=e}return b=this._normalizeItem(b),b.element=a[0],c.data(a[0],"data",b),b},d.prototype._normalizeItem=function(a){c.isPlainObject(a)||(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){return this.options.get("matcher")(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=c.extend(!0,{},j,l),n=this.option(m);k.replaceWith(n)}else{var o=this.option(j);if(j.children){var p=this.convertToOptions(j.children);b.appendMany(o,p)}h.push(o)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(a,b){this.ajaxOptions=this._applyDefaults(b.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),d.__super__.constructor.call(this,a,b)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return c.extend({},a,{q:a.term})},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){d.status&&"0"===d.status||e.trigger("results:message",{message:"errorLoading"})});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url.call(this.$element,a)),"function"==typeof f.data&&(f.data=f.data.call(this.$element,a)),this.ajaxOptions.delay&&null!=a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");void 0!==f&&(this.createTag=f);var g=d.get("insertTag");if(void 0!==g&&(this.insertTag=g),b.call(this,c,d),a.isArray(e))for(var h=0;h<e.length;h++){var i=e[h],j=this._normalizeItem(i),k=this.option(j);this.$element.append(k)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0);if((i.text||"").toUpperCase()===(b.term||"").toUpperCase()||j)return!f&&(a.data=g,void c(a))}if(f)return!0;var k=e.createTag(b);if(null!=k){var l=e.option(k);l.attr("data-select2-tag",!0),e.addOptions([l]),e.insertTag(g,k)}a.results=g,c(a)}var e=this;if(this._removeOldTags(),null==b.term||null!=b.page)return void a.call(this,b,c);a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(b){this._lastTag;this.$element.find("option[data-select2-tag]").each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(b,c,d){function e(b){var c=g._normalizeItem(b);if(!g.$element.find("option").filter(function(){return a(this).val()===c.id}).length){var d=g.option(c);d.attr("data-select2-tag",!0),g._removeOldTags(),g.addOptions([d])}f(c)}function f(a){g.trigger("select",{data:a})}var g=this;c.term=c.term||"";var h=this.tokenizer(c,this.options,e);h.term!==c.term&&(this.$search.length&&(this.$search.val(h.term),this.$search.focus()),c.term=h.term),b.call(this,c,d)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);null!=m?(e(m),g=g.substr(h+1)||"",h=0):h++}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",b.term.length<this.minimumInputLength)return void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){if(b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength)return void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}});a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;if(d.maximumSelectionLength>0&&f>=d.maximumSelectionLength)return void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}});a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.bind=function(){},c.prototype.position=function(a,b){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a,b){function c(){}return c.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},c.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(b){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val("")}),c.on("focus",function(){c.isOpen()||e.$search.focus()}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){e.showSearch(a)?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},c.prototype.handleSearch=function(a){if(!this._keyUpPrevented){var b=this.$search.val();this.trigger("query",{term:b})}this._keyUpPrevented=!1},c.prototype.showSearch=function(a,b){return!0},c}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){e.$results.offset().top+e.$results.outerHeight(!1)+50>=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1)&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="select2-results__option select2-results__option--load-more"role="treeitem" aria-disabled="true"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(b,c,d){this.$dropdownParent=d.get("dropdownParent")||a(document.body),b.call(this,c,d)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.destroy=function(a){a.call(this),this.$dropdownContainer.remove()},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(a){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c,d){var e=this,f="scroll.select2."+d.id,g="resize.select2."+d.id,h="orientationchange.select2."+d.id,i=this.$container.parents().filter(b.hasScroll);i.each(function(){a(this).data("select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),i.on(f,function(b){var c=a(this).data("select2-scroll-position");a(this).scrollTop(c.y)}),a(window).on(f+" "+g+" "+h,function(a){e._positionDropdown(),e._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c,d){var e="scroll.select2."+d.id,f="resize.select2."+d.id,g="orientationchange.select2."+d.id;this.$container.parents().filter(b.hasScroll).off(e),a(window).off(e+" "+f+" "+g)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=this.$container.offset();f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom},m=this.$dropdownParent;"static"===m.css("position")&&(m=m.offsetParent());var n=m.offset();l.top-=n.top,l.left-=n.left,c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-n.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.position="relative",a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(a){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return!(a(c.data.results)<this.minimumResultsForSearch)&&b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(a){d._handleSelectOnClose(a)})},a.prototype._handleSelectOnClose=function(a,b){if(b&&null!=b.originalSelect2Event){var c=b.originalSelect2Event;if("select"===c._type||"unselect"===c._type)return}var d=this.getHighlightedResults();if(!(d.length<1)){var e=d.data("data");null!=e.element&&e.element.selected||null==e.element&&e.selected||this.trigger("select",{data:e})}},a}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close",{originalEvent:c,originalSelect2Event:b})},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){return"Please enter "+(a.minimum-a.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}return D.prototype.apply=function(l){if(l=a.extend(!0,{},this.defaults,l),null==l.dataAdapter){if(null!=l.ajax?l.dataAdapter=o:null!=l.data?l.dataAdapter=n:l.dataAdapter=m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),null==l.tokenSeparators&&null==l.tokenizer||(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.multiple?l.selectionAdapter=e:l.selectionAdapter=d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(a){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(a){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var O=k.loadPath(this.defaults.amdLanguageBase+"en"),P=new k(l.language);P.extend(O),l.translations=P}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){null==c(d,e.children[g])&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var h=b(e.text).toUpperCase(),i=b(d.term).toUpperCase();return h.indexOf(i)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(this.defaults,f)},new D}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(a.prop("dir")?this.options.dir=a.prop("dir"):a.closest("[dir]").prop("dir")?this.options.dir=a.closest("[dir]").prop("dir"):this.options.dir="ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),a.data("select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),a.data("data",a.data("select2Tags")),a.data("tags",!0)),a.data("ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",a.data("ajaxUrl")),a.data("ajax--url",a.data("ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,a.data()):a.data();var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,c){null!=a.data("select2")&&a.data("select2").destroy(),this.$element=a,this.id=this._generateId(a),c=c||{},this.options=new b(c,a),e.__super__.constructor.call(this);var d=a.attr("tabindex")||0;a.data("old-tabindex",d),a.attr("tabindex","-1");var f=this.options.get("dataAdapter");this.dataAdapter=new f(a,this.options);var g=this.render();this._placeContainer(g);var h=this.options.get("selectionAdapter");this.selection=new h(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,g);var i=this.options.get("dropdownAdapter");this.dropdown=new i(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,g);var j=this.options.get("resultsAdapter");this.results=new j(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var k=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){k.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b=b.replace(/(:|\.|\[|\]|,)/g,""),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return e<=0?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;h<i;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this.$element.on("focus.select2",function(a){b.trigger("focus",a)}),this._syncA=c.bind(this._syncAttributes,this),this._syncS=c.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._syncA),a.each(c,b._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",b._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",b._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",b._syncS,!1))},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle","focus"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("focus",function(a){b.focus(a)}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open",{}),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ESC||c===d.TAB||c===d.UP&&b.altKey?(a.close(),b.preventDefault()):c===d.ENTER?(a.trigger("results:select",{}),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle",{}),b.preventDefault()):c===d.UP?(a.trigger("results:previous",{}),b.preventDefault()):c===d.DOWN&&(a.trigger("results:next",{}),b.preventDefault()):(c===d.ENTER||c===d.SPACE||c===d.DOWN&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},e.prototype._syncSubtree=function(a,b){var c=!1,d=this;if(!a||!a.target||"OPTION"===a.target.nodeName||"OPTGROUP"===a.target.nodeName){if(b)if(b.addedNodes&&b.addedNodes.length>0)for(var e=0;e<b.addedNodes.length;e++){var f=b.addedNodes[e];f.selected&&(c=!0)}else b.removedNodes&&b.removedNodes.length>0&&(c=!0);else c=!0;c&&this.dataAdapter.current(function(a){d.trigger("selection:update",{data:a})})}},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting"};if(void 0===b&&(b={}),a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||this.trigger("query",{})},e.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},e.prototype.focus=function(a){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=a&&0!==a.length||(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",this.$element.data("old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),b.data("element",this.$element),b},e}),b.define("jquery-mousewheel",["jquery"],function(a){return a}),b.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults"],function(a,b,c,d){if(null==a.fn.select2){var e=["open","close","destroy"];a.fn.select2=function(b){if("object"==typeof(b=b||{}))return this.each(function(){var d=a.extend(!0,{},b);new c(a(this),d)}),this;if("string"==typeof b){var d,f=Array.prototype.slice.call(arguments,1);return this.each(function(){var c=a(this).data("select2");null==c&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2."),d=c[b].apply(c,f)}),a.inArray(b,e)>-1?this:d}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
\ No newline at end of file
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(u){var e=function(){if(u&&u.fn&&u.fn.select2&&u.fn.select2.amd)var e=u.fn.select2.amd;var t,n,r,h,o,s,f,g,m,v,y,_,i,a,b;function w(e,t){return i.call(e,t)}function l(e,t){var n,r,i,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&b.test(e[s])&&(e[s]=e[s].replace(b,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(r=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(i=(i=f[h.slice(0,d).join("/")])&&i[r]){o=i,a=u;break}if(o)break;!l&&g&&g[r]&&(l=g[r],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(w(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!w(m,e)&&!w(_,e))throw new Error("No "+e);return m[e]}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?c(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},i=Object.prototype.hasOwnProperty,a=[].slice,b=/\.js$/,f=function(e,t){var n,r=c(e),i=r[0],o=t[1];return e=r[1],i&&(n=D(i=l(i,o))),i?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return l(e,t)}}(o)):l(e,o):(i=(r=c(e=l(e,o)))[0],e=r[1],i&&(n=D(i))),{f:i?i+"!"+e:e,n:e,pr:i,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,r){var i,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(r=r||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)i=d[l]=g.module(e);else if(w(m,o)||w(v,o)||w(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(r,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(i&&i.exports!==h&&i.exports!==m[e]?m[e]=i.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,r,i){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=r,r=i),r?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(r=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),w(m,e)||w(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=r),e.define("almond",function(){}),e.define("jquery",[],function(){var e=u||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var i={};function u(e){var t=e.prototype,n=[];for(var r in t){"function"==typeof t[r]&&"constructor"!==r&&n.push(r)}return n}i.Extend=function(e,t){var n={}.hasOwnProperty;function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},i.Decorate=function(r,i){var e=u(i),t=u(r);function o(){var e=Array.prototype.unshift,t=i.prototype.constructor.length,n=r.prototype.constructor;0<t&&(e.call(arguments,r.prototype.constructor),n=i.prototype.constructor),n.apply(this,arguments)}i.displayName=r.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=r.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=i.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,r=e.length;n<r;n++)e[n].apply(this,t)},i.Observable=e,i.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},i.bind=function(e,t){return function(){e.apply(t,arguments)}},i._convertData=function(e){for(var t in e){var n=t.split("-"),r=e;if(1!==n.length){for(var i=0;i<n.length;i++){var o=n[i];(o=o.substring(0,1).toLowerCase()+o.substring(1))in r||(r[o]={}),i==n.length-1&&(r[o]=e[t]),r=r[o]}delete e[t]}}return e},i.hasScroll=function(e,t){var n=o(t),r=t.style.overflowX,i=t.style.overflowY;return(r!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===r||"scroll"===i||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},i.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},i.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},i.__cache={};var n=0;return i.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},i.StoreData=function(e,t,n){var r=i.GetUniqueElementId(e);i.__cache[r]||(i.__cache[r]={}),i.__cache[r][t]=n},i.GetData=function(e,t){var n=i.GetUniqueElementId(e);return t?i.__cache[n]&&null!=i.__cache[n][t]?i.__cache[n][t]:o(e).data(t):i.__cache[n]},i.RemoveData=function(e){var t=i.GetUniqueElementId(e);null!=i.__cache[t]&&delete i.__cache[t],e.removeAttribute("data-select2-id")},i}),e.define("select2/results",["jquery","./utils"],function(h,f){function r(e,t,n){this.$element=e,this.data=n,this.options=t,r.__super__.constructor.call(this)}return f.Extend(r,f.Observable),r.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},r.prototype.clear=function(){this.$results.empty()},r.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),r=this.options.get("translations").get(e.message);n.append(t(r(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},r.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},r.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var r=e.results[n],i=this.option(r);t.push(i)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},r.prototype.position=function(e,t){t.find(".select2-results").append(e)},r.prototype.sort=function(e){return this.options.get("sorter")(e)},r.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},r.prototype.setClasses=function(){var t=this;this.data.current(function(e){var r=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,r)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},r.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},r.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},r.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},r=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var i in(null!=e.element&&r.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[i];t.setAttribute(i,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},r.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var r=n-1;0===e.length&&(r=0);var i=t.eq(r);i.trigger("mouseenter");var o=l.$results.offset().top,s=i.offset().top,a=l.$results.scrollTop()+(s-o);0===r?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var r=t.eq(n);r.trigger("mouseenter");var i=l.$results.offset().top+l.$results.outerHeight(!1),o=r.offset().top+r.outerHeight(!1),s=l.$results.scrollTop()+o-i;0===n?l.$results.scrollTop(0):i<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,r=0<e.deltaY&&t-e.deltaY<=0,i=e.deltaY<0&&n<=l.$results.height();r?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):i&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},r.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},r.prototype.destroy=function(){this.$results.remove()},r.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,r=e.offset().top,i=this.$results.scrollTop()+(r-n),o=r-n;i-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(i)}},r.prototype.template=function(e,t){var n=this.options.get("templateResult"),r=this.options.get("escapeMarkup"),i=n(e,t);null==i?t.style.display="none":"string"==typeof i?t.innerHTML=r(i):h(t).append(i)},r}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,r,i){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return r.Extend(o,r.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=r.GetData(this.$element[0],"old-tabindex")?this._tabindex=r.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,r=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===i.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",r),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&r.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,r){function i(){i.__super__.constructor.apply(this,arguments)}return n.Extend(i,t),i.prototype.render=function(){var e=i.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},i.prototype.bind=function(t,e){var n=this;i.__super__.bind.apply(this,arguments);var r=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",r).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",r),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},i.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},i.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},i.prototype.selectionContainer=function(){return e("<span></span>")},i.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),r=this.display(t,n);n.empty().append(r);var i=t.title||t.text;i?n.attr("title",i):n.removeAttr("title")}else this.clear()},i}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(i,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var r=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){r.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!r.isDisabled()){var t=i(this).parent(),n=l.GetData(t[0],"data");r.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return i('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var r=e[n],i=this.selectionContainer(),o=this.display(r,i);i.append(o);var s=r.title||r.text;s&&i.attr("title",s),l.StoreData(i[0],"data",r),t.push(i)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var r=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(r)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(i,r,a){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){r._handleClear(e)}),t.on("keypress",function(e){r._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var r=a.GetData(n[0],"data"),i=this.$element.val();this.$element.val(this.placeholder.id);var o={data:r};if(this.trigger("clear",o),o.prevented)this.$element.val(i);else{for(var s=0;s<r.length;s++)if(o={data:r[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(i);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=r.DELETE&&t.which!=r.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),r=i('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(r[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(r)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(r,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=r('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),t.on("open",function(){r.$search.attr("aria-controls",i),r.$search.trigger("focus")}),t.on("close",function(){r.$search.val(""),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.trigger("focus")}),t.on("enable",function(){r.$search.prop("disabled",!1),r._transferTabIndex()}),t.on("disable",function(){r.$search.prop("disabled",!0)}),t.on("focus",function(e){r.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){r.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){r._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===r.$search.val()){var t=r.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");r.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){r.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?r.$selection.off("input.search input.searchcheck"):r.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)r.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&r.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var r=this,i=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,i)){t=t||{};var n=s.Event("select2:"+e,{params:t});r.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function r(e){this.dict=e||{}}return r.prototype.all=function(){return this.dict},r.prototype.get=function(e){return this.dict[e]},r.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},r._cache={},r.loadPath=function(e){if(!(e in r._cache)){var t=n(e);r._cache[e]=t}return new r(r._cache[e])},r}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","�":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","�":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","�":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","�":"D","Ḓ":"D","Ḏ":"D","�":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","�":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","�":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","�":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","�":"G","�":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","�":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","�":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","�":"I","Ḯ":"I","Ỉ":"I","�":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","�":"K","�":"K","�":"K","Ꞣ":"K","�":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","�":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","�":"L","�":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","�":"N","�":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","�":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","�":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","�":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","�":"O","�":"O","Œ":"OE","Ƣ":"OI","�":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","�":"P","�":"P","�":"P","Ⓠ":"Q","Ｑ":"Q","�":"Q","�":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","�":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","�":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","�":"V","Ʌ":"V","�":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","�":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","�":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","�":"Z","Ｚ":"Z","Ź":"Z","�":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","�":"Z","�":"a","�":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","�":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","�":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","�":"a","ą":"a","ⱥ":"a","�":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","�":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","�":"d","�":"d","ḑ":"d","ḓ":"d","�":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","�":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","�":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","�":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","�":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","�":"f","ⓖ":"g","ｇ":"g","ǵ":"g","�":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","�":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","�":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","�":"k","�":"k","�":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","�":"l","�":"l","�":"l","lj":"lj","ⓜ":"m","�":"m","ḿ":"m","�":"m","ṃ":"m","ɱ":"m","ɯ":"m","�":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","�":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","�":"o","ȭ":"o","�":"o","�":"o","ṑ":"o","ṓ":"o","�":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","�":"o","ő":"o","ǒ":"o","�":"o","�":"o","ơ":"o","�":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","�":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","�":"o","�":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","�":"oo","ⓟ":"p","�":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","�":"p","�":"p","�":"p","ⓠ":"q","ｑ":"q","ɋ":"q","�":"q","�":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","�":"r","ŗ":"r","ṟ":"r","�":"r","ɽ":"r","�":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","�":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","�":"v","ʌ":"v","�":"vy","ⓦ":"w","ｗ":"w","�":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","�":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","�":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","�":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","�":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","�":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","�":"ι","ό":"ο","�":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(r){function n(e,t){n.__super__.constructor.call(this)}return r.Extend(n,r.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=r.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+r.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],r=this;this.$element.find(":selected").each(function(){var e=l(this),t=r.item(e);n.push(t)}),e(n)},n.prototype.select=function(i){var o=this;if(i.selected=!0,l(i.element).is("option"))return i.element.selected=!0,void this.$element.trigger("input").trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(i=[i]).push.apply(i,e);for(var n=0;n<i.length;n++){var r=i[n].id;-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")});else{var e=i.id;this.$element.val(e),this.$element.trigger("input").trigger("change")}},n.prototype.unselect=function(i){var o=this;if(this.$element.prop("multiple")){if(i.selected=!1,l(i.element).is("option"))return i.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var r=e[n].id;r!==i.id&&-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(r,e){var i=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(r,t);null!==n&&i.push(n)}}),e({results:i})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),r=this._normalizeItem(e);return r.element=t,a.StoreData(t,"data",r),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),r=[],i=0;i<n.length;i++){var o=l(n[i]),s=this.item(o);r.push(s)}t.children=r}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function r(e,t){this._dataToConvert=t.get("data")||[],r.__super__.constructor.call(this,e,t)}return f.Extend(r,e),r.prototype.bind=function(e,t){r.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},r.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),r.__super__.select.call(this,n)},r.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),r=n.map(function(){return t.item(g(this)).id}).get(),i=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,r)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}i.push(p)}}return i},r}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var r=o.ajax(e);return r.then(t),r.fail(n),r}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,r){var i=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=i.processResults(e,n);i.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),r(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||i.trigger("results:message",{message:"errorLoading"})});i._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var r=n.get("tags"),i=n.get("createTag");void 0!==i&&(this.createTag=i);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(r))for(var s=0;s<r.length;s++){var a=r[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var r=t.results,i=0;i<r.length;i++){var o=r[i],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=r,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(r,a)}t.results=r,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var r=n.get("tokenizer");void 0!==r&&(this.tokenizer=r),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var r=this;t.term=t.term||"";var i=this.tokenizer(t,this.options,function(e){var t=r._normalizeItem(e);if(!r.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=r.option(t);n.attr("data-select2-tag",!0),r._removeOldTags(),r.addOptions([n])}!function(e){r.trigger("select",{data:e})}(t)});i.term!==t.term&&(this.$search.length&&(this.$search.val(i.term),this.$search.trigger("focus")),t.term=i.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,r){for(var i=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,i)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(r(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(){r._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var r=this;this._checkIfMaximumSelected(function(){e.call(r,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var r=this;this.current(function(e){var t=null!=e?e.length:0;0<r.maximumSelectionLength&&t>=r.maximumSelectionLength?r.trigger("results:message",{message:"maximumSelected",args:{maximum:r.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){r.handleSearch(e)}),t.on("open",function(){r.$search.attr("tabindex",0),r.$search.attr("aria-controls",i),r.$search.trigger("focus"),window.setTimeout(function(){r.$search.trigger("focus")},0)}),t.on("close",function(){r.$search.attr("tabindex",-1),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.val(""),r.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||r.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(r.showSearch(e)?r.$searchContainer.removeClass("select2-search--hide"):r.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,r){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,r)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),r=t.length-1;0<=r;r--){var i=t[r];this.placeholder.id===i.id&&n.splice(r,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,r){this.lastParams={},e.call(this,t,n,r),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("query",function(e){r.lastParams=e,r.loading=!0}),t.on("query:append",function(e){r.lastParams=e,r.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("open",function(){r._showDropdown(),r._attachPositioningHandler(t),r._bindContainerResultHandlers(t)}),t.on("close",function(){r._hideDropdown(),r._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,r="scroll.select2."+t.id,i="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(r,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(r+" "+i+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,r="resize.select2."+t.id,i="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+r+" "+i)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),r=null,i=this.$container.offset();i.bottom=i.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=i.top,o.bottom=i.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<i.top-s,u=l>i.bottom+s,d={left:i.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(r="below"),u||!c||t?!c&&u&&t&&(r="below"):r="above",("above"==r||t&&"below"!==r)&&(d.top=o.top-h.top-s),null!=r&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+r),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+r)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,r){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,r)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,r=0;r<t.length;r++){var i=t[r];i.children?n+=e(i.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("close",function(e){r._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var r=this.getHighlightedResults();if(!(r.length<1)){var i=o.GetData(r[0],"data");null!=i.element&&i.element.selected||null==i.element&&i.selected||this.trigger("select",{data:i})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(e){r._selectTriggered(e)}),t.on("unselect",function(e){r._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,$,b,w,A,x,D,S,E,C,O,T,q,L,I,j,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=b:null!=e.data?e.dataAdapter=$:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,w)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,I))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=E;else{var r=y.Decorate(E,C);e.dropdownAdapter=r}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,L)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var i=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,i)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var r=c.extend(!0,{},n),i=n.children.length-1;0<=i;i--)null==e(t,n.children[i])&&r.children.splice(i,1);return 0<r.children.length?r:e(t,r)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,r=this.defaults.language,i=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(i),this._resolveLanguage(n),this._resolveLanguage(r),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],r=0;r<t.length;r++)if(n.push(t[r]),"string"==typeof t[r]&&0<t[r].indexOf("-")){var i=t[r].split("-")[0];n.push(i)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,r=0;r<e.length;r++){var i=new s,o=e[r];if("string"==typeof o)try{i=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,i=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else i=c.isPlainObject(o)?new s(o):o;n.extend(i)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var r=y._convertData(n);c.extend(!0,this.defaults,r)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(r,d,i,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=i.applyFromElement(this.options,t)),this.options=i.apply(this.options),t&&t.is("input")){var n=r(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function r(e,t){return t.toUpperCase()}for(var i=0;i<e[0].attributes.length;i++){var o=e[0].attributes[i].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,r)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(o,c,u,r){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var r=this.options.get("dataAdapter");this.dataAdapter=new r(e,this.options);var i=this.render();this._placeContainer(i);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,i);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,i);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var r=this._resolveWidth(e,"style");return null!=r?r:this._resolveWidth(e,"element")}if("element"==t){var i=e.outerWidth(!1);return i<=0?"auto":i+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){t._syncA(),t._syncS(null,e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,r=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===o.inArray(e,r)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===r.ESC||t===r.TAB||t===r.UP&&e.altKey?(n.close(e),e.preventDefault()):t===r.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===r.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===r.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===r.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===r.ENTER||t===r.SPACE||t===r.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._isChangeMutation=function(e,t){var n=!1,r=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var i=0;i<t.addedNodes.length;i++){t.addedNodes[i].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length?n=!0:o.isArray(t)&&o.each(t,function(e,t){if(r._isChangeMutation(e,t))return!(n=!0)});else n=!0;return n}},d.prototype._syncSubtree=function(e,t){var n=this._isChangeMutation(e,t),r=this;n&&this.dataAdapter.current(function(e){r.trigger("selection:update",{data:e})})},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,r={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in r){var i=r[e],o={prevented:!1,name:e,args:t};if(n.call(this,i,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},d.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},d.prototype.isEnabled=function(){return!this.isDisabled()},d.prototype.isDisabled=function(){return this.options.get("disabled")},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];o.isArray(t)&&(t=o.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("input").trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=o('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("jquery-mousewheel",["jquery"],function(e){return e}),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(i,e,o,t,s){if(null==i.fn.select2){var a=["open","close","destroy"];i.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=i.extend(!0,{},t);new o(i(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,r=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,r)}),-1<i.inArray(t,a)?this:n}}return null==i.fn.select2.defaults&&(i.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return u.fn.select2.amd=e,t});
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/select2/package.json b/htdocs/includes/jquery/plugins/select2/package.json
index 69423b397dd..30135ba94ee 100644
--- a/htdocs/includes/jquery/plugins/select2/package.json
+++ b/htdocs/includes/jquery/plugins/select2/package.json
@@ -34,11 +34,12 @@
   ],
   "license": "MIT",
   "main": "dist/js/select2.js",
+  "style": "dist/css/select2.css",
   "files": [
     "src",
     "dist"
   ],
-  "version": "4.0.4",
+  "version": "4.0.13",
   "jspm": {
     "main": "js/select2",
     "directories": {
@@ -46,28 +47,19 @@
     }
   },
   "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-concat": "^0.4.0",
-    "grunt-contrib-connect": "^0.9.0",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-nodeunit": "~0.3.3",
-    "grunt-contrib-qunit": "~0.4.0",
-    "grunt-contrib-requirejs": "^0.4.4",
-    "grunt-contrib-symlink": "^0.3.0",
-    "grunt-contrib-uglify": "~0.4.0",
-    "grunt-contrib-watch": "~0.6.0",
-    "grunt-gh-pages": "^0.9.1",
-    "grunt-jekyll": "^0.4.2",
-    "grunt-sass": "^1.0.0",
-    "grunt-saucelabs": "^9.0.0",
-    "node-sass": "^4.5.3",
-    "request": "<=2.81.0",
-    "shrinkwrap": "^0.4.0"
-  },
-  "dependencies": {
     "almond": "~0.3.1",
-    "jquery-mousewheel": "~3.1.13"
-  }
+    "grunt": "^1.0.4",
+    "grunt-cli": "^1.3.2",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-connect": "^2.0.0",
+    "grunt-contrib-jshint": "^1.1.0",
+    "grunt-contrib-qunit": "^1.3.0",
+    "grunt-contrib-requirejs": "^1.0.0",
+    "grunt-contrib-uglify": "~4.0.1",
+    "grunt-contrib-watch": "~1.1.0",
+    "grunt-sass": "^2.1.0",
+    "jquery-mousewheel": "~3.1.13",
+    "node-sass": "^4.12.0"
+  },
+  "dependencies": {}
 }
diff --git a/htdocs/includes/jquery/plugins/select2/select2.jquery.json b/htdocs/includes/jquery/plugins/select2/select2.jquery.json
deleted file mode 100644
index 92b7c057a59..00000000000
--- a/htdocs/includes/jquery/plugins/select2/select2.jquery.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "name": "select2",
-    "title": "Select2",
-    "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-    "keywords": [
-        "select",
-        "autocomplete",
-        "typeahead",
-        "dropdown",
-        "multiselect",
-        "tag",
-        "tagging"
-    ],
-    "version": "4.0.4",
-    "author": {
-        "name": "Kevin Brown",
-        "url": "https://github.com/kevin-brown"
-    },
-    "licenses": [
-        {
-            "type": "MIT",
-            "url": "http://opensource.org/licenses/MIT"
-        }
-    ],
-    "bugs": "https://github.com/select2/select2/issues",
-    "homepage": "https://select2.org",
-    "docs": "https://select2.org",
-    "download": "https://github.com/select2/select2/releases",
-    "dependencies": {
-        "jquery": ">=1.7.2"
-    }
-}

From e050429854217720c8b5765abaf9805f0eb9f767 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 15:48:45 +0200
Subject: [PATCH 030/144] Update llx_commandedet.key.sql

---
 htdocs/install/mysql/tables/llx_commandedet.key.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql
index 849ff70a5e9..a609294a363 100644
--- a/htdocs/install/mysql/tables/llx_commandedet.key.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql
@@ -26,7 +26,7 @@ ALTER TABLE llx_commandedet ADD INDEX idx_commandedet_fk_product (fk_product);
 ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
 ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commande FOREIGN KEY (fk_commande) REFERENCES llx_commande (rowid);
 ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commandefourndet FOREIGN KEY (fk_commandefourndet) REFERENCES llx_commande_fournisseurdet (rowid);
-ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_multicurrency FOREIGN KEY (fk_multicurrency) REFERENCES llx_multicurrency (rowid);
-ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_product_fournisseur_price FOREIGN KEY (fk_product_fournisseur_price) REFERENCES llx_product_fournisseur_price (rowid);
-ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_remise_except FOREIGN KEY (fk_remise_except) REFERENCES llx_societe_remise_except (rowid);
+--ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_multicurrency FOREIGN KEY (fk_multicurrency) REFERENCES llx_multicurrency (rowid);
+--ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_product_fournisseur_price FOREIGN KEY (fk_product_fournisseur_price) REFERENCES llx_product_fournisseur_price (rowid);
+--ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_remise_except FOREIGN KEY (fk_remise_except) REFERENCES llx_societe_remise_except (rowid);
 

From f0f28c83cd152de60f9e540f7e6894c9a4a02d82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 15:49:40 +0200
Subject: [PATCH 031/144] Add fk

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 91361d76ec6..8603f612c3d 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -241,3 +241,5 @@ ALTER TABLE llx_categorie ADD COLUMN date_creation	datetime;
 ALTER TABLE llx_categorie ADD COLUMN tms     		timestamp;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_creat	integer;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_modif	integer;
+
+ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commandefourndet FOREIGN KEY (fk_commandefourndet) REFERENCES llx_commande_fournisseurdet (rowid);

From de74c447ccfe352798be8f05945b939ab560afde Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 16:05:26 +0200
Subject: [PATCH 032/144] Fix sanitize amount

---
 htdocs/compta/bank/transfer.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index afc1c6711e0..aa4c39e55ee 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,8 +51,8 @@ if ($action == 'add')
 
 	$dateo = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 	$label = GETPOST('label', 'alpha');
-	$amount = GETPOST('amount', 'alpha');
-	$amountto = GETPOST('amountto', 'alpha');
+	$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
+	$amountto = price2num(GETPOST('amountto', 'alpha'), 'MT');
 
 	if (!$label)
 	{
@@ -115,9 +115,9 @@ if ($action == 'add')
 				$typeto = 'LIQ';
 			}
 
-			if (!$error) $bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, -1 * price2num($amount), '', '', $user);
+			if (!$error) $bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, price2num(-1 * $amount), '', '', $user);
 			if (!($bank_line_id_from > 0)) $error++;
-			if (!$error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amountto), '', '', $user);
+			if (!$error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, $amountto, '', '', $user);
 			if (!($bank_line_id_to > 0)) $error++;
 
 		    if (!$error) $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
@@ -246,7 +246,6 @@ print '<td>'.$langs->trans("TransferFrom").'</td><td>'.$langs->trans("TransferTo
 print '<td style="display:none" class="multicurrency">'.$langs->trans("AmountToOthercurrency").'</td>';
 print '</tr>';
 
-$var = false;
 print '<tr class="oddeven"><td>';
 $form->select_comptes($account_from, 'account_from', 0, '', 1, '', empty($conf->multicurrency->enabled) ? 0 : 1);
 print "</td>";

From 018cfdf54b7301df2682f03c7a8f8a35e94fd361 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 16:14:37 +0200
Subject: [PATCH 033/144] FIX Field balance before and after sometimes not
 visible in bank entries

---
 htdocs/compta/bank/bankentries_list.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 43cfdef0b62..7b531d31bc0 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -108,14 +108,6 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = 'desc,desc,desc';
 if (!$sortfield) $sortfield = 'b.datev,b.dateo,b.rowid';
 
-$mode_balance_ok = false;
-//if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid'))    // TODO Manage balance when account not selected
-if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid'))
-{
-    $sortfield = 'b.datev,b.dateo,b.rowid';
-    if ($id > 0 || !empty($ref) || $search_account > 0) $mode_balance_ok = true;
-}
-
 $object = new Account($db);
 if ($id > 0 || !empty($ref))
 {
@@ -130,6 +122,13 @@ if ($id > 0 || !empty($ref))
     }
 }
 
+$mode_balance_ok = false;
+//if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid'))    // TODO Manage balance when account not selected
+if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid'))
+{
+	$sortfield = 'b.datev,b.dateo,b.rowid';
+	if ($id > 0 || !empty($ref) || $search_account > 0) $mode_balance_ok = true;
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('banktransactionlist', $contextpage));
@@ -574,6 +573,7 @@ if ($page >= $nbtotalofpages)
     if ($page < 0) $page = 0;
 }
 
+
 // If not account defined $mode_balance_ok=false
 if (empty($search_account)) $mode_balance_ok = false;
 // If a search is done $mode_balance_ok=false
@@ -583,7 +583,7 @@ if (!empty($search_type)) $mode_balance_ok = false;
 if (!empty($search_debit)) $mode_balance_ok = false;
 if (!empty($search_credit)) $mode_balance_ok = false;
 if (!empty($search_thirdparty)) $mode_balance_ok = false;
-if ($search_conciliated != '') $mode_balance_ok = false;
+if ($search_conciliated != '' && $search_conciliated != '-1') $mode_balance_ok = false;
 if (!empty($search_num_releve)) $mode_balance_ok = false;
 
 $sql .= $db->plimit($limit + 1, $offset);

From 19815850c0c4f76f04a5d16f68aef31e73b73adf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 16:48:49 +0200
Subject: [PATCH 034/144] Look and feel v12 Fix error report

---
 htdocs/user/group/perms.php | 73 +++++++++++++++++++++++--------------
 htdocs/user/perms.php       | 10 ++---
 2 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index aa792811244..a19c5082f74 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@inodbox.com>
  *
@@ -28,6 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 // Load translation files required by page
 $langs->loadLangs(array('users', 'admin'));
@@ -39,9 +40,9 @@ $module = GETPOST('module', 'alpha');
 $rights = GETPOST('rights', 'int');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'groupperms'; // To manage different context of search
 
-// Defini si peux lire les permissions
+// Define if user can read permissions
 $canreadperms = ($user->admin || $user->rights->user->user->lire);
-// Defini si peux modifier les permissions
+// Define if user can modify group permissions
 $caneditperms = ($user->admin || $user->rights->user->user->creer);
 // Advanced permissions
 $advancedpermsactive = false;
@@ -76,7 +77,12 @@ if (empty($reshook)) {
 		$editgroup = new Usergroup($db);
 		$result = $editgroup->fetch($id);
 		if ($result > 0) {
-			$editgroup->addrights($rights, $module, '', $entity);
+			$result= $editgroup->addrights($rights, $module, '', $entity);
+			if ($result < 0) {
+				setEventMessages($editgroup->error, $editgroup->errors, 'errors');
+			}
+		} else {
+			dol_print_error($db);
 		}
 	}
 
@@ -84,7 +90,12 @@ if (empty($reshook)) {
 		$editgroup = new Usergroup($db);
 		$result = $editgroup->fetch($id);
 		if ($result > 0) {
-			$editgroup->delrights($rights, $module, '', $entity);
+			$result = $editgroup->delrights($rights, $module, '', $entity);
+			if ($result < 0) {
+				setEventMessages($editgroup->error, $editgroup->errors, 'errors');
+			}
+		} else {
+			dol_print_error($db);
 		}
 	}
 }
@@ -117,8 +128,6 @@ if ($object->id > 0)
 
     foreach ($modulesdir as $dir)
     {
-        // Load modules attributes in arrays (name, numero, orders) from dir directory
-        //print $dir."\n<br>";
         $handle = @opendir(dol_osencode($dir));
         if (is_resource($handle))
         {
@@ -130,7 +139,7 @@ if ($object->id > 0)
 
                     if ($modName)
                     {
-                        include_once $dir."/".$file;
+                        include_once $dir.$file;
                         $objMod = new $modName($db);
                         // Load all lang files of module
                         if (isset($objMod->langfiles) && is_array($objMod->langfiles))
@@ -154,7 +163,7 @@ if ($object->id > 0)
 
     $db->commit();
 
-    // Lecture des droits groupes
+    // Read permissions of group
     $permsgroupbyentity = array();
 
     $sql = "SELECT DISTINCT r.id, r.libelle, r.module, gr.entity";
@@ -225,20 +234,22 @@ if ($object->id > 0)
     $reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
     if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+    print "\n";
+    print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Module").'</td>';
     if ($caneditperms)
     {
     	print '<td class="center nowrap">';
-    	print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>";
+    	print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>";
     	print '/';
-    	print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>";
+    	print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>";
     	print '</td>';
     }
     print '<td class="center" width="24">&nbsp;</td>';
     print '<td>'.$langs->trans("Permissions").'</td>';
-    print '</tr>';
+    print '</tr>'."\n";
 
     $sql = "SELECT r.id, r.libelle as label, r.module";
     $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
@@ -250,16 +261,15 @@ if ($object->id > 0)
     $result = $db->query($sql);
     if ($result)
     {
-        $i = 0;
+    	$num = $db->num_rows($result);
+    	$i = 0;
         $oldmod = '';
 
-        $num = $db->num_rows($result);
-
         while ($i < $num)
         {
             $obj = $db->fetch_object($result);
 
-            // Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
+            // If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it
             if (empty($modules[$obj->module]))
             {
                 $i++;
@@ -270,29 +280,37 @@ if ($object->id > 0)
             {
                 $oldmod = $obj->module;
 
-                // Rupture detectee, on recupere objMod
+                // Break detected, we get objMod
                 $objMod = $modules[$obj->module];
                 $picto = ($objMod->picto ? $objMod->picto : 'generic');
 
+                // Show break line
                 print '<tr class="oddeven trforbreak">';
-                print '<td class="nowrap">'.img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName();
-                print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
-                print '<td class="center nowrap">';
+                print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
+                print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName();
+                print '<a name="'.$objMod->getName().'"></a>';
+                print '</td>';
                 if ($caneditperms)
                 {
+                	print '<td class="center nowrap">';
                 	print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
                     print '/';
                     print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+                    print '</td>';
+                } else {
+                	print '<td>&nbsp;</td>';
                 }
-                print '</td>';
                 print '<td colspan="2">&nbsp;</td>';
                 print '</tr>';
             }
 
+            print '<!-- '.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '').' -->'."\n";
             print '<tr class="oddeven">';
 
-            // Module
-            print '<td class="nowrap">'.img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName().'</td>';
+            // Picto and label of module
+            print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
+            //print img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName();
+            print '</td>';
 
             if (is_array($permsgroupbyentity[$entity]))
             {
@@ -303,7 +321,7 @@ if ($object->id > 0)
             		{
             			print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
             		}
-            		print '<td class="center">';
+            		print '<td class="center nowrap">';
             		print img_picto($langs->trans("Active"), 'tick');
             		print '</td>';
             	}
@@ -327,15 +345,16 @@ if ($object->id > 0)
             	print '<td>&nbsp</td>';
             }
 
-            $perm_libelle = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
-            print '<td>'.$perm_libelle.'</td>';
+            $permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
+            print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
 
-            print '</tr>';
+            print '</tr>'."\n";
 
             $i++;
         }
     }
     print '</table>';
+    print '</div>';
 
     print '</div>';
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b2370089dd3..24061a9e949 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
- * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
@@ -42,9 +42,9 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'use
 
 if (!isset($id) || empty($id)) accessforbidden();
 
-// Defini si peux lire les permissions
+// Define if user can read permissions
 $canreaduser = ($user->admin || $user->rights->user->user->lire);
-// Defini si peux modifier les autres utilisateurs et leurs permisssions
+// Define if user can modify other users and permissions
 $caneditperms = ($user->admin || $user->rights->user->user->creer);
 // Advanced permissions
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
@@ -132,10 +132,10 @@ if (empty($reshook)) {
  *	View
  */
 
-llxHeader('', $langs->trans("Permissions"));
-
 $form = new Form($db);
 
+llxHeader('', $langs->trans("Permissions"));
+
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");

From 01f96b35ed0b40d7c5ff1eccb6d74a323b7ac640 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Apr 2020 16:50:36 +0200
Subject: [PATCH 035/144] Fix reposition

---
 htdocs/user/group/perms.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index a19c5082f74..8efd7ef38e2 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -293,9 +293,9 @@ if ($object->id > 0)
                 if ($caneditperms)
                 {
                 	print '<td class="center nowrap">';
-                	print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+                	print '<a class="reposition" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
                     print '/';
-                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+                    print '<a class="reposition" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
                     print '</td>';
                 } else {
                 	print '<td>&nbsp;</td>';

From 817e16d6527308fb3d7e29638dd0187dd479f387 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Sat, 18 Apr 2020 20:01:18 +0200
Subject: [PATCH 036/144] Fix birthdays boxes and filter on month

---
 htdocs/core/boxes/box_birthdays.php         | 2 +-
 htdocs/core/boxes/box_birthdays_members.php | 2 +-
 htdocs/core/lib/date.lib.php                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 05d4e1d3ac0..2df1f0d331e 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -89,7 +89,7 @@ class box_birthdays extends ModeleBoxes
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth";
 			$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 			$sql.= " WHERE u.entity IN (".getEntity('user').")";
-			$sql.= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], $tmparray['year']);
+			$sql.= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
 			$sql.= " ORDER BY u.birth ASC";
 			$sql.= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index e48271c4d84..bb8f0b94904 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -90,7 +90,7 @@ class box_birthdays_members extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as u";
 			$sql.= " WHERE u.entity IN (".getEntity('adherent').")";
       		$sql.= " AND u.statut = 1";
-      		$sql.= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], $tmparray['year']);
+      		$sql.= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
 			$sql.= " ORDER BY u.birth ASC";
 			$sql.= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 8fb32bb2f37..123e3297f11 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -301,7 +301,7 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
 			$sqldate.= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
 			$sqldate.= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
 		} else
-			$sqldate.= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%m') = '".$db->escape($month_date)."'";
+			$sqldate.= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
 	} elseif ($year_date > 0){
 		$sqldate.= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
 		$sqldate.= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";

From 200c29bd14e4e115641bf004e33a7a623fc8577a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Apr 2020 14:19:34 +0200
Subject: [PATCH 037/144] Fix some regression with new architecture for groups

---
 htdocs/user/card.php                  | 10 +++++-----
 htdocs/user/class/usergroup.class.php |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a1675771bee..d545391bd4f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1993,6 +1993,8 @@ else
 
 				if ($canreadgroup)
 				{
+					print '<!-- Group section -->'."\n";
+
 					print load_fiche_titre($langs->trans("ListOfGroupsForUser"), '', '');
 
 					// On selectionne les groupes auquel fait parti le user
@@ -2031,13 +2033,11 @@ else
 							print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
 							print ' &nbsp; ';
 							print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-							print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
+							print '<input type="submit" class="button buttongen" value="'.$langs->trans("Add").'" />';
 						}
 						print '</th></tr>'."\n";
 
-						/*
-						 * Groups assigned to user
-						 */
+						// List of groups of user
 						if (!empty($groupslist))
 						{
 							foreach ($groupslist as $group)
@@ -2085,7 +2085,7 @@ else
 		}
 
 		/*
-         * Fiche en mode edition
+         * Card in edit mode
          */
 		if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
 		{
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index aaa631fdf36..c897db44412 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -160,6 +160,8 @@ class UserGroup extends CommonObject
 			$result = $this->fetchCommon($id);
 		}
 
+		$this->name = $this->nom;	// For compatibility with field name
+
 		if($result)
 		{
 			if ($load_members)

From d3598380daf8b454e3a48561571b18d99f20f49e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Apr 2020 14:23:31 +0200
Subject: [PATCH 038/144] Fix do not use hard coded link

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index d545391bd4f..26e455e3346 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2046,7 +2046,7 @@ else
 								print '<td>';
 								if ($caneditgroup)
 								{
-									print '<a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$group->id.'">'.img_object($langs->trans("ShowGroup"), "group").' '.$group->name.'</a>';
+									print $group->getNomUrl(1);
 								}
 								else
 								{

From 0a3d57058342bab68b40245fb3a2c19e2b0f66db Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Apr 2020 14:29:18 +0200
Subject: [PATCH 039/144] Look and feel v12

---
 htdocs/user/group/card.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 25a0db9d633..618f569c1e3 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -447,7 +447,7 @@ else
 					print $form->select_dolusers('', 'user', 1, $exclude, 0, '', '', $object->entity, 0, 0, '', 0, '', 'maxwidth300');
 					print ' &nbsp; ';
 					print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-					print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+					print '<input type="submit" class="button buttongen" value="'.$langs->trans("Add").'">';
 					print '</td></tr>'."\n";
 					print '</table></form>'."\n";
 					print '<br>';
@@ -456,6 +456,7 @@ else
 				/*
 				 * Group members
 				 */
+
 				print '<table class="noborder centpercent">';
 				print '<tr class="liste_titre">';
 				print '<td class="liste_titre">'.$langs->trans("Login").'</td>';

From 9ad086ac3c7682228292adf04db4e9fdbbf46c5e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Apr 2020 14:39:15 +0200
Subject: [PATCH 040/144] Look and feel v12

---
 htdocs/bookmarks/card.php |  4 ++--
 htdocs/bookmarks/list.php | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 44ab989f528..0c73b6c7146 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -172,7 +172,7 @@ if ($action == 'create')
 
 	// Owner
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
-	print $form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : $user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : $user->id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
 
 	// Position
@@ -276,7 +276,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
 	if ($action == 'edit' && $user->admin)
 	{
-		print $form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	}
 	else
 	{
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 067e2abeaa9..5dd1718b263 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -155,13 +155,12 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = '';
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bookmarks/card.php?action=create', '', !empty($user->rights->bookmark->creer));
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bookmark', 0, $newcardbutton, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bookmark', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -178,6 +177,8 @@ print_liste_field_titre("Position", $_SERVER["PHP_SELF"], "b.position", "", $par
 print_liste_field_titre('');
 print "</tr>\n";
 
+$cacheOfUsers = array();
+
 $i = 0;
 while ($i < min($num, $limit))
 {
@@ -222,9 +223,13 @@ while ($i < min($num, $limit))
 	print '<td class="center">';
 	if ($obj->fk_user)
 	{
-		$userstatic->id = $obj->fk_user;
-		$userstatic->lastname = $obj->login;
-		print $userstatic->getNomUrl(1);
+		if (empty($cacheOfUsers[$obj->fk_user])) {
+			$tmpuser = new User($db);
+			$tmpuser->fetch($obj->fk_user);
+			$cacheOfUsers[$obj->fk_user] = $tmpuser;
+		}
+		$tmpuser = $cacheOfUsers[$obj->fk_user];
+		print $tmpuser->getNomUrl(1);
 	}
 	else
 	{
@@ -242,11 +247,11 @@ while ($i < min($num, $limit))
 	print '<td class="nowrap right">';
 	if ($user->rights->bookmark->creer)
 	{
-		print '<a href="'.DOL_URL_ROOT."/bookmarks/card.php?action=edit&id=".$obj->rowid."&backtopage=".urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
+		print '<a class="editfielda" href="'.DOL_URL_ROOT."/bookmarks/card.php?action=edit&id=".$obj->rowid."&backtopage=".urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
 	}
 	if ($user->rights->bookmark->supprimer)
 	{
-		print "<a href=\"".$_SERVER["PHP_SELF"]."?action=delete&id=$obj->rowid\">".img_delete()."</a>";
+		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$obj->rowid.'">'.img_delete().'</a>';
 	}
 	else
 	{

From 8117f37e469f919c2dc9bd2904825c034a252751 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Apr 2020 14:39:37 +0200
Subject: [PATCH 041/144] Fix

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

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 0c73b6c7146..6ab6bc283b6 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -280,7 +280,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	}
 	else
 	{
-		if ($object->fk_user)
+		if ($object->fk_user > 0)
 		{
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user);

From 4bbe307b410297d3dc418b9b36042934e88796de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Apr 2020 15:34:53 +0200
Subject: [PATCH 042/144] Look and feel v12

---
 htdocs/admin/mails_templates.php              |  8 +++----
 .../modulebuilder/template/myobject_card.php  | 13 ++++++-----
 .../modulebuilder/template/myobject_list.php  | 22 ++++++++++---------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index f2d27cf2849..cc8a92f819b 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -754,9 +754,9 @@ if ($resql)
                 print '<td class="center">';
                 print '<input type="hidden" name="page" value="'.$page.'">';
                 print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-                print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                print '<input type="submit" class="button buttongen" name="actionmodify" value="'.$langs->trans("Modify").'">';
                 print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-                print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                print '<input type="submit" class="button buttongen" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                 print '</td>';
 
                 $fieldsforcontent = array('topic', 'joinfiles', 'content');
@@ -902,10 +902,10 @@ if ($resql)
 
                 // Modify link / Delete link
                 print '<td class="center nowraponall" width="64">';
-                if ($canbemodified) print '<a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a>';
+                if ($canbemodified) print '<a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a>';
                 if ($iserasable)
                 {
-                    print ' &nbsp; <a href="'.$url.'action=delete">'.img_delete().'</a>';
+                    print '<a class="marginleftonly" href="'.$url.'action=delete">'.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/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 69272de686f..e299fec88c5 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -100,11 +100,6 @@ 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.
 
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
-//$result = restrictedArea($user, 'mymodule', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
 $permissiontoread = $user->rights->mymodule->myobject->read;
 $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
@@ -113,6 +108,14 @@ $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
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+//$result = restrictedArea($user, 'mymodule', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+//if (!$permissiontoread) accessforbidden();
+
 
 /*
  * Actions
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 5865af34e78..9b230eae594 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -107,16 +107,6 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 if (!$sortorder) $sortorder = "ASC";
 
-// Security check
-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', $id, '');
-
 // Initialize array of search criterias
 $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
@@ -161,6 +151,18 @@ $permissiontoread = $user->rights->mymodule->myobject->read;
 $permissiontoadd = $user->rights->mymodule->myobject->write;
 $permissiontodelete = $user->rights->mymodule->myobject->delete;
 
+// Security check
+if (empty($conf->mymodule->enabled)) accessforbidden('Module not enabled');
+$socid = 0;
+if ($user->socid > 0)	// Protection if external user
+{
+	//$socid = $user->socid;
+	accessforbidden();
+}
+//$result = restrictedArea($user, 'mymodule', $id, '');
+//if (!$permissiontoread) accessforbidden();
+
+
 
 /*
  * Actions

From 7b68d4260c27cda522556a0194f21e8418e2b5bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Apr 2020 15:50:32 +0200
Subject: [PATCH 043/144] Fix permission on button

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

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 3c744f4c4bd..b19a75135aa 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -203,7 +203,7 @@ class FormActions
             if ($typeelement == 'project') $projectid = $object->id;
 
             $newcardbutton = '';
-			if (!empty($conf->agenda->enabled))
+            if (!empty($conf->agenda->enabled) && ! empty($user->rights->agenda->myactions->create))
 			{
                 $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid > 0 ? '&socid='.$object->socid : ($socid > 0 ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').'&backtopage='.urlencode($urlbacktopage));
 			}

From 08260cb7a4787c8361f373bc3e29ea8b097e409c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 19 Apr 2020 15:52:43 +0200
Subject: [PATCH 044/144] Look and feel

---
 htdocs/user/card.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 26e455e3346..22b591dd53f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1618,7 +1618,9 @@ else
 			// Hierarchy
 			print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
 			print '<td>';
-			if (empty($object->fk_user)) print $langs->trans("None");
+			if (empty($object->fk_user)) {
+				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
+			}
 			else {
 				$huser = new User($db);
 				$huser->fetch($object->fk_user);

From ca3402c4cfd06e8921436f8fa508e99e3746a52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 Apr 2020 21:33:31 +0200
Subject: [PATCH 045/144] Update interface_80_modStripe_Stripe.class.php

---
 .../interface_80_modStripe_Stripe.class.php      | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index af2ed9cc96b..f1f0a9530af 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -53,7 +53,7 @@ class InterfaceStripe
 	    $this->family = 'stripe';
         $this->description = "Triggers of the module Stripe";
         $this->version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' or version
-        $this->picto = 'stripe@stripe';
+        $this->picto = 'stripe';
     }
 
 	/**
@@ -85,19 +85,7 @@ class InterfaceStripe
 	public function getVersion()
 	{
 		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') {
-			return $langs->trans("Development");
-		} elseif ($this->version == 'experimental') {
-			return $langs->trans("Experimental");
-		} elseif ($this->version == 'dolibarr') {
-			return DOL_VERSION;
-		} elseif ($this->version) {
-			return $this->version;
-		} else {
-			return $langs->trans("Unknown");
-		}
+		return DOL_VERSION;
 	}
 
 	/**

From 61e76ef25e330b703abe19b167921acc2ee0a73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 Apr 2020 21:47:30 +0200
Subject: [PATCH 046/144] Update api_bankaccounts.class.php

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

diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index bc5b9d46be1..d947d169695 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -73,12 +73,12 @@ class BankAccounts extends DolibarrApi
 
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank_account as t";
     	if ($category > 0) {
-        $sql .= ", ".MAIN_DB_PREFIX."categorie_account as c";
+            $sql .= ", ".MAIN_DB_PREFIX."categorie_account as c";
 		}
         $sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
     	// Select accounts of given category
     	if ($category > 0) {
-        $sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_account = t.rowid ";
+            $sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_account = t.rowid ";
 		}
         // Add sql filters
         if ($sqlfilters)

From 5992318af7f282ed10d7ed0d485ac53b39c61723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 Apr 2020 21:49:37 +0200
Subject: [PATCH 047/144] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5e280535c27..da22eaf872e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4357,16 +4357,13 @@ elseif ($id > 0 || !empty($ref))
 
 
 
-	if(!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
-
+	if (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
         $displayWarranty = true;
-		if(!in_array($object->type, $retainedWarrantyInvoiceAvailableType) && empty($object->retained_warranty)){
+		if (!in_array($object->type, $retainedWarrantyInvoiceAvailableType) && empty($object->retained_warranty)) {
 			$displayWarranty = false;
 		}
 
-		if($displayWarranty)
-		{
-
+		if($displayWarranty) {
 			// Retained Warranty
 			print '<tr class="retained-warranty-lines"  ><td>';
 			print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';

From 7b68a2a60e4f80319934bb5cfdc7e9b259a028d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 Apr 2020 21:50:52 +0200
Subject: [PATCH 048/144] Update pdf_crabe.modules.php

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index cc26c4ba13b..4d9df1c662a 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1419,7 +1419,6 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
-
 				}
 			}
 		}

From 350e75f2839f7b182733fc01756085909dce9e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 Apr 2020 22:05:47 +0200
Subject: [PATCH 049/144] make dolistore happy again

---
 htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
index 7b1f49601c3..dcdf94c8666 100644
--- a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
+++ b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
@@ -112,7 +112,7 @@ class mymodulewidget1 extends ModeleBoxes
 		// Use configuration value for max lines count
 		$this->max = $max;
 
-		//include_once DOL_DOCUMENT_ROOT . "/mymodule/class/mymodule.class.php";
+		//dol_include_once("/mymodule/class/mymodule.class.php");
 
 		// Populate the head at runtime
 		$text = $langs->trans("MyModuleBoxDescription", $max);

From 6472f521ac224f96471c7e6b00ab1bc6a89b0f49 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 00:54:38 +0200
Subject: [PATCH 050/144] css

---
 htdocs/commande/list.php         | 2 +-
 htdocs/theme/eldy/global.inc.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 4c2ade29fcc..43f45b10612 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -919,7 +919,7 @@ if ($resql)
 		// Ref
 		if (!empty($arrayfields['c.ref']['checked']))
 		{
-			print '<td class="nowrap">';
+			print '<td class="nowraponall">';
 
 			$generic_commande->getLinesArray(); // This set ->lines
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 2e49395d9b3..d46bd839958 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1695,8 +1695,8 @@ div.statusrefbis {
 }
 img.photoref, div.photoref {
 	/* border: 1px solid #DDD; */
-    -webkit-box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.2), 0px 0px 2px rgba(0, 0, 0, 0.1);
-    box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.2), 0px 0px 2px rgba(0, 0, 0, 0.1);
+    -webkit-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+    box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
     padding: 4px;
 	height: 80px;
 	width: 80px;

From fa056e59dfca08e23569546967f46e23426f8b4d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 02:14:43 +0200
Subject: [PATCH 051/144] Look and feel v12

---
 htdocs/core/class/doleditor.class.php |   4 +-
 htdocs/core/lib/functions.lib.php     |  32 +++--
 htdocs/fichinter/card.php             |  24 ++--
 htdocs/fichinter/index.php            |   3 +-
 htdocs/index.php                      | 200 +++++++++++++-------------
 htdocs/projet/class/project.class.php |   5 +-
 htdocs/projet/list.php                |   6 +-
 htdocs/theme/eldy/info-box.inc.php    |   2 +-
 htdocs/website/index.php              |   2 +
 9 files changed, 146 insertions(+), 132 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index de5ef1f2e9f..8c7a88e925a 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -96,7 +96,7 @@ class DolEditor
             $this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max
             $this->height = $height;
             $this->width				= $width;
-    	}
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -259,7 +259,7 @@ class DolEditor
 						})';
 	            $out .= '</script>'."\n";
 			}
-
+var_dump($this->height);
             $out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');
             $out .= ($this->height ? ' height: '.$this->height.'px; ' : '');
             //$out.=" min-height: 100px;";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0424ee54ee1..e9285fdee05 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3147,15 +3147,16 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bom',
         		'object_category', 'object_bookmark', 'object_bug', '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_dynamicprice',
-        		'object_holiday', 'object_hrm', 'object_multicurrency', 'object_payment',
+        		'object_holiday', 'object_hrm', 'object_intervention', 'object_multicurrency', 'object_payment',
         		'object_lot', 'object_mrp', 'object_product', 'object_service', 'object_stock',
-        		'object_paragraph', 'object_printer', 'object_resource', 'object_rss', 'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
+        		'object_paragraph', 'object_printer', 'object_project', 'object_projectpub', 'object_resource', 'object_rss', 'object_projecttask',
+        		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
         		'object_phoning', 'object_phoning_fax', 'object_email',
         		'off', 'on', 'paiment', 'play', 'playdisabled', 'printer', 'product', 'resize', 'service', 'stats', 'trip',
 				'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
-				'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'preview', 'project', 'hrm', 'members', 'ticket', 'generic',
+				'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'preview', 'project', 'projectpub', 'hrm', 'members', 'ticket', 'generic',
         		'error', 'warning',
         		'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
 			)
@@ -3182,16 +3183,18 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'info-circle',
 		    	'generic'=>'file', 'holiday'=>'umbrella-beach', 'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
 		    	'sign-out'=>'sign-out-alt',
-		    	'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar',
-		    	'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter', 'split'=>'code-branch',
+		    	'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
+		    	'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
 		    	'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
-		    	'multicurrency'=>'dollar-sign', 'other'=>'square', 'resource'=>'laptop-house',
+		    	'intervention'=>'ambulance', 'multicurrency'=>'dollar-sign',
 		    	'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
+		    	'other'=>'square', 'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks',
+				'resize'=>'crop',
 		    	'payment'=>'money-bill-alt', 'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
-		    	'stock'=>'box-open', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+		    	'resource'=>'laptop-house',
+		    	'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 		    	'title_agenda'=>'calendar-alt',
-		    	'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'resize'=>'crop',
 		    	'uparrow'=>'mail-forward',
 		    	'jabber'=>'comment-o'
 		    );
@@ -3245,10 +3248,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'contract'=>'bg-infoxbox-contrat',
 				'multicurrency'=>'bg-infoxbox-bank_account',
 				'check'=>'font-status4',
-				'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent',
+				'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent', 'intervention'=>'bg-infoxbox-contrat',
 				'members'=>'bg-infoxbox-adherent', 'member'=>'bg-infoxbox-adherent', 'user'=>'bg-infoxbox-adherent', 'users'=>'bg-infoxbox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
-				'holiday'=>'bg-infoxbox-holiday', 'payment'=>'bg-infoxbox-bank_account', 'project'=>'bg-infoxbox-project', 'resource'=>'bg-infoxbox-action',
+				'holiday'=>'bg-infoxbox-holiday', 'payment'=>'bg-infoxbox-bank_account', 'project'=>'bg-infoxbox-project', 'projecttask'=>'bg-infoxbox-project',
+				'resource'=>'bg-infoxbox-action',
 				'ticket'=>'bg-infoxbox-contrat', 'title_hrm'=>'bg-infoxbox-holiday', 'trip'=>'bg-infoxbox-expensereport', 'title_agenda'=>'bg-infoxbox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
@@ -3263,7 +3267,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
 				'lot'=>'#a69944', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
 				'other'=>'#ddd',
-				'playdisabled'=>'#ccc', 'printer'=>'#444', 'resize'=>'#444', 'rss'=>'#cba',
+				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
 				'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'warning'=>''
 			);
 			if (isset($arrayconvpictotocolor[$pictowithouttext])) {
@@ -3349,7 +3353,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
  *	@param	int		$srconly			Return only content of the src attribute of img.
  *  @param	int		$notitle			1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *	@return	string						Return img tag
- *	@see	#img_picto, #img_picto_common
+ *	@see	img_picto(), img_picto_common()
  */
 function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)
 {
@@ -3365,7 +3369,7 @@ function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false,
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
  *  @param      string      $morecss            More CSS
  *	@return     string      					Return img tag
- *  @see        #img_object, #img_picto
+ *  @see        img_object(), img_picto()
  */
 function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $morecss = '')
 {
@@ -3392,7 +3396,7 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
  *	@param		string		$moreatt			Add more attribute on img tag
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
  *	@return     string      					Return img tag
- *  @see        #img_object, #img_picto
+ *  @see        img_object(), img_picto()
  */
 function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)
 {
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 43ff4c978d8..07f9b24476a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1395,7 +1395,6 @@ elseif ($id > 0 || !empty($ref))
 				print '<td class="liste_titre right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
 				print '<td class="liste_titre">&nbsp;</td>';
 				print '<td class="liste_titre">&nbsp;</td>';
-				print '<td class="liste_titre">&nbsp;</td>';
 				print "</tr>\n";
 			}
 			while ($i < $num)
@@ -1420,16 +1419,14 @@ elseif ($id > 0 || !empty($ref))
 					print "</td>\n";
 
 
-					// Icone d'edition et suppression
+					// Econ to edit and delete
 					if ($object->statut == 0 && $user->rights->ficheinter->creer)
 					{
 						print '<td class="center">';
-						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;line_id='.$objp->rowid.'#'.$objp->rowid.'">';
+						print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;line_id='.$objp->rowid.'#'.$objp->rowid.'">';
 						print img_edit();
 						print '</a>';
-						print '</td>';
-						print '<td class="center">';
-						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;line_id='.$objp->rowid.'">';
+						print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;line_id='.$objp->rowid.'">';
 						print img_delete();
 						print '</a></td>';
 						print '<td class="center">';
@@ -1437,13 +1434,13 @@ elseif ($id > 0 || !empty($ref))
 						{
 							if ($i > 0)
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
+								print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
 								print img_up();
 								print '</a>';
 							}
 							if ($i < $num - 1)
 							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=down&amp;line_id='.$objp->rowid.'">';
+								print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=down&amp;line_id='.$objp->rowid.'">';
 								print img_down();
 								print '</a>';
 							}
@@ -1452,7 +1449,7 @@ elseif ($id > 0 || !empty($ref))
 					}
 					else
 					{
-						print '<td colspan="3">&nbsp;</td>';
+						print '<td colspan="2">&nbsp;</td>';
 					}
 
 					print '</tr>';
@@ -1470,7 +1467,7 @@ elseif ($id > 0 || !empty($ref))
 				// Line in update mode
 				if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id', 'int') == $objp->rowid)
 				{
-					print '<tr class="oddeven">';
+					print '<tr class="oddeven nohover">';
 					print '<td>';
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
@@ -1499,8 +1496,9 @@ elseif ($id > 0 || !empty($ref))
                     }
                     print '</td>';
 
-                    print '<td class="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-					print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
+                    print '<td class="center" colspan="5" valign="center">';
+                    print '<input type="submit" class="button buttongen marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
+					print '<input type="submit" class="button buttongen marginbottomonly" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
 					print '</tr>'."\n";
 
 					$line = new FichinterLigne($db);
@@ -1534,7 +1532,7 @@ elseif ($id > 0 || !empty($ref))
     				print "</tr>\n";
 				}
 
-				print '<tr class="oddeven">'."\n";
+				print '<tr class="oddeven nohover">'."\n";
                 print '<td>';
                 // editeur wysiwyg
                 if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index fdf5a222dee..c371be369f3 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -57,11 +57,12 @@ if ($user->socid > 0)
 $fichinterstatic = new Fichinter($db);
 $form = new Form($db);
 $formfile = new FormFile($db);
+
 $help_url = "EN:ModuleFichinters|FR:Module_Fiche_Interventions|ES:Módulo_FichaInterventiones";
 
 llxHeader("", $langs->trans("Interventions"), $help_url);
 
-print load_fiche_titre($langs->trans("InterventionsArea"));
+print load_fiche_titre($langs->trans("InterventionsArea"), '', 'commercial');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 026e6dc8347..d7d15a12fba 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -152,17 +152,18 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 	    // Class file containing the method load_state_board for each line
 	    $includes = array(
 	        DOL_DOCUMENT_ROOT."/user/class/user.class.php",
-	        DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+	    	DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
+	    	DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
 	        DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
     	    DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
-    	    DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
     	    DOL_DOCUMENT_ROOT."/product/class/product.class.php",
     	    DOL_DOCUMENT_ROOT."/product/class/product.class.php",
     	    DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
     	    DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
     	    DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
-    	    DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+	    	DOL_DOCUMENT_ROOT."/don/class/don.class.php",
+	    	DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
     	    DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
     	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
@@ -170,116 +171,119 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
             DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
 	        DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
             DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",
-			DOL_DOCUMENT_ROOT."/don/class/don.class.php",
 	    	DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php"
 	    );
 	    // Name class containing the method load_state_board for each line
-	    $classes = array('User',
-	                   'Client',
-	                   'Client',
-	                   'Fournisseur',
-	                   'Contact',
-	                   'Adherent',
-	                   'Product',
-	                   'Product',
-	                   'Propal',
-	                   'Commande',
-	                   'Facture',
-	                   'Contrat',
-	                   'Fichinter',
-	                   'CommandeFournisseur',
-	                   'FactureFournisseur',
-            	       'SupplierProposal',
-	                   'Project',
-	                   'ExpenseReport',
-                       'Holiday',
-					   'Don',
-	    			   'Ticket',
+	    $classes = array(
+	    	'User',
+	    	'Adherent',
+	    	'Client',
+	    	'Client',
+	    	'Fournisseur',
+	    	'Contact',
+	    	'Product',
+	    	'Product',
+	    	'Propal',
+	    	'Commande',
+	    	'Facture',
+	    	'Don',
+	    	'Contrat',
+	    	'Fichinter',
+	    	'CommandeFournisseur',
+	    	'FactureFournisseur',
+	    	'SupplierProposal',
+	    	'Project',
+	    	'ExpenseReport',
+	    	'Holiday',
+	    	'Ticket',
 	    );
 	    // Cle array returned by the method load_state_board for each line
-	    $keys = array('users',
-	                'customers',
-	                'prospects',
-	                'suppliers',
-	                'contacts',
-	                'members',
-	                'products',
-	                'services',
-	                'proposals',
-	                'orders',
-	                'invoices',
-	                'contracts',
-	                'interventions',
-	                'supplier_orders',
-	                'supplier_invoices',
-	                'askprice',
-	                'projects',
-	                'expensereports',
-                    'holidays',
-					'donations',
-	    			'ticket'
+	    $keys = array(
+	    	'users',
+	    	'members',
+	    	'customers',
+	    	'prospects',
+	    	'suppliers',
+	    	'contacts',
+	    	'products',
+	    	'services',
+	    	'proposals',
+	    	'orders',
+	    	'invoices',
+	    	'donations',
+	    	'contracts',
+	    	'interventions',
+	    	'supplier_orders',
+	    	'supplier_invoices',
+	    	'askprice',
+	    	'projects',
+	    	'expensereports',
+	    	'holidays',
+	    	'ticket'
 	    );
 	    // Dashboard Icon lines
-	    $icons = array('user',
-	                 'company',
-	                 'company',
-	                 'company',
-	                 'contact',
-	                 'user',
-	                 'product',
-	                 'service',
-	                 'propal',
-	                 'order',
-	                 'bill',
-	                 'contract',
-	                 'intervention',
-	                 'order',
-	                 'bill',
-	                 'propal',
-	                 'projectpub',
-					 'trip',
-                     'holiday',
-					 'generic',
-	    			 'ticket',
+	    $icons = array(
+	    	'user',
+	    	'user',
+	    	'company',
+	    	'company',
+	    	'company',
+	    	'contact',
+	    	'product',
+	    	'service',
+	    	'propal',
+	    	'order',
+	    	'bill',
+	    	'generic',
+	    	'contract',
+	    	'intervention',
+	    	'order',
+	    	'bill',
+	    	'propal',
+	    	'project',
+	    	'trip',
+	    	'holiday',
+	    	'ticket',
 	    );
 	    // Translation keyword
-	    $titres = array("Users",
-	                  "ThirdPartyCustomersStats",
-	                  "ThirdPartyProspectsStats",
-	                  "Suppliers",
-	                  "Contacts",
-	                  "Members",
-	                  "Products",
-	                  "Services",
-	                  "CommercialProposalsShort",
-	                  "CustomersOrders",
-	                  "BillsCustomers",
-	                  "Contracts",
-	                  "Interventions",
-	                  "SuppliersOrders",
-                      "SuppliersInvoices",
-	                  "SupplierProposalShort",
-	                  "Projects",
-					  "ExpenseReports",
-                      "Holidays",
-					  "Donations",
-	    			  "Ticket",
+	    $titres = array(
+	    	"Users",
+	    	"Members",
+	    	"ThirdPartyCustomersStats",
+	    	"ThirdPartyProspectsStats",
+	    	"Suppliers",
+	    	"Contacts",
+	    	"Products",
+	    	"Services",
+	    	"CommercialProposalsShort",
+	    	"CustomersOrders",
+	    	"BillsCustomers",
+	    	"Donations",
+	    	"Contracts",
+	    	"Interventions",
+	    	"SuppliersOrders",
+	    	"SuppliersInvoices",
+	    	"SupplierProposalShort",
+	    	"Projects",
+	    	"ExpenseReports",
+	    	"Holidays",
+	    	"Ticket",
 	    );
 	    // Dashboard Link lines
 	    $links = array(
 	        DOL_URL_ROOT.'/user/list.php',
-    	    DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',
+	    	DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
+	    	DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',
     	    DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',
     	    DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',
     	    DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',
-    	    DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
-    	    DOL_URL_ROOT.'/adherents/list.php?statut=-1&mainmenu=members',
     	    DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
     	    DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
     	    DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
     	    DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',
     	    DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
-    	    DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
+	    	DOL_URL_ROOT.'/don/list.php?leftmenu=donations',
+	    	DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
     	    DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
     	    DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
 	        DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
@@ -287,23 +291,23 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 	        DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
     		DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
             DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
-			DOL_URL_ROOT.'/don/list.php?leftmenu=donations',
 	    	DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket'
 	    );
 	    // Translation lang files
 	    $langfile = array(
             "users",
-            "companies",
+	    	"members",
+	    	"companies",
             "prospects",
             "suppliers",
             "companies",
-            "members",
             "products",
             "products",
             "propal",
             "orders",
             "bills",
-			"contracts",
+	    	"donations",
+	    	"contracts",
 			"interventions",
             "bills",
             "bills",
@@ -311,7 +315,6 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 	        "projects",
 			"trips",
             "holiday",
-			"donations",
 	    	"ticket"
 	    );
 
@@ -588,7 +591,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
                 'groupName' => 'Members',
                 'globalStatsKey' => 'members',
                 'stats' =>
-            	array('member_shift', 'member_expired'),
+            		array('member_shift', 'member_expired'),
             ),
         'ExpenseReport' =>
             array(
@@ -923,6 +926,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
     }
 
     if (!empty($boxstatFromHook) || !empty($boxstatItems)) {
+    	$boxstat .= '<!-- Database statistics -->'."\n";
         $boxstat .= '<div class="box">';
         $boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover" width="100%">';
         $boxstat .= '<tr class="liste_titre">';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 9035df18742..0e793361d2b 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1046,9 +1046,12 @@ class Project extends CommonObject
         $result = '';
 
         $label = '';
-        if ($option != 'nolink') $label = '<u>'.$langs->trans("ShowProject").'</u>';
+        if ($option != 'nolink') $label = '<u>'.$langs->trans("Project").'</u>';
         $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
         $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
+        if (isset($this->public)) {
+        	$label .= '<br><b>'.$langs->trans("Visibility").":</b> ".($this->public ? $langs->trans("SharedProject") : $langs->trans("PrivateProject"));
+        }
         if (!empty($this->thirdparty_name))
             $label .= ($label ? '<br>' : '').'<b>'.$langs->trans('ThirdParty').': </b>'.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto
         if (!empty($this->dateo))
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 8ed94cc1180..26b00bae2a9 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -289,7 +289,7 @@ else dol_print_error($db);
 if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
-$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut, p.fk_opp_status, p.public, p.fk_user_creat";
+$sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat";
 $sql .= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount, p.usage_opportunity, p.usage_task, p.usage_bill_time";
 $sql .= ", s.rowid as socid, s.nom as name, s.email";
 $sql .= ", cls.code as opp_status_code";
@@ -713,7 +713,9 @@ while ($i < min($num, $limit))
 	$object->public = $obj->public;
 	$object->ref = $obj->ref;
 	$object->datee = $db->jdate($obj->date_end);
-	$object->statut = $obj->fk_statut;
+	$object->statut = $obj->status;		// deprecated
+	$object->status = $obj->status;
+	$object->public = $obj->public;
 	$object->opp_status = $obj->fk_opp_status;
 	$object->title = $obj->title;
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 3222cbe7964..86d2f96ead3 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -205,7 +205,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 }
 
 .bg-infoxbox-project{
-	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#6c6a98', $conf->global->THEME_AGRESSIVENESS_RATIO); ?> !important;
+	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#6c6aa8', $conf->global->THEME_AGRESSIVENESS_RATIO); ?> !important;
 }
 .bg-infoxbox-action{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#a47080', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 437ef5b498d..32c51d3eef1 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3328,6 +3328,8 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	{
 	    $fuser->fetch($pageauthorid);
 	    print $fuser->getNomUrl(1);
+	} else {
+		print '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>';
 	}
 	print '</td></tr>';
 

From f53dd01d09f196f22d58d4c0b504ea22f727c565 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 02:15:36 +0200
Subject: [PATCH 052/144] Fix css

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

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 07f9b24476a..20f25a1207b 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -825,7 +825,7 @@ if ($action == 'create')
 
 	$soc = new Societe($db);
 
-	print load_fiche_titre($langs->trans("AddIntervention"), '', 'title_commercial');
+	print load_fiche_titre($langs->trans("AddIntervention"), '', 'commercial');
 
 	dol_htmloutput_mesg($mesg);
 

From 8d59ce2e03de6fd444fe34a89082e526389700f7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 02:48:05 +0200
Subject: [PATCH 053/144] Look and feel v12

---
 htdocs/core/class/commonobject.class.php      |  2 +-
 htdocs/core/class/html.formfile.class.php     |  2 +-
 htdocs/core/lib/functions.lib.php             | 29 ++++++++++---------
 htdocs/fichinter/class/fichinter.class.php    |  6 ++--
 htdocs/index.php                              |  2 +-
 .../class/supplier_proposal.class.php         | 27 ++++++++---------
 htdocs/supplier_proposal/list.php             | 19 ++++++------
 htdocs/theme/eldy/info-box.inc.php            | 28 +++++++++---------
 htdocs/theme/md/info-box.inc.php              | 26 ++++++++---------
 9 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 41a7107b8d9..f9c3e260e6f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -575,7 +575,7 @@ abstract class CommonObject
 	{
 		$return = '<div class="box-flex-item">';
 		$return .= '<div class="info-box info-box-sm">';
-		$return .= '<span class="info-box-icon bg-infoxbox-action">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
 		$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index c9c99370816..d4e6620c0da 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -994,7 +994,7 @@ class FormFile
 		{
 			$out = '<dl class="dropdown inline-block">
     			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>
-    			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
+    			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields">';
 			$tmpout = '';
 
 			// Loop on each file found
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e9285fdee05..4c7396eb4e5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3148,11 +3148,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'object_category', 'object_bookmark', 'object_bug', '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_dynamicprice',
         		'object_holiday', 'object_hrm', 'object_intervention', 'object_multicurrency', 'object_payment',
-        		'object_lot', 'object_mrp', 'object_product', 'object_service', 'object_stock',
-        		'object_paragraph', 'object_printer', 'object_project', 'object_projectpub', 'object_resource', 'object_rss', 'object_projecttask',
+        		'object_lot', 'object_mrp', 'object_product', 'object_propal', 'object_supplier_proposal', 'object_service', 'object_stock',
+        		'object_paragraph', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
         		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
         		'object_phoning', 'object_phoning_fax', 'object_email',
-        		'off', 'on', 'paiment', 'play', 'playdisabled', 'printer', 'product', 'resize', 'service', 'stats', 'trip',
+        		'off', 'on',
+        		'paiment', 'play', 'playdisabled', 'printer', 'product', 'propal', 'resize', 'service', 'stats', 'trip',
 				'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
@@ -3188,8 +3189,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
 		    	'intervention'=>'ambulance', 'multicurrency'=>'dollar-sign',
 		    	'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
-		    	'other'=>'square', 'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks',
-				'resize'=>'crop',
+		    	'other'=>'square',
+		    	'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+				'resize'=>'crop', 'supplier_proposal'=>'file-signature',
 		    	'payment'=>'money-bill-alt', 'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 		    	'resource'=>'laptop-house',
 		    	'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
@@ -3244,16 +3246,17 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// Add CSS
 			$arrayconvpictotomorcess = array(
-				'action'=>'bg-infoxbox-action', 'account'=>'bg-infoxbox-bank_account', 'bank_account'=>'bg-infoxbox-bank_account', 'cash-register'=>'bg-infoxbox-bank_account',
-				'contract'=>'bg-infoxbox-contrat',
-				'multicurrency'=>'bg-infoxbox-bank_account',
+				'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'bank_account'=>'bg-infobox-bank_account', 'cash-register'=>'bg-infobox-bank_account',
+				'contract'=>'bg-infobox-contrat',
+				'multicurrency'=>'bg-infobox-bank_account',
 				'check'=>'font-status4',
-				'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent', 'intervention'=>'bg-infoxbox-contrat',
-				'members'=>'bg-infoxbox-adherent', 'member'=>'bg-infoxbox-adherent', 'user'=>'bg-infoxbox-adherent', 'users'=>'bg-infoxbox-adherent',
+				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
+				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'user'=>'bg-infobox-adherent', 'users'=>'bg-infobox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
-				'holiday'=>'bg-infoxbox-holiday', 'payment'=>'bg-infoxbox-bank_account', 'project'=>'bg-infoxbox-project', 'projecttask'=>'bg-infoxbox-project',
-				'resource'=>'bg-infoxbox-action',
-				'ticket'=>'bg-infoxbox-contrat', 'title_hrm'=>'bg-infoxbox-holiday', 'trip'=>'bg-infoxbox-expensereport', 'title_agenda'=>'bg-infoxbox-action',
+				'holiday'=>'bg-infobox-holiday',
+				'payment'=>'bg-infobox-bank_account', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
+				'resource'=>'bg-infobox-action', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
+				'ticket'=>'bg-infobox-contrat', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
 			if (!empty($arrayconvpictotomorcess[$pictowithouttext])) {
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index ff88847140b..ddc9e701e8a 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -729,7 +729,7 @@ class Fichinter extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut, $mode);
+		return $this->LibStatut((isset($this->statut) ? $this->statut : $this->status), $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -783,8 +783,8 @@ class Fichinter extends CommonObject
 
 		$label = '<u>'.$langs->trans("ShowIntervention").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (isset($this->statut)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		if (isset($this->status)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->status.$this->getLibStatut(5);
 		}
 
 		$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
diff --git a/htdocs/index.php b/htdocs/index.php
index d7d15a12fba..850a6c3a932 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -724,7 +724,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
                 $openedDashBoard .= '<div class="box-flex-item">'."\n";
                 $openedDashBoard .= '	<div class="info-box '.$openedDashBoardSize.'">'."\n";
-                $openedDashBoard .= '		<span class="info-box-icon bg-infoxbox-'.$groupKeyLowerCase.'">'."\n";
+                $openedDashBoard .= '		<span class="info-box-icon bg-infobox-'.$groupKeyLowerCase.'">'."\n";
                 $openedDashBoard .= '		<i class="fa fa-dol-'.$groupKeyLowerCase.'"></i>'."\n";
 
                 // Show the span for the total of record
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 19c36bcaa22..3e69fbc167f 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -70,7 +70,7 @@ class SupplierProposal extends CommonObject
     /**
      * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
      */
-    public $picto = 'propal';
+    public $picto = 'supplier_proposal';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -2225,7 +2225,7 @@ class SupplierProposal extends CommonObject
      */
     public function getLibStatut($mode = 0)
     {
-        return $this->LibStatut($this->statut, $mode);
+        return $this->LibStatut((isset($this->statut) ? $this->statut : $this->status), $mode);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2555,17 +2555,16 @@ class SupplierProposal extends CommonObject
         $url = '';
         $result = '';
 
-        $label = '<u>'.$langs->trans("ShowSupplierProposal").'</u>';
-        if (!empty($this->ref))
-        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (!empty($this->ref_fourn))
-            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
-        if (!empty($this->total_ht))
-            $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (!empty($this->total_tva))
-            $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (!empty($this->total_ttc))
-            $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        $label = '<u>'.$langs->trans("SupplierProposal").'</u>';
+        if (!empty($this->ref)) $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+        if (!empty($this->ref_fourn)) $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
+        if (!empty($this->total_ht)) $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_tva)) $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_ttc)) $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        if (isset($this->status)) {
+           	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+        }
+
         if ($option == '') {
             $url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id.$get_params;
         }
@@ -2597,8 +2596,6 @@ class SupplierProposal extends CommonObject
         $linkstart .= $linkclose.'>';
         $linkend = '</a>';
 
-        $picto = 'supplier_proposal';
-
         $result .= $linkstart;
         if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
         if ($withpicto != 2) $result .= $this->ref;
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index c778536685e..28dbc3e12b8 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -259,7 +259,7 @@ if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
 $sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
-$sql .= ' sp.rowid, sp.note_private, sp.total_ht, sp.tva as total_vat, sp.total as total_ttc, sp.localtax1, sp.localtax2, sp.ref, sp.fk_statut, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';
+$sql .= ' sp.rowid, sp.note_private, sp.total_ht, sp.tva as total_vat, sp.total as total_ttc, sp.localtax1, sp.localtax2, sp.ref, sp.fk_statut as status, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';
 $sql .= ' sp.fk_multicurrency, sp.multicurrency_code, sp.multicurrency_tx, sp.multicurrency_total_ht, sp.multicurrency_total_tva as multicurrency_total_vat, sp.multicurrency_total_ttc,';
 $sql .= ' sp.datec as date_creation, sp.tms as date_update,';
 $sql .= " p.rowid as project_id, p.ref as project_ref,";
@@ -695,6 +695,13 @@ if ($resql)
 		$objectstatic->ref = $obj->ref;
 		$objectstatic->note_public = $obj->note_public;
 		$objectstatic->note_private = $obj->note_private;
+		$objectstatic->status = $obj->status;
+
+		// Company
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->name;
+		$companystatic->client = $obj->client;
+		$companystatic->code_client = $obj->code_client;
 
 		print '<tr class="oddeven">';
 
@@ -728,14 +735,6 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 
-		$url = DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid;
-
-		// Company
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->name;
-		$companystatic->client = $obj->client;
-		$companystatic->code_client = $obj->code_client;
-
 		// Thirdparty
 		if (!empty($arrayfields['s.nom']['checked']))
 		{
@@ -901,7 +900,7 @@ if ($resql)
 		// Status
 		if (!empty($arrayfields['sp.fk_statut']['checked']))
 		{
-			print '<td class="right">'.$objectstatic->LibStatut($obj->fk_statut, 5)."</td>\n";
+			print '<td class="right">'.$objectstatic->getLibStatut(5)."</td>\n";
 			if (!$i) $totalarray['nbfield']++;
 		}
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 86d2f96ead3..0473cb15584 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -204,35 +204,35 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
     opacity: 0.95;
 }
 
-.bg-infoxbox-project{
+.bg-infobox-project{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#6c6aa8', $conf->global->THEME_AGRESSIVENESS_RATIO); ?> !important;
 }
-.bg-infoxbox-action{
+.bg-infobox-action{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#a47080', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-propal,
-.bg-infoxbox-facture,
-.bg-infoxbox-commande{
+.bg-infobox-propal,
+.bg-infobox-facture,
+.bg-infobox-commande{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#99a17d', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-supplier_proposal,
-.bg-infoxbox-invoice_supplier,
-.bg-infoxbox-order_supplier{
+.bg-infobox-supplier_proposal,
+.bg-infobox-invoice_supplier,
+.bg-infobox-order_supplier{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#599caf', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-contrat, .bg-infoxbox-ticket{
+.bg-infobox-contrat, .bg-infobox-ticket{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#46a676', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-bank_account{
+.bg-infobox-bank_account{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-adherent{
+.bg-infobox-adherent{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-expensereport{
+.bg-infobox-expensereport{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#79633f', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-holiday{
+.bg-infobox-holiday{
 	<?php echo $prefix; ?>color: <?php print colorAgressiveness('#755114', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
 
@@ -242,7 +242,7 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 }
 .fa-dol-propal:before,
 .fa-dol-supplier_proposal:before {
-	content: "\f2b5";
+	content: "\f573";
 }
 .fa-dol-facture:before,
 .fa-dol-invoice_supplier:before {
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index ad1f037ab1e..d9b467f130b 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -110,35 +110,35 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 if (!isset($conf->global->THEME_AGRESSIVENESS_RATIO)) $conf->global->THEME_AGRESSIVENESS_RATIO = -100;
 if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENESS_RATIO = GETPOST('THEME_AGRESSIVENESS_RATIO', 'int');
 ?>
-.bg-infoxbox-project i.fa{
+.bg-infobox-project i.fa{
 	color: <?php print colorAgressiveness('#605ca8', $conf->global->THEME_AGRESSIVENESS_RATIO); ?> !important;
 }
-.bg-infoxbox-action i.fa{
+.bg-infobox-action i.fa{
 	color: <?php print colorAgressiveness('#d84b80', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-propal i.fa,
-.bg-infoxbox-facture i.fa,
-.bg-infoxbox-commande i.fa{
+.bg-infobox-propal i.fa,
+.bg-infobox-facture i.fa,
+.bg-infobox-commande i.fa{
 	color: <?php print colorAgressiveness('#abb87b', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-supplier_proposal i.fa,
-.bg-infoxbox-invoice_supplier i.fa,
-.bg-infoxbox-order_supplier i.fa{
+.bg-infobox-supplier_proposal i.fa,
+.bg-infobox-invoice_supplier i.fa,
+.bg-infobox-order_supplier i.fa{
 	color: <?php print colorAgressiveness('#40b0cf', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-contrat i.fa, .bg-infoxbox-ticket i.fa{
+.bg-infobox-contrat i.fa, .bg-infobox-ticket i.fa{
 	color: <?php print colorAgressiveness('#20a68a', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-bank_account i.fa{
+.bg-infobox-bank_account i.fa{
 	color: <?php print colorAgressiveness('#b0a53e', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-adherent i.fa{
+.bg-infobox-adherent i.fa{
 	color: <?php print colorAgressiveness('#f39c12', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-expensereport i.fa{
+.bg-infobox-expensereport i.fa{
 	color: <?php print colorAgressiveness('#755114', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
-.bg-infoxbox-holiday i.fa{
+.bg-infobox-holiday i.fa{
 	color: <?php print colorAgressiveness('#755114', $conf->global->THEME_AGRESSIVENESS_RATIO); ?>  !important;
 }
 

From fe674f08d911178193ad24a98c21cb013c5b672c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 03:00:10 +0200
Subject: [PATCH 054/144] Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER

---
 htdocs/commande/card.php                   | 7 ++++---
 htdocs/commande/class/commande.class.php   | 7 +++++--
 htdocs/commande/list.php                   | 5 +++--
 htdocs/core/lib/functions.lib.php          | 7 ++++---
 htdocs/fichinter/class/fichinter.class.php | 2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 2a0675806dc..b43a702c2f2 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -113,7 +113,7 @@ $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc
 $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
-if (!empty($conf->expedition->enabled) && $conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER = 1) {
+if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
 	if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $object->warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 	if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $object->warehouse_id = $user->fk_warehouse;
 }
@@ -1506,9 +1506,10 @@ if ($action == 'create' && $usercancreate)
 	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
+		$regs = array();
 		if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
-			$element = $regs [1];
-			$subelement = $regs [2];
+			$element = $regs[1];
+			$subelement = $regs[2];
 		}
 
 		if ($element == 'project') {
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 9ebc0b166dc..c39a5a05a13 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3697,7 +3697,7 @@ class Commande extends CommonOrder
 		$label = '';
 
 		if ($user->rights->commande->lire) {
-			$label = '<u>'.$langs->trans("ShowOrder").'</u>';
+			$label = '<u>'.$langs->trans("Order").'</u>';
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
 			if (!empty($this->total_ht)) {
@@ -3709,6 +3709,9 @@ class Commande extends CommonOrder
 			if (!empty($this->total_ttc)) {
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			}
+			if (isset($this->statut)) {
+				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			}
 		}
 
 		$linkclose = '';
@@ -3716,7 +3719,7 @@ class Commande extends CommonOrder
 		{
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label = $langs->trans("ShowOrder");
+				$label = $langs->trans("Order");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 43f45b10612..dda9bee327f 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -348,7 +348,7 @@ if ($search_user > 0)                        $sql .= " AND ec.fk_c_type_contact
 if ($search_total_ht != '')                  $sql .= natural_search('c.total_ht', $search_total_ht, 1);
 if ($search_total_vat != '')                 $sql .= natural_search('c.tva', $search_total_vat, 1);
 if ($search_total_ttc != '')                 $sql .= natural_search('c.total_ttc', $search_total_ttc, 1);
-if ($search_warehouse != '')		             $sql .= natural_search('c.fk_warehouse', $search_warehouse, 1);
+if ($search_warehouse != '' && $search_warehouse != '-1') $sql .= natural_search('c.fk_warehouse', $search_warehouse, 1);
 if ($search_multicurrency_code != '')        $sql .= ' AND c.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
 if ($search_multicurrency_tx != '')          $sql .= natural_search('c.multicurrency_tx', $search_multicurrency_tx, 1);
 if ($search_multicurrency_montant_ht != '')  $sql .= natural_search('c.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
@@ -603,7 +603,7 @@ if ($resql)
 		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1);
 	 	$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->expedition->enabled) && $conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER = 1) {
+	if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -901,6 +901,7 @@ if ($resql)
 		$generic_commande->id = $obj->rowid;
 		$generic_commande->ref = $obj->ref;
 		$generic_commande->statut = $obj->fk_statut;
+		$generic_commande->billed = $obj->billed;
 		$generic_commande->date = $db->jdate($obj->date_commande);
 		$generic_commande->date_livraison = $db->jdate($obj->date_delivery);
 		$generic_commande->ref_client = $obj->ref_client;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4c7396eb4e5..f6584a49c77 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3147,7 +3147,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bom',
         		'object_category', 'object_bookmark', 'object_bug', '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_dynamicprice',
-        		'object_holiday', 'object_hrm', 'object_intervention', 'object_multicurrency', 'object_payment',
+        		'object_holiday', 'object_hrm', 'object_intervention', 'object_multicurrency', 'object_order', 'object_payment',
         		'object_lot', 'object_mrp', 'object_product', 'object_propal', 'object_supplier_proposal', 'object_service', 'object_stock',
         		'object_paragraph', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
         		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
@@ -3187,7 +3187,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
 		    	'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
 		    	'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
-		    	'intervention'=>'ambulance', 'multicurrency'=>'dollar-sign',
+		    	'intervention'=>'ambulance', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
 		    	'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 		    	'other'=>'square',
 		    	'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
@@ -3251,7 +3251,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'multicurrency'=>'bg-infobox-bank_account',
 				'check'=>'font-status4',
 				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
-				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'user'=>'bg-infobox-adherent', 'users'=>'bg-infobox-adherent',
+				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'order'=>'bg-infobox-commande',
+				'user'=>'bg-infobox-adherent', 'users'=>'bg-infobox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
 				'holiday'=>'bg-infobox-holiday',
 				'payment'=>'bg-infobox-bank_account', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index ddc9e701e8a..f8a62da7ba6 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -784,7 +784,7 @@ class Fichinter extends CommonObject
 		$label = '<u>'.$langs->trans("ShowIntervention").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->status.$this->getLibStatut(5);
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
 		}
 
 		$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;

From d847f67e4564f91049192a4df0f7880723d9d353 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 03:10:26 +0200
Subject: [PATCH 055/144] Look and feel v12

---
 htdocs/comm/propal/class/propal.class.php | 9 +++++++--
 htdocs/comm/propal/list.php               | 8 +++++---
 htdocs/fichinter/list.php                 | 9 +++++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 938430ea542..6a2eac53f95 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3658,7 +3658,7 @@ class Propal extends CommonObject
 
 		if ($user->rights->propal->lire)
 		{
-			$label = '<u>'.$langs->trans("ShowPropal").'</u>';
+			$label = '<u>'.$langs->trans("Proposal").'</u>';
 			if (!empty($this->ref))
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			if (!empty($this->ref_client))
@@ -3669,6 +3669,11 @@ class Propal extends CommonObject
 				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
 			if (!empty($this->total_ttc))
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			if (isset($this->statut)) {
+				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			}
+
+
 			if ($option == '') {
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
 			}
@@ -3696,7 +3701,7 @@ class Propal extends CommonObject
 		{
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label = $langs->trans("ShowPropal");
+				$label = $langs->trans("Proposal");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 716f2fdd060..955c4f38832 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -287,7 +287,7 @@ $sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.
 $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
-$sql .= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
+$sql .= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut as status, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
 $sql .= ' p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva as multicurrency_total_vat, p.multicurrency_total_ttc,';
 $sql .= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date_cloture,';
 $sql .= ' p.note_public, p.note_private,';
@@ -862,6 +862,8 @@ if ($resql)
 		$objectstatic->ref_client = $obj->ref_client;
 		$objectstatic->note_public = $obj->note_public;
 		$objectstatic->note_private = $obj->note_private;
+		$objectstatic->statut = $obj->status;
+		$objectstatic->status = $obj->status;
 
 		$companystatic->id = $obj->socid;
 		$companystatic->name = $obj->name;
@@ -909,7 +911,7 @@ if ($resql)
 			print '</td>';
 			// Warning
 			$warnornote = '';
-			if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) $warnornote .= img_warning($langs->trans("Late"));
+			if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) $warnornote .= img_warning($langs->trans("Late"));
 			if ($warnornote)
 			{
 				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
@@ -1232,7 +1234,7 @@ if ($resql)
 		// Status
 		if (!empty($arrayfields['p.fk_statut']['checked']))
 		{
-			print '<td class="nowrap right">'.$objectstatic->LibStatut($obj->fk_statut, 5).'</td>';
+			print '<td class="nowrap right">'.$objectstatic->getLibStatut(5).'</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 		// Action column
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index f67e12684fa..7e9dd073925 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -202,7 +202,7 @@ foreach ($arrayfields as $tmpkey => $tmpval)
 }
 
 $sql = "SELECT";
-$sql .= " f.ref, f.rowid, f.fk_statut, f.description, f.datec as date_creation, f.tms as date_update, f.note_private,";
+$sql .= " f.ref, f.rowid, f.fk_statut as status, f.description, f.datec as date_creation, f.tms as date_update, f.note_private,";
 if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= "fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
 $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus";
 if (!empty($conf->projet->enabled)) {
@@ -249,7 +249,7 @@ if ($search_desc) {
 	else $sql .= natural_search(array('f.description'), $search_desc);
 }
 if ($search_status != '' && $search_status >= 0) {
-	$sql .= ' AND f.fk_statut = '.$search_status;
+	$sql .= ' AND f.fk_statut = '.urlencode($search_status);
 }
 if (!$user->rights->societe->client->voir && empty($socid))
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -476,7 +476,8 @@ if ($resql)
 
 		$objectstatic->id = $obj->rowid;
 		$objectstatic->ref = $obj->ref;
-		$objectstatic->statut = $obj->fk_statut;
+		$objectstatic->statut = $obj->status;
+		$objectstatic->status = $obj->status;
 
 		$companystatic->name = $obj->name;
 		$companystatic->id = $obj->socid;
@@ -587,7 +588,7 @@ if ($resql)
 		// Status
 		if (!empty($arrayfields['f.fk_statut']['checked']))
 		{
-			print '<td class="right">'.$objectstatic->LibStatut($obj->fk_statut, 5).'</td>';
+			print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 		// Fields of detail of line

From 78474af4862fa285f0c38d2637f73ea82906ca51 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 03:14:44 +0200
Subject: [PATCH 056/144] Link missing

---
 htdocs/compta/bank/list.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 2e616a6ef48..eaefdfb6573 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -538,7 +538,11 @@ foreach ($accounts as $key=>$type)
     		if ($result < 0) {
     			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
     		} else {
-    			print '<span class="badge badge-info classfortooltip" title="'.dol_htmlentities($langs->trans("TransactionsToConciliate")).'">'.$result->nbtodo.'</span>';
+    			print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'&search_conciliated=0">';
+    			print '<span class="badge badge-info classfortooltip" title="'.dol_htmlentities($langs->trans("TransactionsToConciliate")).'">';
+    			print $result->nbtodo;
+    			print '</span>';
+				print '</a>';
     			if ($result->nbtodolate) {
     				print '<span title="'.dol_htmlentities($langs->trans("Late")).'" class="classfortooltip badge badge-danger marginleftonlyshort">';
     				print '<i class="fa fa-exclamation-triangle"></i> '.$result->nbtodolate;

From afc04faa641647a79fa46fccc8f352934311a3c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 04:26:16 +0200
Subject: [PATCH 057/144] Fix nb of open tickets

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4ce5948f0b3..863c0c03072 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2808,7 +2808,7 @@ class Ticket extends CommonObject
 			$clause = " AND";
 		}
 		$sql .= $clause." p.entity IN (".getEntity('ticket').")";
-		if ($mode == 'opened') $sql .= " AND p.fk_statut in (".Ticket::STATUS_CLOSED.", ".Ticket::STATUS_CANCELED.")";
+		if ($mode == 'opened') $sql .= " AND p.fk_statut NOT IN (".Ticket::STATUS_CLOSED.", ".Ticket::STATUS_CANCELED.")";
 		if ($user->socid) $sql .= " AND p.fk_soc = ".$user->socid;
 
 		$resql = $this->db->query($sql);

From f816fae86cfd523dfb3c57888100666f11c8ee7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 12:21:13 +0200
Subject: [PATCH 058/144] Fix a duplicated index

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql |  5 +++++
 htdocs/install/mysql/migration/3.5.0-3.6.0.sql   |  4 ----
 htdocs/product/class/product.class.php           |  2 +-
 .../product/stock/class/mouvementstock.class.php | 16 ++++++++--------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 628b298329d..681731e27a5 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -45,6 +45,11 @@ UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version
 
 
 -- For v12
+
+-- Delete an old index that is duplicated
+-- VMYSQL4.1 DROP INDEX ix_fk_product_stock on llx_product_batch;
+-- VPGSQL8.2 DROP INDEX ix_fk_product_stock
+
 DELETE FROM llx_menu where module='supplier_proposal';
 
 UPDATE llx_website SET lang = 'en' WHERE lang like 'en_%';
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
index 65752a542ca..5727b946bcb 100644
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -216,10 +216,6 @@ ALTER TABLE llx_expeditiondet_batch ADD INDEX idx_fk_expeditiondet (fk_expeditio
 ALTER TABLE llx_expeditiondet_batch ADD CONSTRAINT fk_expeditiondet_batch_fk_expeditiondet FOREIGN KEY (fk_expeditiondet) REFERENCES llx_expeditiondet(rowid);
 
 
-ALTER TABLE llx_product_batch ADD INDEX ix_fk_product_stock (fk_product_stock);
-ALTER TABLE llx_product_batch ADD CONSTRAINT fk_product_batch_fk_product_stock FOREIGN KEY (fk_product_stock) REFERENCES llx_product_stock (rowid);
-
-
 -- New 1074 : Stock mouvement link to origin
 ALTER TABLE llx_stock_mouvement ADD fk_origin integer;
 ALTER TABLE llx_stock_mouvement ADD origintype VARCHAR(32);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8fac5fb3028..c37dbaeb3f7 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4734,7 +4734,7 @@ class Product extends CommonObject
             $op[1] = "-".trim($nbpiece);
 
             $movementstock = new MouvementStock($this->db);
-            $movementstock->setOrigin($origin_element, $origin_id);
+            $movementstock->setOrigin($origin_element, $origin_id);	// Set ->origin and ->origin->id
             $result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode);
 
             if ($result >= 0) {
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index b7c92215e2a..5bbc3f9d92c 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -142,7 +142,7 @@ class MouvementStock extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
-		$langs->load("errors");
+
 		$error = 0;
 		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
 
@@ -408,13 +408,13 @@ class MouvementStock extends CommonObject
 			$sql .= " ".($batch ? "'".$batch."'" : "null").", ";
 			$sql .= " ".($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ";
 			$sql .= " ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ";
-			$sql .= " ".$this->entrepot_id.", ".$this->qty.", ".$this->type.",";
+			$sql .= " ".$this->entrepot_id.", ".$this->qty.", ".((int) $this->type).",";
 			$sql .= " ".$user->id.",";
 			$sql .= " '".$this->db->escape($label)."',";
 			$sql .= " ".($inventorycode ? "'".$this->db->escape($inventorycode)."'" : "null").",";
-			$sql .= " '".price2num($price)."',";
-			$sql .= " '".$fk_origin."',";
-			$sql .= " '".$origintype."',";
+			$sql .= " ".price2num($price).",";
+			$sql .= " ".$fk_origin.",";
+			$sql .= " '".$this->db->escape($origintype)."',";
 			$sql .= " ".$fk_project;
 			$sql .= ")";
 
@@ -438,7 +438,7 @@ class MouvementStock extends CommonObject
 			$oldpmp = $product->pmp;
 			$oldqtywarehouse = 0;
 
-			// Test if there is already a record for couple (warehouse / product)
+			// Test if there is already a record for couple (warehouse / product), so later we will make an update or create.
 			$alreadyarecord = 0;
 			if (!$error)
 			{
@@ -486,7 +486,7 @@ class MouvementStock extends CommonObject
 				}
 				elseif ($type == 1 || $type == 2)
 				{
-					// After a stock decrease, we don't change value of PMP for product.
+					// After a stock decrease, we don't change value of the AWP/PMP of a product.
 					$newpmp = $oldpmp;
 				}
 				else
@@ -543,7 +543,7 @@ class MouvementStock extends CommonObject
 				// $sql = "UPDATE ".MAIN_DB_PREFIX."product SET pmp = ".$newpmp.", stock = ".$this->db->ifsql("stock IS NULL", 0, "stock") . " + ".$qty;
 				// $sql.= " WHERE rowid = ".$fk_product;
     			// Update pmp + denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
-				$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$newpmp.", ";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$newpmp.",";
 				$sql .= " stock=(SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
 				$sql .= " WHERE rowid = ".$fk_product;
 

From b92c03cdf6e16cc9661167bb93393f327324da6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 13:20:09 +0200
Subject: [PATCH 059/144] Fix Look and feel v12

---
 htdocs/takepos/index.php   |  2 ++
 htdocs/takepos/invoice.php | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index bba62298989..0688d4a8584 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -763,8 +763,10 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
 			?>
 			</a></div>
+			<!-- section for customer and open sales -->
 			<div class="inline-block valignmiddle" id="customerandsales">
 			</div>
+			<!-- More info about customer -->
 			<div class="inline-block valignmiddle" id="moreinfo"></div>
 			<div class="inline-block valignmiddle" id="infowarehouse"></div>
 			</div>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 77254be543f..e358b24602a 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -733,7 +733,7 @@ function DolibarrTakeposPrinting(id) {
 
 
 $( document ).ready(function() {
-	console.log("Set customer info in header");
+	console.log("Set customer info and sales in header");
 
     <?php
     $s = $langs->trans("Customer");
@@ -742,7 +742,9 @@ $( document ).ready(function() {
     }
     ?>
 
-    $("#customerandsales").html('<a class="valignmiddle" id="customer" onclick="Customer();"><?php print dol_escape_js($s); ?></a>');
+    $("#customerandsales").html('');
+
+	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth100" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
 
 	<?php
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
@@ -752,12 +754,13 @@ $( document ).ready(function() {
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			if ($placeid == $obj->rowid) echo "<b>";
 			echo '<a class="valignmiddle" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
-			echo '\\\';Refresh();">'.date('H:i', strtotime($obj->datec));
+			echo '\\\';Refresh();">';
+			if ($placeid == $obj->rowid) echo "<b>";
+			echo date('H:i', strtotime($obj->datec));
 			if ($placeid == $obj->rowid) echo "</b>";
 			echo '</a>\');';
 		}
@@ -787,7 +790,7 @@ $( document ).ready(function() {
 	<?php
 	// Module Adherent
 	$s = '';
-	if (!empty($conf->adherent->enabled) && $invoice->socid != $conf->global->$constforcompanyid)
+	if (!empty($conf->adherent->enabled) && $invoice->socid > 0 && $invoice->socid != $conf->global->$constforcompanyid)
 	{
 		$s = '<span class="small">';
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

From c7fab6a83e42e14b7563f6b54903ce65ee7ea375 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 13:26:06 +0200
Subject: [PATCH 060/144] Fix no tooltip of not predefined products

---
 htdocs/takepos/invoice.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index e358b24602a..adbf403491e 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -944,6 +944,7 @@ if ($placeid > 0)
 
     if (is_array($invoice->lines) && count($invoice->lines))
     {
+    	print '<!-- Show lines of invoices -->'."\n";
         $tmplines = array_reverse($invoice->lines);
         foreach ($tmplines as $line)
         {
@@ -993,11 +994,14 @@ if ($placeid > 0)
                 else $htmlforlines .= img_object('', 'service').' ';
             }
             if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {
-            	$tooltiptext = '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';
-            	$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';
-            	if ($line->product_label != $line->desc) {
-            		if ($line->desc) $tooltiptext .= '<br>';
-    	        	$tooltiptext .= $line->desc;
+            	$tooltiptext = '';
+            	if ($line->product_ref) {
+            		$tooltiptext .= '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';
+            		$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';
+	            	if ($line->product_label != $line->desc) {
+	            		if ($line->desc) $tooltiptext .= '<br>';
+	    	        	$tooltiptext .= $line->desc;
+	            	}
             	}
             	$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
             } else {

From 68702f8053479d364848b1aeb85de81a1eee10f0 Mon Sep 17 00:00:00 2001
From: Adrien Jacob <adrien.jacob@gmail.com>
Date: Mon, 20 Apr 2020 14:12:08 +0200
Subject: [PATCH 061/144] [BUGFIX] Allow update of extra fields

This is to make supplier invoices consistent with other similar classes
---
 htdocs/fourn/class/fournisseur.facture.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 916ef2f001d..28d9310a01f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -976,6 +976,15 @@ class FactureFournisseur extends CommonInvoice
                 $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
+		
+		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
+		{
+			$result=$this->insertExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
 
         if (!$error)
         {

From 36385e3b880e2c5740385a13fa0bd2d3b2f0d5a5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 20 Apr 2020 12:16:34 +0000
Subject: [PATCH 062/144] Fixing style errors.

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 28d9310a01f..a9448c7c925 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -976,7 +976,7 @@ class FactureFournisseur extends CommonInvoice
                 $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
-		
+
 		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
 		{
 			$result=$this->insertExtraFields();

From 924b8fd1386b4556f260b3b1894050f3cb1237ef Mon Sep 17 00:00:00 2001
From: jribal <jeremie.ribal@epitech.eu>
Date: Mon, 20 Apr 2020 13:21:12 +0100
Subject: [PATCH 063/144] add project object dependency

Dependency was missing. Webapp seems fine but api fails.
---
 htdocs/projet/class/task.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 6136198fd5e..f3f75b716c1 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -26,6 +26,7 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
 /**

From dfd1711f539cc7618a8df692796f9c96a9927456 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 14:35:11 +0200
Subject: [PATCH 064/144] Update interface_80_modStripe_Stripe.class.php

---
 .../triggers/interface_80_modStripe_Stripe.class.php  | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index f1f0a9530af..27138e6099f 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -77,17 +77,6 @@ class InterfaceStripe
 		return $this->description;
 	}
 
-	/**
-	 * Trigger version
-	 *
-	 * @return string Version of trigger file
-	 */
-	public function getVersion()
-	{
-		global $langs;
-		return DOL_VERSION;
-	}
-
 	/**
 	 * Function called when a Dolibarrr business event is done.
 	 * All functions "runTrigger" are triggered if file

From f546103c015dad59328cd646ed25834258def42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 19 Apr 2020 22:05:47 +0200
Subject: [PATCH 065/144] make dolistore happy again

---
 htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
index 2b32594e6eb..9402c8eb5fc 100644
--- a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
+++ b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software: you can redistribute it and/or modify
@@ -112,7 +112,7 @@ class mymodulewidget1 extends ModeleBoxes
 		// Use configuration value for max lines count
 		$this->max = $max;
 
-		//include_once DOL_DOCUMENT_ROOT . "/mymodule/class/mymodule.class.php";
+		//dol_include_once("/mymodule/class/mymodule.class.php");
 
 		// Populate the head at runtime
 		$text = $langs->trans("MyModuleBoxDescription", $max);

From 91fbccb59447a048e8ec4010ca74982702197188 Mon Sep 17 00:00:00 2001
From: Adrien Jacob <adrien.jacob@gmail.com>
Date: Mon, 20 Apr 2020 14:12:08 +0200
Subject: [PATCH 066/144] [BUGFIX] Allow update of extra fields

This is to make supplier invoices consistent with other similar classes
---
 htdocs/fourn/class/fournisseur.facture.class.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index bdfdbb360d8..bdeedf44091 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -976,6 +976,15 @@ class FactureFournisseur extends CommonInvoice
                 $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
+		
+		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
+		{
+			$result=$this->insertExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
 
         if (!$error)
         {

From 27aeaaecb5f75a4386abcaf4fc4e3b672a43eece Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 20 Apr 2020 12:16:34 +0000
Subject: [PATCH 067/144] Fixing style errors.

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index bdeedf44091..48ca9ca81f2 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -976,7 +976,7 @@ class FactureFournisseur extends CommonInvoice
                 $this->errors[] = "Error ".$this->db->lasterror();
             }
         }
-		
+
 		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
 		{
 			$result=$this->insertExtraFields();

From 2922d16ca2750b7581735bb88a55f701aefa6663 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 14:46:02 +0200
Subject: [PATCH 068/144] Look and feel v12

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

diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 59ac87a2c56..9f3accfe549 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -208,7 +208,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 {
 	print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 }
-print getTitleFieldOfList("Action", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+print getTitleFieldOfList("", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 print "</tr>\n";
 
 

From 98f370034a6d0c7fd10b3130e52a409b62fce57e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 14:53:17 +0200
Subject: [PATCH 069/144] Look and feel v12

---
 htdocs/compta/bank/various_payment/list.php |  5 ++---
 htdocs/salaries/list.php                    | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index e2aa6517417..b8581151599 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -58,7 +58,7 @@ $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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) $sortfield = "v.datep,v.rowid";
@@ -178,9 +178,8 @@ if ($result)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($langs->trans("VariousPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit);
+	print_barre_liste($langs->trans("VariousPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 259547ae8ff..c92ee53fd38 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -49,16 +49,16 @@ $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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) $sortfield = "s.datep,s.rowid";
 if (!$sortorder) $sortorder = "DESC,DESC";
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$filtre = $_GET["filtre"];
+$filtre = GETPOST("filtre", 'none');
 
-if (empty($_REQUEST['typeid']))
+if (! GETPOST('typeid', 'int'))
 {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
@@ -70,7 +70,7 @@ if (empty($_REQUEST['typeid']))
 }
 else
 {
-	$typeid = $_REQUEST['typeid'];
+	$typeid = GETPOST('typeid', 'int');
 }
 
 
@@ -141,6 +141,7 @@ if ($result)
 }
 $sql .= $db->plimit($limit + 1, $offset);
 
+
 $result = $db->query($sql);
 if ($result)
 {
@@ -167,9 +168,8 @@ if ($result)
     print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
 
-    print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, $newcardbutton, '', $limit);
+    print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

From 16e46c672ccb475569634013e17aaf1ced60214e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 15:06:27 +0200
Subject: [PATCH 070/144] Clean code

---
 htdocs/adherents/document.php                 |  3 ++-
 htdocs/admin/tools/listsessions.php           |  3 ++-
 htdocs/asset/document.php                     |  3 ++-
 htdocs/bom/bom_document.php                   |  3 ++-
 htdocs/comm/action/document.php               |  3 ++-
 htdocs/comm/card.php                          |  3 ++-
 htdocs/comm/propal/document.php               |  3 ++-
 htdocs/commande/document.php                  |  3 ++-
 .../bank/account_statement_document.php       |  3 ++-
 htdocs/compta/bank/document.php               |  3 ++-
 .../compta/bank/various_payment/document.php  |  3 ++-
 htdocs/compta/clients.php                     |  3 ++-
 htdocs/compta/deplacement/document.php        |  3 ++-
 htdocs/compta/deplacement/index.php           |  3 ++-
 htdocs/compta/facture/document.php            |  3 ++-
 htdocs/compta/prelevement/line.php            | 26 ++++++++++---------
 htdocs/compta/prelevement/rejets.php          | 11 ++++----
 htdocs/compta/sociales/document.php           |  3 ++-
 htdocs/compta/tva/document.php                |  4 +--
 htdocs/contact/document.php                   |  3 ++-
 htdocs/contrat/document.php                   |  3 ++-
 htdocs/core/ajax/ajaxdirpreview.php           |  3 ++-
 htdocs/don/document.php                       |  3 ++-
 htdocs/ecm/dir_add_card.php                   |  3 ++-
 htdocs/ecm/dir_card.php                       |  3 ++-
 htdocs/ecm/file_card.php                      |  3 ++-
 htdocs/ecm/index.php                          |  3 ++-
 htdocs/ecm/index_auto.php                     |  3 ++-
 htdocs/ecm/search.php                         |  3 ++-
 htdocs/expedition/document.php                |  3 ++-
 htdocs/expensereport/document.php             |  3 ++-
 htdocs/expensereport/index.php                |  3 ++-
 htdocs/fichinter/document.php                 |  3 ++-
 htdocs/fourn/commande/document.php            |  3 ++-
 htdocs/fourn/contact.php                      |  3 ++-
 htdocs/fourn/facture/document.php             |  3 ++-
 htdocs/fourn/facture/impayees.php             |  3 ++-
 htdocs/ftp/index.php                          |  3 ++-
 htdocs/holiday/document.php                   |  3 ++-
 htdocs/hrm/admin/admin_establishment.php      |  7 ++++-
 htdocs/loan/document.php                      |  3 ++-
 htdocs/margin/tabs/productMargins.php         |  5 ++--
 htdocs/margin/tabs/thirdpartyMargins.php      |  5 ++--
 .../template/myobject_document.php            |  3 ++-
 htdocs/mrp/mo_document.php                    |  3 ++-
 htdocs/product/document.php                   |  3 ++-
 htdocs/product/price.php                      |  3 ++-
 htdocs/product/stock/productlot_document.php  |  3 ++-
 htdocs/projet/document.php                    |  3 ++-
 htdocs/projet/tasks/document.php              |  3 ++-
 htdocs/resource/document.php                  |  3 ++-
 htdocs/salaries/document.php                  |  3 ++-
 htdocs/societe/document.php                   |  3 ++-
 htdocs/stripe/charge.php                      |  4 +--
 htdocs/stripe/payout.php                      |  4 +--
 htdocs/stripe/transaction.php                 |  4 +--
 htdocs/supplier_proposal/document.php         |  3 ++-
 htdocs/ticket/document.php                    |  3 ++-
 htdocs/user/document.php                      |  3 ++-
 htdocs/zapier/hook_document.php               |  3 ++-
 60 files changed, 139 insertions(+), 84 deletions(-)

diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index cc3e06207be..05ccf20169c 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -45,11 +45,12 @@ $confirm = GETPOST('confirm', 'alpha');
 $result = restrictedArea($user, 'adherent', $id);
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index eb4caa4bf3d..253f4919092 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -41,11 +41,12 @@ if ($user->socid > 0)
     $socid = $user->socid;
 }
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index c6762c5c946..4724173cd19 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -45,11 +45,12 @@ $ref = GETPOST('ref', 'alpha');
 //$result = restrictedArea($user, 'asset', $id);
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 0fc68ed276e..a7dca41fff6 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -46,11 +46,12 @@ $ref = GETPOST('ref', 'alpha');
 //$result = restrictedArea($user, 'bom', $id);
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 20e76b6e7d5..9e770f70a93 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -62,11 +62,12 @@ if ($id > 0)
 }
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index f1ea3c0923d..7c6335d146b 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -65,11 +65,12 @@ $result = restrictedArea($user, 'societe', $id, '&societe');
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST("mode");
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 02d801860a5..d9d12c5efb4 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -53,11 +53,12 @@ if (!empty($user->socid))
 $result = restrictedArea($user, 'propal', $id);
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 4fa1095998a..9d188cda104 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -52,11 +52,12 @@ if ($user->socid)
 $result = restrictedArea($user, 'commande', $id, '');
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 1df1f000a61..05f89e1bc6f 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -57,11 +57,12 @@ if ($user->socid)
 	$socid = $user->socid;
 
 // 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; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder)
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 9fd2207f3ec..d003463e5af 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -54,11 +54,12 @@ if ($user->socid)
     $socid = $user->socid;
 
 // 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; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder)
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 618cc6006a5..d81b9bdd41a 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -43,11 +43,12 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'banque', '', '', '');
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 1dc13c0580f..6c1439d5466 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -44,11 +44,12 @@ $langs->load("companies");
 
 $mode = GETPOST("mode");
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 4f42ae2292b..2cef0b3e6cd 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -48,11 +48,12 @@ $result = restrictedArea($user, 'deplacement', $id, '');
 
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index e95d7f95732..9d45bafd20f 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -35,11 +35,12 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'deplacement', '', '');
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index e09c8aee11c..a901b985342 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -56,11 +56,12 @@ if ($user->socid)
 $result = restrictedArea($user, 'facture', $id, '');
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 19ba5892474..6eef29d1e3e 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -43,9 +43,22 @@ $action = GETPOST('action', 'alpha');
 $id = GETPOST('id', 'int');
 $socid = GETPOST('socid', 'int');
 
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'alpha');
 $sortfield = GETPOST('sortfield', 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if ($page == -1 || $page == null) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+if ($sortorder == "") $sortorder = "DESC";
+if ($sortfield == "") $sortfield = "pl.fk_soc";
+
+
+/*
+ * Actions
+ */
 
 if ($action == 'confirm_rejet')
 {
@@ -246,17 +259,6 @@ if ($id)
 
 	print "</div>";
 
-
-
-	if ($page == -1 || $page == null) { $page = 0; }
-
-	$offset = $conf->liste_limit * $page;
-	$pageprev = $page - 1;
-	$pagenext = $page + 1;
-
-	if ($sortorder == "") $sortorder = "DESC";
-	if ($sortfield == "") $sortfield = "pl.fk_soc";
-
 	/*
 	 * List of invoices
 	 */
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 1bc2a1844e2..602c57b5ad4 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -39,20 +39,19 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 // Get supervariables
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'alpha');
 $sortfield = GETPOST('sortfield', 'alpha');
-
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 /*
  * View
  */
 
 llxHeader('', $langs->trans("WithdrawsRefused"));
 
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
 if ($sortorder == "") $sortorder = "DESC";
 if ($sortfield == "") $sortfield = "p.datec";
 
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index a64c0432be9..3c73c8e6614 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -52,13 +52,14 @@ $result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
 
 
 // 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;
 }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 037e6baa5c3..fabaf1ee705 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -53,14 +53,14 @@ $result = restrictedArea($user, 'tax', '', 'vat', 'charges');
 
 
 // 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;
 }
-
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 28d8ac42f6b..e21ee3e492b 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -55,11 +55,12 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index c104d210617..330db63e30c 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -55,11 +55,12 @@ if ($user->socid > 0)
 $result = restrictedArea($user, 'contrat', $id);
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 31d0b449d5b..bb6a8de30d4 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -46,11 +46,12 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
     $urlsource = GETPOST("urlsource", 'alpha');
     $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
+    $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 = $conf->liste_limit * $page;
+    $offset = $limit * $page;
     $pageprev = $page - 1;
     $pagenext = $page + 1;
     if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 8dbb6f99fda..dcb245e3e85 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -55,11 +55,12 @@ $result = restrictedArea($user, 'don', $id, '');
 
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 0c9190b9a4c..4d6f2bdce5a 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -62,11 +62,12 @@ else	// For example $module == 'medias'
 	$upload_dir = $conf->medias->multidir_output[$conf->entity];
 }
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 42c6b140f3c..9b3da9d8aae 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -42,11 +42,12 @@ $pageid  = GETPOST('pageid', 'int');
 if (empty($module)) $module = 'ecm';
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 4b2d6006c5c..1c94fd1700b 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -46,11 +46,12 @@ if ($user->socid > 0)
     $socid = $user->socid;
 }
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 9e51da09899..43b9ca6dcce 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -45,11 +45,12 @@ $section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('secti
 if (!$section) $section = 0;
 $section_dir = GETPOST('section_dir', 'alpha');
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 6c245e3ad1c..39bdc9a1612 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -47,11 +47,12 @@ $section_dir = GETPOST('section_dir', 'alpha');
 
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 1b90ae77411..e125824a8c8 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -52,11 +52,12 @@ if (empty($module)) $module = 'ecm';
 
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 65786dfbdae..6047be5fe0e 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -53,11 +53,12 @@ if ($user->socid)
 $result = restrictedArea($user, 'expedition', $id, '');
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 0c974ef450a..17b7eb57619 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -48,11 +48,12 @@ $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index accea8f8251..0597d1b29a2 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -45,11 +45,12 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'expensereport', '', '');
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 925ad7be709..a6b4c88ed09 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -52,11 +52,12 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 2292f335c40..7db240abf94 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -51,11 +51,12 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 06e7f09edd7..40773f0eca6 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -41,11 +41,12 @@ if ($user->socid > 0)
     $socid = $user->socid;
 }
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 287a85bc7cc..022028bb483 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -50,11 +50,12 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 4e5ed4dbae2..5368b491728 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -54,9 +54,10 @@ $search_company = GETPOST('search_company', 'alpha');
 $search_amount_no_tax = GETPOST('search_amount_no_tax', 'alpha');
 $search_amount_all_tax = GETPOST('search_amount_all_tax', 'alpha');
 
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) $sortfield = "f.date_lim_reglement";
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index eedfa9c3c73..0c7f8409992 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -47,11 +47,12 @@ $confirm = GETPOST('confirm');
 $upload_dir = $conf->ftp->dir_temp;
 $download_dir = $conf->ftp->dir_temp;
 
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 5df844175d4..a0f8723b92d 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -49,11 +49,12 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'holiday', $id, 'holiday');
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index c0d7885850b..ba98812f1b2 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -44,11 +44,16 @@ foreach ($tmpstatus2label as $key => $val) $status2label[$key] = $langs->trans($
  * Actions
  */
 
+// None
+
+
 /*
  * View
  */
+
 llxHeader('', $langs->trans("Establishments"));
 
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortorder     = GETPOST("sortorder");
 $sortfield     = GETPOST("sortfield");
 if (!$sortorder) $sortorder = "DESC";
@@ -58,7 +63,7 @@ if (empty($page) || $page == -1) {
 	$page = 0;
 }
 
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index a68ec64f7b1..6ae646a93a1 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -44,13 +44,14 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'loan', $id, '', '');
 
 // 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;
 }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index d166b990d9b..e68a042ace2 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -42,13 +42,12 @@ if (empty($user->rights->margins->liretous)) accessforbidden();
 
 $object = new Product($db);
 
-$mesg = '';
-
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 5d7d0039b7a..547c3595383 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -34,13 +34,12 @@ if (!empty($user->socid)) $socid = $user->socid;
 $result = restrictedArea($user, 'societe', '', '');
 
 
-$mesg = '';
-
+$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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 231b8bfa3cc..658bed118bd 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -54,11 +54,12 @@ $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 = $conf->liste_limit * $page;
+$offset = $liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index ea01b4316a9..a7baa2d9144 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -48,11 +48,12 @@ $ref = GETPOST('ref', 'alpha');
 //$result = restrictedArea($user, 'mrp', $id);
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 723f3b9fbd5..e5702078dd2 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -55,11 +55,12 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
 $hookmanager->initHooks(array('productdocuments'));
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 3f6a89cbddb..a4e9f46fa0a 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1633,11 +1633,12 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 {
 	$prodcustprice = new Productcustomerprice($db);
 
+	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 	$sortfield = GETPOST("sortfield", 'alpha');
 	$sortorder = GETPOST("sortorder", 'alpha');
 	$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-	$offset = $conf->liste_limit * $page;
+	$offset = $limit * $page;
 	$pageprev = $page - 1;
 	$pagenext = $page + 1;
 	if (!$sortorder)
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 222ba204bac..1dbb8a900e6 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -55,11 +55,12 @@ $result = restrictedArea($user, 'produit|service');
 $hookmanager->initHooks(array('productlotdocuments'));
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index e3dafef1246..9b4c852100d 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -55,11 +55,12 @@ 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');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 8febad854b7..bd4335f747f 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -51,11 +51,12 @@ $socid = 0;
 if (!$user->rights->projet->lire) accessforbidden();
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 5f053be4321..d0d4e2300d8 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -49,11 +49,12 @@ $result = restrictedArea($user, 'resource', $id, 'resource');
 
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index c8de93c0786..ff709816d18 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -50,11 +50,12 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index f22fb1ec5b6..d082ae6baa5 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -48,11 +48,12 @@ if ($user->socid > 0)
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index f765a2a3ec1..44c7db306a2 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -36,13 +36,13 @@ $socid = GETPOST("socid", "int");
 if ($user->socid) $socid = $user->socid;
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 10316ec2ece..17f2423327f 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -36,13 +36,13 @@ $socid = GETPOST("socid", "int");
 if ($user->socid) $socid = $user->socid;
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 59858a69262..3829eba4d0d 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -36,13 +36,13 @@ $socid = GETPOST("socid", "int");
 if ($user->socid) $socid = $user->socid;
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
 $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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 8a6ec8f1bab..3f471e28b3f 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -52,11 +52,12 @@ if (!empty($user->socid))
 $result = restrictedArea($user, 'supplier_proposal', $id);
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index ce5326b81e5..d48001a680e 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -48,11 +48,12 @@ if (!$user->rights->ticket->read) {
 }
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 905eca0e4cf..2b8c67d7ae6 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -72,11 +72,12 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 if ($user->id <> $id && !$canreaduser) accessforbidden();
 
 // 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; }
-$offset = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index a5610543eac..cdc5f8c7ddf 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -46,11 +46,12 @@ $ref = GETPOST('ref', 'alpha');
 //$result = restrictedArea($user, 'mymodule', $id);
 
 // 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 = $conf->liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "ASC";

From 9697085f123c0f9c47d387af2ae24730f6731d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 20 Apr 2020 15:36:08 +0200
Subject: [PATCH 071/144] remove debug

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

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 8c7a88e925a..d4ee7ccaced 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -259,7 +259,7 @@ class DolEditor
 						})';
 	            $out .= '</script>'."\n";
 			}
-var_dump($this->height);
+
             $out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');
             $out .= ($this->height ? ' height: '.$this->height.'px; ' : '');
             //$out.=" min-height: 100px;";

From 67a7d6b77daeec0c66948b7575361971a8a2d335 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 15:57:15 +0200
Subject: [PATCH 072/144] Look and feel v12

---
 htdocs/adherents/subscription/list.php         |  3 +--
 htdocs/adherents/type.php                      |  5 +++--
 htdocs/compta/facture/invoicetemplate_list.php |  3 +--
 htdocs/compta/paiement/list.php                |  3 +--
 htdocs/compta/sociales/list.php                |  9 +++------
 htdocs/compta/tva/list.php                     |  5 ++---
 htdocs/core/lib/functions.lib.php              | 13 ++++++-------
 htdocs/don/list.php                            |  8 ++++++--
 htdocs/expedition/card.php                     |  8 +++++---
 htdocs/expedition/class/expedition.class.php   |  9 +++++----
 htdocs/expedition/index.php                    |  2 +-
 htdocs/expedition/list.php                     |  3 +--
 htdocs/expedition/stats/index.php              |  2 +-
 htdocs/fourn/facture/paiement.php              |  7 +++----
 htdocs/product/reassortlot.php                 |  6 ++----
 htdocs/product/stock/list.php                  |  6 +-----
 htdocs/product/stock/productlot_list.php       | 10 ++--------
 htdocs/product/stock/replenish.php             |  2 +-
 htdocs/product/stock/replenishorders.php       | 11 +++++------
 htdocs/reception/card.php                      | 11 +++++------
 htdocs/reception/class/reception.class.php     | 13 ++++++-------
 htdocs/reception/contact.php                   |  2 +-
 htdocs/reception/index.php                     |  2 +-
 htdocs/reception/list.php                      |  3 +--
 htdocs/reception/note.php                      |  2 +-
 htdocs/reception/stats/index.php               |  4 ++--
 htdocs/theme/eldy/global.inc.php               |  3 +++
 27 files changed, 70 insertions(+), 85 deletions(-)

diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index b9f5611f7e8..faba2c50ac2 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -259,10 +259,9 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $topicmail = "Information";
 $modelmail = "subscription";
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 969117c4bdc..cfac2313fba 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -239,6 +239,8 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		$i = 0;
 
 		$param = '';
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		$newcardbutton = '';
 		if ($user->rights->adherent->configurer)
@@ -252,10 +254,9 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		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="page" value="'.$page.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-		print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit);
+		print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 		$moreforfilter = '';
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 759e9cc3944..8faa0de3de5 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -328,13 +328,12 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 
 	$title = $langs->trans("RepeatableInvoices");
 
-	print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit);
+	print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit, 0, 0, 1);
 
 	print '<span class="opacitymedium">'.$langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'</span><br><br>';
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 3cb06396c80..87bdaa9641d 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -215,10 +215,9 @@ if ($resql)
     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 
-    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit);
+    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit, 0, 0, 1);
 
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 9cfec1868fa..ef39d559ca0 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -191,19 +191,16 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 
+	$center = '';
 	if ($year)
 	{
 	    $center = ($year ? "<a href='list.php?year=".($year - 1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='list.php?year=".($year + 1)."'>".img_next()."</a>" : "");
-	    print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit);
-	}
-	else
-	{
-		print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit);
 	}
 
+	print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
 	if (empty($mysoc->country_id) && empty($mysoc->country_code))
 	{
 		print '<div class="error">';
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 35c5dc2c052..003a7eabcad 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  *
@@ -160,9 +160,8 @@ if ($result)
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy', 0, $newcardbutton, '', $limit);
+	print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f6584a49c77..37dcf0c693e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3142,10 +3142,10 @@ 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',
         		'address', 'bank_account', 'barcode', 'bank', 'bookmark', 'bom', 'building', 'cash-register', 'check', 'close_title', 'company', 'contact', 'cubes',
-        		'delete', 'dolly', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
+        		'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
         		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot', 'mrp', 'note', 'stock',
         		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bom',
-        		'object_category', 'object_bookmark', 'object_bug', 'object_generic', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
+	        	'object_category', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', '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_dynamicprice',
         		'object_holiday', 'object_hrm', 'object_intervention', 'object_multicurrency', 'object_order', 'object_payment',
         		'object_lot', 'object_mrp', 'object_product', 'object_propal', 'object_supplier_proposal', 'object_service', 'object_stock',
@@ -3178,7 +3178,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'account'=>'university', 'action'=>'calendar-alt', 'address'=> 'address-book', 'bank_account'=>'university', 'bom'=>'cubes',
 		    	'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'dynamicprice'=>'hand-holding-usd',
 		    	'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt',
-		    	'accounting'=>'chart-line', 'category'=>'tag',
+		    	'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
 		    	'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
 		    	'email'=>'at',
 		    	'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'info-circle',
@@ -3247,10 +3247,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			// Add CSS
 			$arrayconvpictotomorcess = array(
 				'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'bank_account'=>'bg-infobox-bank_account', 'cash-register'=>'bg-infobox-bank_account',
-				'contract'=>'bg-infobox-contrat',
-				'multicurrency'=>'bg-infobox-bank_account',
-				'check'=>'font-status4',
+				'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'dollyrevert'=>'flip',
 				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
+				'multicurrency'=>'bg-infobox-bank_account',
 				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'order'=>'bg-infobox-commande',
 				'user'=>'bg-infobox-adherent', 'users'=>'bg-infobox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
@@ -3269,7 +3268,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'address'=>'#37a', 'building'=>'#37a', 'bom'=>'#a69944',
 				'companies'=>'#37a', 'company'=>'#37a', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',
 				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
-				'lot'=>'#a69944', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
+				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
 				'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'warning'=>''
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index a61a97f7c78..cd0d0539f8f 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -32,10 +32,12 @@ if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/clas
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "donations"));
 
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'sclist';
+
+$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;
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -137,6 +139,8 @@ if ($resql)
 	$i = 0;
 
 	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 	if ($search_status && $search_status != -1) $param .= '&search_status='.urlencode($search_status);
 	if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
@@ -159,7 +163,7 @@ if ($resql)
     print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="type" value="'.$type.'">';
 
-	print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, $newcardbutton);
+	print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	if ($search_all)
     {
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e4fc2868b99..655ba8f060f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -874,8 +874,9 @@ $warehousestatic = new Entrepot($db);
 
 if ($action == 'create2')
 {
-    print load_fiche_titre($langs->trans("CreateShipment")).'<br>';
-    print $langs->trans("ShipmentCreationIsDoneFromOrder");
+    print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
+
+    print '<br>'.$langs->trans("ShipmentCreationIsDoneFromOrder");
     $action = ''; $id = ''; $ref = '';
 }
 
@@ -884,7 +885,8 @@ if ($action == 'create')
 {
     $expe = new Expedition($db);
 
-    print load_fiche_titre($langs->trans("CreateShipment"));
+    print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
+
     if (!$origin)
     {
         setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 7cce1c282da..624add5c075 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -74,7 +74,7 @@ class Expedition extends CommonObject
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
-	public $picto = 'sending';
+	public $picto = 'dolly';
 
 	public $socid;
 
@@ -1626,7 +1626,7 @@ class Expedition extends CommonObject
 		global $langs, $conf;
 
 		$result = '';
-		$label = '<u>'.$langs->trans("ShowSending").'</u>';
+		$label = '<u>'.$langs->trans("Shipment").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
 
@@ -1647,14 +1647,15 @@ class Expedition extends CommonObject
 		{
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label = $langs->trans("ShowSending");
+				$label = $langs->trans("Shipment");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip"';
 		}
 
-		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index a930fed21b0..d3fec260d95 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -47,7 +47,7 @@ $shipment = new Expedition($db);
 $helpurl = 'EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
 llxHeader('', $langs->trans("Shipment"), $helpurl);
 
-print load_fiche_titre($langs->trans("SendingsArea"));
+print load_fiche_titre($langs->trans("SendingsArea"), '', 'dolly');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 6f33c41c9dc..52c69f960cc 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -365,11 +365,10 @@ if ($resql)
 	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="page" value="'.$page.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
+	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'dolly', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$topicmail = "SendShippingRef";
 	$modelmail = "shipping_send";
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 5d3c8038bc2..db28b094e65 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -58,7 +58,7 @@ $form = new Form($db);
 
 llxHeader();
 
-print load_fiche_titre($langs->trans("StatisticsOfSendings"), $mesg);
+print load_fiche_titre($langs->trans("StatisticsOfSendings"), '', 'dolly');
 
 
 dol_mkdir($dir);
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index a907bcd6bb0..45d9c8ef967 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
  * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
@@ -889,8 +889,6 @@ if (empty($action) || $action == 'list')
 
     	$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
-        print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit);
-
         print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
         if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
         print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -898,7 +896,8 @@ if (empty($action) || $action == 'list')
         print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
         print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
         print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-        print '<input type="hidden" name="page" value="'.$page.'">';
+
+        print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'invoicing', 0, '', '', $limit, 0, 0, 1);
 
         $moreforfilter = '';
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 83bad5c43ad..0fec39d1708 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -109,11 +109,10 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
  * View
  */
 
-$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-
 $form = new Form($db);
 $htmlother = new FormOther($db);
 
+$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 $title = $langs->trans("ProductsAndServices");
 
 $sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
@@ -230,10 +229,9 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
-	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit);
+	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit, 0, 0, 1);
 
 
 	if (!empty($catid))
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index b3ed7e39663..06d3e46728f 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -72,9 +72,6 @@ if (!$sortorder) $sortorder = "ASC";
 // Security check
 $result = restrictedArea($user, 'stock');
 
-
-$year = strftime("%Y", time());
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Entrepot($db);
 $extrafields = new ExtraFields($db);
@@ -355,12 +352,11 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('MenuNewWarehouse'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->rights->stock->creer);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, $newcardbutton, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "Information";
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index f87a772ef56..c03030fb7f3 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -38,9 +38,8 @@ $langs->loadLangs(array('stocks', 'productbatch', 'other', 'users'));
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
-$myparam = GETPOST('myparam', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-
+$optioncss = GETPOST('optioncss', 'alpha');
 
 $search_entity = GETPOST('search_entity', 'int');
 $search_product = GETPOST('search_product', 'alpha');
@@ -49,10 +48,6 @@ $search_fk_user_creat = GETPOST('search_fk_user_creat', 'int');
 $search_fk_user_modif = GETPOST('search_fk_user_modif', 'int');
 $search_import_key = GETPOST('search_import_key', 'int');
 
-
-$search_myfield = GETPOST('search_myfield');
-$optioncss = GETPOST('optioncss', 'alpha');
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'alpha');
@@ -300,9 +295,8 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'lot', 0, '', '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'lot', 0, '', '', $limit, 0, 0, 1);
 
 	$topicmail = "Information";
 	$modelmail = "productlot";
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 220f35659f3..ed83034bb6c 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -490,7 +490,7 @@ print load_fiche_titre($langs->trans('Replenishment'), '', 'stock');
 
 dol_fiche_head($head, 'replenish', '', -1, '');
 
-print $langs->trans("ReplenishmentStatusDesc").'<br>'."\n";
+print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDesc").'</span><br>'."\n";
 if ($usevirtualstock == 1)
 {
 	print $langs->trans("CurentSelectionMode").': ';
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index c1e1e157f79..9ed74d112eb 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -94,7 +94,7 @@ $texte = $langs->trans('ReplenishmentOrders');
 
 llxHeader('', $texte, $helpurl, '');
 
-print load_fiche_titre($langs->trans('Replenishment'), '', 'generic');
+print load_fiche_titre($langs->trans('Replenishment'), '', 'stock');
 
 $head = array();
 $head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php';
@@ -151,9 +151,11 @@ if ($resql)
     $num = $db->num_rows($resql);
     $i = 0;
 
-	print $langs->trans("ReplenishmentOrdersDesc").'<br><br>';
+	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentOrdersDesc").'</span><br><br>';
 
-    print_barre_liste('', $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, 0, '');
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
+
+	print_barre_liste('', $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, 0, '');
 
     $param = '';
     if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
@@ -167,9 +169,6 @@ if ($resql)
     if ($search_dateday) $param .= '&search_dateday='.urlencode($search_dateday);
     if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 
-
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
-
     print '<table class="noborder centpercent">';
 
     print '<tr class="liste_titre_filter">';
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 85ff3715b73..1269a99d1ea 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -307,7 +307,7 @@ if (empty($reshook))
 			{
 				$lineToTest = '';
 				foreach ($objectsrc->lines as $linesrc) {
-					if ($linesrc->id == GETPOST($idl, 'int'))$lineToTest = $linesrc;
+					if ($linesrc->id == GETPOST($idl, 'int')) $lineToTest = $linesrc;
 				}
 				$qty = "qtyl".$i;
 				$comment = "comment".$i;
@@ -315,8 +315,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))
@@ -713,8 +711,9 @@ $warehousestatic = new Entrepot($db);
 
 if ($action == 'create2')
 {
-    print load_fiche_titre($langs->trans("CreateReception")).'<br>';
-    print $langs->trans("ReceptionCreationIsDoneFromOrder");
+    print load_fiche_titre($langs->trans("CreateReception"), '', 'dollyrevert');
+
+    print '<br>'.$langs->trans("ReceptionCreationIsDoneFromOrder");
     $action = ''; $id = ''; $ref = '';
 }
 
@@ -1235,7 +1234,7 @@ elseif ($id || $ref)
 		$res = $object->fetch_optionals();
 
 		$head = reception_prepare_head($object);
-		dol_fiche_head($head, 'reception', $langs->trans("Reception"), -1, 'reception');
+		dol_fiche_head($head, 'reception', $langs->trans("Reception"), -1, 'dollyrevert');
 
 		$formconfirm = '';
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 81c4854a4bf..1679f186a72 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -52,7 +52,7 @@ class Reception extends CommonObject
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
-	public $picto = 'reception';
+	public $picto = 'dollyrevert';
 
     public $socid;
     public $ref_supplier;
@@ -1116,7 +1116,7 @@ class Reception extends CommonObject
 	{
 		global $conf, $langs;
 		$result = '';
-        $label = '<u>'.$langs->trans("ShowReception").'</u>';
+        $label = '<u>'.$langs->trans("Reception").'</u>';
         $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
         $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
 
@@ -1129,19 +1129,18 @@ class Reception extends CommonObject
 		{
 		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		    {
-		        $label = $langs->trans("ShowReception");
+		        $label = $langs->trans("Reception");
 		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 		    }
 		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 		    $linkclose .= ' class="classfortooltip"';
 		}
 
-        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
-		$picto = 'sending';
-
-		if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+		if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 7dd0bec2b38..b2d30bf7c7f 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -158,7 +158,7 @@ if ($id > 0 || !empty($ref))
 	$langs->trans("OrderCard");
 
 	$head = reception_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Reception"), -1, 'sending');
+	dol_fiche_head($head, 'contact', $langs->trans("Reception"), -1, 'dollyrevert');
 
 
 	// Reception card
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index c615017ad37..b9786229468 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -47,7 +47,7 @@ $reception = new Reception($db);
 $helpurl = 'EN:Module_Receptions|FR:Module_Receptions|ES:M&oacute;dulo_Receptiones';
 llxHeader('', $langs->trans("Reception"), $helpurl);
 
-print load_fiche_titre($langs->trans("ReceptionsArea"));
+print load_fiche_titre($langs->trans("ReceptionsArea"), '', 'dollyrevert');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index f370c9ed9cf..4bb80f34753 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -547,11 +547,10 @@ if ($resql)
     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="page" value="'.$page.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'dollyrevert', 0, '', '', $limit, 0, 0, 1);
 
 
 	if ($massaction == 'createbills')
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index 0bec9f8c9e2..9e9b6c20f92 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -98,7 +98,7 @@ $form = new Form($db);
 if ($id > 0 || !empty($ref))
 {
 	$head = reception_prepare_head($object);
-	dol_fiche_head($head, 'note', $langs->trans("Reception"), -1, 'sending');
+	dol_fiche_head($head, 'note', $langs->trans("Reception"), -1, 'dollyrevert');
 
 
 	// Reception card
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index a93003b0ef9..e7e8ef7e090 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -61,7 +61,7 @@ $form = new Form($db);
 
 llxHeader();
 
-print load_fiche_titre($langs->trans("StatisticsOfReceptions"), $mesg);
+print load_fiche_titre($langs->trans("StatisticsOfReceptions"), '', 'dollyrevert');
 
 
 dol_mkdir($dir);
@@ -200,7 +200,7 @@ if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
 $h = 0;
 $head = array();
-$head[$h][0] = DOL_URL_ROOT.'/commande/stats/index.php';
+$head[$h][0] = DOL_URL_ROOT.'/reception/stats/index.php';
 $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d46bd839958..e56cd8ee36a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -536,6 +536,9 @@ textarea.centpercent {
     color: #777;
 }
 
+.flip {
+	transform: scaleX(-1);
+}
 .center {
     text-align: center;
     margin: 0px auto;

From b72651fdfdae61724fcb8832979a12ead6264f1f Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 20 Apr 2020 15:59:44 +0200
Subject: [PATCH 073/144] FIX : we must export company mail address on contact
 vcard only if contact email address is empty

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

diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index ebfdfecd6a7..8536c4ebe33 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -79,7 +79,7 @@ if ($company->id)
 	if (! $contact->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
 	if (! $contact->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
 	if (! $contact->zip)        $v->setAddress("", "", $company->address, $company->town, "", $company->zip, $company->country, "TYPE=WORK;POSTAL");
-	if ($company->email != $contact->email) $v->setEmail($company->email, 'TYPE=PREF,INTERNET');
+	if (empty($contact->email)) $v->setEmail($company->email, 'TYPE=PREF,INTERNET');
 	// Si contact lie a un tiers non de type "particulier"
 	if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->name);
 }

From 66ad197fc5230383c42609ced6540119f16c26b6 Mon Sep 17 00:00:00 2001
From: "DEMAREST Maxime (Indelog)" <maxime@indelog.fr>
Date: Mon, 20 Apr 2020 15:49:31 +0200
Subject: [PATCH 074/144] NEW possibility to show society info when print page

If global config key SHOW_SOCINFO_ON_PRINT is set, this add a block in
top of page which display basic society information when the layout for
printing is activated (print button in top bar is cliqued).
---
 htdocs/main.inc.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 400ad73fad2..10db0b954ae 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2020       Demarest Maxime         <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
@@ -2364,6 +2365,36 @@ function main_area($title = '')
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
 	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+
+    // Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT
+    if ($conf->global->SHOW_SOCINFO_ON_PRINT && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
+    {
+        global $hookmanager;
+        $hookmanager->initHooks(array('showsocinfoonprint'));
+        $parameters = array();
+        $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
+        if (empty($reshook))
+        {
+            print '<!-- Begin show mysoc info header -->'."\n";
+            print '<div id="mysoc-info-header">'."\n";
+            print '<table class="centpercent div-table-responsive">'."\n";
+            print '<tbody>';
+            print '<tr><td rowspan="0" class="width20p">';
+            if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO))
+                print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
+            print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
+            print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
+            print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
+            if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
+            if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
+            if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
+            print '</tbody>';
+            print '</table>'."\n";
+            print '</div>'."\n";
+            print '<!-- End show mysoc info header -->'."\n";
+        }
+    }
+
 }
 
 

From f4d1ca94b34bbbd65e395c05b9fdac6455073e3c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 20 Apr 2020 14:49:18 +0000
Subject: [PATCH 075/144] Fixing style errors.

---
 htdocs/main.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 10db0b954ae..73c21459b5c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2394,7 +2394,6 @@ function main_area($title = '')
             print '<!-- End show mysoc info header -->'."\n";
         }
     }
-
 }
 
 

From e1f1e2bf9782957f9eac5257ff6c5b04762887ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Mon, 20 Apr 2020 17:50:19 +0200
Subject: [PATCH 076/144] FIX type member extrafields are duplicated on edit

type member extrafields are duplicated on edit, and old usage on create (without tpl)
---
 htdocs/adherents/type.php | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index cfac2313fba..c190398c1db 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * 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>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -376,13 +377,8 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Other attributes
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
-		print $object->showOptionals($extrafields, 'edit', $parameters);
-	}
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
 	print '<tbody>';
 	print "</table>\n";
 
@@ -823,15 +819,6 @@ if ($rowid > 0)
 		// Other attributes
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
-		// Other attributes
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        	print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
-		    print $object->showOptionals($extrafields, 'edit', $parameters);
-		}
-
 		print '</table>';
 
 		dol_fiche_end();

From 230fe26b589a7aea0e2e0cefcd4375f9f245f306 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 18:38:25 +0200
Subject: [PATCH 077/144] Look and feel v12

---
 htdocs/core/lib/functions.lib.php             | 19 +++++++++++--------
 htdocs/core/modules/modExpedition.class.php   |  2 +-
 htdocs/core/modules/modLoan.class.php         |  2 +-
 htdocs/core/modules/modOpenSurvey.class.php   |  2 +-
 htdocs/core/modules/modReception.class.php    |  2 +-
 htdocs/loan/card.php                          |  2 +-
 htdocs/loan/class/loan.class.php              |  2 +-
 htdocs/loan/list.php                          |  4 ++--
 .../class/opensurveysondage.class.php         |  8 ++++++--
 htdocs/opensurvey/index.php                   |  2 +-
 htdocs/opensurvey/list.php                    |  2 +-
 htdocs/opensurvey/wizard/index.php            |  3 ++-
 htdocs/theme/eldy/info-box.inc.php            |  2 +-
 13 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 37dcf0c693e..8d61b192bb4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3143,17 +3143,18 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
         		'address', 'bank_account', 'barcode', 'bank', 'bookmark', 'bom', 'building', 'cash-register', 'check', 'close_title', 'company', 'contact', 'cubes',
         		'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
-        		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot', 'mrp', 'note', 'stock',
+        		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot',
+        		'money-bill-alt', 'mrp', 'note', 'stock',
         		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bom',
 	        	'object_category', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', '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_dynamicprice',
-        		'object_holiday', 'object_hrm', 'object_intervention', 'object_multicurrency', 'object_order', 'object_payment',
+        		'object_holiday', 'object_hrm', 'object_intervention', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
         		'object_lot', 'object_mrp', 'object_product', 'object_propal', 'object_supplier_proposal', 'object_service', 'object_stock',
-        		'object_paragraph', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
+        		'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
         		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
         		'object_phoning', 'object_phoning_fax', 'object_email',
         		'off', 'on',
-        		'paiment', 'play', 'playdisabled', 'printer', 'product', 'propal', 'resize', 'service', 'stats', 'trip',
+        		'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'resize', 'service', 'stats', 'trip',
 				'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
@@ -3190,7 +3191,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'intervention'=>'ambulance', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
 		    	'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 		    	'other'=>'square',
-		    	'playdisabled'=>'play', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+		    	'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
 				'resize'=>'crop', 'supplier_proposal'=>'file-signature',
 		    	'payment'=>'money-bill-alt', 'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 		    	'resource'=>'laptop-house',
@@ -3250,11 +3251,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'dollyrevert'=>'flip',
 				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
 				'multicurrency'=>'bg-infobox-bank_account',
-				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'order'=>'bg-infobox-commande',
+				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'money-bill-alt'=>'bg-infobox-bank_account',
+				'order'=>'bg-infobox-commande',
 				'user'=>'bg-infobox-adherent', 'users'=>'bg-infobox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
 				'holiday'=>'bg-infobox-holiday',
-				'payment'=>'bg-infobox-bank_account', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
+				'payment'=>'bg-infobox-bank_account', 'poll'=>'bg-infobox-adherent', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
 				'resource'=>'bg-infobox-action', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
 				'ticket'=>'bg-infobox-contrat', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
@@ -3360,7 +3362,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
  */
 function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)
 {
-	return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
+	if (strpos($picto, '^') === 0) return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);
+	else return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
 }
 
 /**
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 93cd08c7001..19e22497a7a 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -57,7 +57,7 @@ class modExpedition extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = "sending";
+		$this->picto = "dolly";
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/expedition/temp",
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index e4e93e495a0..b1adf99940b 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -54,7 +54,7 @@ class modLoan extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'bill';
+		$this->picto = 'money-bill-alt';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/loan/temp");
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 3e5f3d8d62e..165cb9d5858 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -64,7 +64,7 @@ class modOpenSurvey 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 = 'opensurvey.png@opensurvey';
+		$this->picto = '^date@opensurvey';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 0a03515b246..637afae049d 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -53,7 +53,7 @@ class modReception extends DolibarrModules
 		$this->version = 'experimental';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = "sending";
+		$this->picto = "dollyrevert";
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/reception/receipt",
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 47ddfd2b109..81a8d5e9df7 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -253,7 +253,7 @@ if ($action == 'create')
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-	print load_fiche_titre($langs->trans("NewLoan"), '', 'title_accountancy.png');
+	print load_fiche_titre($langs->trans("NewLoan"), '', 'money-bill-alt');
 
 	$datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 340d9dea02a..1a24eb6be11 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -44,7 +44,7 @@ class Loan extends CommonObject
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
-	public $picto = 'bill';
+	public $picto = 'money-bill-alt';
 
 	/**
 	 * @var int ID
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 380d475398e..3f87f322ccb 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -35,7 +35,7 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'loan', '', '', '');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -167,7 +167,7 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-	print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($langs->trans("Loans"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'money-bill-alt', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$moreforfilter = '';
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 7c1263904fc..d9af22ed78e 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -47,8 +47,12 @@ class Opensurveysondage extends CommonObject
     /**
      * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
      */
-    public $picto = 'opensurvey';
+    public $picto = 'poll';
 
+
+    /**
+     * @var string	ID survey
+     */
     public $id_sondage;
     /**
      * @deprecated
@@ -462,7 +466,7 @@ class Opensurveysondage extends CommonObject
         $linkend = '</a>';
 
         $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
         if ($withpicto != 2) $result .= $this->ref;
         $result .= $linkend;
 
diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index 44ce6b3168b..20609602ad2 100644
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -59,7 +59,7 @@ else dol_print_error($db, '');
 $title = $langs->trans("OpenSurveyArea");
 llxHeader('', $title);
 
-print load_fiche_titre($title, '', 'generic');
+print load_fiche_titre($title, '', 'poll');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 990f9a30e73..442fc1b539b 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -254,7 +254,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSurvey'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/opensurvey/wizard/index.php', '', $user->rights->opensurvey->write);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'poll', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "SendOpenSurveyRef";
diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php
index 1fa07eeb4e9..68d660dff3d 100644
--- a/htdocs/opensurvey/wizard/index.php
+++ b/htdocs/opensurvey/wizard/index.php
@@ -31,6 +31,7 @@ if (!$user->rights->opensurvey->write) accessforbidden();
 
 $langs->load("opensurvey");
 
+
 /*
  * View
  */
@@ -39,7 +40,7 @@ $arrayofjs = array();
 $arrayofcss = array('/opensurvey/css/style.css');
 llxHeader('', $langs->trans("Survey"), '', "", 0, 0, $arrayofjs, $arrayofcss);
 
-print load_fiche_titre($langs->trans("CreatePoll"));
+print load_fiche_titre($langs->trans("CreatePoll"), '', 'poll');
 
 print '<form name="formulaire" action="create_survey.php" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 0473cb15584..028039f6c8b 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -77,7 +77,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 	max-width: 100%;
 }
 .info-box-module .info-box-icon > img {
-    max-width: 55%;
+    max-width: 60%;
 }
 
 .info-box-icon-text{

From f09fa5226a30e6846cdadf27f75894912afbc64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 20 Apr 2020 18:43:05 +0200
Subject: [PATCH 078/144] Rename llx_c_shipment_package_type to
 llx_c_shipment_package_type.sql

---
 ...lx_c_shipment_package_type => llx_c_shipment_package_type.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/install/mysql/tables/{llx_c_shipment_package_type => llx_c_shipment_package_type.sql} (100%)

diff --git a/htdocs/install/mysql/tables/llx_c_shipment_package_type b/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_shipment_package_type
rename to htdocs/install/mysql/tables/llx_c_shipment_package_type.sql

From b0069f4fed626406109c6e425316c103d021b2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 20 Apr 2020 18:46:11 +0200
Subject: [PATCH 079/144] Update 11.0.0-12.0.0.sql

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 681731e27a5..0e7433677ed 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -250,3 +250,13 @@ ALTER TABLE llx_categorie ADD COLUMN fk_user_creat	integer;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_modif	integer;
 
 ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commandefourndet FOREIGN KEY (fk_commandefourndet) REFERENCES llx_commande_fournisseurdet (rowid);
+
+--Dictionary of package type because filename in V11 was incomplete
+create table llx_c_shipment_package_type
+(
+    rowid        integer  AUTO_INCREMENT PRIMARY KEY,
+    label        varchar(50) NOT NULL,  -- Short name
+    description	 varchar(255), -- Description
+    active       integer DEFAULT 1 NOT NULL, -- Active or not	
+    entity       integer DEFAULT 1 NOT NULL -- Multi company id 
+)ENGINE=innodb;

From cadb52c5b3fd1e4f14be6140ad4f73e0fb2e49d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Apr 2020 19:39:34 +0200
Subject: [PATCH 080/144] Look and feel v12

---
 htdocs/compta/bank/various_payment/card.php   |   2 +-
 htdocs/compta/bank/various_payment/list.php   |   3 ++-
 htdocs/compta/charges/index.php               |   4 ++--
 htdocs/core/lib/functions.lib.php             |   9 +++++----
 htdocs/core/modules/modECM.class.php          |   2 +-
 htdocs/core/modules/modGeoIPMaxmind.class.php |   2 +-
 htdocs/salaries/card.php                      |   2 +-
 htdocs/salaries/list.php                      |   2 +-
 htdocs/salaries/stats/index.php               |   2 +-
 htdocs/theme/eldy/img/object_geoip.png        | Bin 0 -> 4896 bytes
 htdocs/theme/md/img/object_geoip.png          | Bin 0 -> 4896 bytes
 11 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 htdocs/theme/eldy/img/object_geoip.png
 create mode 100644 htdocs/theme/md/img/object_geoip.png

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index ccd6b24c6b9..c4fdc3be56a 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -277,7 +277,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	print load_fiche_titre($langs->trans("NewVariousPayment"), '', 'invoicing');
+	print load_fiche_titre($langs->trans("NewVariousPayment"), '', 'object_payment');
 
 	dol_fiche_head('', '');
 
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index b8581151599..5f68440809c 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -95,6 +95,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$typeid = "";
 }
 
+
 /*
  * View
  */
@@ -179,7 +180,7 @@ if ($result)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans("VariousPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'invoicing', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($langs->trans("VariousPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index e9aa35d80b3..93065219248 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -102,11 +102,11 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 if ($mode != 'sconly')
 {
     $center = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit, 1);
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 1);
 }
 else
 {
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'object_payment', 0, '', '', $limit, 0);
 }
 
 if ($year) $param .= '&year='.$year;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8d61b192bb4..da1b7ac632e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3146,10 +3146,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot',
         		'money-bill-alt', 'mrp', 'note', 'stock',
         		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bom',
-	        	'object_category', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
+	        	'object_category', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
+        		'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
         		'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_dynamicprice',
         		'object_holiday', 'object_hrm', 'object_intervention', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
-        		'object_lot', 'object_mrp', 'object_product', 'object_propal', 'object_supplier_proposal', 'object_service', 'object_stock',
+        		'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal', 'object_supplier_proposal', 'object_service', 'object_stock',
         		'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
         		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
         		'object_phoning', 'object_phoning_fax', 'object_email',
@@ -3193,7 +3194,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'other'=>'square',
 		    	'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
 				'resize'=>'crop', 'supplier_proposal'=>'file-signature',
-		    	'payment'=>'money-bill-alt', 'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+		    	'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 		    	'resource'=>'laptop-house',
 		    	'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
@@ -3248,7 +3249,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			// Add CSS
 			$arrayconvpictotomorcess = array(
 				'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'bank_account'=>'bg-infobox-bank_account', 'cash-register'=>'bg-infobox-bank_account',
-				'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'dollyrevert'=>'flip',
+				'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'dollyrevert'=>'flip', 'folder'=>'bg-infobox-action',
 				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
 				'multicurrency'=>'bg-infobox-bank_account',
 				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'money-bill-alt'=>'bg-infobox-bank_account',
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index b6efd6a05f1..4d314644fb4 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -58,7 +58,7 @@ class modECM extends DolibarrModules
 		// Key used in llx_const table to save module status enabled/disabled (XXX is id value)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of png file (without png) used for this module
-		$this->picto = 'dir';
+		$this->picto = 'folder';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/ecm/temp");
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index c3fe9b3a18d..10515a78449 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -56,7 +56,7 @@ class modGeoIPMaxmind 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/images directory, use this->picto=DOL_URL_ROOT.'/module/images/file.png'
-		$this->picto = 'globe';
+		$this->picto = 'geoip';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/geoipmaxmind");
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index ac1c08f2948..ade8924b0d0 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -264,7 +264,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	print load_fiche_titre($langs->trans("NewSalaryPayment"), '', 'title_accountancy.png');
+	print load_fiche_titre($langs->trans("NewSalaryPayment"), '', 'object_payment');
 
 	dol_fiche_head('', '');
 
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index c92ee53fd38..fd89ba5dd2d 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -169,7 +169,7 @@ if ($result)
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, $newcardbutton, '', $limit, 0, 0, 1);
+    print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 33082a4ad91..b0023de8b64 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -60,7 +60,7 @@ llxHeader();
 $title = $langs->trans("SalariesStatistics");
 $dir = $conf->salaries->dir_temp;
 
-print load_fiche_titre($title, $mesg);
+print load_fiche_titre($title, '', 'object_payment');
 
 dol_mkdir($dir);
 
diff --git a/htdocs/theme/eldy/img/object_geoip.png b/htdocs/theme/eldy/img/object_geoip.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcf80a67e657d3029455dd089b409dd4208c629f
GIT binary patch
literal 4896
zcmeH~<y+Ga)W*LXqehMH8V!<CqQK||>FyHgkPwx@5Qek}Oh73qX(<UAA}Jt0L{ega
zfP{22+2iwfJkNEV`?}9LFF)6PUYw-+#yV6`HYfl9RC>CaW&i;C*Ma~tqJQRFV`K5p
zh(gu%EXc^ney*6{{*B~8y0)PJP|x+h0(qz&>;GG_hH2S^nFo4>MYx7|0ud1r5<UUG
zq3*6ho)Uo}-uZj?*Z=^$ci+%Li$EX{fgt~1|4-om0)b)~bmhPExC}EhHU~gpA_y@F
zDH%DGf|81w21ZLq&%nsU%)-jX&cVsW&BF`l;};MV5*85^yCp6mDJ3m)TUJh9LGjMr
zd&(-R2sL#LO)VW=J$(a1BV&{Mre@|AmR8m_ws!Uoj!w=lu5Rugo?hM$d>;Dx`3D3B
z1&4%&JqnMAjCvgX<XH?dHVzg4JRuRC^ddPWH7z|O^JUhn?3`T8>%9DeH*X7zic3n%
z$}1|X-dESu*3~yOHZ`}jwtZ~x=<NE`jqUl|`=zgcU~p*o>&WQXxAFfbzEA#`nx2`R
zoBz46xU`I0UHi4ZvH5#zduR90-u}Vi(ecUY+4;rg)iwU_jS<Xt3;?JL^)%HiBInl~
zqa7?QnVgs<c;GxDZt;>9quwm9O3PyN?2J%G-Jym}i7UdTmBr|iE##SIAEr;oRlrBu
zi(h4cR7u9FgkR+)bh!xKcf9m>`NVf%wKulu?9O%Y-lt{kc|ptc`Qq`ccWui#35<Hb
zK`*%4Ox}C_7b8RN^p96e%)iz>{EclH6+}kaIoRqxmu}WA+pF6lhL=u5bx1pvcrN8j
zvyQ9D>837+OMfcDF0E*j5_iZ1wyA}*n?oRHG!oxx;cTYaofm4?UNOtPlbS-tl3n9Y
zbJ0e_jWCjiUxtStRL{zXj2PotMdh{fc3*U#$8nRn;~RROk&vI?6652z-@41yS+p$O
z9v7sp6{7QHazD>bOR+?>rMh^FH1IuNfoYq_Y{QB2YBd_L=#OT}BCKtqc?zNzkSC~C
z`q)`652>q-OGZs$(T)7nzL?)4aE^)uw#|K$4|L=Wf~>#bzr!%Py(`ArID&^rX2N%&
zb?2L5D>&`6$8ek4CZDEET3Gn>$TC@*T1_?!Fl}S2S18xVW5Xxl=&__viK?aJdhXPT
zj%_fAoNrz<bra_B7rHn-f3t+H=NMmX_gsAc@siwkvh9yjWQSeFr~UYD>TCQvzOk5x
z*I%n>uI1&oj(pco^1?e+PiY6SKLu(7YqA2B7hAO^pL)l<f8-Zjl`njA<K0r$GC6qZ
zKH5oH5P_Hk)@raUH~wk9WOZJHHW7Khj$Xp4jMFHpsya9S)5%dt?k<;p!1?!6#@e?+
ztVq_?!185=y!G4A%EFe{_`&$VNtKh^*E=8Qow^WPd;UxKHQ^B!_UP^7O{M1{eYAtQ
z1W3mN>a&^s?;N4|UpFCd@fwvcmuJcw+xhm(9`7#f4X4Lc2R;b6kyZ6d<MY`=)nA@k
z`4@>eQ@L%;i5GM2D`hhik{Ix+N3Of~;@mEj(`X29FA_~pZ=LNCb*pzu?n_*Pf&zHb
z0f*IzHZ_%WT35Ebm{yvKXsIJX`S^(0yXor3%R`cCGgt^a<k+EoCf#PHI+9wmqd-mD
zbRn;ClYcjNoTFP~;%x92p601<aDcB6;2rriHszgyc^hd)DfSSL9aKJBahn_Yz7;yO
zBVnhhJ+SHPAeA-O?ibCt8Pbj^a2VVVPKt2$;xZ4yPilI4M&oWWB5W@yzO?-HZYLWV
zNi0?w5qC{l_@i|w=|{DSyp|a8T=SFqIye3o!M~(IEQd*|k12UF2K&l=&!nVV-{vD5
zdX)eo8~7U`<@#LaAbuMp@u7COnR|+XGcOd!&2;*;t6yxo+{<GRf8;z!@h$gN&Xe=~
z1x|Z2t4~+D$J{yQ(!oz_3S+npUw@+ui2g48-2LXqY{(|<B)$Be$iw#jrK`Vb@xtp-
zaBg>Sr*j)nsf~G5q=sDlO|yGdPzANbA`BBAHaXoaO50+p{V$;h6r!pell)^aRMlwM
zln6peuwxV131D$2e5nS4%kXb@^~cAZBrEQ!WVA?|WnT*)mbge2%bk2*=G4ohJuzLR
z^InTytKgDOL8+u#>M*v8v=_qj%jjnbYe|c!2@SysqZ1a936?c;;asIuZs}!Y8$@yt
zH&_-?z%48I3|vLE@4dc)G9hcqo<JRbIF)iGka?4$nUE<y7<RQ3^XBooD^hq~Vjo3N
zqwB^B(dpWxoHfzNR4O<45S;Oj#EQ#I6`wPm5POKW@%q4AbT!a#u3*QtO#Q%xWa4gd
zi$mJSj`vSqLxYsO`aT5^MxG|B(C42~32qYDupY!E0=)DXXhT)-Q7Gyt?1?XG`oMU5
zZN*^z;#_+HRC)mgU{0046>=oJtHs3*-gm4R)O8UftzO(VKVs*QPMtYN<aDek{Nsgd
zcODK+U#2;*BJj-C`LNi$zod2%1umA&8d~3d23=dObrpL`p@&Fj9w)&N(#OZPsO7aO
zzNZKjaNL|0hoQig2ay*%IJoB9&Kx+XO1#C)2l)9u{&kuFwtTOBbw@eoHhhzfR~LyD
z#`r3B{WX*O9&)86dJRvA<%)wuS_q6a-dDD|67h7OO64L^1IG(vk}YT}X-g`J5tNO~
z%mPSkTsy5OR-qUE5F}s4?#QDLl>K-&W<hy6wIfqWJY>#{^DzZeT1qh^n0IL(f?x*V
zB}skY`7>Cu*y6gK{s?!l{ZxAr9fJ2bYHS0kwLQ^V!2n2ih=SF?AB7F8R6Ii=C0WsA
zWx(wpMtigZ$d@htt+qs`4}9z+VPg|_A>=r_B9}i=^H3|gYmXi)HSnla2-kzqp{Lsu
zUZ&8D>Hrzb6reO)^hC%%{m?W$r`7uaQ<war7~o@wM!#fV6xg2NDrG3Tzv$5gfEKK$
zOW!-HR%_eqiU4j2hLjPYQPZ(z4K6=FgHO>{I{F~kag)=!7;-bC&x?XSeS+YuAVQ2_
zaAa=y7m?nH-IRB;Sc#{;2G1z63H7p+3p*k^CFl}ecr+;ELW4dLtwP=b6<IYeGHrT+
z0OjRe-Gg~gh)dI_G+-q3kZW&^@GTkz+HLT2Aim!}1acwLP=&2SACufChb1&%#I=z6
zW&YMzyvFbHRZ&~%clkAtKTTXF2T~`J^^u79{%ShN(0=jn{iwdGSPO8Zdx?*j15zR1
zmf1ya)uBUN-w@+Nhk{T9tyOK{|5&Kb>D%%Q7;0lgEs$3=8@WGpWc3%zIiT)#ht^Pr
zqFYr46psx15C{Ba05@;kyo4b#j@iB-dyd{UF8s;@+`GZb3%202qc6s$>E)P0kv=c^
zIio0oR#0;*0o$M5tUl)Jiu4d^rkmD+ci9d{k3&~yx;ovKQW`U9!oSpMn<LTL;ZRSp
zQIFy<wQSxN6YIXaozq#<+fMNSa|&;dqGsiFRjowd0+AynZ_i`RclD<BRQ+U9V=%A_
zQ&E}o!blja>zO$p87z+M<VAw<@EBRA+#gDw9(~Osd)e7H@$IA~>lC=SxrGp!id>32
z63)mKv{Y>#)1r25(V|WVU@sNLU_@g*TBCOqF$Zq`e5<U{EDOMBvWo;~-Rhw<e3kx?
zuE!y*QQ5H$kiZa=jL1nGqV2{nYLYELZ~OZ&RjF9F7&mjn3{l{r=bf=oZ|NxMqguTZ
zz@!NN<14pUi9~D#KNLB?9aQcGvMbGLRQ7r)h~O9O&R4REvQO@Sln>MOr05aP)hQs7
z_A0X>^_O~dE-Hdb$#sufn@n>Nc^sg)`y-;;_ND<0`oPE+Gsp#maY5J-j0uVsUGLO|
z;est5ct6?;k!H63bdetk>KZSF=U1nzUX)CW^UJOD5?{a=XE_&rcgj~KVkx@gh$BJF
zxi^30l`L28J%w8#pQ)CXymxC*kPG*nvety+EYTDXQ=i=gjf)r5Z^wd(XH$~5n6gq8
z8#{d+w?z$+WkVTEO*op`M)n1K_X@8!$Vr<d?Dd3GvrP;?AwVc6da(R~%+x~tmh{Jn
z=|b_LNE`n%ckRH&cAcJtL|D>d(ODO}SngT_I3wM${g_5)|6DfnwTZckUF^7B@CLVO
z8r8aQLZ?Yuk3tyd!TMJME1qPm)aI&x|5&S=95+M|pioMC>KAzLMJjTfG<1zSJw1-n
zZRfGr^PQ3O!{TKn6ddiJ^5%Nd5A47_?%tWXM9jduusbyWH%uMnuyNzM&6x){c@Ri<
zE6i|Tbq8_@+M?&Acl>%5s`Er4Blfo<I63Te*SpHwc6AQwofAj3-9Yxjj*@Ffu<(in
zqP&bxhBst0zwKW=8;?AQqEdcXW?2;8a&zr6L~d6<?b<cKyA{u-Kz}OW2|xSq`bptW
z#OOZssqC+BY=7$eq;+H!yS4|7fcZ}|`{iCUr{7OTS!2|*I+J>6oniipSI|FJ+$b}H
zmiGCvQ{QIaGHqhru`|_Gdf7K?-yWQr&!q;cxG_zneK0AdrMTP5`UcNk9WK;_y!|0b
z!eO{zuKuzuEOAAQdS>fG;aI+E*hl@7-VoOrc1h)FWn9}5XXwwO8}~JN?oU-ePo}8x
zSs&cVZrcRpGB7%HIrV>AWdYgx>@wBJWWeK8BbnH;V~Q(aAfDy{4Bl5=4Yt8<j=U_n
zK#9zt@u5b&5M+_e+My%`I5u)R5`2$BJ=0b8hSlv7b#Ci^sJbI=1N?UO;lIiLtEMQ(
zu7@1v0g<rLRSe;1_M)^`3O6OR0J07*%A1)u1RZ=QwFj$0_s%tw7GlGnu8Il&x{00S
zHw6xqh4Kk^oHL+vYrL#{Jobi}Vm%BQ)KzQ6443%Nx1{gB^p!^fIBWjom`rXKFz?GF
z4NqPd7-fCdXKa8X3yI_i4Cg5YTcRB&aPl3J&McN(?uX000&rp<oveOSkZ2rGW#R)N
zs1>PZD-ObZu?xbGS*RyWir*@E70X5mRa-BiEIlGU-h^Mo1jyF_xG1zLLF289%LU`X
zhBJ;dLEA;z`KCYCB`DrubC~d$jD>535r1JFkK%OUZxj5Gm+8XH61ehZS%zyDGVuh0
zCh7bf!iCR8ak>&k->~l{sebfm+$dakvj!svRa)`qQOGx+Hz5W$LQi`3U_oy=3CAFp
zM6&MD7ld_}27~yVrWI!{X!r})saqG;G(??R3@G^zSHcbMT`p52%U9r8Ij=277pB=e
zUOQ{5?7Li{CkKT@)JT>;c=sM&DHAb56pjZyHK5AGL6VpEo;j9?H|=c<hayAHe@D(>
z>V&c|d~VzqS5_*5Cl0CGcWeSl?Ax)qsYju}a~e%-987vFH+r}pgr8#zQ%@CRP|yuP
zE`DqRBn~bxeejrW$3ZaDe&x;2*c6Ee<R{h5ZZj1?_!ya!x^L4Jkf0dLZL_IJgnE&J
zBTY`Mfbny#R5sD%Xk-@ekXM?KD@>7dUSYOf0IRIX`-FO7J*J1WfbK29xk&COeE~xN
tHemnl7Kt%MuB`fZho0AscHvi>*oj6j;!YDq^?(05pr>W5S*Pw2_dgvN+u#5I

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/object_geoip.png b/htdocs/theme/md/img/object_geoip.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcf80a67e657d3029455dd089b409dd4208c629f
GIT binary patch
literal 4896
zcmeH~<y+Ga)W*LXqehMH8V!<CqQK||>FyHgkPwx@5Qek}Oh73qX(<UAA}Jt0L{ega
zfP{22+2iwfJkNEV`?}9LFF)6PUYw-+#yV6`HYfl9RC>CaW&i;C*Ma~tqJQRFV`K5p
zh(gu%EXc^ney*6{{*B~8y0)PJP|x+h0(qz&>;GG_hH2S^nFo4>MYx7|0ud1r5<UUG
zq3*6ho)Uo}-uZj?*Z=^$ci+%Li$EX{fgt~1|4-om0)b)~bmhPExC}EhHU~gpA_y@F
zDH%DGf|81w21ZLq&%nsU%)-jX&cVsW&BF`l;};MV5*85^yCp6mDJ3m)TUJh9LGjMr
zd&(-R2sL#LO)VW=J$(a1BV&{Mre@|AmR8m_ws!Uoj!w=lu5Rugo?hM$d>;Dx`3D3B
z1&4%&JqnMAjCvgX<XH?dHVzg4JRuRC^ddPWH7z|O^JUhn?3`T8>%9DeH*X7zic3n%
z$}1|X-dESu*3~yOHZ`}jwtZ~x=<NE`jqUl|`=zgcU~p*o>&WQXxAFfbzEA#`nx2`R
zoBz46xU`I0UHi4ZvH5#zduR90-u}Vi(ecUY+4;rg)iwU_jS<Xt3;?JL^)%HiBInl~
zqa7?QnVgs<c;GxDZt;>9quwm9O3PyN?2J%G-Jym}i7UdTmBr|iE##SIAEr;oRlrBu
zi(h4cR7u9FgkR+)bh!xKcf9m>`NVf%wKulu?9O%Y-lt{kc|ptc`Qq`ccWui#35<Hb
zK`*%4Ox}C_7b8RN^p96e%)iz>{EclH6+}kaIoRqxmu}WA+pF6lhL=u5bx1pvcrN8j
zvyQ9D>837+OMfcDF0E*j5_iZ1wyA}*n?oRHG!oxx;cTYaofm4?UNOtPlbS-tl3n9Y
zbJ0e_jWCjiUxtStRL{zXj2PotMdh{fc3*U#$8nRn;~RROk&vI?6652z-@41yS+p$O
z9v7sp6{7QHazD>bOR+?>rMh^FH1IuNfoYq_Y{QB2YBd_L=#OT}BCKtqc?zNzkSC~C
z`q)`652>q-OGZs$(T)7nzL?)4aE^)uw#|K$4|L=Wf~>#bzr!%Py(`ArID&^rX2N%&
zb?2L5D>&`6$8ek4CZDEET3Gn>$TC@*T1_?!Fl}S2S18xVW5Xxl=&__viK?aJdhXPT
zj%_fAoNrz<bra_B7rHn-f3t+H=NMmX_gsAc@siwkvh9yjWQSeFr~UYD>TCQvzOk5x
z*I%n>uI1&oj(pco^1?e+PiY6SKLu(7YqA2B7hAO^pL)l<f8-Zjl`njA<K0r$GC6qZ
zKH5oH5P_Hk)@raUH~wk9WOZJHHW7Khj$Xp4jMFHpsya9S)5%dt?k<;p!1?!6#@e?+
ztVq_?!185=y!G4A%EFe{_`&$VNtKh^*E=8Qow^WPd;UxKHQ^B!_UP^7O{M1{eYAtQ
z1W3mN>a&^s?;N4|UpFCd@fwvcmuJcw+xhm(9`7#f4X4Lc2R;b6kyZ6d<MY`=)nA@k
z`4@>eQ@L%;i5GM2D`hhik{Ix+N3Of~;@mEj(`X29FA_~pZ=LNCb*pzu?n_*Pf&zHb
z0f*IzHZ_%WT35Ebm{yvKXsIJX`S^(0yXor3%R`cCGgt^a<k+EoCf#PHI+9wmqd-mD
zbRn;ClYcjNoTFP~;%x92p601<aDcB6;2rriHszgyc^hd)DfSSL9aKJBahn_Yz7;yO
zBVnhhJ+SHPAeA-O?ibCt8Pbj^a2VVVPKt2$;xZ4yPilI4M&oWWB5W@yzO?-HZYLWV
zNi0?w5qC{l_@i|w=|{DSyp|a8T=SFqIye3o!M~(IEQd*|k12UF2K&l=&!nVV-{vD5
zdX)eo8~7U`<@#LaAbuMp@u7COnR|+XGcOd!&2;*;t6yxo+{<GRf8;z!@h$gN&Xe=~
z1x|Z2t4~+D$J{yQ(!oz_3S+npUw@+ui2g48-2LXqY{(|<B)$Be$iw#jrK`Vb@xtp-
zaBg>Sr*j)nsf~G5q=sDlO|yGdPzANbA`BBAHaXoaO50+p{V$;h6r!pell)^aRMlwM
zln6peuwxV131D$2e5nS4%kXb@^~cAZBrEQ!WVA?|WnT*)mbge2%bk2*=G4ohJuzLR
z^InTytKgDOL8+u#>M*v8v=_qj%jjnbYe|c!2@SysqZ1a936?c;;asIuZs}!Y8$@yt
zH&_-?z%48I3|vLE@4dc)G9hcqo<JRbIF)iGka?4$nUE<y7<RQ3^XBooD^hq~Vjo3N
zqwB^B(dpWxoHfzNR4O<45S;Oj#EQ#I6`wPm5POKW@%q4AbT!a#u3*QtO#Q%xWa4gd
zi$mJSj`vSqLxYsO`aT5^MxG|B(C42~32qYDupY!E0=)DXXhT)-Q7Gyt?1?XG`oMU5
zZN*^z;#_+HRC)mgU{0046>=oJtHs3*-gm4R)O8UftzO(VKVs*QPMtYN<aDek{Nsgd
zcODK+U#2;*BJj-C`LNi$zod2%1umA&8d~3d23=dObrpL`p@&Fj9w)&N(#OZPsO7aO
zzNZKjaNL|0hoQig2ay*%IJoB9&Kx+XO1#C)2l)9u{&kuFwtTOBbw@eoHhhzfR~LyD
z#`r3B{WX*O9&)86dJRvA<%)wuS_q6a-dDD|67h7OO64L^1IG(vk}YT}X-g`J5tNO~
z%mPSkTsy5OR-qUE5F}s4?#QDLl>K-&W<hy6wIfqWJY>#{^DzZeT1qh^n0IL(f?x*V
zB}skY`7>Cu*y6gK{s?!l{ZxAr9fJ2bYHS0kwLQ^V!2n2ih=SF?AB7F8R6Ii=C0WsA
zWx(wpMtigZ$d@htt+qs`4}9z+VPg|_A>=r_B9}i=^H3|gYmXi)HSnla2-kzqp{Lsu
zUZ&8D>Hrzb6reO)^hC%%{m?W$r`7uaQ<war7~o@wM!#fV6xg2NDrG3Tzv$5gfEKK$
zOW!-HR%_eqiU4j2hLjPYQPZ(z4K6=FgHO>{I{F~kag)=!7;-bC&x?XSeS+YuAVQ2_
zaAa=y7m?nH-IRB;Sc#{;2G1z63H7p+3p*k^CFl}ecr+;ELW4dLtwP=b6<IYeGHrT+
z0OjRe-Gg~gh)dI_G+-q3kZW&^@GTkz+HLT2Aim!}1acwLP=&2SACufChb1&%#I=z6
zW&YMzyvFbHRZ&~%clkAtKTTXF2T~`J^^u79{%ShN(0=jn{iwdGSPO8Zdx?*j15zR1
zmf1ya)uBUN-w@+Nhk{T9tyOK{|5&Kb>D%%Q7;0lgEs$3=8@WGpWc3%zIiT)#ht^Pr
zqFYr46psx15C{Ba05@;kyo4b#j@iB-dyd{UF8s;@+`GZb3%202qc6s$>E)P0kv=c^
zIio0oR#0;*0o$M5tUl)Jiu4d^rkmD+ci9d{k3&~yx;ovKQW`U9!oSpMn<LTL;ZRSp
zQIFy<wQSxN6YIXaozq#<+fMNSa|&;dqGsiFRjowd0+AynZ_i`RclD<BRQ+U9V=%A_
zQ&E}o!blja>zO$p87z+M<VAw<@EBRA+#gDw9(~Osd)e7H@$IA~>lC=SxrGp!id>32
z63)mKv{Y>#)1r25(V|WVU@sNLU_@g*TBCOqF$Zq`e5<U{EDOMBvWo;~-Rhw<e3kx?
zuE!y*QQ5H$kiZa=jL1nGqV2{nYLYELZ~OZ&RjF9F7&mjn3{l{r=bf=oZ|NxMqguTZ
zz@!NN<14pUi9~D#KNLB?9aQcGvMbGLRQ7r)h~O9O&R4REvQO@Sln>MOr05aP)hQs7
z_A0X>^_O~dE-Hdb$#sufn@n>Nc^sg)`y-;;_ND<0`oPE+Gsp#maY5J-j0uVsUGLO|
z;est5ct6?;k!H63bdetk>KZSF=U1nzUX)CW^UJOD5?{a=XE_&rcgj~KVkx@gh$BJF
zxi^30l`L28J%w8#pQ)CXymxC*kPG*nvety+EYTDXQ=i=gjf)r5Z^wd(XH$~5n6gq8
z8#{d+w?z$+WkVTEO*op`M)n1K_X@8!$Vr<d?Dd3GvrP;?AwVc6da(R~%+x~tmh{Jn
z=|b_LNE`n%ckRH&cAcJtL|D>d(ODO}SngT_I3wM${g_5)|6DfnwTZckUF^7B@CLVO
z8r8aQLZ?Yuk3tyd!TMJME1qPm)aI&x|5&S=95+M|pioMC>KAzLMJjTfG<1zSJw1-n
zZRfGr^PQ3O!{TKn6ddiJ^5%Nd5A47_?%tWXM9jduusbyWH%uMnuyNzM&6x){c@Ri<
zE6i|Tbq8_@+M?&Acl>%5s`Er4Blfo<I63Te*SpHwc6AQwofAj3-9Yxjj*@Ffu<(in
zqP&bxhBst0zwKW=8;?AQqEdcXW?2;8a&zr6L~d6<?b<cKyA{u-Kz}OW2|xSq`bptW
z#OOZssqC+BY=7$eq;+H!yS4|7fcZ}|`{iCUr{7OTS!2|*I+J>6oniipSI|FJ+$b}H
zmiGCvQ{QIaGHqhru`|_Gdf7K?-yWQr&!q;cxG_zneK0AdrMTP5`UcNk9WK;_y!|0b
z!eO{zuKuzuEOAAQdS>fG;aI+E*hl@7-VoOrc1h)FWn9}5XXwwO8}~JN?oU-ePo}8x
zSs&cVZrcRpGB7%HIrV>AWdYgx>@wBJWWeK8BbnH;V~Q(aAfDy{4Bl5=4Yt8<j=U_n
zK#9zt@u5b&5M+_e+My%`I5u)R5`2$BJ=0b8hSlv7b#Ci^sJbI=1N?UO;lIiLtEMQ(
zu7@1v0g<rLRSe;1_M)^`3O6OR0J07*%A1)u1RZ=QwFj$0_s%tw7GlGnu8Il&x{00S
zHw6xqh4Kk^oHL+vYrL#{Jobi}Vm%BQ)KzQ6443%Nx1{gB^p!^fIBWjom`rXKFz?GF
z4NqPd7-fCdXKa8X3yI_i4Cg5YTcRB&aPl3J&McN(?uX000&rp<oveOSkZ2rGW#R)N
zs1>PZD-ObZu?xbGS*RyWir*@E70X5mRa-BiEIlGU-h^Mo1jyF_xG1zLLF289%LU`X
zhBJ;dLEA;z`KCYCB`DrubC~d$jD>535r1JFkK%OUZxj5Gm+8XH61ehZS%zyDGVuh0
zCh7bf!iCR8ak>&k->~l{sebfm+$dakvj!svRa)`qQOGx+Hz5W$LQi`3U_oy=3CAFp
zM6&MD7ld_}27~yVrWI!{X!r})saqG;G(??R3@G^zSHcbMT`p52%U9r8Ij=277pB=e
zUOQ{5?7Li{CkKT@)JT>;c=sM&DHAb56pjZyHK5AGL6VpEo;j9?H|=c<hayAHe@D(>
z>V&c|d~VzqS5_*5Cl0CGcWeSl?Ax)qsYju}a~e%-987vFH+r}pgr8#zQ%@CRP|yuP
zE`DqRBn~bxeejrW$3ZaDe&x;2*c6Ee<R{h5ZZj1?_!ya!x^L4Jkf0dLZL_IJgnE&J
zBTY`Mfbny#R5sD%Xk-@ekXM?KD@>7dUSYOf0IRIX`-FO7J*J1WfbK29xk&COeE~xN
tHemnl7Kt%MuB`fZho0AscHvi>*oj6j;!YDq^?(05pr>W5S*Pw2_dgvN+u#5I

literal 0
HcmV?d00001


From ea9f0097a284277122ca71715e02187a9e6f03b5 Mon Sep 17 00:00:00 2001
From: Matt Sidnell <54064522+pstructures@users.noreply.github.com>
Date: Mon, 20 Apr 2020 22:42:13 +0100
Subject: [PATCH 081/144] Add default values for Create

Added default extrafield values for html and text fields to prepopulate data on record create only.
---
 htdocs/core/class/commonobject.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4b94f87c65f..f881a89c204 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7117,6 +7117,14 @@ abstract class CommonObject
 					{
 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
 					}
+
+					// HTML and text add default value
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text')))
+					{
+						if($action=='create') $value = $extrafields->attributes[$this->table_element]['default'][$key];
+						else $value = $this->array_options['options_'.$key];
+					}
+					
 					$labeltoshow = $langs->trans($label);
 					$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
 

From 59b574742b1f18ab6159e96eff8a06cd4d8a8d06 Mon Sep 17 00:00:00 2001
From: Matt Sidnell <54064522+pstructures@users.noreply.github.com>
Date: Mon, 20 Apr 2020 22:52:36 +0100
Subject: [PATCH 082/144] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f881a89c204..83de743931c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7124,7 +7124,14 @@ abstract class CommonObject
 						if($action=='create') $value = $extrafields->attributes[$this->table_element]['default'][$key];
 						else $value = $this->array_options['options_'.$key];
 					}
-					
+
+					// select fields use default value
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('select')))
+					{
+						if($action=='create') $value = $extrafields->attributes[$this->table_element]['default'][$key];
+						else $value = $this->array_options['options_'.$key];
+					}
+
 					$labeltoshow = $langs->trans($label);
 					$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
 

From 3f42bfb40f614d1e69454226502947ee6bf3045d Mon Sep 17 00:00:00 2001
From: mattsidnell <mattsidnell@gmail.com>
Date: Mon, 20 Apr 2020 23:42:12 +0100
Subject: [PATCH 083/144] change

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 83de743931c..02445a218c1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7117,16 +7117,9 @@ abstract class CommonObject
 					{
 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
 					}
-
-					// HTML and text add default value
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text')))
-					{
-						if($action=='create') $value = $extrafields->attributes[$this->table_element]['default'][$key];
-						else $value = $this->array_options['options_'.$key];
-					}
-
-					// select fields use default value
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('select')))
+					
+					// HTML, select, integer and text add default value
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'select', 'int')))
 					{
 						if($action=='create') $value = $extrafields->attributes[$this->table_element]['default'][$key];
 						else $value = $this->array_options['options_'.$key];

From 9040c9680db3b4216f1a29b46b153f6812d2b7b2 Mon Sep 17 00:00:00 2001
From: mattsidnell <mattsidnell@gmail.com>
Date: Mon, 20 Apr 2020 23:44:23 +0100
Subject: [PATCH 084/144] Removed whitespace

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 02445a218c1..b091caa548a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7117,7 +7117,6 @@ abstract class CommonObject
 					{
 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
 					}
-					
 					// HTML, select, integer and text add default value
 					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'select', 'int')))
 					{

From f3ebc33d1e22f78d335021874fd9805ec341d157 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Tue, 21 Apr 2020 01:14:02 -0500
Subject: [PATCH 085/144] Fix calculator to consume with to produce

i.e. to produce 100 then Order can be produce 135.
---
 htdocs/mrp/class/mo.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 84bf44c84fe..76bbe7ef26f 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2020  Lenin Rivas		   <lenin@leninrivas.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
@@ -648,7 +648,7 @@ class Mo extends CommonObject
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {
-								$moline->qty = round($line->qty * $this->qty / $line->efficiency, 2);
+								$moline->qty = round($line->qty * ($this->qty / $bom->qty) / $line->efficiency, 4); // Calculate with Qty to produce and  more presition
 							}
 							if ($moline->qty <= 0) {
 								$error++;

From b469775718e9b429628a23a825031442d55c4749 Mon Sep 17 00:00:00 2001
From: Lenin Rivas <53640168+leninrivas@users.noreply.github.com>
Date: Tue, 21 Apr 2020 01:21:08 -0500
Subject: [PATCH 086/144] More Presition to 8 decimals

---
 htdocs/mrp/class/mo.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 76bbe7ef26f..570281ac294 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020  Lenin Rivas		   <lenin@leninrivas.com>
+ * 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
@@ -648,7 +649,7 @@ class Mo extends CommonObject
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {
-								$moline->qty = round($line->qty * ($this->qty / $bom->qty) / $line->efficiency, 4); // Calculate with Qty to produce and  more presition
+								$moline->qty = round($line->qty * ($this->qty / $bom->qty) / $line->efficiency, 8); // Calculate with Qty to produce and  more presition
 							}
 							if ($moline->qty <= 0) {
 								$error++;

From 53530821545eb3a9eeda13ab00bce1dce4d04c49 Mon Sep 17 00:00:00 2001
From: Adrien Jacob <adrien.jacob@gmail.com>
Date: Tue, 21 Apr 2020 09:57:45 +0200
Subject: [PATCH 087/144] FIX Delete extra fields for supplier invoice line

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index a9448c7c925..a79209d8e05 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3155,6 +3155,17 @@ class SupplierInvoiceLine extends CommonObjectLine
 				$this->error = $this->db->lasterror();
 			}
 		}
+		
+		// Remove extrafields
+        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        {
+        	$result=$this->deleteExtraFields();
+        	if ($result < 0)
+        	{
+        		$error++;
+        		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+        	}
+        }
 
 		if (!$error)
 		{

From d4a8718e6ca17cda3dcce6d8b3a824245e23a651 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 21 Apr 2020 08:00:14 +0000
Subject: [PATCH 088/144] Fixing style errors.

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index a79209d8e05..c886588ee9b 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3155,7 +3155,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 				$this->error = $this->db->lasterror();
 			}
 		}
-		
+
 		// Remove extrafields
         if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
         {

From ff5bf040e8594485be07690eda2192d4d9206d8b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Apr 2020 11:19:27 +0200
Subject: [PATCH 089/144] FIX text version of html emailing (removed the body
 style)

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

diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index f80d2f1547a..df7647b330c 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1379,9 +1379,10 @@ class SMTPs
         $strContentAltText = '';
         if ($strType == 'html')
         {
-            // Similar code to forge a text from html is also in CMailFile.class.php
-            $strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
-            $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
+        	// Similar code to forge a text from html is also in CMailFile.class.php
+        	$strContentAltText = preg_replace('/<head><title>.*<\/style><\/head>/', '', $strContent);
+        	$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);
+        	$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
             $strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));
         }
 

From f8ae5d9972b1aa1119eaadb377b908d02a54ad31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Apr 2020 12:00:14 +0200
Subject: [PATCH 090/144] Fix Do not show value if null

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

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index d5a24a0e2e5..d8fe9975da5 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -933,7 +933,7 @@ while ($i < min($num, $limit))
 	// Amount debit
 	if (!empty($arrayfields['t.debit']['checked']))
 	{
-		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
+		print '<td class="nowrap right">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
 		$totalarray['val']['totaldebit'] += $line->debit;
@@ -942,7 +942,7 @@ while ($i < min($num, $limit))
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked']))
 	{
-		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
+		print '<td class="nowrap right">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
 		$totalarray['val']['totalcredit'] += $line->credit;

From 536ab9520745218532e7bdb901750a1eb3c26a17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Apr 2020 00:29:34 +0200
Subject: [PATCH 091/144] FIX: The "test smtp connectivity" failed on page to
 setup mass emailing

Conflicts:
	htdocs/admin/mails.php
---
 htdocs/admin/mails.php          | 5 +++--
 htdocs/admin/mails_emailing.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index dd67b138da5..d41cb687446 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -99,6 +99,7 @@ $trigger_name='';       // Disable triggers
 $paramname='id';
 $mode='emailfortest';
 $trackid=(($action == 'testhtml')?"testhtml":"test");
+$sendcontext='';
 include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'test')       $action='test';
@@ -791,8 +792,8 @@ else
 		print load_fiche_titre($langs->trans("DoTestServerAvailability"));
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mail = new CMailFile('', '', '', '');
-		$result=$mail->check_server_port($server, $port);
+		$mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext);
+		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
 		else
 		{
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 12076a00579..5a15be94bc4 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -536,8 +536,9 @@ else
 		print load_fiche_titre($langs->trans("DoTestServerAvailability"));
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mail = new CMailFile('', '', '', '');
-		$result=$mail->check_server_port($server, $port);
+		$mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext);
+
+		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
 		else
 		{

From 1ef89eb1a131fa50a97a5eefac33270d4fab4459 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Apr 2020 14:14:49 +0200
Subject: [PATCH 092/144] Fix $mysoc global not loaded.

---
 htdocs/compta/facture/card.php          |  3 ++-
 htdocs/core/tpl/objectline_view.tpl.php | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index da22eaf872e..4f111c26f39 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5046,8 +5046,9 @@ elseif ($id > 0 || !empty($ref))
 	print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
 	// Show object lines
-	if (!empty($object->lines))
+	if (!empty($object->lines)) {
 		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+	}
 
 	// Form to add new line
 	if ($object->statut == 0 && $usercancreate && $action != 'valid' && $action != 'editline')
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index d61810c5178..57e4c14e5d5 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -45,7 +45,7 @@ if (empty($object) || !is_object($object))
 	exit;
 }
 
-
+global $mysoc;
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
 $usemargins = 0;
@@ -282,13 +282,13 @@ if ($line->special_code == 3) { ?>
 	$coldisplay++;
 	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-    	print '<span class="classfortooltip" title="';
-    	print $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
-    	print '<br>'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva);
-    	if (price2num($line->total_localtax1)) print '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax1);
-    	if (price2num($line->total_localtax2)) print '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax2);
-    	print '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).'='.price($line->total_ttc);
-    	print '">';
+		$tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
+		$tooltiponprice .= '<br>'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva);
+		if (price2num($line->total_localtax1)) $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax1);
+		if (price2num($line->total_localtax2)) $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax2);
+		$tooltiponprice .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).'='.price($line->total_ttc);
+
+		print '<span class="classfortooltip" title="'.$tooltiponprice.'">';
 	}
 	print price($line->total_ht);
 	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

From f6735ce8f20577241ba6f64065d506e0398fb9c1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Apr 2020 14:28:52 +0200
Subject: [PATCH 093/144] Update repair.sql script

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

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 73cb1e6592d..64e81e30329 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -337,9 +337,14 @@ UPDATE llx_c_lead_status set code = 'WON' where code = 'WIN';
 -- To replace amount on all invoice and lines when forgetting to apply a 20% vat
 -- update llx_facturedet set tva_tx = 20 where tva_tx = 0;
 -- update llx_facturedet set total_ht = round(total_ttc / 1.2, 5) where total_ht = total_ttc;
--- update llx_facturedet set total_tva = total_ttc - total_ht where total_vat = 0;
 -- update llx_facture set total = round(total_ttc / 1.2, 5) where total_ht = total_ttc;
--- update llx_facture set tva = total_ttc - total where tva = 0;
+
+-- To fix bad total of price excluding tax, vat and price tax including tax.
+-- select * from llx_facture where tva <> (total_ttc - total - localtax1 - localtax2 - revenuestamp);
+-- update llx_facture set tva = (total_ttc - total - localtax1 - localtax2 - revenuestamp) where tva <> (total_ttc - total - localtax1 - localtax2 - revenuestamp);
+-- select * from llx_facturedet where total_tva <> (total_ttc - total_ht - total_localtax1 - total_localtax2);
+-- update llx_facturedet set total_tva = (total_ttc - total_ht - total_localtax1 - total_localtax2) where total_tva <> (total_ttc - total_ht - total_localtax1 - total_localtax2);
+
 
 -- To insert elements into a category
 -- Search idcategory: select rowid from llx_categorie where type=0 and ref like '%xxx%'

From 7b99ebfca5a44e7bd5bd3fa2101eeec5c926142b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Apr 2020 14:54:30 +0200
Subject: [PATCH 094/144] Debug generic translation of fields

---
 htdocs/core/class/html.form.class.php | 10 ++++++++--
 htdocs/langs/en_US/main.lang          |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9a8ade00367..63500b156a8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -348,6 +348,7 @@ class Form
 				return ''; // No extralang field to show
 			}
 
+			$result .= '<!-- Widget for translation -->'."\n";
 			$result .= '<div class="inline-block paddingleft image-'.$object->element.'-'.$fieldname.'">';
 			$s = img_picto($langs->trans("ShowOtherLanguages"), 'language', '', false, 0, 0, '', 'fa-15 editfieldlang');
 			$result .= $s;
@@ -7408,9 +7409,14 @@ class Form
 					$htmltext = '';
 					// If there is extra languages
 					foreach ($arrayoflangcode as $extralangcode) {
-						$s = picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"');
-						$htmltext .= $s.$object->array_languages['name'][$extralangcode];
+						$htmltext .= picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"');
+						if ($object->array_languages['name'][$extralangcode]) {
+							$htmltext .= $object->array_languages['name'][$extralangcode];
+						} else {
+							$htmltext .= '<span class="opacitymedium">'.$langs->trans("SwitchInEditModeToAddTranslation").'</span>';
+						}
 					}
+					$ret .= '<!-- Show translations of name -->'."\n";
 					$ret .= $this->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
 				}
 			}
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2082506c405..c34ea6a9e96 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1028,3 +1028,5 @@ 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

From 23c2335396c5485931534ac21a68c41ed89f11f6 Mon Sep 17 00:00:00 2001
From: Adrien Jacob <adrien.jacob@gmail.com>
Date: Tue, 21 Apr 2020 16:07:49 +0200
Subject: [PATCH 095/144] Add API endpoints for supplier invoice lines

---
 .../class/api_supplier_invoices.class.php     | 197 ++++++++++++++++++
 1 file changed, 197 insertions(+)

diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 179b9f158bc..ceaf01fd338 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -479,6 +479,203 @@ class SupplierInvoices extends DolibarrApi
         return $paiement_id;
     }
 
+    /**
+     * Get lines of a supplier invoice
+     *
+     * @param int   $id             Id of supplier invoice
+     *
+     * @url	GET {id}/lines
+     *
+     * @return array
+     */
+    public function getLines($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Supplier invoice not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        $this->invoice->fetch_lines();
+        $result = array();
+        foreach ($this->invoice->lines as $line) {
+            array_push($result, $this->_cleanObjectDatas($line));
+        }
+        return $result;
+    }
+
+    /**
+     * Add a line to given supplier invoice
+     *
+     * @param int   $id             Id of supplier invoice to update
+     * @param array $request_data   supplier invoice line data
+     *
+     * @url	POST {id}/lines
+     *
+     * @return int|bool
+     */
+    public function postLine($id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Supplier invoice not found');
+        }
+
+        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;
+
+        $updateRes = $this->invoice->addline(
+            $request_data->description,
+    		$request_data->pu_ht,
+			$request_data->tva_tx,
+    		$request_data->localtax1_tx,
+    		$request_data->localtax2_tx,
+    		$request_data->qty,
+			$request_data->fk_product,
+			$request_data->remise_percent,
+			$request_data->date_start,
+			$request_data->date_end,
+			$request_data->ventil,
+			$request_data->info_bits,
+			'HT',
+			$request_data->product_type,
+			$request_data->rang,
+			false,
+			$request_data->array_options,
+			$request_data->fk_unit,
+			$request_data->origin_id,
+			$request_data->multicurrency_subprice,
+			$request_data->ref_supplier,
+			$request_data->special_code
+        );
+
+        if ($updateRes < 0) {
+            throw new RestException(400, 'Unable to insert the new line. Check your inputs. '.$this->invoice->error);
+        }
+
+        return $updateRes;
+    }
+
+    /**
+     * Update a line to a given supplier invoice
+     *
+     * @param int   $id             Id of supplier invoice to update
+     * @param int   $lineid         Id of line to update
+     * @param array $request_data   InvoiceLine data
+     *
+     * @url	PUT {id}/lines/{lineid}
+     *
+     * @return object
+     *
+     * @throws 200
+     * @throws 304
+     * @throws 401
+     * @throws 404
+     */
+    public function putLine($id, $lineid, $request_data = null)
+    {
+    	if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Supplier invoice not found');
+        }
+
+        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;
+        $updateRes = $this->invoice->updateline(
+    		$lineid,
+    		$request_data->description,
+    		$request_data->pu_ht,
+			$request_data->tva_tx,
+    		$request_data->localtax1_tx,
+    		$request_data->localtax2_tx,
+    		$request_data->qty,
+			$request_data->fk_product,
+			'HT',
+			$request_data->info_bits,
+			$request_data->product_type,
+			$request_data->remise_percent,
+			false,
+			$request_data->date_start,
+			$request_data->date_end,
+			$request_data->array_options,
+			$request_data->fk_unit,
+			$request_data->multicurrency_subprice,
+			$request_data->ref_supplier
+    	);
+
+    	if ($updateRes > 0) {
+    		$result = $this->get($id);
+    		unset($result->line);
+    		return $this->_cleanObjectDatas($result);
+	    } else {
+	    	throw new RestException(304, $this->invoice->error);
+    	}
+    }
+
+	/**
+     * Deletes a line of a given supplier invoice
+     *
+     * @param int   $id             Id of supplier invoice
+     * @param int   $lineid 		Id of the line to delete
+     *
+     * @url     DELETE {id}/lines/{lineid}
+     *
+     * @return array
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 405
+     */
+    public function deleteLine($id, $lineid)
+    {
+		if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+            throw new RestException(401);
+        }
+		
+		$result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Supplier invoice not found');
+        }
+		
+    	if(empty($lineid)) {
+    		throw new RestException(400, 'Line ID is mandatory');
+    	}
+
+    	if( ! DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+    	// TODO Check the lineid $lineid is a line of ojbect
+
+    	$updateRes = $this->invoice->deleteline($lineid);
+    	if ($updateRes > 0) {
+    		return $this->get($id);
+    	}
+    	else
+    	{
+    		throw new RestException(405, $this->invoice->error);
+    	}
+    }
+
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas

From 9f4d2ee8817bb4281ca59c1cefaac994440531ac Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 21 Apr 2020 14:11:33 +0000
Subject: [PATCH 096/144] Fixing style errors.

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

diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index ceaf01fd338..139d87162c6 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -650,12 +650,12 @@ class SupplierInvoices extends DolibarrApi
 		if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
             throw new RestException(401);
         }
-		
+
 		$result = $this->invoice->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Supplier invoice not found');
         }
-		
+
     	if(empty($lineid)) {
     		throw new RestException(400, 'Line ID is mandatory');
     	}

From d3c5173c5bea774c25444a0c1031ef80710ef0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 21 Apr 2020 16:14:38 +0200
Subject: [PATCH 097/144] Update usergroup.class.php

---
 htdocs/user/class/usergroup.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index c897db44412..2cf11c3851f 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -654,6 +654,9 @@ class UserGroup extends CommonObject
 		global $user, $conf;
 
 		$this->datec = dol_now();
+		if (empty($this->nom) && !empty($this->name)) {
+			$this->nom = $this->name;
+		}
 
 		if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value
 		$entity = $this->entity;

From 86e571323355b8aae91407e4521a1c6b5005398a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 21 Apr 2020 16:26:02 +0200
Subject: [PATCH 098/144] Update card.php

---
 htdocs/user/group/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 618f569c1e3..1cd3b3edc37 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -132,7 +132,7 @@ if (empty($reshook)) {
 				$action = "create"; // Go back to create page
 			} else {
 				$object->name	= trim(GETPOST("nom", 'nohtml'));
-				$object->nom = $object->name; // For backward compatibility
+				//$object->nom = $object->name; // For backward compatibility
 				$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
 
 				// Fill array 'array_options' with data from add form
@@ -215,7 +215,7 @@ if (empty($reshook)) {
 			$object->oldcopy = clone $object;
 
 			$object->name	= trim(GETPOST("nom", 'nohtml'));
-			$object->nom = $object->name; // For backward compatibility
+			//$object->nom = $object->name; // For backward compatibility
 			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
 
 			// Fill array 'array_options' with data from add form

From 0b790ef3275ecbbc3fb4907285742205569110df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Apr 2020 18:18:07 +0200
Subject: [PATCH 099/144] Sync lang files

---
 htdocs/langs/ar_SA/admin.lang             |  38 +-
 htdocs/langs/ar_SA/bills.lang             |  16 +-
 htdocs/langs/ar_SA/blockedlog.lang        |   2 +-
 htdocs/langs/ar_SA/cashdesk.lang          |  21 +-
 htdocs/langs/ar_SA/companies.lang         |   2 +-
 htdocs/langs/ar_SA/compta.lang            |  11 +-
 htdocs/langs/ar_SA/errors.lang            |   4 +-
 htdocs/langs/ar_SA/install.lang           |   4 +
 htdocs/langs/ar_SA/link.lang              |   3 +-
 htdocs/langs/ar_SA/mails.lang             |   2 +-
 htdocs/langs/ar_SA/main.lang              |   6 +
 htdocs/langs/ar_SA/other.lang             |   4 +-
 htdocs/langs/ar_SA/products.lang          |   4 +-
 htdocs/langs/ar_SA/projects.lang          |   6 +-
 htdocs/langs/ar_SA/receiptprinter.lang    |  32 ++
 htdocs/langs/ar_SA/stripe.lang            |   3 +-
 htdocs/langs/ar_SA/users.lang             |   7 +-
 htdocs/langs/ar_SA/website.lang           |   8 +-
 htdocs/langs/bg_BG/admin.lang             |  76 +--
 htdocs/langs/bg_BG/bills.lang             |  22 +-
 htdocs/langs/bg_BG/blockedlog.lang        |   2 +-
 htdocs/langs/bg_BG/cashdesk.lang          |  27 +-
 htdocs/langs/bg_BG/companies.lang         |   2 +-
 htdocs/langs/bg_BG/compta.lang            |  29 +-
 htdocs/langs/bg_BG/errors.lang            |  14 +-
 htdocs/langs/bg_BG/install.lang           |   8 +-
 htdocs/langs/bg_BG/link.lang              |   1 +
 htdocs/langs/bg_BG/mails.lang             |   2 +-
 htdocs/langs/bg_BG/main.lang              |  34 +-
 htdocs/langs/bg_BG/orders.lang            |   2 +-
 htdocs/langs/bg_BG/other.lang             |  12 +-
 htdocs/langs/bg_BG/products.lang          |   6 +-
 htdocs/langs/bg_BG/projects.lang          |  32 +-
 htdocs/langs/bg_BG/propal.lang            |   2 +-
 htdocs/langs/bg_BG/receiptprinter.lang    |  32 ++
 htdocs/langs/bg_BG/stripe.lang            |   3 +-
 htdocs/langs/bg_BG/users.lang             |   4 +-
 htdocs/langs/bg_BG/website.lang           |   8 +-
 htdocs/langs/bn_BD/admin.lang             |  38 +-
 htdocs/langs/bn_BD/bills.lang             |  16 +-
 htdocs/langs/bn_BD/blockedlog.lang        |   2 +-
 htdocs/langs/bn_BD/cashdesk.lang          |  21 +-
 htdocs/langs/bn_BD/companies.lang         |   2 +-
 htdocs/langs/bn_BD/compta.lang            |  11 +-
 htdocs/langs/bn_BD/errors.lang            |   4 +-
 htdocs/langs/bn_BD/install.lang           |   4 +
 htdocs/langs/bn_BD/link.lang              |   1 +
 htdocs/langs/bn_BD/mails.lang             |   2 +-
 htdocs/langs/bn_BD/main.lang              |   6 +
 htdocs/langs/bn_BD/other.lang             |   4 +-
 htdocs/langs/bn_BD/products.lang          |   4 +-
 htdocs/langs/bn_BD/projects.lang          |   6 +-
 htdocs/langs/bn_BD/receiptprinter.lang    |  32 ++
 htdocs/langs/bn_BD/stripe.lang            |   3 +-
 htdocs/langs/bn_BD/users.lang             |   7 +-
 htdocs/langs/bn_BD/website.lang           |   8 +-
 htdocs/langs/bs_BA/admin.lang             |  38 +-
 htdocs/langs/bs_BA/bills.lang             |  16 +-
 htdocs/langs/bs_BA/blockedlog.lang        |   2 +-
 htdocs/langs/bs_BA/cashdesk.lang          |  21 +-
 htdocs/langs/bs_BA/companies.lang         |   2 +-
 htdocs/langs/bs_BA/compta.lang            |  11 +-
 htdocs/langs/bs_BA/errors.lang            |   4 +-
 htdocs/langs/bs_BA/install.lang           |   4 +
 htdocs/langs/bs_BA/link.lang              |   1 +
 htdocs/langs/bs_BA/mails.lang             |   2 +-
 htdocs/langs/bs_BA/main.lang              |   6 +
 htdocs/langs/bs_BA/other.lang             |   4 +-
 htdocs/langs/bs_BA/products.lang          |   4 +-
 htdocs/langs/bs_BA/projects.lang          |   6 +-
 htdocs/langs/bs_BA/receiptprinter.lang    |  32 ++
 htdocs/langs/bs_BA/stripe.lang            |   3 +-
 htdocs/langs/bs_BA/users.lang             |   7 +-
 htdocs/langs/bs_BA/website.lang           |   8 +-
 htdocs/langs/ca_ES/admin.lang             |  38 +-
 htdocs/langs/ca_ES/bills.lang             |  16 +-
 htdocs/langs/ca_ES/blockedlog.lang        |   2 +-
 htdocs/langs/ca_ES/cashdesk.lang          |  23 +-
 htdocs/langs/ca_ES/companies.lang         |   2 +-
 htdocs/langs/ca_ES/compta.lang            |  11 +-
 htdocs/langs/ca_ES/errors.lang            |   4 +-
 htdocs/langs/ca_ES/install.lang           |   4 +
 htdocs/langs/ca_ES/link.lang              |   1 +
 htdocs/langs/ca_ES/mails.lang             |   2 +-
 htdocs/langs/ca_ES/main.lang              |   6 +
 htdocs/langs/ca_ES/mrp.lang               |   2 +
 htdocs/langs/ca_ES/orders.lang            |   2 +-
 htdocs/langs/ca_ES/other.lang             |   4 +-
 htdocs/langs/ca_ES/products.lang          |   4 +-
 htdocs/langs/ca_ES/projects.lang          |   6 +-
 htdocs/langs/ca_ES/propal.lang            |   2 +-
 htdocs/langs/ca_ES/receiptprinter.lang    |  32 ++
 htdocs/langs/ca_ES/stripe.lang            |   3 +-
 htdocs/langs/ca_ES/ticket.lang            |   2 +-
 htdocs/langs/ca_ES/users.lang             |   4 +-
 htdocs/langs/ca_ES/website.lang           |   8 +-
 htdocs/langs/cs_CZ/admin.lang             | 106 ++--
 htdocs/langs/cs_CZ/bills.lang             |  16 +-
 htdocs/langs/cs_CZ/blockedlog.lang        |   2 +-
 htdocs/langs/cs_CZ/cashdesk.lang          |  21 +-
 htdocs/langs/cs_CZ/companies.lang         |   2 +-
 htdocs/langs/cs_CZ/compta.lang            |  11 +-
 htdocs/langs/cs_CZ/errors.lang            |   4 +-
 htdocs/langs/cs_CZ/install.lang           |   4 +
 htdocs/langs/cs_CZ/link.lang              |  13 +-
 htdocs/langs/cs_CZ/mails.lang             |   2 +-
 htdocs/langs/cs_CZ/main.lang              |   6 +
 htdocs/langs/cs_CZ/other.lang             |   4 +-
 htdocs/langs/cs_CZ/products.lang          |   4 +-
 htdocs/langs/cs_CZ/projects.lang          |   6 +-
 htdocs/langs/cs_CZ/receiptprinter.lang    |  32 ++
 htdocs/langs/cs_CZ/stripe.lang            |   3 +-
 htdocs/langs/cs_CZ/users.lang             |   4 +-
 htdocs/langs/cs_CZ/website.lang           |   8 +-
 htdocs/langs/da_DK/admin.lang             |  38 +-
 htdocs/langs/da_DK/bills.lang             |  12 +-
 htdocs/langs/da_DK/blockedlog.lang        |   2 +-
 htdocs/langs/da_DK/cashdesk.lang          |  21 +-
 htdocs/langs/da_DK/companies.lang         |   2 +-
 htdocs/langs/da_DK/compta.lang            |  11 +-
 htdocs/langs/da_DK/errors.lang            |   4 +-
 htdocs/langs/da_DK/install.lang           |   4 +
 htdocs/langs/da_DK/link.lang              |  19 +-
 htdocs/langs/da_DK/mails.lang             |   2 +-
 htdocs/langs/da_DK/main.lang              |   6 +
 htdocs/langs/da_DK/other.lang             |   4 +-
 htdocs/langs/da_DK/products.lang          | 128 ++---
 htdocs/langs/da_DK/projects.lang          |   6 +-
 htdocs/langs/da_DK/receiptprinter.lang    |  32 ++
 htdocs/langs/da_DK/stripe.lang            |   3 +-
 htdocs/langs/da_DK/users.lang             |   7 +-
 htdocs/langs/da_DK/website.lang           |   8 +-
 htdocs/langs/de_AT/admin.lang             |   2 -
 htdocs/langs/de_AT/bills.lang             |   4 +-
 htdocs/langs/de_AT/other.lang             |   1 -
 htdocs/langs/de_CH/admin.lang             |   5 -
 htdocs/langs/de_CH/bills.lang             |   5 +-
 htdocs/langs/de_CH/companies.lang         |   1 -
 htdocs/langs/de_CH/compta.lang            |   1 -
 htdocs/langs/de_CH/orders.lang            |   2 +-
 htdocs/langs/de_CH/other.lang             |   1 -
 htdocs/langs/de_CH/products.lang          |   1 -
 htdocs/langs/de_CH/users.lang             |   1 -
 htdocs/langs/de_DE/admin.lang             |  40 +-
 htdocs/langs/de_DE/bills.lang             |  16 +-
 htdocs/langs/de_DE/blockedlog.lang        |   2 +-
 htdocs/langs/de_DE/cashdesk.lang          |  21 +-
 htdocs/langs/de_DE/companies.lang         |   2 +-
 htdocs/langs/de_DE/compta.lang            |  11 +-
 htdocs/langs/de_DE/errors.lang            |   4 +-
 htdocs/langs/de_DE/install.lang           |   4 +
 htdocs/langs/de_DE/link.lang              |   1 +
 htdocs/langs/de_DE/mails.lang             |   2 +-
 htdocs/langs/de_DE/main.lang              |   6 +
 htdocs/langs/de_DE/orders.lang            |   2 +-
 htdocs/langs/de_DE/other.lang             |   4 +-
 htdocs/langs/de_DE/products.lang          |   4 +-
 htdocs/langs/de_DE/projects.lang          |   6 +-
 htdocs/langs/de_DE/propal.lang            |   2 +-
 htdocs/langs/de_DE/receiptprinter.lang    |  32 ++
 htdocs/langs/de_DE/stripe.lang            |   3 +-
 htdocs/langs/de_DE/users.lang             |   4 +-
 htdocs/langs/de_DE/website.lang           |   8 +-
 htdocs/langs/el_GR/admin.lang             |  40 +-
 htdocs/langs/el_GR/bills.lang             |  22 +-
 htdocs/langs/el_GR/blockedlog.lang        |  98 ++--
 htdocs/langs/el_GR/cashdesk.lang          |  21 +-
 htdocs/langs/el_GR/companies.lang         |   4 +-
 htdocs/langs/el_GR/compta.lang            |  11 +-
 htdocs/langs/el_GR/errors.lang            |   4 +-
 htdocs/langs/el_GR/install.lang           |   4 +
 htdocs/langs/el_GR/link.lang              |   1 +
 htdocs/langs/el_GR/mails.lang             |  82 ++--
 htdocs/langs/el_GR/main.lang              |   6 +
 htdocs/langs/el_GR/other.lang             |   4 +-
 htdocs/langs/el_GR/products.lang          |   4 +-
 htdocs/langs/el_GR/projects.lang          |   6 +-
 htdocs/langs/el_GR/receiptprinter.lang    |  32 ++
 htdocs/langs/el_GR/stripe.lang            |   3 +-
 htdocs/langs/el_GR/users.lang             |   4 +-
 htdocs/langs/el_GR/website.lang           |   8 +-
 htdocs/langs/en_AU/admin.lang             |   8 +
 htdocs/langs/en_AU/bills.lang             |   7 +-
 htdocs/langs/en_AU/cashdesk.lang          |   2 +
 htdocs/langs/en_AU/compta.lang            |   1 -
 htdocs/langs/en_CA/admin.lang             |   8 +
 htdocs/langs/en_GB/admin.lang             |   8 +
 htdocs/langs/en_GB/bills.lang             |   7 +-
 htdocs/langs/en_GB/cashdesk.lang          |   2 +
 htdocs/langs/en_GB/projects.lang          |   1 +
 htdocs/langs/en_GB/users.lang             |   1 +
 htdocs/langs/en_GB/website.lang           |   2 +
 htdocs/langs/en_IN/admin.lang             |   8 +
 htdocs/langs/en_IN/bills.lang             |   7 +-
 htdocs/langs/en_IN/other.lang             |   1 -
 htdocs/langs/en_IN/projects.lang          |   1 +
 htdocs/langs/es_AR/main.lang              | 557 +++++++++++++++++++++-
 htdocs/langs/es_CL/admin.lang             |   8 -
 htdocs/langs/es_CL/bills.lang             |   7 +-
 htdocs/langs/es_CL/compta.lang            |   2 -
 htdocs/langs/es_CL/other.lang             |   1 -
 htdocs/langs/es_CL/products.lang          |   1 -
 htdocs/langs/es_CL/projects.lang          |   2 -
 htdocs/langs/es_CO/admin.lang             |   3 -
 htdocs/langs/es_CO/bills.lang             |   7 +-
 htdocs/langs/es_CO/compta.lang            |   1 -
 htdocs/langs/es_EC/admin.lang             |   5 +-
 htdocs/langs/es_ES/admin.lang             |  38 +-
 htdocs/langs/es_ES/bills.lang             |  16 +-
 htdocs/langs/es_ES/blockedlog.lang        |   2 +-
 htdocs/langs/es_ES/cashdesk.lang          |  21 +-
 htdocs/langs/es_ES/companies.lang         |   2 +-
 htdocs/langs/es_ES/compta.lang            |  11 +-
 htdocs/langs/es_ES/errors.lang            |   4 +-
 htdocs/langs/es_ES/install.lang           |   4 +
 htdocs/langs/es_ES/link.lang              |   1 +
 htdocs/langs/es_ES/mails.lang             |   2 +-
 htdocs/langs/es_ES/main.lang              |   6 +
 htdocs/langs/es_ES/other.lang             |   4 +-
 htdocs/langs/es_ES/products.lang          |   4 +-
 htdocs/langs/es_ES/projects.lang          |   6 +-
 htdocs/langs/es_ES/receiptprinter.lang    |  32 ++
 htdocs/langs/es_ES/stripe.lang            |   3 +-
 htdocs/langs/es_ES/users.lang             |   4 +-
 htdocs/langs/es_ES/website.lang           |   8 +-
 htdocs/langs/es_MX/admin.lang             |   3 -
 htdocs/langs/es_MX/bills.lang             |   4 +-
 htdocs/langs/es_MX/companies.lang         |  47 +-
 htdocs/langs/es_MX/other.lang             |   1 -
 htdocs/langs/es_PE/admin.lang             |   1 -
 htdocs/langs/es_PE/bills.lang             |   4 +-
 htdocs/langs/es_PE/mrp.lang               |  45 +-
 htdocs/langs/es_VE/bills.lang             |   4 +-
 htdocs/langs/es_VE/other.lang             |   1 -
 htdocs/langs/et_EE/admin.lang             |  40 +-
 htdocs/langs/et_EE/bills.lang             |  12 +-
 htdocs/langs/et_EE/blockedlog.lang        |   2 +-
 htdocs/langs/et_EE/cashdesk.lang          |  21 +-
 htdocs/langs/et_EE/companies.lang         | 118 ++---
 htdocs/langs/et_EE/compta.lang            |  19 +-
 htdocs/langs/et_EE/errors.lang            |   4 +-
 htdocs/langs/et_EE/install.lang           |   4 +
 htdocs/langs/et_EE/link.lang              |   1 +
 htdocs/langs/et_EE/mails.lang             |   2 +-
 htdocs/langs/et_EE/main.lang              |  22 +-
 htdocs/langs/et_EE/other.lang             |   4 +-
 htdocs/langs/et_EE/products.lang          |   4 +-
 htdocs/langs/et_EE/projects.lang          |   6 +-
 htdocs/langs/et_EE/receiptprinter.lang    |  32 ++
 htdocs/langs/et_EE/stripe.lang            |   3 +-
 htdocs/langs/et_EE/users.lang             |   7 +-
 htdocs/langs/et_EE/website.lang           |   8 +-
 htdocs/langs/eu_ES/admin.lang             |  38 +-
 htdocs/langs/eu_ES/bills.lang             |  16 +-
 htdocs/langs/eu_ES/blockedlog.lang        |   2 +-
 htdocs/langs/eu_ES/cashdesk.lang          |  21 +-
 htdocs/langs/eu_ES/companies.lang         |   2 +-
 htdocs/langs/eu_ES/compta.lang            |  11 +-
 htdocs/langs/eu_ES/errors.lang            |   4 +-
 htdocs/langs/eu_ES/install.lang           |   4 +
 htdocs/langs/eu_ES/link.lang              |   1 +
 htdocs/langs/eu_ES/mails.lang             |   2 +-
 htdocs/langs/eu_ES/main.lang              |   6 +
 htdocs/langs/eu_ES/other.lang             |   4 +-
 htdocs/langs/eu_ES/products.lang          |   4 +-
 htdocs/langs/eu_ES/projects.lang          |   6 +-
 htdocs/langs/eu_ES/receiptprinter.lang    |  32 ++
 htdocs/langs/eu_ES/stripe.lang            |   3 +-
 htdocs/langs/eu_ES/users.lang             |   7 +-
 htdocs/langs/eu_ES/website.lang           |   8 +-
 htdocs/langs/fa_IR/admin.lang             |  38 +-
 htdocs/langs/fa_IR/bills.lang             |  16 +-
 htdocs/langs/fa_IR/blockedlog.lang        |   2 +-
 htdocs/langs/fa_IR/cashdesk.lang          |  21 +-
 htdocs/langs/fa_IR/companies.lang         |   2 +-
 htdocs/langs/fa_IR/compta.lang            |  11 +-
 htdocs/langs/fa_IR/errors.lang            |   4 +-
 htdocs/langs/fa_IR/install.lang           |   4 +
 htdocs/langs/fa_IR/link.lang              |   1 +
 htdocs/langs/fa_IR/mails.lang             |   2 +-
 htdocs/langs/fa_IR/main.lang              |   6 +
 htdocs/langs/fa_IR/other.lang             |   4 +-
 htdocs/langs/fa_IR/products.lang          |   4 +-
 htdocs/langs/fa_IR/projects.lang          |   6 +-
 htdocs/langs/fa_IR/receiptprinter.lang    |  32 ++
 htdocs/langs/fa_IR/stripe.lang            |   3 +-
 htdocs/langs/fa_IR/users.lang             |   7 +-
 htdocs/langs/fa_IR/website.lang           |   8 +-
 htdocs/langs/fi_FI/admin.lang             |  40 +-
 htdocs/langs/fi_FI/bills.lang             |  20 +-
 htdocs/langs/fi_FI/blockedlog.lang        |   2 +-
 htdocs/langs/fi_FI/cashdesk.lang          |  21 +-
 htdocs/langs/fi_FI/companies.lang         |  46 +-
 htdocs/langs/fi_FI/compta.lang            |  11 +-
 htdocs/langs/fi_FI/errors.lang            |   4 +-
 htdocs/langs/fi_FI/install.lang           |   4 +
 htdocs/langs/fi_FI/link.lang              |   1 +
 htdocs/langs/fi_FI/mails.lang             |   2 +-
 htdocs/langs/fi_FI/main.lang              |  10 +-
 htdocs/langs/fi_FI/orders.lang            |   2 +-
 htdocs/langs/fi_FI/other.lang             |   4 +-
 htdocs/langs/fi_FI/products.lang          |   4 +-
 htdocs/langs/fi_FI/projects.lang          |  88 ++--
 htdocs/langs/fi_FI/receiptprinter.lang    |  32 ++
 htdocs/langs/fi_FI/stripe.lang            |   3 +-
 htdocs/langs/fi_FI/users.lang             |   4 +-
 htdocs/langs/fi_FI/website.lang           |   8 +-
 htdocs/langs/fr_BE/admin.lang             |   8 +
 htdocs/langs/fr_BE/bills.lang             |   6 +-
 htdocs/langs/fr_CA/admin.lang             |   8 +
 htdocs/langs/fr_CA/bills.lang             |   6 +-
 htdocs/langs/fr_CA/cashdesk.lang          |   2 +
 htdocs/langs/fr_CA/compta.lang            |   1 -
 htdocs/langs/fr_CA/errors.lang            |   1 +
 htdocs/langs/fr_CA/main.lang              |   1 +
 htdocs/langs/fr_CA/other.lang             |   1 -
 htdocs/langs/fr_CA/projects.lang          |   1 -
 htdocs/langs/fr_CA/users.lang             |   1 +
 htdocs/langs/fr_CA/website.lang           |   2 +
 htdocs/langs/fr_FR/admin.lang             |  62 ++-
 htdocs/langs/fr_FR/bills.lang             |  12 +-
 htdocs/langs/fr_FR/blockedlog.lang        |   2 +-
 htdocs/langs/fr_FR/cashdesk.lang          |  35 +-
 htdocs/langs/fr_FR/companies.lang         |   2 +-
 htdocs/langs/fr_FR/compta.lang            |  11 +-
 htdocs/langs/fr_FR/errors.lang            |  22 +-
 htdocs/langs/fr_FR/install.lang           |   4 +
 htdocs/langs/fr_FR/link.lang              |   1 +
 htdocs/langs/fr_FR/mails.lang             |   6 +-
 htdocs/langs/fr_FR/main.lang              |  14 +-
 htdocs/langs/fr_FR/other.lang             |  24 +-
 htdocs/langs/fr_FR/products.lang          |  14 +-
 htdocs/langs/fr_FR/projects.lang          |  16 +-
 htdocs/langs/fr_FR/propal.lang            |   2 +-
 htdocs/langs/fr_FR/receiptprinter.lang    |  44 +-
 htdocs/langs/fr_FR/stripe.lang            |   3 +-
 htdocs/langs/fr_FR/users.lang             |   7 +-
 htdocs/langs/fr_FR/website.lang           |  14 +-
 htdocs/langs/he_IL/admin.lang             |  38 +-
 htdocs/langs/he_IL/bills.lang             |  16 +-
 htdocs/langs/he_IL/blockedlog.lang        |   2 +-
 htdocs/langs/he_IL/cashdesk.lang          |  21 +-
 htdocs/langs/he_IL/companies.lang         |   2 +-
 htdocs/langs/he_IL/compta.lang            |  11 +-
 htdocs/langs/he_IL/errors.lang            |   4 +-
 htdocs/langs/he_IL/install.lang           |   4 +
 htdocs/langs/he_IL/link.lang              |   1 +
 htdocs/langs/he_IL/mails.lang             |   2 +-
 htdocs/langs/he_IL/main.lang              |   6 +
 htdocs/langs/he_IL/other.lang             |   4 +-
 htdocs/langs/he_IL/products.lang          |   4 +-
 htdocs/langs/he_IL/projects.lang          |   6 +-
 htdocs/langs/he_IL/receiptprinter.lang    |  32 ++
 htdocs/langs/he_IL/stripe.lang            |   3 +-
 htdocs/langs/he_IL/users.lang             |   7 +-
 htdocs/langs/he_IL/website.lang           |   8 +-
 htdocs/langs/hr_HR/admin.lang             |  38 +-
 htdocs/langs/hr_HR/bills.lang             |  16 +-
 htdocs/langs/hr_HR/blockedlog.lang        |   2 +-
 htdocs/langs/hr_HR/cashdesk.lang          |  21 +-
 htdocs/langs/hr_HR/companies.lang         |   2 +-
 htdocs/langs/hr_HR/compta.lang            |  11 +-
 htdocs/langs/hr_HR/errors.lang            |   4 +-
 htdocs/langs/hr_HR/install.lang           |   4 +
 htdocs/langs/hr_HR/link.lang              |   1 +
 htdocs/langs/hr_HR/mails.lang             |  28 +-
 htdocs/langs/hr_HR/main.lang              |   6 +
 htdocs/langs/hr_HR/orders.lang            |   2 +-
 htdocs/langs/hr_HR/other.lang             |   4 +-
 htdocs/langs/hr_HR/products.lang          |   4 +-
 htdocs/langs/hr_HR/projects.lang          |   6 +-
 htdocs/langs/hr_HR/propal.lang            |   2 +-
 htdocs/langs/hr_HR/receiptprinter.lang    |  32 ++
 htdocs/langs/hr_HR/stripe.lang            |   3 +-
 htdocs/langs/hr_HR/users.lang             |   4 +-
 htdocs/langs/hr_HR/website.lang           |   8 +-
 htdocs/langs/hu_HU/admin.lang             | 148 +++---
 htdocs/langs/hu_HU/bills.lang             |  16 +-
 htdocs/langs/hu_HU/blockedlog.lang        |   2 +-
 htdocs/langs/hu_HU/cashdesk.lang          |  21 +-
 htdocs/langs/hu_HU/companies.lang         |   2 +-
 htdocs/langs/hu_HU/compta.lang            |  11 +-
 htdocs/langs/hu_HU/errors.lang            |   4 +-
 htdocs/langs/hu_HU/install.lang           |   4 +
 htdocs/langs/hu_HU/link.lang              |   1 +
 htdocs/langs/hu_HU/mails.lang             |   2 +-
 htdocs/langs/hu_HU/main.lang              |   6 +
 htdocs/langs/hu_HU/orders.lang            |   2 +-
 htdocs/langs/hu_HU/other.lang             |   4 +-
 htdocs/langs/hu_HU/products.lang          |   4 +-
 htdocs/langs/hu_HU/projects.lang          |   6 +-
 htdocs/langs/hu_HU/receiptprinter.lang    |  32 ++
 htdocs/langs/hu_HU/stripe.lang            |   3 +-
 htdocs/langs/hu_HU/users.lang             |   4 +-
 htdocs/langs/hu_HU/website.lang           |   8 +-
 htdocs/langs/id_ID/admin.lang             |  38 +-
 htdocs/langs/id_ID/bills.lang             |  16 +-
 htdocs/langs/id_ID/blockedlog.lang        |   2 +-
 htdocs/langs/id_ID/cashdesk.lang          |  21 +-
 htdocs/langs/id_ID/companies.lang         |   2 +-
 htdocs/langs/id_ID/compta.lang            |  11 +-
 htdocs/langs/id_ID/errors.lang            |   4 +-
 htdocs/langs/id_ID/install.lang           |   4 +
 htdocs/langs/id_ID/link.lang              |   1 +
 htdocs/langs/id_ID/mails.lang             |   2 +-
 htdocs/langs/id_ID/main.lang              |   6 +
 htdocs/langs/id_ID/other.lang             |   4 +-
 htdocs/langs/id_ID/products.lang          |   4 +-
 htdocs/langs/id_ID/projects.lang          |   6 +-
 htdocs/langs/id_ID/receiptprinter.lang    |  32 ++
 htdocs/langs/id_ID/stripe.lang            |   3 +-
 htdocs/langs/id_ID/users.lang             |   7 +-
 htdocs/langs/id_ID/website.lang           |   8 +-
 htdocs/langs/is_IS/admin.lang             |  38 +-
 htdocs/langs/is_IS/bills.lang             |  16 +-
 htdocs/langs/is_IS/blockedlog.lang        |   2 +-
 htdocs/langs/is_IS/cashdesk.lang          |  21 +-
 htdocs/langs/is_IS/companies.lang         |   2 +-
 htdocs/langs/is_IS/compta.lang            |  11 +-
 htdocs/langs/is_IS/errors.lang            |   4 +-
 htdocs/langs/is_IS/install.lang           |   4 +
 htdocs/langs/is_IS/link.lang              |   1 +
 htdocs/langs/is_IS/mails.lang             |   2 +-
 htdocs/langs/is_IS/main.lang              |   6 +
 htdocs/langs/is_IS/other.lang             |   4 +-
 htdocs/langs/is_IS/products.lang          |   4 +-
 htdocs/langs/is_IS/projects.lang          |   6 +-
 htdocs/langs/is_IS/receiptprinter.lang    |  32 ++
 htdocs/langs/is_IS/stripe.lang            |   3 +-
 htdocs/langs/is_IS/users.lang             |   7 +-
 htdocs/langs/is_IS/website.lang           |   8 +-
 htdocs/langs/it_IT/accountancy.lang       |  22 +-
 htdocs/langs/it_IT/admin.lang             | 452 +++++++++---------
 htdocs/langs/it_IT/banks.lang             |   6 +-
 htdocs/langs/it_IT/bills.lang             |  38 +-
 htdocs/langs/it_IT/blockedlog.lang        |   2 +-
 htdocs/langs/it_IT/boxes.lang             |  32 +-
 htdocs/langs/it_IT/cashdesk.lang          |  21 +-
 htdocs/langs/it_IT/categories.lang        |  22 +-
 htdocs/langs/it_IT/companies.lang         |  12 +-
 htdocs/langs/it_IT/compta.lang            |  49 +-
 htdocs/langs/it_IT/ecm.lang               |   4 +-
 htdocs/langs/it_IT/errors.lang            |   8 +-
 htdocs/langs/it_IT/holiday.lang           |  14 +-
 htdocs/langs/it_IT/install.lang           |  12 +-
 htdocs/langs/it_IT/link.lang              |   1 +
 htdocs/langs/it_IT/mails.lang             |  10 +-
 htdocs/langs/it_IT/main.lang              |  66 +--
 htdocs/langs/it_IT/modulebuilder.lang     |  32 +-
 htdocs/langs/it_IT/mrp.lang               |  34 +-
 htdocs/langs/it_IT/multicurrency.lang     |   4 +-
 htdocs/langs/it_IT/oauth.lang             |   2 +-
 htdocs/langs/it_IT/orders.lang            |  19 +-
 htdocs/langs/it_IT/other.lang             |  50 +-
 htdocs/langs/it_IT/paybox.lang            |   2 +-
 htdocs/langs/it_IT/products.lang          |  32 +-
 htdocs/langs/it_IT/projects.lang          |  32 +-
 htdocs/langs/it_IT/propal.lang            |   2 +-
 htdocs/langs/it_IT/receiptprinter.lang    |  38 +-
 htdocs/langs/it_IT/stocks.lang            |  26 +-
 htdocs/langs/it_IT/stripe.lang            |  11 +-
 htdocs/langs/it_IT/supplier_proposal.lang |   6 +-
 htdocs/langs/it_IT/suppliers.lang         |   2 +-
 htdocs/langs/it_IT/ticket.lang            |  12 +-
 htdocs/langs/it_IT/trips.lang             |   6 +-
 htdocs/langs/it_IT/users.lang             |   8 +-
 htdocs/langs/it_IT/website.lang           |  12 +-
 htdocs/langs/ja_JP/admin.lang             |  38 +-
 htdocs/langs/ja_JP/bills.lang             |  16 +-
 htdocs/langs/ja_JP/blockedlog.lang        |   2 +-
 htdocs/langs/ja_JP/cashdesk.lang          |  21 +-
 htdocs/langs/ja_JP/companies.lang         |   2 +-
 htdocs/langs/ja_JP/compta.lang            |  11 +-
 htdocs/langs/ja_JP/errors.lang            |   4 +-
 htdocs/langs/ja_JP/install.lang           |   4 +
 htdocs/langs/ja_JP/link.lang              |   1 +
 htdocs/langs/ja_JP/mails.lang             |   2 +-
 htdocs/langs/ja_JP/main.lang              |   8 +-
 htdocs/langs/ja_JP/other.lang             |   4 +-
 htdocs/langs/ja_JP/products.lang          |   4 +-
 htdocs/langs/ja_JP/projects.lang          |   6 +-
 htdocs/langs/ja_JP/receiptprinter.lang    |  32 ++
 htdocs/langs/ja_JP/stripe.lang            |   3 +-
 htdocs/langs/ja_JP/users.lang             |   7 +-
 htdocs/langs/ja_JP/website.lang           |   8 +-
 htdocs/langs/ka_GE/admin.lang             |  38 +-
 htdocs/langs/ka_GE/bills.lang             |  16 +-
 htdocs/langs/ka_GE/blockedlog.lang        |   2 +-
 htdocs/langs/ka_GE/cashdesk.lang          |  21 +-
 htdocs/langs/ka_GE/companies.lang         |   2 +-
 htdocs/langs/ka_GE/compta.lang            |  11 +-
 htdocs/langs/ka_GE/errors.lang            |   4 +-
 htdocs/langs/ka_GE/install.lang           |   4 +
 htdocs/langs/ka_GE/link.lang              |   1 +
 htdocs/langs/ka_GE/mails.lang             |   2 +-
 htdocs/langs/ka_GE/main.lang              |   6 +
 htdocs/langs/ka_GE/other.lang             |   4 +-
 htdocs/langs/ka_GE/products.lang          |   4 +-
 htdocs/langs/ka_GE/projects.lang          |   6 +-
 htdocs/langs/ka_GE/receiptprinter.lang    |  32 ++
 htdocs/langs/ka_GE/stripe.lang            |   3 +-
 htdocs/langs/ka_GE/users.lang             |   7 +-
 htdocs/langs/ka_GE/website.lang           |   8 +-
 htdocs/langs/km_KH/blockedlog.lang        |   2 +-
 htdocs/langs/km_KH/main.lang              |   6 +
 htdocs/langs/kn_IN/admin.lang             |  38 +-
 htdocs/langs/kn_IN/bills.lang             |  16 +-
 htdocs/langs/kn_IN/blockedlog.lang        |   2 +-
 htdocs/langs/kn_IN/cashdesk.lang          |  21 +-
 htdocs/langs/kn_IN/companies.lang         |   2 +-
 htdocs/langs/kn_IN/compta.lang            |  11 +-
 htdocs/langs/kn_IN/errors.lang            |   4 +-
 htdocs/langs/kn_IN/install.lang           |   4 +
 htdocs/langs/kn_IN/link.lang              |   1 +
 htdocs/langs/kn_IN/mails.lang             |   2 +-
 htdocs/langs/kn_IN/main.lang              |   6 +
 htdocs/langs/kn_IN/other.lang             |   4 +-
 htdocs/langs/kn_IN/products.lang          |   4 +-
 htdocs/langs/kn_IN/projects.lang          |   6 +-
 htdocs/langs/kn_IN/receiptprinter.lang    |  32 ++
 htdocs/langs/kn_IN/stripe.lang            |   3 +-
 htdocs/langs/kn_IN/users.lang             |   7 +-
 htdocs/langs/kn_IN/website.lang           |   8 +-
 htdocs/langs/ko_KR/admin.lang             |  38 +-
 htdocs/langs/ko_KR/bills.lang             |  16 +-
 htdocs/langs/ko_KR/blockedlog.lang        |   2 +-
 htdocs/langs/ko_KR/cashdesk.lang          |  21 +-
 htdocs/langs/ko_KR/companies.lang         |   2 +-
 htdocs/langs/ko_KR/compta.lang            |  11 +-
 htdocs/langs/ko_KR/errors.lang            |   4 +-
 htdocs/langs/ko_KR/install.lang           |   4 +
 htdocs/langs/ko_KR/link.lang              |   1 +
 htdocs/langs/ko_KR/mails.lang             |   2 +-
 htdocs/langs/ko_KR/main.lang              |   6 +
 htdocs/langs/ko_KR/other.lang             |   4 +-
 htdocs/langs/ko_KR/products.lang          |   4 +-
 htdocs/langs/ko_KR/projects.lang          |   6 +-
 htdocs/langs/ko_KR/receiptprinter.lang    |  32 ++
 htdocs/langs/ko_KR/stripe.lang            |   3 +-
 htdocs/langs/ko_KR/users.lang             |   7 +-
 htdocs/langs/ko_KR/website.lang           |   8 +-
 htdocs/langs/lo_LA/admin.lang             |  38 +-
 htdocs/langs/lo_LA/bills.lang             |  16 +-
 htdocs/langs/lo_LA/blockedlog.lang        |   2 +-
 htdocs/langs/lo_LA/cashdesk.lang          |  21 +-
 htdocs/langs/lo_LA/companies.lang         |   2 +-
 htdocs/langs/lo_LA/compta.lang            |  11 +-
 htdocs/langs/lo_LA/errors.lang            |   4 +-
 htdocs/langs/lo_LA/install.lang           |   4 +
 htdocs/langs/lo_LA/link.lang              |   1 +
 htdocs/langs/lo_LA/mails.lang             |   2 +-
 htdocs/langs/lo_LA/main.lang              |   6 +
 htdocs/langs/lo_LA/other.lang             |   4 +-
 htdocs/langs/lo_LA/products.lang          |   4 +-
 htdocs/langs/lo_LA/projects.lang          |   6 +-
 htdocs/langs/lo_LA/receiptprinter.lang    |  32 ++
 htdocs/langs/lo_LA/stripe.lang            |   3 +-
 htdocs/langs/lo_LA/users.lang             |   7 +-
 htdocs/langs/lo_LA/website.lang           |   8 +-
 htdocs/langs/lt_LT/admin.lang             |  38 +-
 htdocs/langs/lt_LT/bills.lang             |  16 +-
 htdocs/langs/lt_LT/blockedlog.lang        |   2 +-
 htdocs/langs/lt_LT/cashdesk.lang          |  21 +-
 htdocs/langs/lt_LT/companies.lang         |   2 +-
 htdocs/langs/lt_LT/compta.lang            |  11 +-
 htdocs/langs/lt_LT/errors.lang            |   4 +-
 htdocs/langs/lt_LT/install.lang           |   4 +
 htdocs/langs/lt_LT/link.lang              |   1 +
 htdocs/langs/lt_LT/mails.lang             |   2 +-
 htdocs/langs/lt_LT/main.lang              |   6 +
 htdocs/langs/lt_LT/other.lang             |   4 +-
 htdocs/langs/lt_LT/products.lang          |   4 +-
 htdocs/langs/lt_LT/projects.lang          |   6 +-
 htdocs/langs/lt_LT/receiptprinter.lang    |  32 ++
 htdocs/langs/lt_LT/stripe.lang            |   3 +-
 htdocs/langs/lt_LT/users.lang             |   7 +-
 htdocs/langs/lt_LT/website.lang           |   8 +-
 htdocs/langs/lv_LV/admin.lang             |  38 +-
 htdocs/langs/lv_LV/bills.lang             |  14 +-
 htdocs/langs/lv_LV/blockedlog.lang        |   4 +-
 htdocs/langs/lv_LV/cashdesk.lang          |  21 +-
 htdocs/langs/lv_LV/companies.lang         |   2 +-
 htdocs/langs/lv_LV/compta.lang            |  11 +-
 htdocs/langs/lv_LV/errors.lang            |   4 +-
 htdocs/langs/lv_LV/install.lang           |   4 +
 htdocs/langs/lv_LV/link.lang              |   3 +-
 htdocs/langs/lv_LV/mails.lang             |  10 +-
 htdocs/langs/lv_LV/main.lang              |   6 +
 htdocs/langs/lv_LV/orders.lang            |   2 +-
 htdocs/langs/lv_LV/other.lang             |   4 +-
 htdocs/langs/lv_LV/products.lang          |   4 +-
 htdocs/langs/lv_LV/projects.lang          |   6 +-
 htdocs/langs/lv_LV/receiptprinter.lang    |  32 ++
 htdocs/langs/lv_LV/stripe.lang            |   3 +-
 htdocs/langs/lv_LV/users.lang             |   7 +-
 htdocs/langs/lv_LV/website.lang           |   8 +-
 htdocs/langs/mk_MK/admin.lang             |  38 +-
 htdocs/langs/mk_MK/bills.lang             |  16 +-
 htdocs/langs/mk_MK/blockedlog.lang        |   2 +-
 htdocs/langs/mk_MK/cashdesk.lang          |  21 +-
 htdocs/langs/mk_MK/companies.lang         |   2 +-
 htdocs/langs/mk_MK/compta.lang            |  11 +-
 htdocs/langs/mk_MK/errors.lang            |   4 +-
 htdocs/langs/mk_MK/install.lang           |   4 +
 htdocs/langs/mk_MK/link.lang              |   1 +
 htdocs/langs/mk_MK/mails.lang             |   4 +-
 htdocs/langs/mk_MK/main.lang              |   6 +
 htdocs/langs/mk_MK/other.lang             |   4 +-
 htdocs/langs/mk_MK/products.lang          |   4 +-
 htdocs/langs/mk_MK/projects.lang          |   6 +-
 htdocs/langs/mk_MK/receiptprinter.lang    |  32 ++
 htdocs/langs/mk_MK/stripe.lang            |   3 +-
 htdocs/langs/mk_MK/users.lang             |   7 +-
 htdocs/langs/mk_MK/website.lang           |   8 +-
 htdocs/langs/mn_MN/admin.lang             |  38 +-
 htdocs/langs/mn_MN/bills.lang             |  16 +-
 htdocs/langs/mn_MN/blockedlog.lang        |   2 +-
 htdocs/langs/mn_MN/cashdesk.lang          |  21 +-
 htdocs/langs/mn_MN/companies.lang         |   2 +-
 htdocs/langs/mn_MN/compta.lang            |  11 +-
 htdocs/langs/mn_MN/errors.lang            |   4 +-
 htdocs/langs/mn_MN/install.lang           |   4 +
 htdocs/langs/mn_MN/link.lang              |   1 +
 htdocs/langs/mn_MN/mails.lang             |   2 +-
 htdocs/langs/mn_MN/main.lang              |   6 +
 htdocs/langs/mn_MN/other.lang             |   4 +-
 htdocs/langs/mn_MN/products.lang          |   4 +-
 htdocs/langs/mn_MN/projects.lang          |   6 +-
 htdocs/langs/mn_MN/receiptprinter.lang    |  32 ++
 htdocs/langs/mn_MN/stripe.lang            |   3 +-
 htdocs/langs/mn_MN/users.lang             |   7 +-
 htdocs/langs/mn_MN/website.lang           |   8 +-
 htdocs/langs/nb_NO/admin.lang             |  38 +-
 htdocs/langs/nb_NO/bills.lang             |  16 +-
 htdocs/langs/nb_NO/blockedlog.lang        |   2 +-
 htdocs/langs/nb_NO/cashdesk.lang          |  21 +-
 htdocs/langs/nb_NO/companies.lang         |   2 +-
 htdocs/langs/nb_NO/compta.lang            |  11 +-
 htdocs/langs/nb_NO/errors.lang            |   4 +-
 htdocs/langs/nb_NO/install.lang           |   4 +
 htdocs/langs/nb_NO/link.lang              |   1 +
 htdocs/langs/nb_NO/mails.lang             |   2 +-
 htdocs/langs/nb_NO/main.lang              |   6 +
 htdocs/langs/nb_NO/other.lang             |   4 +-
 htdocs/langs/nb_NO/products.lang          |   4 +-
 htdocs/langs/nb_NO/projects.lang          |   6 +-
 htdocs/langs/nb_NO/receiptprinter.lang    |  32 ++
 htdocs/langs/nb_NO/stripe.lang            |   3 +-
 htdocs/langs/nb_NO/users.lang             |  27 +-
 htdocs/langs/nb_NO/website.lang           |   8 +-
 htdocs/langs/nl_BE/admin.lang             |   3 +-
 htdocs/langs/nl_BE/bills.lang             |   5 +
 htdocs/langs/nl_BE/compta.lang            |   1 -
 htdocs/langs/nl_BE/other.lang             |   1 -
 htdocs/langs/nl_BE/users.lang             |   1 -
 htdocs/langs/nl_NL/admin.lang             |  52 +-
 htdocs/langs/nl_NL/bills.lang             |  12 +-
 htdocs/langs/nl_NL/blockedlog.lang        |   2 +-
 htdocs/langs/nl_NL/cashdesk.lang          |  21 +-
 htdocs/langs/nl_NL/companies.lang         |   2 +-
 htdocs/langs/nl_NL/compta.lang            |  11 +-
 htdocs/langs/nl_NL/errors.lang            |   4 +-
 htdocs/langs/nl_NL/install.lang           |   4 +
 htdocs/langs/nl_NL/link.lang              |   1 +
 htdocs/langs/nl_NL/mails.lang             |   2 +-
 htdocs/langs/nl_NL/main.lang              |   6 +
 htdocs/langs/nl_NL/other.lang             |   4 +-
 htdocs/langs/nl_NL/products.lang          |   4 +-
 htdocs/langs/nl_NL/projects.lang          |   6 +-
 htdocs/langs/nl_NL/receiptprinter.lang    |  32 ++
 htdocs/langs/nl_NL/stripe.lang            |   3 +-
 htdocs/langs/nl_NL/users.lang             |   4 +-
 htdocs/langs/nl_NL/website.lang           |   8 +-
 htdocs/langs/pl_PL/admin.lang             |  38 +-
 htdocs/langs/pl_PL/bills.lang             |  16 +-
 htdocs/langs/pl_PL/blockedlog.lang        |   2 +-
 htdocs/langs/pl_PL/cashdesk.lang          |  21 +-
 htdocs/langs/pl_PL/companies.lang         |   2 +-
 htdocs/langs/pl_PL/compta.lang            |  11 +-
 htdocs/langs/pl_PL/errors.lang            |   4 +-
 htdocs/langs/pl_PL/install.lang           |   4 +
 htdocs/langs/pl_PL/link.lang              |   1 +
 htdocs/langs/pl_PL/mails.lang             |   2 +-
 htdocs/langs/pl_PL/main.lang              |   6 +
 htdocs/langs/pl_PL/other.lang             |   4 +-
 htdocs/langs/pl_PL/products.lang          |   4 +-
 htdocs/langs/pl_PL/projects.lang          |   6 +-
 htdocs/langs/pl_PL/receiptprinter.lang    |  32 ++
 htdocs/langs/pl_PL/stripe.lang            |   3 +-
 htdocs/langs/pl_PL/users.lang             |   7 +-
 htdocs/langs/pl_PL/website.lang           |   8 +-
 htdocs/langs/pt_BR/admin.lang             |  16 +-
 htdocs/langs/pt_BR/bills.lang             |  11 +-
 htdocs/langs/pt_BR/blockedlog.lang        |   1 -
 htdocs/langs/pt_BR/cashdesk.lang          |   4 +-
 htdocs/langs/pt_BR/compta.lang            |   2 -
 htdocs/langs/pt_BR/errors.lang            |   1 +
 htdocs/langs/pt_BR/link.lang              |   1 +
 htdocs/langs/pt_BR/mails.lang             |   1 -
 htdocs/langs/pt_BR/orders.lang            |   2 +-
 htdocs/langs/pt_BR/other.lang             |   2 +-
 htdocs/langs/pt_BR/products.lang          |   1 -
 htdocs/langs/pt_BR/projects.lang          |   3 -
 htdocs/langs/pt_BR/stripe.lang            |   1 -
 htdocs/langs/pt_BR/users.lang             |   5 +-
 htdocs/langs/pt_BR/website.lang           |   2 -
 htdocs/langs/pt_PT/admin.lang             |  38 +-
 htdocs/langs/pt_PT/bills.lang             |  16 +-
 htdocs/langs/pt_PT/blockedlog.lang        |   2 +-
 htdocs/langs/pt_PT/cashdesk.lang          |  21 +-
 htdocs/langs/pt_PT/companies.lang         |   2 +-
 htdocs/langs/pt_PT/compta.lang            |  11 +-
 htdocs/langs/pt_PT/errors.lang            |   4 +-
 htdocs/langs/pt_PT/install.lang           |   4 +
 htdocs/langs/pt_PT/link.lang              |   1 +
 htdocs/langs/pt_PT/mails.lang             |   2 +-
 htdocs/langs/pt_PT/main.lang              |   6 +
 htdocs/langs/pt_PT/other.lang             |   4 +-
 htdocs/langs/pt_PT/products.lang          |   4 +-
 htdocs/langs/pt_PT/projects.lang          |   6 +-
 htdocs/langs/pt_PT/receiptprinter.lang    |  32 ++
 htdocs/langs/pt_PT/stripe.lang            |   3 +-
 htdocs/langs/pt_PT/users.lang             |   7 +-
 htdocs/langs/pt_PT/website.lang           |   8 +-
 htdocs/langs/ro_RO/admin.lang             |  38 +-
 htdocs/langs/ro_RO/bills.lang             |  16 +-
 htdocs/langs/ro_RO/blockedlog.lang        |   2 +-
 htdocs/langs/ro_RO/cashdesk.lang          |  21 +-
 htdocs/langs/ro_RO/companies.lang         |   2 +-
 htdocs/langs/ro_RO/compta.lang            |  11 +-
 htdocs/langs/ro_RO/errors.lang            |   4 +-
 htdocs/langs/ro_RO/install.lang           |   4 +
 htdocs/langs/ro_RO/link.lang              |   1 +
 htdocs/langs/ro_RO/mails.lang             |   2 +-
 htdocs/langs/ro_RO/main.lang              |   6 +
 htdocs/langs/ro_RO/other.lang             |   4 +-
 htdocs/langs/ro_RO/products.lang          |   4 +-
 htdocs/langs/ro_RO/projects.lang          |   6 +-
 htdocs/langs/ro_RO/receiptprinter.lang    |  32 ++
 htdocs/langs/ro_RO/stripe.lang            |   3 +-
 htdocs/langs/ro_RO/users.lang             |   4 +-
 htdocs/langs/ro_RO/website.lang           |   8 +-
 htdocs/langs/ru_RU/admin.lang             |  38 +-
 htdocs/langs/ru_RU/bills.lang             |  16 +-
 htdocs/langs/ru_RU/blockedlog.lang        |   2 +-
 htdocs/langs/ru_RU/cashdesk.lang          |  21 +-
 htdocs/langs/ru_RU/companies.lang         |   2 +-
 htdocs/langs/ru_RU/compta.lang            |  11 +-
 htdocs/langs/ru_RU/errors.lang            |   4 +-
 htdocs/langs/ru_RU/install.lang           |   4 +
 htdocs/langs/ru_RU/link.lang              |   1 +
 htdocs/langs/ru_RU/mails.lang             |   2 +-
 htdocs/langs/ru_RU/main.lang              |   6 +
 htdocs/langs/ru_RU/other.lang             |   4 +-
 htdocs/langs/ru_RU/products.lang          |   4 +-
 htdocs/langs/ru_RU/projects.lang          |   6 +-
 htdocs/langs/ru_RU/receiptprinter.lang    |  32 ++
 htdocs/langs/ru_RU/stripe.lang            |   3 +-
 htdocs/langs/ru_RU/users.lang             |   7 +-
 htdocs/langs/ru_RU/website.lang           |   8 +-
 htdocs/langs/sk_SK/admin.lang             |  38 +-
 htdocs/langs/sk_SK/bills.lang             |  16 +-
 htdocs/langs/sk_SK/blockedlog.lang        |   2 +-
 htdocs/langs/sk_SK/cashdesk.lang          |  21 +-
 htdocs/langs/sk_SK/companies.lang         |   2 +-
 htdocs/langs/sk_SK/compta.lang            |  11 +-
 htdocs/langs/sk_SK/errors.lang            |   4 +-
 htdocs/langs/sk_SK/install.lang           |   4 +
 htdocs/langs/sk_SK/link.lang              |   1 +
 htdocs/langs/sk_SK/mails.lang             |   2 +-
 htdocs/langs/sk_SK/main.lang              |   6 +
 htdocs/langs/sk_SK/other.lang             |   4 +-
 htdocs/langs/sk_SK/products.lang          |   4 +-
 htdocs/langs/sk_SK/projects.lang          |   6 +-
 htdocs/langs/sk_SK/receiptprinter.lang    |  32 ++
 htdocs/langs/sk_SK/stripe.lang            |   3 +-
 htdocs/langs/sk_SK/users.lang             |   7 +-
 htdocs/langs/sk_SK/website.lang           |   8 +-
 htdocs/langs/sl_SI/admin.lang             |  38 +-
 htdocs/langs/sl_SI/bills.lang             |  16 +-
 htdocs/langs/sl_SI/blockedlog.lang        |   2 +-
 htdocs/langs/sl_SI/cashdesk.lang          |  21 +-
 htdocs/langs/sl_SI/companies.lang         |   2 +-
 htdocs/langs/sl_SI/compta.lang            |  11 +-
 htdocs/langs/sl_SI/errors.lang            |   4 +-
 htdocs/langs/sl_SI/install.lang           |   4 +
 htdocs/langs/sl_SI/link.lang              |   1 +
 htdocs/langs/sl_SI/mails.lang             |   2 +-
 htdocs/langs/sl_SI/main.lang              |   6 +
 htdocs/langs/sl_SI/other.lang             |   4 +-
 htdocs/langs/sl_SI/products.lang          |   4 +-
 htdocs/langs/sl_SI/projects.lang          |   6 +-
 htdocs/langs/sl_SI/receiptprinter.lang    |  32 ++
 htdocs/langs/sl_SI/stripe.lang            |   3 +-
 htdocs/langs/sl_SI/users.lang             |   7 +-
 htdocs/langs/sl_SI/website.lang           |   8 +-
 htdocs/langs/sq_AL/admin.lang             |  38 +-
 htdocs/langs/sq_AL/bills.lang             |  16 +-
 htdocs/langs/sq_AL/blockedlog.lang        |   2 +-
 htdocs/langs/sq_AL/cashdesk.lang          |  21 +-
 htdocs/langs/sq_AL/companies.lang         |   2 +-
 htdocs/langs/sq_AL/compta.lang            |  11 +-
 htdocs/langs/sq_AL/errors.lang            |   4 +-
 htdocs/langs/sq_AL/install.lang           |   4 +
 htdocs/langs/sq_AL/link.lang              |   1 +
 htdocs/langs/sq_AL/mails.lang             |   2 +-
 htdocs/langs/sq_AL/main.lang              |   6 +
 htdocs/langs/sq_AL/other.lang             |   4 +-
 htdocs/langs/sq_AL/products.lang          |   4 +-
 htdocs/langs/sq_AL/projects.lang          |   6 +-
 htdocs/langs/sq_AL/receiptprinter.lang    |  32 ++
 htdocs/langs/sq_AL/stripe.lang            |   3 +-
 htdocs/langs/sq_AL/users.lang             |   7 +-
 htdocs/langs/sq_AL/website.lang           |   8 +-
 htdocs/langs/sr_RS/admin.lang             |  38 +-
 htdocs/langs/sr_RS/bills.lang             |  16 +-
 htdocs/langs/sr_RS/cashdesk.lang          |  21 +-
 htdocs/langs/sr_RS/companies.lang         |   2 +-
 htdocs/langs/sr_RS/compta.lang            |  11 +-
 htdocs/langs/sr_RS/errors.lang            |   4 +-
 htdocs/langs/sr_RS/install.lang           |   4 +
 htdocs/langs/sr_RS/link.lang              |   1 +
 htdocs/langs/sr_RS/mails.lang             |   2 +-
 htdocs/langs/sr_RS/main.lang              |   6 +
 htdocs/langs/sr_RS/other.lang             |   4 +-
 htdocs/langs/sr_RS/products.lang          |   4 +-
 htdocs/langs/sr_RS/projects.lang          |   6 +-
 htdocs/langs/sr_RS/users.lang             |   7 +-
 htdocs/langs/sv_SE/admin.lang             |  38 +-
 htdocs/langs/sv_SE/bills.lang             |  16 +-
 htdocs/langs/sv_SE/blockedlog.lang        |   2 +-
 htdocs/langs/sv_SE/cashdesk.lang          |  21 +-
 htdocs/langs/sv_SE/companies.lang         |   2 +-
 htdocs/langs/sv_SE/compta.lang            |  11 +-
 htdocs/langs/sv_SE/errors.lang            |   4 +-
 htdocs/langs/sv_SE/install.lang           |   4 +
 htdocs/langs/sv_SE/link.lang              |   1 +
 htdocs/langs/sv_SE/mails.lang             |   2 +-
 htdocs/langs/sv_SE/main.lang              |   6 +
 htdocs/langs/sv_SE/other.lang             |   4 +-
 htdocs/langs/sv_SE/products.lang          |   4 +-
 htdocs/langs/sv_SE/projects.lang          |   6 +-
 htdocs/langs/sv_SE/receiptprinter.lang    |  32 ++
 htdocs/langs/sv_SE/stripe.lang            |   3 +-
 htdocs/langs/sv_SE/users.lang             |   9 +-
 htdocs/langs/sv_SE/website.lang           |   8 +-
 htdocs/langs/sw_SW/admin.lang             |  38 +-
 htdocs/langs/sw_SW/bills.lang             |  16 +-
 htdocs/langs/sw_SW/cashdesk.lang          |  21 +-
 htdocs/langs/sw_SW/companies.lang         |   2 +-
 htdocs/langs/sw_SW/compta.lang            |  11 +-
 htdocs/langs/sw_SW/errors.lang            |   4 +-
 htdocs/langs/sw_SW/install.lang           |   4 +
 htdocs/langs/sw_SW/link.lang              |   1 +
 htdocs/langs/sw_SW/mails.lang             |   2 +-
 htdocs/langs/sw_SW/main.lang              |   6 +
 htdocs/langs/sw_SW/other.lang             |   4 +-
 htdocs/langs/sw_SW/products.lang          |   4 +-
 htdocs/langs/sw_SW/projects.lang          |   6 +-
 htdocs/langs/sw_SW/users.lang             |   7 +-
 htdocs/langs/th_TH/admin.lang             |  38 +-
 htdocs/langs/th_TH/bills.lang             |  16 +-
 htdocs/langs/th_TH/blockedlog.lang        |   2 +-
 htdocs/langs/th_TH/cashdesk.lang          |  21 +-
 htdocs/langs/th_TH/companies.lang         |   2 +-
 htdocs/langs/th_TH/compta.lang            |  11 +-
 htdocs/langs/th_TH/errors.lang            |   4 +-
 htdocs/langs/th_TH/install.lang           |   4 +
 htdocs/langs/th_TH/link.lang              |   1 +
 htdocs/langs/th_TH/mails.lang             |   2 +-
 htdocs/langs/th_TH/main.lang              |   6 +
 htdocs/langs/th_TH/other.lang             |   4 +-
 htdocs/langs/th_TH/products.lang          |   4 +-
 htdocs/langs/th_TH/projects.lang          |   6 +-
 htdocs/langs/th_TH/receiptprinter.lang    |  32 ++
 htdocs/langs/th_TH/stripe.lang            |   3 +-
 htdocs/langs/th_TH/users.lang             |   7 +-
 htdocs/langs/th_TH/website.lang           |   8 +-
 htdocs/langs/tr_TR/admin.lang             |  72 +--
 htdocs/langs/tr_TR/bills.lang             |  16 +-
 htdocs/langs/tr_TR/blockedlog.lang        |   2 +-
 htdocs/langs/tr_TR/cashdesk.lang          |  21 +-
 htdocs/langs/tr_TR/companies.lang         |   2 +-
 htdocs/langs/tr_TR/compta.lang            |  11 +-
 htdocs/langs/tr_TR/errors.lang            |   4 +-
 htdocs/langs/tr_TR/install.lang           |   4 +
 htdocs/langs/tr_TR/link.lang              |   1 +
 htdocs/langs/tr_TR/mails.lang             |   2 +-
 htdocs/langs/tr_TR/main.lang              |  16 +-
 htdocs/langs/tr_TR/other.lang             |   4 +-
 htdocs/langs/tr_TR/products.lang          |  26 +-
 htdocs/langs/tr_TR/projects.lang          |   6 +-
 htdocs/langs/tr_TR/receiptprinter.lang    |  32 ++
 htdocs/langs/tr_TR/stripe.lang            |   3 +-
 htdocs/langs/tr_TR/users.lang             |  11 +-
 htdocs/langs/tr_TR/website.lang           |   8 +-
 htdocs/langs/uk_UA/admin.lang             |  38 +-
 htdocs/langs/uk_UA/bills.lang             |  16 +-
 htdocs/langs/uk_UA/blockedlog.lang        |   2 +-
 htdocs/langs/uk_UA/cashdesk.lang          |  21 +-
 htdocs/langs/uk_UA/companies.lang         |   2 +-
 htdocs/langs/uk_UA/compta.lang            |  11 +-
 htdocs/langs/uk_UA/errors.lang            |   4 +-
 htdocs/langs/uk_UA/install.lang           |   4 +
 htdocs/langs/uk_UA/link.lang              |   1 +
 htdocs/langs/uk_UA/mails.lang             |   2 +-
 htdocs/langs/uk_UA/main.lang              |   6 +
 htdocs/langs/uk_UA/other.lang             |   4 +-
 htdocs/langs/uk_UA/products.lang          |   4 +-
 htdocs/langs/uk_UA/projects.lang          |   6 +-
 htdocs/langs/uk_UA/receiptprinter.lang    |  32 ++
 htdocs/langs/uk_UA/stripe.lang            |   3 +-
 htdocs/langs/uk_UA/users.lang             |   7 +-
 htdocs/langs/uk_UA/website.lang           |   8 +-
 htdocs/langs/uz_UZ/admin.lang             |  38 +-
 htdocs/langs/uz_UZ/bills.lang             |  16 +-
 htdocs/langs/uz_UZ/cashdesk.lang          |  21 +-
 htdocs/langs/uz_UZ/companies.lang         |   2 +-
 htdocs/langs/uz_UZ/compta.lang            |  11 +-
 htdocs/langs/uz_UZ/errors.lang            |   4 +-
 htdocs/langs/uz_UZ/install.lang           |   4 +
 htdocs/langs/uz_UZ/link.lang              |   1 +
 htdocs/langs/uz_UZ/mails.lang             |   2 +-
 htdocs/langs/uz_UZ/main.lang              |   6 +
 htdocs/langs/uz_UZ/other.lang             |   4 +-
 htdocs/langs/uz_UZ/products.lang          |   4 +-
 htdocs/langs/uz_UZ/projects.lang          |   6 +-
 htdocs/langs/uz_UZ/users.lang             |   7 +-
 htdocs/langs/vi_VN/admin.lang             |  38 +-
 htdocs/langs/vi_VN/bills.lang             |  16 +-
 htdocs/langs/vi_VN/blockedlog.lang        |   2 +-
 htdocs/langs/vi_VN/cashdesk.lang          |  21 +-
 htdocs/langs/vi_VN/companies.lang         |   2 +-
 htdocs/langs/vi_VN/compta.lang            |  11 +-
 htdocs/langs/vi_VN/errors.lang            |   4 +-
 htdocs/langs/vi_VN/install.lang           |   4 +
 htdocs/langs/vi_VN/link.lang              |   1 +
 htdocs/langs/vi_VN/mails.lang             |   2 +-
 htdocs/langs/vi_VN/main.lang              |   6 +
 htdocs/langs/vi_VN/other.lang             |   4 +-
 htdocs/langs/vi_VN/products.lang          |   4 +-
 htdocs/langs/vi_VN/projects.lang          |   6 +-
 htdocs/langs/vi_VN/receiptprinter.lang    |  32 ++
 htdocs/langs/vi_VN/stripe.lang            |   3 +-
 htdocs/langs/vi_VN/users.lang             |   4 +-
 htdocs/langs/vi_VN/website.lang           |   8 +-
 htdocs/langs/zh_CN/admin.lang             |  38 +-
 htdocs/langs/zh_CN/bills.lang             |  16 +-
 htdocs/langs/zh_CN/blockedlog.lang        |   2 +-
 htdocs/langs/zh_CN/cashdesk.lang          |  21 +-
 htdocs/langs/zh_CN/companies.lang         |   2 +-
 htdocs/langs/zh_CN/compta.lang            |  11 +-
 htdocs/langs/zh_CN/errors.lang            |   4 +-
 htdocs/langs/zh_CN/install.lang           |   4 +
 htdocs/langs/zh_CN/link.lang              |   1 +
 htdocs/langs/zh_CN/mails.lang             |   2 +-
 htdocs/langs/zh_CN/main.lang              |   6 +
 htdocs/langs/zh_CN/other.lang             |   4 +-
 htdocs/langs/zh_CN/products.lang          |   4 +-
 htdocs/langs/zh_CN/projects.lang          |   6 +-
 htdocs/langs/zh_CN/receiptprinter.lang    |  32 ++
 htdocs/langs/zh_CN/stripe.lang            |   3 +-
 htdocs/langs/zh_CN/users.lang             |   7 +-
 htdocs/langs/zh_CN/website.lang           |   8 +-
 htdocs/langs/zh_TW/admin.lang             |  44 +-
 htdocs/langs/zh_TW/bills.lang             |  14 +-
 htdocs/langs/zh_TW/blockedlog.lang        |   2 +-
 htdocs/langs/zh_TW/cashdesk.lang          |  63 ++-
 htdocs/langs/zh_TW/companies.lang         |   2 +-
 htdocs/langs/zh_TW/compta.lang            |  11 +-
 htdocs/langs/zh_TW/errors.lang            |  20 +-
 htdocs/langs/zh_TW/install.lang           |   4 +
 htdocs/langs/zh_TW/link.lang              |   1 +
 htdocs/langs/zh_TW/mails.lang             | 246 +++++-----
 htdocs/langs/zh_TW/main.lang              |   6 +
 htdocs/langs/zh_TW/other.lang             |   6 +-
 htdocs/langs/zh_TW/products.lang          |   4 +-
 htdocs/langs/zh_TW/projects.lang          |   8 +-
 htdocs/langs/zh_TW/receiptprinter.lang    |  32 ++
 htdocs/langs/zh_TW/stripe.lang            |   3 +-
 htdocs/langs/zh_TW/users.lang             |   4 +-
 htdocs/langs/zh_TW/website.lang           |   8 +-
 982 files changed, 8440 insertions(+), 3139 deletions(-)

diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 1627eeacfd9..c316fb0b4a3 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=ملاحظة : لم يتم وضح حد �ي إعدادات الـ PHP الخاص بك
 MaxSizeForUploadedFiles=الحجم الأقصى لتحميل المل�ات (0 لمنع أي تحميل)
 UseCaptchaCode=إستخدم الرسوم كرمز (كابتشا) �ي ص�حة الدخول
-AntiVirusCommand= المسار الكامل لبرنامج مكا�حة ال�يروسات
-AntiVirusCommandExample= مثل ل ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommand=المسار الكامل لبرنامج مكا�حة ال�يروسات
+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= المزيد من الصلاحيات بإستخدام command line
-AntiVirusParamExample= مثال على ClamWin:--database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=نموذج وحدة المحاسبة
 UserSetup=إعداد مستخدم الإدارة
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ 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.
 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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=انظر إعداد وحدة٪ الصورة
 Updated=Updated
 Nouveauté=Novelty
 AchatTelechargement=Buy / Download
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
 ActivateOn=على ت�عيل
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=الوحدة الخارجية - المثبتة �ي الدليل %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=الحر� الأول الباركود الشامل أو إعادة للمنتجات أو الخدمات
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=المناطق
 DictionaryCountry=الدول
 DictionaryCurrency=العملات
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=أسعار الضريبة على القيمة المضا�ة أو ضريبة المبيعات الاسعار
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=معدل
 LocalTax1IsNotUsed=لا تستخدم الضريبة الثانية
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=ا�تراضيا IRPF المقترحة هي 0. نهاية الحكم.
 LocalTax2IsUsedExampleES=�ي اسبانيا ، لحسابهم الخاص والمهنيين المستقلين الذين يقدمون الخدمات والشركات الذين اختاروا النظام الضريبي من وحدات.
 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 des 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=تقارير عن الضرائب المحلية
 CalcLocaltax1=مبيعات - مشتريات
 CalcLocaltax1Desc=وتحسب تقارير الضرائب المحلية مع ال�رق بين localtaxes المبيعات والمشتريات localtaxes
@@ -1018,6 +1025,7 @@ CalcLocaltax2=مشتريات
 CalcLocaltax2Desc=تقارير الضرائب المحلية هي مجموعه localtaxes المشتريات
 CalcLocaltax3=مبيعات
 CalcLocaltax3Desc=تقارير الضرائب المحلية هي مجموعه localtaxes المبيعات
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=العلامة التي يستخدمها التقصير إذا لم يمكن العثور على ترجمة للقانون
 LabelOnDocuments=علامة على وثائق
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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=مراجعة الحسابات الأحداث الأمنية
 Audit=المراجعة
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=شاهد الإعداد وحدة
 UserMailRequired=Email required to create a new user
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=HRM وحدة الإعداد
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=�اتورة نماذج الوثائق
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=قوة تاريخ ال�اتورة تاريخ المصادقة على
-SuggestedPaymentModesIfNotDefinedInInvoice=واقترح على طريقة د�ع ال�واتير تلقائيا اذا لم تعر� لل�اتورة
+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=نص حر على ال�واتير
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=وحدة إعداد مقترحات تجارية
 ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
 ProposalsPDFModules=اقتراح نماذج الوثائق التجارية
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
 WatermarkOnDraftProposal=العلامة المائية على مشاريع المقترحات التجارية (أي إذا �ارغ)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=اسأل عن وجهة الحساب المصر�ي للاقتراح
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_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=أوامر الترقيم نمائط
 OrdersModelModule=وثائق من أجل النماذج
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 5060a169ae7..9625e9a54b6 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=�واتير الموردين 
 Payment=د�عة
-PaymentBack=الد�ع مرة أخرى
-CustomerInvoicePaymentBack=د�ع العودة
+PaymentBack=رد
+CustomerInvoicePaymentBack=رد
 Payments=المد�وعات
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=تسديدها
 DeletePayment=حذ� الد�عة
 ConfirmDeletePayment=هل انت متأكد انك ترغب �ي حذ� هذه الد�عة؟
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=المد�وعات المستلمة
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=د�ع
 ToMakePaymentBack=تسديد
 ListOfYourUnpaidInvoices=قائمة ال�واتير غير المسددة
 NoteListOfYourUnpaidInvoices=ملاحظة: تحتوي هذه القائمة على ال�واتير الوحيدة لأطرا� ثالثة ترتبط لك كممثل بيع.
-RevenueStamp=طوابع الواردات
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=تم حذ� ال�اتورة
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/ar_SA/blockedlog.lang b/htdocs/langs/ar_SA/blockedlog.lang
index 89228fd0f71..5f6dd79f6f5 100644
--- a/htdocs/langs/ar_SA/blockedlog.lang
+++ b/htdocs/langs/ar_SA/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index dd6f62c3c21..d8014d393ab 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=إضا�ة هذا العنصر
 RestartSelling=التراجع عن بيع
 SellFinished=اكتمل البيع
 PrintTicket=طباعة التذكرة
+SendTicket=Send ticket
 NoProductFound=لم يتم العثور على عناصر
 ProductFound=تم العثور على المنتج
 NoArticle=لا يوجد عناصر
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=ملاحظة : من ال�واتير
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 53e87a2729f..ad09ad636f5 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=شركة "٪ ل" حذ�ها من قاعدة البيانات.
 ListOfContacts=قائمة الاتصالات
 ListOfContactsAddresses=قائمة الاتصالات
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=وتظهر الاتصال
 ContactsAllShort=جميع (بدون �لتر)
 ContactType=نوع الاتصال
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 49d7e5054c9..7eb313a3d83 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- المبالغ المبينة لمع جميع الضرائب المدرجة
-RulesResultDue=- وتتضمن ال�واتير غير المسددة، والن�قات، ضريبة القيمة المضا�ة، والتبرعات سواء كانت بأجر أو لا. هو أيضا يتضمن الرواتب المد�وعة. <br> - وهو يستند إلى تاريخ المصادقة على ال�واتير وضريبة القيمة المضا�ة وعلى الموعد المحدد للن�قات. لرواتب محددة مع وحدة الراتب، يتم استخدام قيمة تاريخ الد�ع.
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- ويشمل المد�وعات الحقيقية المحرز �ي ال�واتير والمصاري� والضريبة على القيمة المضا�ة والرواتب. <br> - لأنه يقوم على مواعيد د�ع ال�واتير والمصاري� والضريبة على القيمة المضا�ة والرواتب. تاريخ التبرع للتبرع.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=التسمية قصيرة
+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
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 6810547c909..c1cfd43814f 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=المل� لم تتلق تماما بواسطة الخادم.
 ErrorNoTmpDir=%s directy مؤقتة لا وجود.
 ErrorUploadBlockedByAddon=حظر حمل من قبل البرنامج المساعد بى اباتشي /.
 ErrorFileSizeTooLarge=حجم المل� كبير جدا.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=طويل جدا بالنسبة نوع INT (%s أرقام كحد أقصى) حجم
 ErrorSizeTooLongForVarcharType=وقتا طويلا لنوع السلسلة (%s حر� كحد أقصى) حجم
 ErrorNoValueForSelectType=يرجى ملء قيمة لقائمة مختارة
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعري� أي تسجيل دخول أو كلمة المرور لأحد أ�راد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الح�اظ على هذا الحقل �ارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 57d86ff2a83..60fe91b918f 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=تم إعداد الجلسة الزمنية للذاكرة �ي  PHP الى <b>%s</b> . من الم�ترض ان تكون كا�ية.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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=دليل ٪ ق لا يوجد.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ar_SA/link.lang b/htdocs/langs/ar_SA/link.lang
index dd19eb683a0..18b8a80fecb 100644
--- a/htdocs/langs/ar_SA/link.lang
+++ b/htdocs/langs/ar_SA/link.lang
@@ -7,4 +7,5 @@ ErrorFileNotLinked=لا يمكن ربط المل�
 LinkRemoved= الرابط%sتم إزالتة 
 ErrorFailedToDeleteLink= �شل �ي إزالة الرابط '<b> %s </b>'
 ErrorFailedToUpdateLink= �شل تحديث الرابط '<b> %s </b>'
-URLToLink=الرابط لربطه
+URLToLink=عنوان URL للربط
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 66d53f91fb3..0f3ece4cca0 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=معلومات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index acdedfeb1e0..b0df25d3f55 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=لا توجد بيانات لاستنساخ محددة.
 Of=من
@@ -829,6 +830,8 @@ Gender=جنس
 Genderman=رجل
 Genderwoman=امرأة
 ViewList=عرض القائمة
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=إلزامي
 Hello=أهلا
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index b266e30cab7..50522e619b0 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=العنوان
 WEBSITE_DESCRIPTION=الوص�
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index e35fb90932a..84088913fff 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=الحر� الأول الباركود الشامل
 MassBarcodeInitDesc=هذه الص�حة يمكن استخدامها لتهيئة الباركود على الكائنات التي لا يكون الباركود تعري�. تحقق قبل أن الإعداد وحدة الباركود كاملة.
 ProductAccountancyBuyCode=كود المحاسبة (شراء)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=كود المحاسبة (بيع)
 ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
 ProductAccountancySellExportCode=Accounting code (sale export)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=بلد المنشأ
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=التسمية قصيرة
 Unit=وحدة
 p=Ø´.
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 1705bce206c..e92384e6dc2 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=وقت
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=عبء العمل المخطط لها
 PlannedWorkloadShort=عبء العمل
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=يجب التحقق من صحة المشروع أولا
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=إدخال يوميا
 InputPerWeek=مساهمة �ي الأسبوع
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=�اتورة جديدة
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/ar_SA/receiptprinter.lang b/htdocs/langs/ar_SA/receiptprinter.lang
index 5fec542953f..ddc0c867bbb 100644
--- a/htdocs/langs/ar_SA/receiptprinter.lang
+++ b/htdocs/langs/ar_SA/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=طابعة وهمية
 CONNECTOR_NETWORK_PRINT=طابعة الشبكة
 CONNECTOR_FILE_PRINT=الطابعة المحلية
 CONNECTOR_WINDOWS_PRINT=طابعة ويندوز المحلية
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=طابعة وهمية لاختبار، لا ي�عل شيئا
 CONNECTOR_NETWORK_PRINT_HELP=10.xxx:9100
 CONNECTOR_FILE_PRINT_HELP=/ دي� / USB / lp0، / دي� / USB / LP1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1، COM1، �لان: // FooUser: السر @ الكمبيوتر / مجموعة العمل / استلام الطابعة
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=مل� التعري� الا�تراضي
 PROFILE_SIMPLE=مل� التعري� بسيط
 PROFILE_EPOSTEP=ملحمة تيب المل� الشخصي
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=عاصمة
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ar_SA/stripe.lang b/htdocs/langs/ar_SA/stripe.lang
index 421ef62e1f8..0fac9d2d553 100644
--- a/htdocs/langs/ar_SA/stripe.lang
+++ b/htdocs/langs/ar_SA/stripe.lang
@@ -32,6 +32,7 @@ VendorName=اسم البائع
 CSSUrlForPaymentForm=عزيزي ورقة النمط المغلق للنموذج الد�ع
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index 6b8ad486f97..2d79e755885 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=منح إذن لأن الموروث من واحد من المستخدم.
 Inherited=موروث
 UserWillBeInternalUser=وسو� يكون المستخدم إنشاء مستخدم داخلية (لأنه لا يرتبط طر� ثالث خاص)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 07bfd981cf9..4def736100c 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index dfa35253ad2..aff61d22ae5 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Забележка: <b> Вашата </b> PHP конфи
 NoMaxSizeByPHPLimit=Забележка: �е е зададено ограничение във вашата PHP конфигураци�
 MaxSizeForUploadedFiles=Мак�имален размер за качени файлове (0 за забрана на качването)
 UseCaptchaCode=Използване на графичен код (CAPTCHA) на �траницата за вход
-AntiVirusCommand= Пълен път към антивиру�на команда
-AntiVirusCommandExample= Пример за ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe <br> Пример за ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Пълен път към антивиру�на команда
+AntiVirusCommandExample=Пример за ClamAv Daemon (изи�ква clamav-daemon): /usr/bin/clamdscan<br>Пример за ClamWin (много забав�щ): C:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Още параметри в командни� ред
-AntiVirusParamExample= Пример за ClamWin: --database="C:\\Programm Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Пример за ClamAv Daemon: --fdpass<br>Пример за ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=�а�тройка на модул Счетовод�тво
 UserSetup=�а�тройка за управление на потребители
 MultiCurrencySetup=�а�тройки на различни валути
@@ -136,7 +136,7 @@ Boxes=Джаджи
 MaxNbOfLinesForBoxes=Мак�имален брой редове за джаджи
 AllWidgetsWereEnabled=В�ички налични джаджи �а активирани
 PositionByDefault=Позици� по подразбиране
-Position=Длъжно�т
+Position=Позици�
 MenusDesc=Меню мениджърите определ�т �ъдържанието на двете ленти � менюта (хоризонтална и вертикална).
 MenusEditorDesc=Редакторът на менюто ви позвол�ва да дефинирате потребител�ки менюта. Използвайте го внимателно, за да избегнете не�табилно�т и трайно недо�тъпни менюта.<br>��кои модули добав�т менюта (най-вече в менюто <b>В�ички</b>). �ко премахнете н�кои от тези менюта по погрешка, можете да ги въз�тановите като деактивирате и да активирате отново модула.
 MenuForUsers=Меню за потребители
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Функци�та е деактивирана в демо
 FeatureAvailableOnlyOnStable=Функци�та �е предлага �амо в официални �табилни вер�ии
 BoxesDesc=Джаджите �а компоненти, показващи информаци�, които може да добавите, за да пер�онализирате н�кои �траници. Можете да избирате между показване на джаджата или не, като изберете целевата �траница и кликнете върху '�ктивиране', или като кликнете върху кошчето, за да � деактивирате.
 OnlyActiveElementsAreShown=Показани �а �амо елементи от <a href="%s">активни модули</a>.
-ModulesDesc=Модулите / приложени�та определ�т кои функции �а налични в �и�темата. ��кои модули изи�кват да �е предо�тав�т �ъответните разрешени� на потребителите �лед активиране на модула. Кликнете върху бутона за включване / изключване (в кра� на реда � името на модула), за да активирате / деактивирате модул / приложение.
+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=Може да намерите още модули за изтегл�не от външни уеб �айтове в интернет...
 ModulesDeployDesc=�ко разрешени�та във вашата файлова �и�тема го позвол�ват, можете да използвате този ин�трумент за ин�талиране на външен модул. След това модулът ще �е вижда в раздела <strong>%s</strong>.
 ModulesMarketPlaces=�амиране на външно приложение / модул
@@ -212,15 +212,17 @@ CompatibleUpTo=Съвме�тим � вер�и� %s
 NotCompatible=Този модул не изглежда �ъвме�тим � Dolibarr %s (Мин. %s - Мак�. %s).
 CompatibleAfterUpdate=Този модул изи�ква актуализаци� на ваши� Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Вижте в онлайн магазина
+SeeSetupOfModule=Вижте на�тройка на модул %s
 Updated=�ктуализиран
 Nouveauté=�ово�т
 AchatTelechargement=Купуване / Изтегл�не
 GoModuleSetupArea=За да разположите / ин�талирате нов модул, отидете в �екци�та за на�тройка на модул: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, официални�т пазар за Dolibarr ERP / CRM външни модули
 DoliPartnersDesc=Спи�ък на компаниите, които предо�тав�т разработване по поръчка модули или функции. <br> Забележка: тъй като Dolibarr е приложение � отворен код, <i> в�еки </i>, който има опит в програмирането на PHP, може да разработи модул.
-WebSiteDesc=Външни уеб�айтове за повече модули за добавки (които не �а о�новни)...
+WebSiteDesc=Външни уеб�айтове � повече модули (които не �а ча�т от �дрото)
 DevelopYourModuleDesc=��кои решени� за разработване на ваш �об�твен модул...
 URL=URL адре�
+RelativeURL=Отно�ителен URL адре�
 BoxesAvailable=�алични джаджи
 BoxesActivated=�ктивирани джаджи
 ActivateOn=�ктивирай на
@@ -252,8 +254,8 @@ ExternalResources=Външни ре�ур�и
 SocialNetworks=Социални мрежи
 ForDocumentationSeeWiki=За потребител�ка документаци� и такава за разработчици (документи, че�то задавани въпро�и,...), <br> погледнете в Dolibarr Wiki: <br> <b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=За в��какви други въпро�и / помощ може да използвате Dolibarr форума: <br> <b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Ето н�кои ре�ур�и за получаване на помощ и подкрепа � Dolibarr.
-HelpCenterDesc2=��кои от тези ре�ур�и �а налице �амо на <b> англий�ки </b>.
+HelpCenterDesc1=Ре�ур�и за получаване на помощ и поддръжка отно�но Dolibarr
+HelpCenterDesc2=��кои от тези ре�ур�и �а до�тъпни �амо на <b>англий�ки език</b>
 CurrentMenuHandler=Текущ манипулатор на менюто
 MeasuringUnit=Мерна единица
 LeftMargin=Л�ва граница
@@ -425,7 +427,7 @@ ExtrafieldCheckBox=Полета за отметка
 ExtrafieldCheckBoxFromList=Отметки от таблица
 ExtrafieldLink=Връзка към обект
 ComputedFormula=Изчи�лено поле
-ComputedFormulaDesc=Тук можете да въведете формула, използвайки други �вой�тва на обекта или PHP код, за да получите динамична изчи�лена �тойно�т. Можете да използвате в�ички �ъвме�тими � PHP формули, включително "?" у�ловен оператор и �ледни� глобален обект: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br> <strong>В�ИМ��ИЕ</strong>: Може да �а налице �амо н�кои �вой�тва на $object. �ко ви тр�бват �вой�тва, които не �а заредени, про�то вземете �ами обекта във вашата формула като във втори� пример. <br> Използването на изчи�лено поле означава, че не можете да въведете никаква �тойно�т от интерфей�а. Също така, ако има �интактична грешка, формулата може да не върне нищо. <br><br> Пример за формула: <br> $object->id<10 ? round($object>id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($ mysoc->zip, 1, 2) <br><br> Пример за презареждане на обект <br>(($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch ($obj->id ? $obj->id:($ obj->rowid ? $obj->rowid: $object->id )) > 0)) ? $reloadedobj->array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br><br> Друг пример за формула за натоварване на обекта и негови� главен обект: <br> (($reloadedobj = new Task ($db)) && ($reloadedobj->fetch ($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch ($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Тук можете да въведете формула, използвайки други �вой�тва на обекта или PHP код, за да получите изчи�лена динамична �тойно�т. Може да използвате в�ички �ъвме�тими � PHP формули, включително "?" у�ловен оператор и �ледни� глобален обект: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>Внимание</strong>: Може да �а налице �амо н�кои �вой�тва на $object. �ко ви тр�бват �вой�тва, които не �а заредени, про�то при�воете обекта във вашата формула като във втори� пример.<br>Използването на изчи�лено поле означава, че не може да въведете никаква �тойно�т от интерфей�а. Също така, ако има �интактична грешка, формулата може да не върне нищо.<br><br>Пример за формула:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Пример за презареждане на обект:<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id:($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Друг пример � формула за принудително зареждане на обект и негов главен обект:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Запазване на изчи�леното поле
 ComputedpersistentDesc=Изчи�лените допълнителни полета ще бъдат �ъхранени в базата данни, но �тойно�тта ще бъде преизчи�лена �амо когато обектът на това поле бъде променен. �ко изчи�леното поле зави�и от други обекти или глобални данни, тази �тойно�т може да е грешна!!
 ExtrafieldParamHelpPassword=О�тав�йки това поле празно означава, че тази �тойно�т ще бъде �ъхранена без криптиране (полето тр�бва да бъде �крито �амо �ъ� звезда на екрана).<br>По�очете 'auto', за да използвате правилото за криптиране по подразбиране и за да запазите паролата в базата данни (тогава четимата �тойно�т ще бъде �амо хеш код и н�ма да има начин да извлечете реалната �тойно�т).
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=О�тавете празно, за да използва
 DefaultLink=Връзка по подразбиране
 SetAsDefault=По�очете по подразбиране
 ValueOverwrittenByUserSetup=Внимание, тази �тойно�т може да бъде презапи�ана от �пецифична за потребител� на�тройка (в�еки потребител може да зададе �вой �об�твен URL адре�)
-ExternalModule=Външен модул - ин�талиран в директори� %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Ма�ова баркод инициализаци� за контрагенти
 BarcodeInitForProductsOrServices=Ма�ово въвеждане на баркод или занул�ване за продукти или у�луги
 CurrentlyNWithoutBarCode=В момента имате <strong>%s</strong> запи�а на <strong>%s</strong> %s без дефиниран баркод.
@@ -868,8 +871,8 @@ Permission1186=Поръчка на поръчки за покупка
 Permission1187=Потвърждаване на получаването на поръчка за покупка
 Permission1188=Изтриване на поръчки за покупка
 Permission1190=Одобр�ване (второ одобрение) на поръчки за покупка
-Permission1201=Получава на резултат от ек�портиране
-Permission1202=Създаване / промен�не на ек�порт на данни
+Permission1201=Получаване на резултат � ек�портирани данни
+Permission1202=Създаване / промен�не на ек�портирани данни
 Permission1231=Преглед на фактури за до�тавка
 Permission1232=Създаване / промен�не на фактури за до�тавка
 Permission1233=Валидиране на фактури за до�тавка
@@ -947,7 +950,7 @@ DictionaryCanton=Обла�ти / Региони
 DictionaryRegion=Региони
 DictionaryCountry=Държави
 DictionaryCurrency=Валути
-DictionaryCivility=Обръщени�
+DictionaryCivility=Honorific titles
 DictionaryActions=Видове �ъбити� в календара
 DictionarySocialContributions=Видове �оциални или фи�кални данъци
 DictionaryVAT=Ставки на ДДС или Данък върху продажби
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=По подразбиране предложената �тав
 VATIsUsedExampleFR=Във Франци� това означава друже�тва или организации, които имат реална фи�кална �и�тема (опро�тена реална или нормална реална). Си�тема, в ко�то е деклариран ДДС.
 VATIsNotUsedExampleFR=Във Франци� това означава а�оциации, които не декларират данък върху продажбите или компании, организации, или �вободни профе�ии, които �а избрали фи�калната �и�тема за микропредпри�ти� (данък върху продажбите във франчайз) и �а платили франчайз данък върху продажбите без деклараци� за данък върху продажбите. Този избор ще покаже информаци� за "�еприложим данък върху продажбите - art-293B от CGI" във фактурите.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Ставка
 LocalTax1IsNotUsed=Да не �е използва втори данък
 LocalTax1IsUsedDesc=Използване на втори тип данък (различен от първи�)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Ставката на IRPF по подразбиране 
 LocalTax2IsNotUsedDescES=По подразбиране предложената IRPF е 0. Край на правилото.
 LocalTax2IsUsedExampleES=В И�пани�, профе�ионали�тите на �вободна практика и незави�имите профе�ионали�ти, които предо�тав�т у�луги и фирми, които �а избрали данъчната �и�тема от модули.
 LocalTax2IsNotUsedExampleES=В И�пани� те �а предпри�ти�, които не подлежат на данъчна �и�тема от модули.
+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 des 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=Справки за ме�тни данъци
 CalcLocaltax1=Продажби - Покупки
 CalcLocaltax1Desc=Справките за ме�тни данъци �е изчи�л�ват � разликата между размера ме�тни данъци от продажби и размера ме�тни данъци от покупки.
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Покупки
 CalcLocaltax2Desc=Справки за ме�тни данъци �е определ�т, чрез размера на ме�тни данъци от общи покупки
 CalcLocaltax3=Продажби
 CalcLocaltax3Desc=Справки за ме�тни данъци �е определ�т, чрез размера на ме�тни данъци от общи продажби
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Име, използвано по подразбиране, ако не може да бъде намерен превод за кода
 LabelOnDocuments=Тек�т в документи
 LabelOrTranslationKey=Име или ключ за превод
@@ -1091,11 +1099,11 @@ Alerts=Сигнали
 DelaysOfToleranceBeforeWarning=Закъ�нение преди показване на предупредителен �игнал за:
 DelaysOfToleranceDesc=Задаване на закъ�нение, преди на екрана да �е покаже иконата за предупреждение %s за закъ�нели� елемент.
 Delays_MAIN_DELAY_ACTIONS_TODO=Планирани �ъбити� (�ъбити� в календара), които не �а завършени
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Проект, който не е затворен навреме
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Проект, който не е приключен навреме
 Delays_MAIN_DELAY_TASKS_TODO=Планирана задача (задача от проект), ко�то не е завършена
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Поръчка, ко�то не е обработена
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Поръчка за покупка, ко�то не е обработена
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Предложение, което не е затворено
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Предложение, което не е приключено
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Предложение, което не е фактурирано
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=У�луга, ко�то не е активирана
 Delays_MAIN_DELAY_RUNNING_SERVICES=У�луга, ко�то е изтекла
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Разходен отчет, който не е
 Delays_MAIN_DELAY_HOLIDAYS=Молби за отпу�к за одобрение
 SetupDescription1=Преди да започнете да използвате Dolibarr тр�бва да �е дефинират н�кои първоначални параметри и да �е активират / конфигурират н�кои модули.
 SetupDescription2=Следните две �екции �а задължителни (първите две подменюта в менюто �а�тройка):
-SetupDescription3=<a href="%s">%s ->%s</a> <br> О�новни параметри, използвани за пер�онализиране на поведението по подразбиране на вашето приложение (например за функции, �вързани �ъ� държавата).
-SetupDescription4=<a href="%s">%s ->%s</a> <br> Този �офтуер е пакет от много модули / приложени�, в�ички повече или по-малко незави�ими. Модулите, �ъответ�тващи на вашите нужди, тр�бва да бъдат активирани и конфигурирани. В менютата �е добав�т нови елементи / опции � активирането на модул.
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>О�новни параметри, използвани за пер�онализиране на поведението по подразбиране на вашата �и�тема (например за функции, �вързани � държавата).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>Този �офтуер е пакет от много модули / приложени�. Модулите, �вързани � вашите нужди, тр�бва да бъдат активирани и конфигурирани. С активирането на тези модули ще �е по�в�т нови менюта.
 SetupDescription5=Менюто "Други на�тройки" управл�ва допълнителни параметри.
 LogEvents=Събити� за проверка на �игурно�тта
 Audit=Проверка
@@ -1128,7 +1136,7 @@ LogEventDesc=�ктивиране на реги�трирането за кон
 AreaForAdminOnly=Параметрите за на�тройка могат да �е задават �амо от <b>�дмини�тратори</b>.
 SystemInfoDesc=Си�темната информаци� е различна техниче�ка информаци�, ко�то получавате в режим �амо за четене и е видима �амо за админи�тратори.
 SystemAreaForAdminOnly=Тази �екци� е до�тъпна �амо за админи�тратори. Потребител�ките права в Dolibarr не могат да промен�т това ограничение.
-CompanyFundationDesc=Редактирайте информаци�та за фирмата / обекта. Кликнете върху бутона '%s' в долната ча�т на �траницата.
+CompanyFundationDesc=Редактирайте информаци�та за вашата фирма / организаци�. Кликнете върху бутона '%s' в долната ча�т на �траницата, когато �те готови.
 AccountantDesc=�ко имате външен �четоводител, тук може да редактирате неговата информаци�.
 AccountantFileNumber=Счетоводен код
 DisplayDesc=Тук могат да �е промен�т параметрите, които вли��т на външни� вид и поведението на Dolibarr.
@@ -1197,7 +1205,7 @@ MAIN_PROXY_PASS=Прок�и �ървър: Парола
 DefineHereComplementaryAttributes=Определете тук в�ички допълнителни / пер�онализирани атрибути, които и�кате да бъдат включени за: %s
 ExtraFields=Допълнителни атрибути
 ExtraFieldsLines=Допълнителни атрибути (редове)
-ExtraFieldsLinesRec=Допълнителни атрибути (шаблонни редове на фактури)
+ExtraFieldsLinesRec=Допълнителни атрибути (редове в шаблонни фактури)
 ExtraFieldsSupplierOrdersLines=Допълнителни атрибути (редове в поръчки за покупка)
 ExtraFieldsSupplierInvoicesLines=Допълнителни атрибути (редове във фактури за покупка)
 ExtraFieldsThirdParties=Допълнителни атрибути (контрагенти)
@@ -1205,7 +1213,7 @@ ExtraFieldsContacts=Допълнителни атрибути (контакти
 ExtraFieldsMember=Допълнителни атрибути (член)
 ExtraFieldsMemberType=Допълнителни атрибути (тип член)
 ExtraFieldsCustomerInvoices=Допълнителни атрибути (фактури за продажба)
-ExtraFieldsCustomerInvoicesRec=Допълнителни атрибути (шаблони на фактури)
+ExtraFieldsCustomerInvoicesRec=Допълнителни атрибути (шаблонни фактури)
 ExtraFieldsSupplierOrders=Допълнителни атрибути (поръчки за покупка)
 ExtraFieldsSupplierInvoices=Допълнителни атрибути (фактури за покупка)
 ExtraFieldsProject=Допълнителни атрибути (проекти)
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Правила за генериране и валид
 DisableForgetPasswordLinkOnLogonPage=Да не �е показва връзката "Забравена парола" на �траницата за вход
 UsersSetup=�а�тройка на модула за потребители
 UserMailRequired=�еобходим е имейл при �ъздаване на нов потребител
+UsersDocModules=Шаблони на документи за потребител�ки профил
+GroupsDocModules=Шаблони на документи за групов профил
 ##### HRM setup #####
 HRMSetup=�а�тройка на модула ЧР
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Шаблони на документи за фактури
 BillsPDFModulesAccordindToInvoiceType=Модели на фактури в зави�имо�т от вида на фактурата
 PaymentsPDFModules=Шаблони на платежни документи
 ForceInvoiceDate=Принуждаване на датата на фактурата да �е �инхронизира � датата на валидиране
-SuggestedPaymentModesIfNotDefinedInInvoice=Предлагане на плащани� по подразбиране, ако не �а определени такива във фактурата
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Да �е предлага плащане по �метка
 SuggestPaymentByChequeToAddress=Да �е предлага плащане � чек
 FreeLegalTextOnInvoices=Свободен тек�т във фактури
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=�а�тройка на плащани� към до�та
 PropalSetup=�а�тройка на модула за търгов�ки предложени�
 ProposalsNumberingModules=Модели за номериране на търгов�ки предложени�
 ProposalsPDFModules=Шаблони на документи за търгов�ки предложени�
-SuggestedPaymentModesIfNotDefinedInProposal=Препоръчителен начин на плащане по подразбиране за търгов�ко предложение, ако не е по�очен
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Свободен тек�т в търгов�ки предложени�
 WatermarkOnDraftProposal=Воден знак върху чернови търгов�ки предложени� (н�ма, ако е празно)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Питане за данни на банкова �метка в търгов�ки предложени�
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Питане за изходен �клад
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Да �е пита за детайли на банковата �метка в поръчките за покупка
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=�а�тройка на модул Поръчки за продажба
 OrdersNumberingModules=Модели за номериране на поръчки
 OrdersModelModule=Шаблони на документи за поръчки
@@ -1618,7 +1629,7 @@ HideUnauthorizedMenu= Скриване на неоторизирани (�иви
 DetailId=Идентификатор на меню
 DetailMenuHandler=Манипулатор на меню, в който да �е покаже новото меню
 DetailMenuModule=Име на модула, ако входните данни на менюто идват от модул
-DetailType=Тип меню (горе или вл�во)
+DetailType=Тип меню (горно или л�во)
 DetailTitre=Име на меню или име на код за превод
 DetailUrl=URL адре�, където менюто ви изпрат� (Absolute на URL линк или външна връзка � http://)
 DetailEnabled=У�ловие за показване или не на впи�ване
@@ -1720,7 +1731,7 @@ MultiCompanySetup=�а�тройка на модула за н�колко фи
 ##### Suppliers #####
 SuppliersSetup=�а�тройка на модул До�тавчици
 SuppliersCommandModel=Пълен шаблон на поръчка за покупка
-SuppliersCommandModelMuscadet=Пълен шаблон на поръчка за покупка (�тара реализаци� на шаблона Cornas)
+SuppliersCommandModelMuscadet=Пълен шаблон на поръчка за покупка 
 SuppliersInvoiceModel=Пълен шаблон на фактура за до�тавка
 SuppliersInvoiceNumberingModel=Модели за номериране на фактури за до�тавка
 IfSetToYesDontForgetPermission=�ко е на�троена различна от нула �тойно�т, не забрав�йте да предо�тавите права на групите или потребителите за второ одобрение
@@ -1834,8 +1845,8 @@ ByDefaultInList=Показване по подразбиране в �пи�ъч
 YouUseLastStableVersion=Използвате по�ледната �табилна вер�и�
 TitleExampleForMajorRelease=Пример за �ъобщение, което може да използвате, за да об�вите това главно издание (не �е колебайте да го използвате на уеб�айтовете �и)
 TitleExampleForMaintenanceRelease=Пример за �ъобщение, което може да използвате, за да об�вите това издание за поддръжка (не �е колебайте да го използвате на уеб�айтовете �и)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s е наличен. Вер�и� %s е главна вер�и� � много нови функции както за потребители, така и за разработчици. Може да го изтеглите от раздела за изтегл�не на портала https://www.dolibarr.org (поддиректори� Стабилни вер�ии). Може да прочетете <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> за пълен �пи�ък � промените.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s е наличен. Вер�и�та %s е поддържаща вер�и�, така че �ъдържа �амо корекции на грешки. Препоръчваме на в�ички потребители да актуализират до тази вер�и�. Изданието за поддръжка не въвежда нови функции или промени в базата данни. Може да го изтеглите от раздела за изтегл�не на портала https://www.dolibarr.org (поддиректори� Стабилни вер�ии). Може да прочетете <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> за пълен �пи�ък � промените.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s е наличен. Вер�и� %s е главна вер�и� � много нови функции както за потребители, така и за разработчици. Може да �е изтегли от раздела за изтегл�не в портала https://www.dolibarr.org (подраздел Стабилни вер�ии). Прочетете <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> за пълен �пи�ък � промените.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s е наличен. Вер�и� %s е поддържаща вер�и�, така че �ъдържа �амо корекции на грешки. Препоръчваме на в�ички потребители да актуализират до тази вер�и�. Изданието за поддръжка не въвежда нови функции или промени в базата данни. Може да �е изтегли от раздела за изтегл�не в портала https://www.dolibarr.org (подраздел Стабилни вер�ии). Прочетете <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> за пълен �пи�ък � промените.
 MultiPriceRuleDesc=Когато опци�та "��колко нива на цени за продукт / у�луга" е активирана може да определите различни цени (по едно за ниво цена) за в�еки продукт. За да �пе�тите време тук може да въведете правило за автоматично изчи�л�ване на цена за в��ко ниво на базата на цената от първото ниво, така че ще тр�бва да въведете �амо цена за първото ниво за в�еки продукт. Тази �траница е предназначена да ви �пе�ти време, но е полезна �амо ако цените за в��ко ниво �а отно�ителни към първо ниво. В повечето �лучаи може да игнорирате тази �траница.
 ModelModulesProduct=Шаблони за продуктови документи
 ToGenerateCodeDefineAutomaticRuleFirst=За да можете автоматично да генерирате кодове, първо тр�бва да определите мениджър, за да дефинирате автоматично номера на баркода.
@@ -1884,9 +1895,9 @@ RemoveSpecialChars=Премахване на �пециални �имволи
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex филтър за изчи�тване на �тойно�тта (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex филтър за чи�та �тойно�т (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Дублирането не е позволено
-GDPRContact=Длъжно�тно лице по защита на данните (DPO, Защита на лични данни или GDPR контакт)
+GDPRContact=Длъжно�тно лице по защита на данните (DPO, защита на лични данни или GDPR контакт)
 GDPRContactDesc=�ко �ъхран�вате данни за европей�ки компании / граждани, тук може да по�очите контакт, който е отговорен за Общи� регламент за защита на данните /GDPR/
-HelpOnTooltip=Помощен тек�т, който да �е показва в под�казка
+HelpOnTooltip=Под�казка
 HelpOnTooltipDesc=По�тавете тук тек�т или ключ за превод, който да �е покаже в под�казка, когато това поле �е по�ви във формул�р
 YouCanDeleteFileOnServerWith=Може да изтриете този файл от �ървъра � команда в терминала: <br> %s
 ChartLoaded=Сметкопланът е зареден
@@ -1923,7 +1934,7 @@ LoadThirdPartyFromNameOrCreate=Зареждане на името на конт
 WithDolTrackingID=�амерена е Dolibarr референци� в идентификационни� номер на �ъобщението
 WithoutDolTrackingID=�е е намерена Dolibarr референци� в идентификационни� номер на �ъобщението
 FormatZip=Zip
-MainMenuCode=Код на менюто (главно меню)
+MainMenuCode=Код на меню (главно меню)
 ECMAutoTree=Показване на автоматично ECM дърво
 OperationParamDesc=Определете �тойно�ти, които да използвате за дей�твие или как да извличате �тойно�ти. �апример: <br> objproperty1=SET:abc <br> objproperty1=SET:value with replacement of __objproperty1__ <br> objproperty3=SETIFEMPTY:abc <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(*). <br> options_myextrafield=EXTRACT:SUBJECT:([^\\s]*) <br> object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*) <br><br> Използвайте �имвола ; като разделител за извличане или задаване на н�колко �вой�тва.
 OpeningHours=Работно време
@@ -1958,7 +1969,8 @@ DEBUGBAR_LOGS_LINES_NUMBER=Брой по�ледни редове на журн
 WarningValueHigherSlowsDramaticalyOutput=Внимание, по-ви�оките �тойно�ти забав�т драматично производително�тта
 ModuleActivated=Модул %s е активиран и забав� интерфей�а
 EXPORTS_SHARE_MODELS=Моделите за ек�портиране �е �подел�т � в�ички
-ExportSetup=�а�тройка на модула Ек�портиране на данни
+ExportSetup=�а�тройка на модула за ек�портиране на данни
+ImportSetup=�а�тройка на модула за импортиране на данни
 InstanceUniqueID=Уникален идентификатор на ин�танци�та
 SmallerThan=По-малък от
 LargerThan=По-гол�м от
@@ -1979,5 +1991,7 @@ MakeAnonymousPing=�аправете анонимен Ping '+1' до �ървъ
 FeatureNotAvailableWithReceptionModule=Функци�та не е налична, когато е активиран модул Приемане
 EmailTemplate=Шаблон за имейл
 EMailsWillHaveMessageID=Имейлите ще имат етикет „Референции“, отговар�щ на този �интак�и�
-PDF_USE_ALSO_LANGUAGE_CODE=�ко и�кате да имате н�какво тек�тово заглавие във ваши� PDF файл, дублиран на 2 различни езика в един и �ъщ генериран PDF файл, тр�бва да зададете тук този втори език, така генерирани�т PDF файл ще �ъдържа 2 различни езика на една и �ъща �траница, избрани�т при генериране на PDF и този (�амо н�колко PDF шаблона поддържат това). Запазете празно за един език в PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=�ко и�кате да имате н�кои тек�тове във ваши� PDF файл, дублирани на 2 различни езика в един и �ъщ генериран PDF файл, тр�бва да по�очите тук този втори език, така че генерирани�т PDF файл да �ъдържа 2 различни езика на една и �ъща �траница, избрани�т при генериране на PDF и този (�амо н�колко PDF шаблона поддържат това). Запазете празно за един език в PDF файла.
 FafaIconSocialNetworksDesc=Въведете тук кода за FontAwesome икона. �ко не знаете какво е FontAwesome, може да използвате �тандартната �тойно�т fa-address book.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 1d906bde056..6b3ccb21875 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Фактури за до�тавка
 SupplierBill=Фактура за до�тавка
 SupplierBills=Фактури за до�тавка
 Payment=Плащане
-PaymentBack=Обратно плащане
-CustomerInvoicePaymentBack=Обратно плащане
+PaymentBack=Въз�танов�ване
+CustomerInvoicePaymentBack=Въз�танов�ване
 Payments=Плащани�
 PaymentsBack=Въз�танов�вани�
 paymentInInvoiceCurrency=във валута на фактури
 PaidBack=Платено обратно
 DeletePayment=Изтриване на плащане
 ConfirmDeletePayment=Сигурни ли �те че, и�кате да изтриете това плащане?
-ConfirmConvertToReduc=И�кате ли да конвертирате това %s в аб�олютна от�тъпка?
+ConfirmConvertToReduc=И�кате ли да конвертирате товa %s в наличен кредит?
 ConfirmConvertToReduc2=Сумата ще бъде запазена измежду в�ички от�тъпки и може да �е използва като от�тъпка за текуща или бъдеща фактура за този клиент.
-ConfirmConvertToReducSupplier=И�кате ли да конвертирате това %s в аб�олютна от�тъпка?
+ConfirmConvertToReducSupplier=И�кате ли да конвертирате товa %s в наличен кредит?
 ConfirmConvertToReducSupplier2=Сумата ще бъде запазена измежду в�ички от�тъпки и може да �е използва като от�тъпка за текуща или бъдеща фактура за този до�тавчик.
 SupplierPayments=Плащани� към до�тавчици
 ReceivedPayments=Получени плащани�
@@ -205,10 +205,10 @@ ConfirmValidatePayment=Сигурни ли �те, че и�кате да вал
 ValidateBill=Валидиране на фактура
 UnvalidateBill=Повторно отвар�не на фактура
 NumberOfBills=Брой фактури
-NumberOfBillsByMonth=Брой фактури на ме�ец
+NumberOfBillsByMonth=Брой фактури за ме�ец
 AmountOfBills=Сума на фактури
 AmountOfBillsHT=Сума на фактури (без ДДС)
-AmountOfBillsByMonthHT=Сума на фактури по ме�ец (без ДДС)
+AmountOfBillsByMonthHT=Стойно�т на фактури за ме�ец (без ДДС)
 ShowSocialContribution=Показване на �оциален / фи�кален данък
 ShowBill=Показване на фактура
 ShowInvoice=Показване на фактура
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Показване на �итуационна фактур
 UseSituationInvoices=Разрешаване на �итуационна фактура
 UseSituationInvoicesCreditNote=Разрешаване на кредитно изве�тие за �итуационна фактура
 Retainedwarranty=Запазена гаранци�
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Процент по подразбиране за запазена гаранци�
+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=Да �е плати на %s
 toPayOn=да �е плати на %s
 RetainedWarranty=Запазена гаранци�
@@ -509,11 +512,11 @@ ToMakePayment=Плащане
 ToMakePaymentBack=Обратно плащане
 ListOfYourUnpaidInvoices=Спи�ък � неплатени фактури
 NoteListOfYourUnpaidInvoices=Забележка: Този �пи�ък �ъдържа �амо фактури за контрагенти, � които �те �вързан като търгов�ки пред�тавител.
-RevenueStamp=Приходен печат (бандерол)
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Тази опци� е налична �амо при �ъздаване на фактура от раздел "Клиент" на контрагента
 YouMustCreateInvoiceFromSupplierThird=Тази опци� е налична �амо при �ъздаването на фактура от раздел "До�тавчик" на контрагента
 YouMustCreateStandardInvoiceFirstDesc=Първо тр�бва да �ъздадете �тандартна фактура и да � конвертирате в „шаблон“, за да �ъздадете нова шаблонна фактура
-PDFCrabeDescription=PDF шаблон за фактура. Пълен шаблон за фактура (�тара реализаци� на шаблон Sponge)
+PDFCrabeDescription=PDF шаблон за фактура. Пълен шаблон за фактура 
 PDFSpongeDescription=PDF шаблон за фактура. Пълен шаблон за фактура
 PDFCrevetteDescription=PDF шаблон за фактура. Пълен шаблон за �итуационни фактури
 TerreNumRefModelDesc1=Връща номер � формат %syymm-nnnn за �тандартни фактури и %syymm-nnnn за кредитни бележки, където yy е година, mm е ме�ец и nnnn е по�ледователно�т без прекъ�ване и н�ма връщане към 0
@@ -550,7 +553,7 @@ DisabledBecauseFinal=Тази �итуаци� е финална.
 situationInvoiceShortcode_AS=К�ТО
 situationInvoiceShortcode_S=С
 CantBeLessThanMinPercent=�апредъкът не може да бъде по-малък от �тойно�тта в предишната �итуаци�.
-NoSituations=��ма отворени �итуации
+NoSituations=��ма активни �итуации
 InvoiceSituationLast=По�ледна и обща фактура
 PDFCrevetteSituationNumber=Ситуаци� №%s
 PDFCrevetteSituationInvoiceLineDecompte=Ситуационна фактура - Пребро�ване
@@ -575,3 +578,4 @@ AutoFillDateTo=По�очете крайна дата на у�луга в за
 AutoFillDateToShort=Задаване на крайна дата
 MaxNumberOfGenerationReached=Мак�имални�т брой генерирани документи е до�тигнат
 BILL_DELETEInDolibarr=Фактурата е изтрита
+BILL_SUPPLIER_DELETEInDolibarr=Фактурата за до�тавка е изтрита
diff --git a/htdocs/langs/bg_BG/blockedlog.lang b/htdocs/langs/bg_BG/blockedlog.lang
index 372aa24a92b..60c5d813935 100644
--- a/htdocs/langs/bg_BG/blockedlog.lang
+++ b/htdocs/langs/bg_BG/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=�еизменими реги�три
 ShowAllFingerPrintsMightBeTooLong=Показване на в�ички архивирани реги�три (може да �а дълги)
 ShowAllFingerPrintsErrorsMightBeTooLong=Показване на в�ички невалидни архивирани реги�три (може да �а дълги)
 DownloadBlockChain=Изтегл�не на идентификационни данни
-KoCheckFingerprintValidity=Запи�ът в архивирани�т реги�тър не е валиден. Това означава, че н�кой (хакер?) е променил данните тук, �лед като е бил направен запи� или е изтрил предишни� архивиран запи� (�равнете този ред � предишни� #, който �ъще�твува).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Запи�ът в архивирани�т реги�тър е валиден. Данните от този ред не �а променени и запи�ът �ледва предишни�.
 OkCheckFingerprintValidityButChainIsKo=�рхивирани�т реги�тър изглежда валиден в �равнение � предишни�, но веригата е повредена от преди това.
 AddedByAuthority=Съхранено в отдалечен орган
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index a6d1891c088..28d7540f858 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Добавете артикула
 RestartSelling=Обратно към продажбите
 SellFinished=Продажбата е завършена
 PrintTicket=Отпечатване на етикет
+SendTicket=Изпращане на етикет
 NoProductFound=��ма открит артикул
 ProductFound=открит продукт
 NoArticle=��ма артикул
@@ -48,6 +49,7 @@ Footer=Футър
 AmountAtEndOfPeriod=Сума в кра� на периода (ден, ме�ец или година)
 TheoricalAmount=Теоретична �ума
 RealAmount=Реална �ума
+CashFence=Cash fence
 CashFenceDone=Парична граница за периода
 NbOfInvoices=Брой фактури
 Paymentnumpad=Тип Pad за въвеждане на плащане
@@ -56,11 +58,12 @@ BillsCoinsPad=Pad за монети и банкноти
 DolistorePosCategory=TakePOS модули и други ПОС решени� за Dolibarr
 TakeposNeedsCategories=TakePOS �е нуждае от продуктови категории, за да работи
 OrderNotes=Бележки за поръчка
-CashDeskBankAccountFor=Профил по подразбиране, който да �е използва за плащани� в
+CashDeskBankAccountFor=Сметка по подразбиране, ко�то да �е използва за плащани� �
 NoPaimementModesDefined=В конфигураци�та на TakePOS не е определен тип на плащане
-TicketVatGrouped=Групиране на ДДС по �тавка в билетите
-AutoPrintTickets=�втоматично отпечатване на билети
-EnableBarOrRestaurantFeatures=Включете функции за бар или ре�торант
+TicketVatGrouped=Групиране на ДДС по �тавка в етикети / разпи�ки
+AutoPrintTickets=�втоматично отпечатване на етикети / разпи�ки
+PrintCustomerOnReceipts=Отпечатване на клиент върху етикети / разпи�ки
+EnableBarOrRestaurantFeatures=Функции за бар или ре�торант
 ConfirmDeletionOfThisPOSSale=Потвърждавате ли изтриването на на�то�щата продажба?
 ConfirmDiscardOfThisPOSSale=И�кате ли да отхвърлите тази текуща продажба?
 History=И�тори�
@@ -87,7 +90,19 @@ HeadBar=Заглавна лента
 SortProductField=Поле за �ортиране на продукти
 Browser=Браузър
 BrowserMethodDescription=Про�т и ле�ен отпечатване на разпи�ки. Само н�колко параметъра за конфигуриране на разпи�ката. Отпечатване, чрез браузър.
-TakeposConnectorMethodDescription=Външен модул � допълнителни функции. Възможно�т за отпечатване от облака.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Метод на отпечатване
 ReceiptPrinterMethodDescription=Мощен метод � много параметри. Пълно пер�онализиране � шаблони. �е може да отпечатва от облака.
-ByTerminal=By terminal
+ByTerminal=По терминал
+TakeposNumpadUsePaymentIcon=Използване на икона за плащане в цифрови� панел
+CashDeskRefNumberingModules=Модул за номериране на ка�и
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> тагът �е използва за добав�не на номера на терминала
+TakeposGroupSameProduct=Групиране на едни и �ъщи продукти
+StartAParallelSale=Стартиране на нова паралелна продажба
+ControlCashOpening=Контролиране на ка�а при �тартиране на ПОС
+CloseCashFence=Close cash fence
+CashReport=Паричен отчет
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index d0da486bd28..5118a9a8ede 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Фирма "%s" е изтрита от базата данни.
 ListOfContacts=Спи�ък на контакти / адре�и
 ListOfContactsAddresses=Спи�ък на контакти / адре�и
 ListOfThirdParties=Спи�ък на контрагенти
-ShowCompany=Показване на контрагент
 ShowContact=Показване на контакт
 ContactsAllShort=В�ички (без филтър)
 ContactType=Тип контакт
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Соб�твено име на търгов�ки�
 SaleRepresentativeLastname=Фамили� на търгов�ки� пред�тавител
 ErrorThirdpartiesMerge=При изтриването на контрагента възникна грешка. Мол�, проверете и�тори�та. Промените �а отменени.
 NewCustomerSupplierCodeProposed=Кода на клиент или до�тавчик е вече използван, необходим е нов код.
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=�ачин на плащане - клиент
 PaymentTermsCustomer=У�лови� за плащане - Клиент
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 3b9a13a5d6b..e89f987a70d 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -68,7 +68,7 @@ SpecialExpensesArea=Секци� за в�ички �пециални плаща
 SocialContribution=Социален или фи�кален данък
 SocialContributions=Социални или фи�кални данъци
 SocialContributionsDeductibles=При�падащи �е �оциални или фи�кални данъци
-SocialContributionsNondeductibles=�е при�падащи �е �оциални или данъчни данъци
+SocialContributionsNondeductibles=�е при�падащи �е �оциални или фи�кални данъци
 LabelContrib=Име на вно�ка
 TypeContrib=Тип вно�ка
 MenuSpecialExpenses=Специални разходи
@@ -139,8 +139,8 @@ ConfirmDeleteSocialContribution=Сигурни ли �те, че и�кате д
 ExportDataset_tax_1=Социални / фи�кални данъци и плащани�
 CalcModeVATDebt=Режим <b>%sДДС върху о�четоводени задължени�%s</b>
 CalcModeVATEngagement=Режим <b>%sДДС върху приходи - разходи%s</b>
-CalcModeDebt=�нализ на реги�трираните фактури, дори ако те в�е още не �а о�четоводени в книгата.
-CalcModeEngagement=�нализ на реги�трираните плащани�, дори ако те в�е още не �а о�четоводени в книгата.
+CalcModeDebt=�нализ на реги�трирани фактури, включително на нео�четоводени в книгата
+CalcModeEngagement=�нализ на реги�трирани плащани�, включително на нео�четоводени в книгата
 CalcModeBookkeeping=�нализ на данни, реги�трирани в таблицата на �четоводната книга.
 CalcModeLT1= Режим <b>%sRE върху фактури за продажба - фактури за до�тавка%s</b>
 CalcModeLT1Debt=Режим <b>%sRE върху фактури за продажба%s</b>
@@ -157,17 +157,17 @@ SeeReportInInputOutputMode=Вижте %sанализа на плащани�та
 SeeReportInDueDebtMode=Вижте %sанализа на фактурите%s за изчи�л�ване, който е базиран на реги�тираните фактури, дори и ако те в�е още не �а о�четоводени в книгата.
 SeeReportInBookkeepingMode=Вижте <b>%sСчетоводни� доклад%s</b> за изчи�л�ване на <b>таблицата в �четоводната книга</b>
 RulesAmountWithTaxIncluded=- По�очените �уми �а � включени в�ички данъци
-RulesResultDue=- Включва неизплатени фактури, разходи, ДДС, дарени�, незави�имо дали �а платени или не. Включва �ъщо платени заплати. <br> - О�новава �е на датата на валидиране на фактурите и ДДС и на датата на падежа на разходите. За заплати, определени � модула заплати �е използва датата на плащането.
-RulesResultInOut=- Включва реалните плащани� по фактури, разходи, ДДС и заплати. <br> - О�новава �е на датите на плащане на фактурите, разходите, ДДС и заплатите. Датата на дарение за дарени�.
-RulesCADue=- Включва дължимите фактури на клиента, незави�имо дали �а платени или не. <br>- Базирани на датата на валидиране на тези фактури.<br>
-RulesCAIn=- Включва в�ички ефективни плащани� по фактури, получени от клиенти. <br>- Базирани на датата на плащане на тези фактури<br>
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultInOut=- Включва реални плащани� по фактури, разходи, ДДС и заплати<br>- О�новава �е на дата на плащане на фактури, разходи, ДДС и заплати. Дата на дарение за дарени�.
+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=Включва в�ички кредитни линии от журнала за продажба.
 RulesAmountOnInOutBookkeepingRecord=Включва запи� във вашата книга �ъ� �четоводни �метки, които �а в групата "Р�ЗХОД" или "ПРИХОД"
 RulesResultBookkeepingPredefined=Включва запи� във вашата книга �ъ� �четоводни �метки, които �а в групата "Р�ЗХОД" или "ПРИХОД"
 RulesResultBookkeepingPersonalized=Показва запи� във вашата книга �ъ� �четоводни �метки <b>, групирани в пер�онализирани групи</b>
 SeePageForSetup=Вижте менюто <a href="%s">%s</a> за на�тройка
-DepositsAreNotIncluded=- Фактурите за аван�ови плащани� не �а включени
-DepositsAreIncluded=- Фактурите за аван�ови плащани� �а включени
+DepositsAreNotIncluded=- �е включва фактури за аван�ови плащани�
+DepositsAreIncluded=- Включва фактури за аван�ови плащани�
 LT1ReportByCustomers=Справка за данък 2 по контрагент
 LT2ReportByCustomers=Справка за данък 3 по контрагент
 LT1ReportByCustomersES=Справка за RE по контрагент
@@ -219,8 +219,8 @@ Mode1=Метод 1
 Mode2=Метод 2
 CalculationRuleDesc=За изчи�л�ване на общи� ДДС има два метода: <br> Метод 1 закръгл� ДДС за в�еки ред, �лед което ги �умира. <br> Метод 2 �умира ДДС от в�еки ред, �лед което закръгл�ва резултатът. <br> Крайните резултати може да �е различават в изве�тна �тепен. Метод по подразбиране е метод <b>%s</b>.
 CalculationRuleDescSupplier=Според до�тавчика, изберете подход�щ метод, за да приложите �ъщото правило за изчи�ление и да получите �ъщи� резултат, очакван от ваши� до�тавчик.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Справката за оборот, натрупан от продукт, не е наличен. Тази �правка е налице �амо за фактуриран оборот.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Справката за оборот, натрупан от данък върху продажбите, не е наличен. Тази �правка е налице �амо за фактуриран оборот.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Отчетът за оборот, натрупан от продукт, не е наличен. Този отчет е наличен �амо за фактуриран оборот.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Отчетът за оборот, натрупан от данък върху продажбите, не е наличен. Този отчет е наличен �амо за фактуриран оборот.
 CalculationMode=Режим на изчи�ление
 AccountancyJournal=Счетоводен код на журнал
 ACCOUNTING_VAT_SOLD_ACCOUNT=Счетоводна �метка по подразбиране за ДДС при продажби (използва �е, ако не е определена при на�тройка на речника за ДДС)
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Оборот, фактуриран по �тавка на ДД
 TurnoverCollectedbyVatrate=Оборот, натрупан по �тавка на ДДС
 PurchasebyVatrate=Покупка по �тавка на ДДС
 LabelToShow=Кратко означение
+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
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index e8d46885c8a..58564caac1b 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -46,9 +46,9 @@ ErrorUserCannotBeDelete=Потребител�т не може да бъде и
 ErrorFieldsRequired=��кои задължителни полета не �а попълнени.
 ErrorSubjectIsRequired=�еобходима е тема на имейл
 ErrorFailedToCreateDir=�еу�пешно �ъздаване на директори�. Уверете �е, че уеб �ървър потребител има разрешение да пишат в Dolibarr документи. �ко параметър <b>safe_mode</b> е разрешен в тази PHP, проверете дали Dolibarr PHP файлове притежава за потребител� на уеб �ървъра (или група).
-ErrorNoMailDefinedForThisUser=�е поща, определена за този потребител
+ErrorNoMailDefinedForThisUser=��ма дефиниран имейл за този потребител
 ErrorFeatureNeedJavascript=Тази функци� тр�бва ДжаваСкрипт да �е активира, за да работ�т. Променете тази на�тройка - ди�плей.
-ErrorTopMenuMustHaveAParentWithId0=Менюто на &quot;Топ&quot; тип не може да има меню майка. По�тавете 0 в майка меню или изберете меню от типа &quot;л�во&quot;.
+ErrorTopMenuMustHaveAParentWithId0=Меню от тип 'Горно' не може да има главно меню. По�тавете 0 за главно меню или изберете меню от тип 'Л�во'.
 ErrorLeftMenuMustHaveAParentId=Менюто на &quot;левицата&quot; тип тр�бва да имат родител�ки идентификатор.
 ErrorFileNotFound=Файлът не <b>%s</b> намерена (Bad път, грешни права или отказан до�тъп от PHP openbasedir или safe_mode параметър)
 ErrorDirNotFound=Директори� <b>%s</b> не е намерен (Bad път, грешни права или отказан до�тъп от PHP openbasedir или safe_mode параметър)
@@ -59,6 +59,7 @@ ErrorPartialFile=Файла не е получил изц�ло от �ървъ
 ErrorNoTmpDir=Временно за директно %s не �ъще�твува.
 ErrorUploadBlockedByAddon=Качи блокиран от PHP / Apache плъгин.
 ErrorFileSizeTooLarge=Размерът на файла е твърде гол�м.
+ErrorFieldTooLong=Полето %s е твърде дълго
 ErrorSizeTooLongForIntType=Размер твърде дълго за Вътрешна (%s цифри мак�имум)
 ErrorSizeTooLongForVarcharType=Размер твърде дълго за низ тип (%s �имвола мак�имум)
 ErrorNoValueForSelectType=Мол� попълнете �тойно�т за �пи�ък избиране
@@ -122,7 +123,7 @@ ErrorLinesCantBeNegativeForOneVATRate=Total of lines can't be negative for a giv
 ErrorLinesCantBeNegativeOnDeposits=Редовете не могат да бъдат отрицателни при депозит. Ще �е �блъ�кате � проблеми, когато включите депозита в окончателната фактура.
 ErrorQtyForCustomerInvoiceCantBeNegative=Количе�тво за ред в клиент�ка фактура не може да бъде отрицателно
 ErrorWebServerUserHasNotPermission=Потребител�ки акаунт <b>%s</b> използват за извършване на уеб �ървър не разполага � разрешение за това
-ErrorNoActivatedBarcode=�е е тип баркод активира
+ErrorNoActivatedBarcode=��ма активиран тип баркод
 ErrUnzipFails=�еу�пех да разархивирате %s � ZipArchive
 ErrNoZipEngine=��ма ин�трумент за архивиране/разархивиране на файл %s в PHP
 ErrorFileMustBeADolibarrPackage=Файла %s тр�бва да бъде Dolibarr zip архив
@@ -233,8 +234,9 @@ ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Грешка, езикът
 ErrorLanguageOfTranslatedPageIsSameThanThisPage=Грешка, езикът на преведената �траница е �ъщи�т като този.
 ErrorBatchNoFoundForProductInWarehouse=��ма намерен партиден / �ериен номер за продукт '%s' в �клад '%s'.
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=��ма до�татъчно количе�тво от този партиден / �ериен номер за продукт '%s' в �клад '%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 user 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 ?
+ErrorOnlyOneFieldForGroupByIsPossible=Възможно е �амо едно поле за 'Групиране по' (другите �е пренебрегват)
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата �тойно�т на PHP параметър upload_max_filesize (%s) е по-гол�ма от �тойно�тта на PHP параметър post_max_size (%s). Това не е по�ледователна на�тройка.
 WarningPasswordSetWithNoAccount=За този член бе зададена парола. Въпреки това, не е �ъздаден потребител�ки акаунт. Така че тази парола е �ъхранена, но не може да �е използва за влизане в Dolibarr. Може да �е използва от външен модул/интерфей�, но ако не е необходимо да дефинирате потребител�ко име или парола за член може да деактивирате опци�та "Управление на вход за в�еки член" от на�тройката на модула Членове. �ко тр�бва да управл�вате вход, но не �е нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да �е използва и като вход, ако членът е �вързан � потребител.
@@ -259,5 +261,5 @@ WarningYourLoginWasModifiedPleaseLogin=Входните ви данни �а п
 WarningAnEntryAlreadyExistForTransKey=Вече �ъще�твува запи� за ключа за превод за този език
 WarningNumberOfRecipientIsRestrictedInMassAction=Внимание, бро�т на различните получатели е ограничен до <b>%s</b>, когато �е използват ма�ови дей�тви� в �пи�ъците
 WarningDateOfLineMustBeInExpenseReportRange=Внимание, датата на реда не е в обхвата на разходни� отчет
-WarningProjectClosed=Проектът е затворен. Тр�бва първо да го отворите отново.
+WarningProjectClosed=Проектът е приключен. Тр�бва първо да го активирате отново.
 WarningSomeBankTransactionByChequeWereRemovedAfter=��кои банкови транзакции б�ха премахнати, �лед което бе генерирана разпи�ка, в ко�то �а включени. Бро�т на чековете и общата �ума на разпи�ката може да �е различават от бро� и общата �ума в �пи�ъка.
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 008cb0e89bd..e4abfe30de4 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=PHP поддържа Curl.
 PHPSupportCalendar=PHP поддържа разширени� на календари.
 PHPSupportUTF8=PHP поддържа UTF8 функции.
 PHPSupportIntl=PHP поддържа Intl функции.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=PHP поддържа %s функции.
 PHPMemoryOK=Мак�имални�т размер на паметта за PHP �е�и� е на�троен на <b>%s</b>. Това тр�бва да е до�татъчно.
 PHPMemoryTooLow=Ваши�т мак�имален размер на паметта за PHP �е�и� е на�троен на <b> %s </b> байта. Това е твърде ни�ко. Променете <b> php.ini </b> като зададете �тойно�т на параметър <b> memory_limit </b> поне <b> %s </b> байта.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Вашата PHP ин�талаци� не поддъ
 ErrorPHPDoesNotSupportCalendar=Вашата PHP ин�талаци� не поддържа разширени� за календар.
 ErrorPHPDoesNotSupportUTF8=Вашата PHP ин�талаци� не поддържа UTF8 функции. Dolibarr не може да работи правилно. Решете това преди да ин�талирате Dolibarr.
 ErrorPHPDoesNotSupportIntl=Вашата PHP ин�талаци� не поддържа Intl функции.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Вашата PHP ин�талаци� не поддържа %s функции.
 ErrorDirDoesNotExists=Директори�та %s не �ъще�твува.
 ErrorGoBackAndCorrectParameters=Върнете �е назад и проверете / коригирайте параметрите.
@@ -182,10 +184,10 @@ MigrationContractsInvalidDatesNothingToUpdate=��ма неправилни да
 MigrationContractsIncoherentCreationDateUpdate=Корекци� на неправилни дати на �ъздаване в договори
 MigrationContractsIncoherentCreationDateUpdateSuccess=Корекци�та на неправилните дати на �ъздаване в договори е у�пешно извършена
 MigrationContractsIncoherentCreationDateNothingToUpdate=��ма неправилни дати на �ъздаване в договори за коригиране
-MigrationReopeningContracts=Отворен договор е затворен � грешка
+MigrationReopeningContracts=�ктивен договор е приключен � грешка
 MigrationReopenThisContract=Повторно отвар�не на договор %s
 MigrationReopenedContractsNumber=%s променен(и) договор(а)
-MigrationReopeningContractsNothingToUpdate=��ма затворени договори за отвар�не
+MigrationReopeningContractsNothingToUpdate=��ма приключени договори за актуализиране
 MigrationBankTransfertsUpdate=�ктуализиране на връзките между банков запи� и банков превод
 MigrationBankTransfertsNothingToUpdate=В�ички връзки �а актуални
 MigrationShipmentOrderMatching=�ктуализаци� на ек�педиционни бележки
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Приложението �е опита да �
 YouTryInstallDisabledByFileLock=Приложението �е опита да �е �амоактуализира, но �траниците за ин�талаци� / актуализаци� �а били изключени от гледна точка на �игурно�т (от наличието на заключващ файл <strong> install.lock </strong> в директори�та documents на Dolibarr). <br>
 ClickHereToGoToApp=Кликнете тук, за да отидете в приложението �и
 ClickOnLinkOrRemoveManualy=Кликнете върху �ледната връзка. �ко винаги виждате �ъщата �траница, тр�бва да премахнете / преименувате файла install.lock в директори�та documents на Dolibarr.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/bg_BG/link.lang b/htdocs/langs/bg_BG/link.lang
index 82f13ef5198..047d53902e2 100644
--- a/htdocs/langs/bg_BG/link.lang
+++ b/htdocs/langs/bg_BG/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Връзката %s е премахната
 ErrorFailedToDeleteLink= Премахването на връзката '<b>%s</b>' не е у�пешно
 ErrorFailedToUpdateLink= �ктуализаци�та на връзката '<b>%s</b>' не е у�пешна
 URLToLink=URL адре�
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 83e195432d4..e0396ddfaa9 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=��ма намерен контакт/адре� �
 NoContactLinkedToThirdpartieWithCategoryFound=��ма намерен контакт/адре� � тази категори�
 OutGoingEmailSetup=�а�тройка на изход�ща електронна поща
 InGoingEmailSetup=�а�тройка на вход�щата поща
-OutGoingEmailSetupForEmailing=�а�тройка на изход�ща електронна поща (за ма�ово изпращане по имейл)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=�а�тройка на изход�щата поща по подразбиране
 Information=Информаци�
 ContactsWithThirdpartyFilter=Контакти � филтър за контрагент
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index c3f5487e1b0..c5fdbe37db2 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -61,7 +61,7 @@ ErrorDuplicateField=Дублиране в поле � уникални �той
 ErrorSomeErrorWereFoundRollbackIsDone=�амерени �а н�кои грешки. Промените б�ха отменени.
 ErrorConfigParameterNotDefined=Параметър <b> %s </b> не е дефиниран в конфигурационни� файл на Dolibarr <b> conf.php </b>.
 ErrorCantLoadUserFromDolibarrDatabase=�е е открит потребител <b>%s</b> в базата данни.
-ErrorNoVATRateDefinedForSellerCountry=Грешка, не �а дефинирани ДДС �тавки за държавата „%s“.
+ErrorNoVATRateDefinedForSellerCountry=Грешка, не �а дефинирани ДДС �тавки за държавата "%s".
 ErrorNoSocialContributionForSellerCountry=Грешка, не е дефиниран тип за �оциални / фи�кални данъци за държавата "%s".
 ErrorFailedToSaveFile=Грешка, неу�пешно запи�ване на файл.
 ErrorCannotAddThisParentWarehouse=Опитвате �е да добавите о�новен �клад, който вече е под-�клад на �ъще�твуващ �клад
@@ -143,7 +143,7 @@ Activate=�ктивиране
 Activated=�ктивирано
 Closed=Приключен
 Closed2=�еактивен
-NotClosed=�е е затворен
+NotClosed=�е е приключен
 Enabled=�ктивен
 Enable=Включване
 Deprecated=Отхвърлено
@@ -174,6 +174,7 @@ SaveAndStay=Съхран�ване
 SaveAndNew=Съхран�ване и �ъздаване
 TestConnection=Провер�ване на връзката
 ToClone=Клониране
+ConfirmCloneAsk=Сигурни ли �те, че и�кате да клонирате обект <b>%s</b>?
 ConfirmClone=Изберете данни, които и�кате да клонирате:
 NoCloneOptionsSpecified=��ма определени данни за клониране.
 Of=на
@@ -417,7 +418,7 @@ VATNPR=Данъчна �тавка NPR
 DefaultTaxRate=Данъчна �тавка по подразбиране
 Average=Средно
 Sum=Сума
-Delta=Делта
+Delta=Разлика
 StatusToPay=За плащане
 RemainToPay=О�таващо за плащане
 Module=Модул / Приложение
@@ -429,7 +430,7 @@ Statistics=Стати�тика
 OtherStatistics=Други �тати�тиче�ки данни
 Status=Стату�
 Favorite=Фаворит
-ShortInfo=Инфо.
+ShortInfo=Информаци�
 Ref=â„–
 ExternalRef=Външен №
 RefSupplier=Изх. № на до�тавчик
@@ -438,7 +439,7 @@ CommercialProposalsShort=Търгов�ки предложени�
 Comment=Коментар
 Comments=Коментари
 ActionsToDo=Пред�то�щи �ъбити�
-ActionsToDoShort=Да �е направи
+ActionsToDoShort=За извършване
 ActionsDoneShort=Завършено
 ActionNotApplicable=�е �е прилага
 ActionRunningNotStarted=За започване
@@ -457,7 +458,7 @@ ActionsOnContract=Свързани �ъбити�
 ActionsOnMember=Събити� за този член
 ActionsOnProduct=Събити� за този продукт
 NActionsLate=%s закъ�нели
-ToDo=Да �е направи
+ToDo=За извършване
 Completed=Завършено
 Running=В проце�
 RequestAlreadyDone=За�вката вече е запи�ана
@@ -472,8 +473,8 @@ Duration=Продължително�т
 TotalDuration=Обща продължително�т
 Summary=Резюме
 DolibarrStateBoard=Стати�тика от базата данни
-DolibarrWorkBoard=Отворени елементи
-NoOpenedElementToProcess=��ма отворен елемент за обработка
+DolibarrWorkBoard=�ктивни елементи
+NoOpenedElementToProcess=��ма активен елемент за обработка
 Available=�алично
 NotYetAvailable=В�е още не е налично
 NotAvailable=�е е налично
@@ -593,8 +594,8 @@ JoinMainDoc=При�ъединете към о�новни� документ
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Име на отчета
-ReportPeriod=Период на отчета
+ReportName=Име на отчет
+ReportPeriod=Период на отчет
 ReportDescription=Опи�ание
 Report=Отчет
 Keyword=Ключова дума
@@ -659,7 +660,7 @@ AlreadyRead=Вече е прочетено
 NotRead=�епрочетено
 NoMobilePhone=��ма мобилен телефон
 Owner=Соб�твеник
-FollowingConstantsWillBeSubstituted=Следните кон�танти ще бъдат заменени �ъ� �ъответната �тойно�т.
+FollowingConstantsWillBeSubstituted=Следните кон�танти ще бъдат заменени �ъ� �ъответната �тойно�т:
 Refresh=Обнов�ване
 BackToList=�азад към �пи�ъка
 GoBack=�азад
@@ -745,7 +746,7 @@ Result=Резултат
 ToTest=Те�т
 ValidateBefore=Елементът тр�бва да бъде валидиран, преди да използвате тази функци�.
 Visibility=Видимо�т
-Totalizable=Обобщаване
+Totalizable=Обобщено�т
 TotalizableDesc=Това поле е обобщаващо в �пи�ъка
 Private=Личен
 Hidden=Скрит
@@ -829,6 +830,8 @@ Gender=Пол
 Genderman=Мъж
 Genderwoman=Жена
 ViewList=Спи�ъчен изглед
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Задължително
 Hello=Здравейте
 GoodBye=Довиждане
@@ -898,8 +901,8 @@ LeadOrProject=Възможно�т | Проект
 LeadsOrProjects=Възможно�ти | Проекти
 Lead=Възможно�т
 Leads=Възможно�ти
-ListOpenLeads=Отворени възможно�ти
-ListOpenProjects=Отворени проекти
+ListOpenLeads=�ктивни възможно�ти
+ListOpenProjects=�ктивни проекти
 NewLeadOrProject=�ова възможно�т или проект
 Rights=Права
 LineNb=Ред №
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Изберете опциите за изгражд
 Measures=Мерки
 XAxis=Х-о�
 YAxis=Y-о�
+StatusOfRefMustBe=Стату�а на %s тр�бва да бъде %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index b19a1664578..09890779ff5 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -141,7 +141,7 @@ OrderByEMail=Имейл
 OrderByWWW=Онлайн
 OrderByPhone=Телефон
 # Documents models
-PDFEinsteinDescription=Пълен шаблон на поръчка (�тара реализаци� на шаблон Eratosthene))
+PDFEinsteinDescription=Пълен шаблон на поръчка 
 PDFEratostheneDescription=Пълен шаблон на поръчка
 PDFEdisonDescription=Опро�тен шаблон за поръчка
 PDFProformaDescription=Пълен шаблон за проформа-фактура
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index b2d59a2aa81..db0d1a6edd7 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -30,11 +30,11 @@ PreviousYearOfInvoice=Предишна година от дата на факт
 NextYearOfInvoice=Следваща година от дата на фактурата
 DateNextInvoiceBeforeGen=Дата на �ледващата фактура (преди генериране)
 DateNextInvoiceAfterGen=Дата на �ледващата фактура (�лед генериране)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+GraphInBarsAreLimitedToNMeasures=Графиките �а ограничени до %s измервани� в режим 'Ленти'. Вме�то това автоматично е избран режимът 'Линии'.
 OnlyOneFieldForXAxisIsPossible=Пона�то�щем е възможно �амо 1 поле за X-о�. Само първото маркирано поле е избрано.
 AtLeastOneMeasureIsRequired=Изи�ква �е поне 1 поле за измерване
 AtLeastOneXAxisIsRequired=�еобходимо е поне 1 поле за X-о�
-
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=Поръчката за продажба е валидирана
 Notify_ORDER_SENTBYMAIL=Поръчката за продажба е изпратена на имейл
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Поръчката за покупка е изпратена на имейл
@@ -51,7 +51,7 @@ Notify_WITHDRAW_EMIT=Извършване на оттегл�не
 Notify_COMPANY_CREATE=Контрагентът е �ъздаден
 Notify_COMPANY_SENTBYMAIL=Имейли изпратени от картата на контрагента
 Notify_BILL_VALIDATE=Фактурата за продажба е валидирана
-Notify_BILL_UNVALIDATE=Фактурата за продажба е отворена отново
+Notify_BILL_UNVALIDATE=Фактурата за продажба е активна отново
 Notify_BILL_PAYED=Фактурата за продажба е платена
 Notify_BILL_CANCEL=Фактурата за продажба е анулирана
 Notify_BILL_SENTBYMAIL=Фактурата за продажба е изпратена на имейл
@@ -132,9 +132,9 @@ FeaturesSupported=Поддържани функции
 Width=Ширина
 Height=Ви�очина
 Depth=Дълбочина
-Top=Отгоре
+Top=Горно
 Bottom=Отдолу
-Left=Отл�во
+Left=Л�во
 Right=Отд��но
 CalculatedWeight=Изчи�лено тегло
 CalculatedVolume=Изчи�лен обем
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL адре� на �траницата
 WEBSITE_TITLE=Заглавие
 WEBSITE_DESCRIPTION=Опи�ание
 WEBSITE_IMAGE=Изображение
-WEBSITE_IMAGEDesc=Отно�ителен път до изображението. Може да запазите това празно, тъй като �е използва р�дко (може да �е използва от динамично �ъдържание, за да �е покаже миниатюра в �пи�ък � публикации в блога). Използвайте __WEBSITEKEY__ в път�, ако път�т зави�и от името на уеб�айта.
+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=Ключови думи
 LinesToImport=Редове за импортиране
 
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 65ed5522789..7c7f0f55122 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Този ин�трумент актуализира �
 MassBarcodeInit=Ма�ова инициализаци� на баркодове
 MassBarcodeInitDesc=Тази �траница може да �е използва за инициализиране на баркод на обекти, които н�мат дефиниран баркод. Проверете преди това дали на�тройката на модул 'Баркод' е завършена.
 ProductAccountancyBuyCode=Счетоводен код (покупка)
+ProductAccountancyBuyIntraCode=Счетоводен код (вътреобщно�тна покупка)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Счетоводен код (продажба)
 ProductAccountancySellIntraCode=Счетоводен код (вътреобщно�тна продажба)
 ProductAccountancySellExportCode=Счетоводен код (ек�портна продажба)
@@ -79,7 +81,7 @@ NewPrice=�ова цена
 MinPrice=Минимална продажна цена
 EditSellingPriceLabel=Промен�не на етикета � продажна цена
 CantBeLessThanMinPrice=Продажната цена не може да бъде по-ни�ка от минимално допу�тимата за този продукт/у�луга (%s без ДДС). Това �ъобщение може да �е по�ви, ако въведете твърде гол�ма от�тъпка.
-ContractStatusClosed=Затворен
+ContractStatusClosed=Приключен
 ErrorProductAlreadyExists=Вече �ъще�твува продукт / у�луга � № %s.
 ErrorProductBadRefOrLabel=Грешна �тойно�т за № или име
 ErrorProductClone=Възникна проблем при опит за клониране на продукта/у�лугата.
@@ -165,7 +167,7 @@ SuppliersPrices=До�тавни цени
 SuppliersPricesOfProductsOrServices=До�тавни цени (на продукти / у�луги)
 CustomCode=Митниче�ки / Стоков / ХС код
 CountryOrigin=Държава на произход
-Nature=Произход на продукта (�уровина / произведен)
+Nature=Nature of product (material/finished)
 ShortLabel=Кратко означение
 Unit=М�рка
 p=е.
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 085bf0bbe35..a0bc06032dd 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -17,7 +17,7 @@ ProjectsPublicTaskDesc=Този изглед пред�тав� в�ички п
 ProjectsDesc=Този изглед пред�тав� в�ички проекти (вашите потребител�ки права ви дават разрешение да виждате в�ичко).
 TasksOnProjectsDesc=Този изглед пред�тав� в�ички задачи за в�ички проекти (вашите потребител�ки права ви дават разрешение да виждате в�ичко).
 MyTasksDesc=Този изглед е ограничен до проекти или задачи, в които �те определен за контакт
-OnlyOpenedProject=Само отворените проекти �а видими (чернови или приключени проекти не �а видими).
+OnlyOpenedProject=Само активните проекти �а видими (чернови или приключени проекти не �а видими).
 ClosedProjectsAreHidden=Приключените проекти не �а видими.
 TasksPublicDesc=Този �траница показва в�ички проекти и задачи, които може да прочетете.
 TasksDesc=Този �траница показва в�ички проекти и задачи (вашите потребител�ки права ви дават разрешение да виждате в�ичко).
@@ -31,9 +31,9 @@ DeleteAProject=Изтриване на проект
 DeleteATask=Изтриване на задача
 ConfirmDeleteAProject=Сигурни ли �те, че и�кате да изтриете този проект?
 ConfirmDeleteATask=Сигурни ли �те, че и�кате да изтриете тази задача?
-OpenedProjects=Отворени проекти
-OpenedTasks=Отворени задачи
-OpportunitiesStatusForOpenedProjects=Размер на възможно�тите от отворени проекти по �тату�
+OpenedProjects=�ктивни проекти
+OpenedTasks=�ктивни задачи
+OpportunitiesStatusForOpenedProjects=Размер на възможно�тите от активни проекти по �тату�
 OpportunitiesStatusForProjects=Размер на възможно�тите от проекти по �тату�
 ShowProject=Показване на проект
 ShowTask=Показване на задача
@@ -52,7 +52,7 @@ TaskTimeSpent=Време, отделено на задачи
 TaskTimeUser=Потребител
 TaskTimeNote=Бележка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Задачи от отворени проекти
+TasksOnOpenedProject=Задачи от активни проекти
 WorkloadNotDefined=�е е определена работна натоварено�т
 NewTimeSpent=Отделено време
 MyTimeSpent=Моето отделено време
@@ -78,7 +78,7 @@ MyProjectsArea=Секци� � мои проекти
 DurationEffective=Ефективна продължително�т
 ProgressDeclared=Деклариран напредък
 TaskProgressSummary=�апредък на задачата
-CurentlyOpenedTasks=Отворени задачи в момента
+CurentlyOpenedTasks=Текущи активни задачи
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=Декларирани�т напредък е по-малко %s от изчи�лени� напредък
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Декларирани�т напредък е повече %s от изчи�лени� напредък
 ProgressCalculated=Изчи�лен напредък
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=� които �ъм �вързан в проект
 Time=Време
 ListOfTasks=Спи�ък �ъ� задачи
 GoToListOfTimeConsumed=Показване на �пи�ъка � изразходвано време
-GoToListOfTasks=Показване като �пи�ък
-GoToGanttView=Показване като Gantt
 GanttView=Gantt диаграма
 ListProposalsAssociatedProject=Спи�ък на търгов�ки предложени�, �вързани � проекта
 ListOrdersAssociatedProject=Спи�ък на поръчки за продажба, �вързани � проекта
@@ -122,7 +120,7 @@ ValidateProject=Валидиране на проект
 ConfirmValidateProject=Сигурни ли �те, че и�кате да валидирате този проект?
 CloseAProject=Приключване на проект
 ConfirmCloseAProject=Сигурни ли �те, че и�кате да приключите този проект?
-AlsoCloseAProject=Приключване на проект (задръжте го отворен, ако в�е още тр�бва да работите по задачите в него)
+AlsoCloseAProject=Приключване на проект (задръжте го активен, ако в�е още тр�бва да работите по задачите в него)
 ReOpenAProject=Отвар�не на проект
 ConfirmReOpenAProject=Сигурни ли �те, че и�кате да отворите повторно този проект?
 ProjectContact=Контакти / Уча�тници
@@ -188,7 +186,7 @@ PlannedWorkload=Планирана натоварено�т
 PlannedWorkloadShort=�атоварено�т
 ProjectReferers=Свързани елементи
 ProjectMustBeValidatedFirst=Проектът тр�бва първо да бъде валидиран
-FirstAddRessourceToAllocateTime=Определете потребител�ки ре�ур� на задачата за разпредел�не на времето
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=За ден
 InputPerWeek=За �едмица
 InputPerMonth=За ме�ец
@@ -212,16 +210,16 @@ ProjectNbProjectByMonth=Брой �ъздадени проекти на ме�е
 ProjectNbTaskByMonth=Брой �ъздадени задачи на ме�ец
 ProjectOppAmountOfProjectsByMonth=Сума на възможно�тите на ме�ец
 ProjectWeightedOppAmountOfProjectsByMonth=Изчи�лена �ума на възможно�тите на ме�ец
-ProjectOpenedProjectByOppStatus=Отворен проект / възможно�т по �тату� на възможно�тта
+ProjectOpenedProjectByOppStatus=�ктивен проект / възможно�т по �тату� на възможно�тта
 ProjectsStatistics=Стати�тики на проекти / възможно�ти
 TasksStatistics=Стати�тика на задачи
 TaskAssignedToEnterTime=Задачата е възложена. Въвеждането на време по тази задача тр�бва да е възможно.
 IdTaskTime=Идентификатор на време на задача
 YouCanCompleteRef=�ко и�кате да завършите номера � н�какъв �уфик�, препоръчително е да добавите �имвол "-", за да го отделите, така че автоматичното номериране да продължи да работи правилно за �ледващите проекти. �апример %s-Суфик�
-OpenedProjectsByThirdparties=Отворени проекти по контрагенти
+OpenedProjectsByThirdparties=�ктивни проекти по контрагенти
 OnlyOpportunitiesShort=Само възможно�ти
-OpenedOpportunitiesShort=Отворени възможно�ти
-NotOpenedOpportunitiesShort=�еотворени възможно�ти
+OpenedOpportunitiesShort=�ктивни възможно�ти
+NotOpenedOpportunitiesShort=�еактивни възможно�ти
 NotAnOpportunityShort=�е е възможно�т
 OpportunityTotalAmount=Обща �ума на възможно�тите
 OpportunityPonderatedAmount=Изчи�лена �ума на възможно�тите
@@ -240,11 +238,12 @@ LatestModifiedProjects=Проекти: %s по�ледно променени
 OtherFilteredTasks=Други филтрирани задачи
 NoAssignedTasks=�е �а намерени възложени задачи (възложете проект / задачи на текущи� потребител от най-горното поле за избор, за да въведете времето в него)
 ThirdPartyRequiredToGenerateInvoice=Тр�бва да бъде определен контрагент по проекта, за да може да генерирате фактура.
+ChooseANotYetAssignedTask=Изберете задача, ко�то в�е още не ви е възложена
 # Comments trans
 AllowCommentOnTask=Разрешаване на потребител�ки коментари в задачите
 AllowCommentOnProject=Разрешаване на потребител�ки коментари в проектите
 DontHavePermissionForCloseProject=��мате права, за да приключите проект %s.
-DontHaveTheValidateStatus=Проектът %s тр�бва да бъде отворен, за да го приключите.
+DontHaveTheValidateStatus=Проектът %s тр�бва да бъде активен, за да го приключите.
 RecordsClosed=%s проект(а) е(�а) приключен(и)
 SendProjectRef=Информаци� за проект %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Модулът 'Заплати' тр�бва да бъде активиран, за да дефинирате поча�ова �тавка на �лужителите, за да оценените отделеното по проекта време
@@ -257,7 +256,7 @@ InvoiceGeneratedFromTimeSpent=Фактура %s е генерирана въз 
 ProjectBillTimeDescription=Маркирайте, ако въвеждате график на задачите в проекта и планирате да генерирате фактура(и) за клиента от графика на задачите в проекта (не маркирайте, ако планирате да �ъздадете фактура, ко�то не �е о�новава на въведени�т график на задачите). Забележка: За да генерирате фактура, отидете в раздела "Отделено време" на проекта и изберете редовете, които да включите.
 ProjectFollowOpportunity=Про�лед�ване на възможно�ти
 ProjectFollowTasks=Про�лед�ване на задачи
-Usage=Usage
+Usage=Употреба
 UsageOpportunity=Употреба: Възможно�т
 UsageTasks=Употреба: Задачи
 UsageBillTimeShort=Употреба: Фактуриране на време
@@ -265,3 +264,4 @@ InvoiceToUse=Чернова фактура, ко�то да използвате
 NewInvoice=�ова фактура
 OneLinePerTask=Един ред на задача
 OneLinePerPeriod=Един ред на период
+RefTaskParent=Съгла�но главна задача №
diff --git a/htdocs/langs/bg_BG/propal.lang b/htdocs/langs/bg_BG/propal.lang
index 2e87c9ef3a0..567c61986d2 100644
--- a/htdocs/langs/bg_BG/propal.lang
+++ b/htdocs/langs/bg_BG/propal.lang
@@ -76,7 +76,7 @@ TypeContact_propal_external_BILLING=Получател на фактура
 TypeContact_propal_external_CUSTOMER=Получател на предложение
 TypeContact_propal_external_SHIPPING=Получател на до�тавка
 # Document models
-DocModelAzurDescription=Пълен шаблон на предложение (�тара реализаци� на шаблон Cyan)
+DocModelAzurDescription=Пълен шаблон на предложение 
 DocModelCyanDescription=Пълен модел на предложение
 DefaultModelPropalCreate=Създаване на шаблон по подразбиране
 DefaultModelPropalToBill=Шаблон по подразбиране, когато �е приключва търгов�ко предложение (за да бъде фактурирано)
diff --git a/htdocs/langs/bg_BG/receiptprinter.lang b/htdocs/langs/bg_BG/receiptprinter.lang
index b7af63dc077..05efd4813a1 100644
--- a/htdocs/langs/bg_BG/receiptprinter.lang
+++ b/htdocs/langs/bg_BG/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Фиктивен принтер
 CONNECTOR_NETWORK_PRINT=Мрежови принтер
 CONNECTOR_FILE_PRINT=Локален принтер
 CONNECTOR_WINDOWS_PRINT=Локален Windows принтер
+CONNECTOR_CUPS_PRINT=CUPS принтер
 CONNECTOR_DUMMY_HELP=Фиктивен принтер за те�т, не прави нищо
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=Име на CUPS принтер, пример: HPRT_TP805L
 PROFILE_DEFAULT=Профил по подразбиране
 PROFILE_SIMPLE=Обикновен профил
 PROFILE_EPOSTEP=Epos Tep профил
@@ -61,3 +63,33 @@ DOL_VALUE_MONTH_LETTERS=Ме�ец на фактура � букви
 DOL_VALUE_MONTH=Ме�ец на фактура
 DOL_VALUE_DAY=Ден на фактура
 DOL_VALUE_DAY_LETTERS=Ден на фактура � букви
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=ДДС №
+DOL_VALUE_MYSOC_CAPITAL=Капитал
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/bg_BG/stripe.lang b/htdocs/langs/bg_BG/stripe.lang
index fcd0789b5f7..b5cfa89acb3 100644
--- a/htdocs/langs/bg_BG/stripe.lang
+++ b/htdocs/langs/bg_BG/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Име на до�тавчик
 CSSUrlForPaymentForm=URL адре� на CSS �тил � формул�р за плащане
 NewStripePaymentReceived=Получено е ново Stripe плащане
 NewStripePaymentFailed=�еу�пешен опит за ново Stripe плащане
+FailedToChargeCard=�еупешно так�уване на карта
 STRIPE_TEST_SECRET_KEY=Те�тов Secret ключ
 STRIPE_TEST_PUBLISHABLE_KEY=Те�тов Publishable ключ
 STRIPE_TEST_WEBHOOK_KEY=Те�тов Webhook ключ
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Връзка към на�тройка на Stripe We
 ToOfferALinkForLiveWebhook=Връзка към на�тройка на Stripe WebHook за извикване на IPN (реален режим)
 PaymentWillBeRecordedForNextPeriod=Плащането ще бъде реги�трирано за �ледващи� период.
 ClickHereToTryAgain=<a href="%s">Кликнете тук, за да опитате отново ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Поради �трогите правила за автентификаци� на клиентите, �ъздаването на карта тр�бва да �е извърши от вътрешни� интерфей� на Stripe. Може да кликнете тук, за да включите клиент�ки� Stripe запи�: %s
+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/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 38003af0e13..e5a96ba466f 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -70,7 +70,7 @@ ExportDataset_user_1=Потребители и техните реквизити
 DomainUser=Домейн потребител %s
 Reactivate=Въз�танов�ване
 CreateInternalUserDesc=Тази форма позвол�ва да �ъздадете вътрешен потребител във вашата фирма / организаци�. За да �ъздадете външен потребител (за клиент, до�тавчик и т.н.), използвайте бутона 'Създаване на потребител' в картата на контакта за този контрагент.
-InternalExternalDesc=<b>Вътрешни�</b> потребител е потребител, който е ча�т от вашата фирма / организаци�.<br><b>Външни�т</b> потребител е клиент, до�тавчик или друг.<br><br>И в двата �луча� разрешени�та дефинират права в Dolibarr, �ъщо така външни� потребител може да има различен мениджър на менюто от вътрешни� потребител (Вижте �ачало - �а�тройка - Ди�плей)
+InternalExternalDesc=<b>Вътрешен</b> потребител е този, който е ча�т от вашата фирма / организаци�.<br><b>Външен</b> потребител е този, който е клиент, до�тавчик или друг (Външен потребител към контрагент може да бъде �ъздаден от раздела 'Контакти / �дре�и' на �ъответни�т контрагент).<br><br>И в двата �луча� разрешени�та определ�т права в Dolibarr, �ъщо така външни�т потребител може да има различен меню манипулатор от вътрешни�т (Вижте �ачало - �а�тройка - Интерфей�).
 PermissionInheritedFromAGroup=Разрешението е предо�тавено, тъй като е на�ледено от една от групите на потребител�.
 Inherited=�а�ледено
 UserWillBeInternalUser=Създадени�т потребител�т ще бъде вътрешен потребител (тъй като не е �вързан � определен контрагент)
@@ -113,3 +113,5 @@ CantDisableYourself=�е можете да забраните �об�твени
 ForceUserExpenseValidator=Принудително валидиране на разходни отчети
 ForceUserHolidayValidator=Принудително валидиране на молби за отпу�к
 ValidatorIsSupervisorByDefault=По подразбиране валидиращи�т е ръководител� на потребител�. О�тавете празно, за да запазите това поведение.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index b6b2033b01b..95a9f829429 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Преглед на �траницата в нов раздел
 SetAsHomePage=Задаване като начална �траница
 RealURL=Реален URL адре�
 ViewWebsiteInProduction=Преглед на уеб�айт, чрез начални URL адре�и
-SetHereVirtualHost=<u>Използване, чрез Apache / NGinx / ...</u> <br> �ко може да �ъздадете на ваши� уеб �ървър (Apache, Nginx, ...) �пециален виртуален хо�т � активиран PHP и о�новна директори� в <br> <strong>%s</strong>, <br> то тогава по�очете името на виртуални� хо�т, който �те �ъздали в �вой�твата на уеб�айта, така че прегледът може да �е извърши и чрез този �пециализиран до�тъп до уеб �ървъра, вме�то чрез вътрешни� Dolibarr �ървър.
+SetHereVirtualHost=<u>Използвайте � Apache / Nginx / ...</u><br>Създайте на ваши�т уеб �ървър (Apache, Nginx, ...) �пециален виртуален хо�т � PHP поддръжка и о�новна директори� в<br><strong>%s</strong>
+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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=За �ъжаление този уеб�айт 
 WEBSITE_USE_WEBSITE_ACCOUNTS=�ктивиране на таблица � уеб�айт профили
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=�ктивирайте таблица, ко�то да �ъхран�ва уеб�айт профили (потребител�ки имена / пароли) за в�еки уеб�айт / контрагент
 YouMustDefineTheHomePage=Първо тр�бва да дефинирате началната �траница по подразбиране
-OnlyEditionOfSourceForGrabbedContentFuture=Внимание: Създаването на уеб �траница, чрез импортиране на външна уеб �траница е препоръчително за опитни потребители. В зави�имо�т от �ложно�тта на импортираната �траница, резултатът може да �е различава от оригинала. Също така, ако импортираната �траницата използва общи CSS �тилове или противоречащ JavaScript, т� може да наруши външни� вид или функции на редактора на уеб�айтове, когато �е работи върху тази �траница. Този метод е бърз начин за �ъздаване на �траница, но �е препоръчва да �ъздадете новата �и �траница от нулата или от предложен шаблон за �траница.<br>Обърнете внимание �ъщо, че редактирането на изходни� HTML код ще бъде възможно, когато �ъдържанието на �траницата е инициализирано, чрез прихващане на външна �траница ("Онлайн" редакторът н�ма да бъде наличен).
+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=Когато �ъдържанието е прихванато от външен �айт е възможно �амо издание � изходен HTML код.
 GrabImagesInto=Прихващане на изображени� открити в CSS и �траница.
 ImagesShouldBeSavedInto=Изображени�та тр�бва да бъдат запи�ани в директори�
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=Като добра SEO практика използ
 MainLanguage=О�новен език
 OtherLanguages=Други езици
 UseManifest=Въведете manifest.json файл
+PublicAuthorAlias=Публичен п�евдоним на автора
+AvailableLanguagesAreDefinedIntoWebsiteProperties=�аличните езици �a дефинирани в �вой�твата на уеб�айта
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 2f36c876c1a..0205f246b0c 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index a8b48700ee6..5c9c86c1376 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/bn_BD/blockedlog.lang b/htdocs/langs/bn_BD/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/bn_BD/blockedlog.lang
+++ b/htdocs/langs/bn_BD/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 7ddbc71f3e9..f9f00015840 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 3de0eb0c8e3..4ef1ae39ddd 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 1de030a1905..6cd046c5607 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/bn_BD/link.lang b/htdocs/langs/bn_BD/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/bn_BD/link.lang
+++ b/htdocs/langs/bn_BD/link.lang
@@ -8,3 +8,4 @@ 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/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 8b92cef3103..7b3bfd3852a 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index a29b56dc3bf..2f70685f627 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 00259d976bc..ba85f51e739 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index d8a3192551f..a31243a07b6 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 94e440f9ab9..cdc0e6b3c95 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/bn_BD/receiptprinter.lang b/htdocs/langs/bn_BD/receiptprinter.lang
index 3df49b9fe67..896eaa313dd 100644
--- a/htdocs/langs/bn_BD/receiptprinter.lang
+++ b/htdocs/langs/bn_BD/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/bn_BD/stripe.lang b/htdocs/langs/bn_BD/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/bn_BD/stripe.lang
+++ b/htdocs/langs/bn_BD/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index 43fa5342da3..aea4e7676e4 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index e8725dacf6f..8747ea5b951 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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= Više parametara preko komandne linije
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Postavke modula za ra�unovodstvo
 UserSetup=Postavke upravljanja korisnika
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=External websites for more add-on (non-core) modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=Link
+RelativeURL=Relative URL
 BoxesAvailable=Widgets available
 BoxesActivated=Widgets activated
 ActivateOn=Activate on
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Upozorenje, ova vrijednost se može prebrisati posebnim postavkama korisnika (svaki korisnik može postaviti svoj clicktodial URL)
-ExternalModule=Eksterni moduli - Instalirani u direktorij %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Stopa
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) 
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index ad9be7f229a..252e06a5c6c 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=fakture dobavlja�a
 Payment=Uplata
-PaymentBack=Povrat uplate
-CustomerInvoicePaymentBack=Povrat uplate
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Uplate
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=u valuti faktura
 PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
 ConfirmDeletePayment=Da li ste sigurni da želite obrisati ovu uplatu?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Primljene uplate
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Platiti
 ToMakePaymentBack=Povrat uplate
 ListOfYourUnpaidInvoices=Lista neplaćenih faktura
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Carinski pe�at
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Faktura obrisana
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/bs_BA/blockedlog.lang b/htdocs/langs/bs_BA/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/bs_BA/blockedlog.lang
+++ b/htdocs/langs/bs_BA/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index e97f4077a5c..30796188873 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Dodaj ovaj proizvod
 RestartSelling=Nazad na prodaju
 SellFinished=Sale complete
 PrintTicket=Isprintaj ra�un
+SendTicket=Send ticket
 NoProductFound=Nema pronađenih proizvoda
 ProductFound=proizvod pronađen
 NoArticle=Nema proizvoda
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Broj faktura
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 38ad3fdea51..af7c0a6cc82 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Kompanija"%s" obrisana iz baze podataka
 ListOfContacts=Lista kontakta/adresa
 ListOfContactsAddresses=Lista kontakta/adresa
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Prikaži kontakt
 ContactsAllShort=Svi (bez filtera)
 ContactType=Tip kontakta
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Ime predstavnika prodaje
 SaleRepresentativeLastname=Prezime predstavnika prodaje
 ErrorThirdpartiesMerge=Nastala je greška pri brisanju treće strane. Molimo vas da provjerite zapisnik. Izmjene su vraćene.
 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
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 247a97b2fb1..488ffaee0e9 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 4cb8dc104bf..5ab22b34cc1 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index df3d27d0459..204e5360006 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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=Direktorij %s ne postoji.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/bs_BA/link.lang b/htdocs/langs/bs_BA/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/bs_BA/link.lang
+++ b/htdocs/langs/bs_BA/link.lang
@@ -8,3 +8,4 @@ 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/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 386a1f9a367..3b41f698ef6 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Inromacije
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 8e35d27d977..a025ce378fb 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=Nije definiran podatak za kloniranje.
 Of=od
@@ -829,6 +830,8 @@ Gender=Spol
 Genderman=Muškarac
 Genderwoman=Žena
 ViewList=Lista
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obavezno
 Hello=Zdravo
 GoodBye=Zbogom
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 91eec967638..0ecb34ad42f 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titula
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Linija za uvoz
 
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index a945967e610..afa6c414b77 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Jedinica
 p=u.
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 48074f53837..56127b173e0 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Vrijeme
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Povezane stavke
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nova faktura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/bs_BA/receiptprinter.lang b/htdocs/langs/bs_BA/receiptprinter.lang
index 22f1e96b300..c8fa83f8e37 100644
--- a/htdocs/langs/bs_BA/receiptprinter.lang
+++ b/htdocs/langs/bs_BA/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Referenca fakture
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/bs_BA/stripe.lang b/htdocs/langs/bs_BA/stripe.lang
index 3cbffcb605f..a1d7a15aa8b 100644
--- a/htdocs/langs/bs_BA/stripe.lang
+++ b/htdocs/langs/bs_BA/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index 5a9bc1af868..06906541007 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Dozvola je prenesena od jedne korisni�ke grupe.
 Inherited=Preneseno
 UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije povezan sa nekim subjektom)
@@ -110,3 +110,8 @@ UserLogged=Korisnik prijavljen
 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
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 0bb2c7d5870..735f153ab1f 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index b8125edbf2e..2b9c2c4ea33 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Observació: El seu PHP limita la mida a <b>%s</b> %s de
 NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP
 MaxSizeForUploadedFiles=Tamany màxim dels documents a pujar (0 per prohibir la pujada)
 UseCaptchaCode=Utilització de codi gràfic (CAPTCHA) en el login
-AntiVirusCommand= Ruta completa cap al comandament antivirus
-AntiVirusCommandExample= Exemple per a ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Exemple per a ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Ruta completa cap al comandament antivirus
+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= Paràmetres complementaris en la línia de comandes
-AntiVirusParamExample= Exemple per a ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuració del mòdul Comptabilitat
 UserSetup=Configuració de gestió d'usuaris
 MultiCurrencySetup=Configuració multi-divisa
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Opció deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions estables oficials 
 BoxesDesc=Els panells són components que mostren algunes dades que poden afegir-se per personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activar', o fent clic en la paperera per desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
-ModulesDesc=Els mòduls/aplicacions determinen quines funcions estan disponibles al programa. Alguns mòduls requereixen permisos que es concedeixen als usuaris després d'activar el mòdul. Feu clic al botó d'encès/apagat (al final de la línia del mòdul) per activar/desactivar un mòdul/aplicació.
+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=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
 ModulesDeployDesc=Si els permisos en el seu sistema d'arxius ho permiteixen, pot utilitzar aquesta ferramente per instal·lar un mòdul extern. El mòdul estarà aleshores visible en la pestanya <strong>%s</strong>
 ModulesMarketPlaces=Trobar mòduls/complements externs
@@ -212,6 +212,7 @@ 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).
 SeeInMarkerPlace=Veure a la tenda d'apps
+SeeSetupOfModule=Vegi la configuració del mòdul %s
 Updated=Actualitzat
 Nouveauté=Novetat
 AchatTelechargement=Comprar / Descarregar
@@ -221,6 +222,7 @@ DoliPartnersDesc=Llista d'empreses que proporcionen desenvolupament a mida de m
 WebSiteDesc=Llocs web de referència per trobar més mòduls (no core)...
 DevelopYourModuleDesc=Algunes solucions per desenvolupar el vostre propi mòdul...
 URL=URL
+RelativeURL=URL relativa
 BoxesAvailable=Panells disponibles
 BoxesActivated=Panells activats
 ActivateOn=Activar a
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Deixa-ho buit per usar el valor per defecte
 DefaultLink=Enllaç per defecte
 SetAsDefault=Indica'l com Defecte
 ValueOverwrittenByUserSetup=Atenció: Aquest valor pot ser sobreescrit per un valor específic de la configuració de l'usuari (cada usuari pot tenir la seva pròpia url clicktodial)
-ExternalModule=Mòdul extern - Instal·lat al directori %s
+ExternalModule=Mòdul extern
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Inicialització massiva de codis de barres per a tercers
 BarcodeInitForProductsOrServices=Inici massiu de codi de barres per productes o serveis
 CurrentlyNWithoutBarCode=Actualment, té <strong>%s</strong> registres a <strong>%s</strong> %s sense codi de barres definit.
@@ -947,7 +950,7 @@ DictionaryCanton=Estats/Províncies
 DictionaryRegion=Regions
 DictionaryCountry=Països
 DictionaryCurrency=Monedes
-DictionaryCivility=Títol de civisme
+DictionaryCivility=Títols honorífics
 DictionaryActions=Tipus d'esdeveniments de l'agenda
 DictionarySocialContributions=Tipus d'impostos varis
 DictionaryVAT=Taxa d'IVA o Impost de vendes
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d'
 VATIsUsedExampleFR=A França, es tracta de les societats o organismes que trien un règim fiscal general (General simplificat o General normal), règim en el qual es declara l'IVA.
 VATIsNotUsedExampleFR=A França, es tracta d'associacions que no siguin declarades per vendes o empreses, organitzacions o professions liberals que hagin triat el sistema fiscal de la microempresa (Impost sobre vendes en franquícia) i paguen una franquícia. Impost sobre vendes sense declaració d'impost sobre vendes. Aquesta elecció mostrarà la referència "Impost sobre vendes no aplicable - art-293B de CGI" a les factures.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Tarifa
 LocalTax1IsNotUsed=No subjecte
 LocalTax1IsUsedDesc=Utilitzar un 2on tipus d'impost (diferent de l'IVA)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de p
 LocalTax2IsNotUsedDescES=El tipus d'IRPF proposat per defecte es 0. Final de 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=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 des 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=Informes d'impostos locals
 CalcLocaltax1=Vendes - Compres
 CalcLocaltax1Desc=Els informes es calculen amb la diferència entre les vendes i les compres
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Compres
 CalcLocaltax2Desc=Els informes es basen en el total de les compres
 CalcLocaltax3=Vendes
 CalcLocaltax3Desc=Els informes es basen en el total de les vendes
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Etiqueta utilitzada per defecte si no es troba cap traducció per aquest codi
 LabelOnDocuments=Etiqueta sobre documents
 LabelOrTranslationKey=Clau de traducció o cadena
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de despeses per aprovar
 Delays_MAIN_DELAY_HOLIDAYS=Dies lliures a aprovar
 SetupDescription1=Abans de començar a utilitzar Dolibarr cal definir alguns paràmetres inicials i habilitar/configurar els mòduls.
 SetupDescription2=Les dues seccions següents són obligatòries (les dues primeres entrades al menú Configuració):
-SetupDescription3= <a href="%s"> %s -> %s </a> <br> Paràmetres bàsics per personalitzar el comportament predeterminat de la vostra aplicació (per exemple, per a funcions relacionades amb el país).
-SetupDescription4= <a href="%s"> %s -> %s </a> <br> Aquest programari és un conjunt de molts mòduls / aplicacions, tots ells més o menys independents. Els mòduls rellevants per a les vostres necessitats s'han d’habilitar i configurar. S'afegeixen nous elements / opcions als menús amb l’activació d’un mòdul.
+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=Altres entrades del menú d'instal·lació gestionen paràmetres opcionals.
 LogEvents=Auditoria de la seguretat d'esdeveniments
 Audit=Auditoria
@@ -1128,7 +1136,7 @@ LogEventDesc=Habiliteu el registre per a esdeveniments de seguretat específics.
 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.
 SystemAreaForAdminOnly=Aquesta àrea només està disponible per als usuaris administradors. Els permisos d'usuari de Dolibarr no poden canviar aquesta restricció.
-CompanyFundationDesc=Edita la informació de l’empresa / entitat. Feu clic al botó &quot;%s&quot; al final de la pàgina.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 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í.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Regles per 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
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Configuració de mòdul de gestió de recursos humans
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Models de documents de factures
 BillsPDFModulesAccordindToInvoiceType=Model de documents de factures d'acord amb el tipus de factura
 PaymentsPDFModules=Models de documents de pagament
 ForceInvoiceDate=Forçar la data de factura a la data de validació
-SuggestedPaymentModesIfNotDefinedInInvoice=Formes de pagament suggerides per a les factures si no estan definides explícitament
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Suggereix el pagament per retirada per compte
 SuggestPaymentByChequeToAddress=Suggereix pagament mitjançant xec a
 FreeLegalTextOnInvoices=Text lliure en factures
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Configuració de pagaments a proveïdors
 PropalSetup=Configuració del mòdul Pressupostos
 ProposalsNumberingModules=Models de numeració de pressupostos
 ProposalsPDFModules=Models de documents de pressupostos
-SuggestedPaymentModesIfNotDefinedInProposal=El mode de pagaments suggerit a la proposta per defecte si no es defineix per a la proposta
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Text lliure en pressupostos
 WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Preguntar per el magatzem d'origen per a la
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demana el compte bancari de destí de la comanda de compra
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Configuració de gestió d'ordres de vendes
 OrdersNumberingModules=Models de numeració de comandes
 OrdersModelModule=Models de documents de comandes
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts fren
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
+ImportSetup=Setup of module Import
 InstanceUniqueID=ID únic de la instància
 SmallerThan=Menor que
 LargerThan=Major que
@@ -1979,5 +1991,7 @@ MakeAnonymousPing=Creeu un ping &quot;+1&quot; anònim al servidor de bases Doli
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 EmailTemplate=Plantilla per correu electrònic
 EMailsWillHaveMessageID=Els correus electrònics tindran una etiqueta "Referències" que coincideix amb aquesta sintaxi
-PDF_USE_ALSO_LANGUAGE_CODE=Si voleu tenir un títol de text al vostre PDF duplicat en 2 idiomes diferents en un mateix generar PDF, heu d’establir aquí aquest segon idioma de manera que el PDF generat contindrà 2 idiomes diferents a la mateixa pàgina, l’elecció al generar PDF i aquest. (només algunes plantilles PDF suporten això). Manteniu-lo buit per a 1 idioma per PDF.
+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=Introduïu aquí el codi de la icona de FontAwesome. Si no sabeu què és FontAwesome, podeu utilitzar el llibre genèric d’adreces.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index f9866a5e9fb..b6726202768 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Factures de proveïdors
 SupplierBill=Factura del proveïdor
 SupplierBills=Factures de proveïdors
 Payment=Pagament
-PaymentBack=Reembossament
-CustomerInvoicePaymentBack=Reembossament
+PaymentBack=Devolució
+CustomerInvoicePaymentBack=Devolució
 Payments=Pagaments
 PaymentsBack=Devolucions
 paymentInInvoiceCurrency=en divisa de factures
 PaidBack=Reemborsat
 DeletePayment=Elimina el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
-ConfirmConvertToReduc=Voleu convertir aquest %s en un descompte absolut?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=L’import s’emmagatzemarà entre tots els descomptes i es podrà utilitzar com a descompte per a una factura actual o futura per a aquest client.
-ConfirmConvertToReducSupplier=Voleu convertir aquest %s en un descompte absolut?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=L’import s’ha desat entre tots els descomptes i es podrà utilitzar com a descompte per a una factura actual o futura per a aquest proveïdor.
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Mostra la factura de situació
 UseSituationInvoices=Permetre la factura de la situació
 UseSituationInvoicesCreditNote=Permet la nota de crèdit de la factura de situació
 Retainedwarranty=Garantia retinguda
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Percentatge de garantia retingut per defecte
+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=Per pagar %s
 toPayOn=a pagar %s
 RetainedWarranty=Garantia retinguda
@@ -509,11 +512,11 @@ ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
 ListOfYourUnpaidInvoices=Llistat de factures impagades
 NoteListOfYourUnpaidInvoices=Nota: Aquest llistat només conté factures de tercers que tens enllaçats com a agent comercial.
-RevenueStamp=Timbre fiscal
+RevenueStamp=Tax stamp
 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
-PDFCrabeDescription=Plantilla de factura PDF Crabe. Una plantilla de factura completa (implementació antiga de la plantilla Sponge)
+PDFCrabeDescription=Plantilla de factura PDF Crabe. Una plantilla de factura completa 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Estableix la data de finalització de la línia de serveis amb la
 AutoFillDateToShort=Estableix la data de finalització
 MaxNumberOfGenerationReached=Nombre màxim de gen. arribat
 BILL_DELETEInDolibarr=Factura esborrada
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/ca_ES/blockedlog.lang b/htdocs/langs/ca_ES/blockedlog.lang
index 0a991ede0cf..2d1baa823d7 100644
--- a/htdocs/langs/ca_ES/blockedlog.lang
+++ b/htdocs/langs/ca_ES/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Registres inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostra tots els registres arxivats (pot ser llarg)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostra tots els registres d'arxiu no vàlids (pot ser llarg)
 DownloadBlockChain=Baixa les empremtes dactilars
-KoCheckFingerprintValidity=L'entrada de registre arxivada no és vàlida. Significa que algú (un hacker?) Ha modificat algunes dades d'aquest re després de la seva gravació, o ha esborrat el registre arxivat anterior (comprova que existeix la línia anterior).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=El registre del registre arxivat és vàlid. Les dades d'aquesta línia no s'han modificat i l'entrada segueix l'anterior.
 OkCheckFingerprintValidityButChainIsKo=El registre arxivat sembla ser vàlid en comparació amb l'anterior, però la cadena s'ha corromput prèviament.
 AddedByAuthority=Emmagatzemat a l'autoritat remota
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 369f180c048..f6dfbd865dc 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Afegeix aquest article
 RestartSelling=Reprendre la venda
 SellFinished=Venda acabada
 PrintTicket=Imprimir
+SendTicket=Send ticket
 NoProductFound=Cap article trobat
 ProductFound=Producte trobat
 NoArticle=Cap article
@@ -48,6 +49,7 @@ Footer=Peu de pàgina
 AmountAtEndOfPeriod=Import al final del període (dia, mes o any)
 TheoricalAmount=Import teòric
 RealAmount=Import real
+CashFence=Cash fence
 CashFenceDone=Tancament de caixa realitzat pel període
 NbOfInvoices=Nº de factures
 Paymentnumpad=Tipus de pad per introduir el pagament
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS necessita que les categories de productes funcion
 OrderNotes=Notes de comanda
 CashDeskBankAccountFor=Compte predeterminat a utilitzar per als pagaments
 NoPaimementModesDefined=No hi ha cap mode de pagament definit a la configuració de TakePOS
-TicketVatGrouped=IVA per grups als tiquets
-AutoPrintTickets=Imprimeix automàticament els tiquets
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Habiliteu funcions per a bar o restaurant
 ConfirmDeletionOfThisPOSSale=Confirmeu la supressió de la venda actual?
 ConfirmDiscardOfThisPOSSale=Voleu descartar aquesta venda actual?
@@ -87,7 +90,19 @@ HeadBar=Barra de capçalera
 SortProductField=Camp per ordenar productes
 Browser=Navegador
 BrowserMethodDescription=Impressió de rebuts senzilla i senzilla. Només uns quants paràmetres per configurar el rebut. Imprimeix a través del navegador.
-TakeposConnectorMethodDescription=Mòdul extern amb funcions addicionals. Possibilitat d'imprimir des de núvol.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Mètode d'impressió
 ReceiptPrinterMethodDescription=Mètode potent amb molts paràmetres. Completament personalitzable amb plantilles. No es pot imprimir des del núvol.
-ByTerminal=By terminal
+ByTerminal=Per terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Inicia una nova venda paral·lela
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Informe d'efectiu
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 2cd312297d8..223d1aa37e4 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=L'empresa "%s" ha estat eliminada
 ListOfContacts=Llistat de contactes
 ListOfContactsAddresses=Llistat de contactes
 ListOfThirdParties=Llista de tercers
-ShowCompany=Mostra el tercer
 ShowContact=Mostrar contacte
 ContactsAllShort=Tots (sense filtre)
 ContactType=Tipus de contacte
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Nom de l'agent comercial
 SaleRepresentativeLastname=Cognoms de l'agent comercial
 ErrorThirdpartiesMerge=S'ha produït un error en suprimir els tercers. Verifiqueu el registre. S'han revertit els canvis.
 NewCustomerSupplierCodeProposed=El codi de client o proveïdor ja utilitzat, es suggereix un codi nou
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Tipus de pagament - Client
 PaymentTermsCustomer=Condicions de pagament - Client
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index c74186ba10c..6cb0f6b1b98 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Veure %sl'anàlisi de pagaments %s per a un càlcul d
 SeeReportInDueDebtMode=Veure l'informe %sanàlisi de factures%s per a un càlcul basat en factures registrades conegudes encara que encara no s'hagin comptabilitzat en el Llibre Major.
 SeeReportInBookkeepingMode=Veure <b>%sl'informe%s</b> per a un càlcul a <b> Taula de Llibre Major</b>
 RulesAmountWithTaxIncluded=- Els imports mostrats són amb tots els impostos inclosos.
-RulesResultDue=- Inclou les factures pendents, despeses, IVA, donacions estiguen o no pagades. També s'inclou salaris pagats. <br> - Es basa en la data de la validació de les factures i l'IVA i en la data de venciment per a despeses. Per salaris definits amb el mòdul de Salari, s'utilitza la data de valor del pagament.
+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=- Inclou els pagaments reals realitzats en les factures, les despeses, l'IVA i els salaris. <br> - Es basa en les dates de pagament de les factures, les despeses, l'IVA i els salaris. La data de la donació per a la donació.
-RulesCADue=- Inclou les factures degudes del client estiguin pagades o no. <br> - Es basa en la data de la validació d'aquestes factures. <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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Facturació facturada pel tipus d'impost sobre la venda
 TurnoverCollectedbyVatrate=Facturació recaptada pel tipus d'impost sobre la venda
 PurchasebyVatrate=Compra per l'impost sobre vendes
 LabelToShow=Etiqueta curta
+PurchaseTurnover=Purchase turnover
+PurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 02a35eb9659..fc5e083a365 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Arxiu no rebut íntegrament pel servidor.
 ErrorNoTmpDir=Directori temporal de recepció %s inexistent
 ErrorUploadBlockedByAddon=Pujada bloquejada per un plugin PHP/Apache.
 ErrorFileSizeTooLarge=La mida del fitxer és massa gran.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Longitud del camp massa llarg per al tipus int (màxim %s xifres)
 ErrorSizeTooLongForVarcharType=Longitud del camp massa llarg per al tipus cadena (màxim %s xifres)
 ErrorNoValueForSelectType=Els valors de la llista han de ser indicats
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, l’idioma de la pàgina
 ErrorBatchNoFoundForProductInWarehouse=No s'ha trobat lot / sèrie per al producte "%s" al magatzem "%s".
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No hi ha quantitat suficient per a aquest lot / sèrie per al producte "%s" al magatzem "%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 user 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 ?
+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
 # 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í
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index bc315d5b8b6..8a74e406fb7 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Aquest PHP suporta Curl.
 PHPSupportCalendar=Aquest PHP admet extensions de calendaris.
 PHPSupportUTF8=Aquest PHP és compatible amb les funcions UTF8.
 PHPSupportIntl=Aquest PHP admet funcions Intl.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Aquest PHP admet les funcions %s.
 PHPMemoryOK=La seva memòria màxima de sessió PHP està definida a <b>%s</b>. Això hauria de ser suficient.
 PHPMemoryTooLow=La seva memòria màxima de sessió PHP està definida a <b>%s</b> bytes. Això és molt poc. Es recomana modificar el paràmetre <b>memory_limit</b> del seu arxiu <b> php.ini</b> a almenys <b>%s</b> octets.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=La teva instal·lació PHP no soporta Curl.
 ErrorPHPDoesNotSupportCalendar=La vostra instal·lació de PHP no admet extensions de calendari php.
 ErrorPHPDoesNotSupportUTF8=Aquest PHP no suporta les funcions UTF8. Resolgui el problema abans d'instal lar Dolibarr ja que no funcionarà correctamete.
 ErrorPHPDoesNotSupportIntl=La vostra instal·lació de PHP no admet funcions Intl.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=La teva instal·lació PHP no admet funcions %s.
 ErrorDirDoesNotExists=La carpeta <b>%s</b> no existeix o no és accessible.
 ErrorGoBackAndCorrectParameters=Torneu enrere i verifiqueu / corregiu els paràmetres.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=L'aplicació ha intentat actualitzar-se automàti
 YouTryInstallDisabledByFileLock=L'aplicació s'ha intentat actualitzar automàticament, però les pàgines d'instal·lació / actualització s'han desactivat per a la seguretat (per l'existència d'un fitxer de bloqueig <strong> install.lock </strong> al directori de documents del dolibarr). <br>
 ClickHereToGoToApp=Fes clic aquí per anar a la teva aplicació
 ClickOnLinkOrRemoveManualy=Feu clic al següent enllaç. Si sempre veieu aquesta mateixa pàgina, heu d'eliminar / canviar el nom del fitxer install.lock al directori de documents.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ca_ES/link.lang b/htdocs/langs/ca_ES/link.lang
index d385261415b..60bb39b3786 100644
--- a/htdocs/langs/ca_ES/link.lang
+++ b/htdocs/langs/ca_ES/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=L'enllaç %s s'ha eliminat
 ErrorFailedToDeleteLink= Error en eliminar l'enllaç '<b>%s</b>'
 ErrorFailedToUpdateLink= Error en actualitzar l'enllaç '<b>%s</b>'
 URLToLink=URL a enllaçar
+OverwriteIfExists=Sobreescriu el fitxer si existeix
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 3a70554297a..33c56156b38 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No s'han trobat contactes/adreces amb categoria
 NoContactLinkedToThirdpartieWithCategoryFound=No s'han trobat contactes/adreces amb categoria
 OutGoingEmailSetup=Configuració de correus electrònics sortints
 InGoingEmailSetup=Configuració de correus electrònics entrants
-OutGoingEmailSetupForEmailing=Configuració del correu electrònic sortint (per enviament de correus massiu)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Configuració per defecte del correu electrònic sortint 
 Information=Informació
 ContactsWithThirdpartyFilter=Contactes amb filtre de tercers
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 8448d1b9644..c28f8eb03eb 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Desa i continua
 SaveAndNew=Guardar i nou
 TestConnection=Provar la connexió
 ToClone=Copiar
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Trieu les dades que voleu clonar:
 NoCloneOptionsSpecified=no hi ha dades definits per copiar
 Of=de
@@ -829,6 +830,8 @@ Gender=Sexe
 Genderman=Home
 Genderwoman=Dona
 ViewList=Vista llistat
+ViewGantt=Vista Gantt
+ViewKanban=Vista de Kanban
 Mandatory=Obligatori
 Hello=Hola
 GoodBye=A reveure
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Seleccioneu les opcions gràfiques per crear un grà
 Measures=Mesures
 XAxis=Eix X
 YAxis=Eix Y
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirma l'eliminació del fitxer
+DeleteFileText=Realment vols suprimir aquest fitxer?
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index 5b4b70f6c37..0e92fda2b8e 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -71,3 +71,5 @@ ProductQtyToProduceByMO=Quantitat de producte que encara es pot produir mitjanç
 AddNewConsumeLines=Afegiu una nova línia per consumir
 ProductsToConsume=Productes a consumir
 ProductsToProduce=Productes a produir
+UnitCost=Cost unitari
+TotalCost=Cost total
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 7c3f75f91b8..fdbcc544fdb 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -141,7 +141,7 @@ OrderByEMail=Correu electrònic
 OrderByWWW=En línia
 OrderByPhone=Telèfon
 # Documents models
-PDFEinsteinDescription=Un model complet de comanda (antiga implementació de la plantilla d'Eratosthene)
+PDFEinsteinDescription=Un model complet de comanda 
 PDFEratostheneDescription=Un model complet de comanda
 PDFEdisonDescription=Model de comanda simple
 PDFProformaDescription=Una plantilla completa de factura Proforma
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index dec9c733127..b98360624ba 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 OnlyOneFieldForXAxisIsPossible=Actualment només és possible 1 camp com a Eix X. Només s’ha seleccionat el primer camp seleccionat.
 AtLeastOneMeasureIsRequired=Almenys 1 camp per a la mesura és obligatori
 AtLeastOneXAxisIsRequired=Almenys 1 camp per a l'Eix X és obligatori
-
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=Ordre de venda validat
 Notify_ORDER_SENTBYMAIL=Ordre de venda enviat per correu
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Ordre de compra enviat per correu electrònic
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL de pàgina
 WEBSITE_TITLE=Títol
 WEBSITE_DESCRIPTION=Descripció
 WEBSITE_IMAGE=Imatge
-WEBSITE_IMAGEDesc=Camí relatiu dels mitjans d'imatge. Podeu mantenir aquest buit perquè no s'usa gaire (el contingut dinàmic pot utilitzar-se per mostrar una vista prèvia d'una llista de publicacions de bloc).
+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=Paraules clau
 LinesToImport=Línies per importar
 
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 2832d002fa0..c184a1f0292 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Aquesta eina actualitza el tipus d'IVA establert a <b>
 MassBarcodeInit=Inicialització massiu de codis de barres
 MassBarcodeInitDesc=Pot utilitzar aquesta pàgina per inicialitzar el codi de barres en els objectes que no tenen un codi de barres definit. Comprovi abans que el mòdul de codis de barres estar ben configurat
 ProductAccountancyBuyCode=Codi comptable (compra)
+ProductAccountancyBuyIntraCode=Codi comptable (compra intracomunitària)
+ProductAccountancyBuyExportCode=Codi comptable (compra d'importació)
 ProductAccountancySellCode=Codi comptable (venda)
 ProductAccountancySellIntraCode=Codi de comptabilitat (venda intracomunitària)
 ProductAccountancySellExportCode=Codi comptable (exportació de venda)
@@ -165,7 +167,7 @@ SuppliersPrices=Preus del proveïdor
 SuppliersPricesOfProductsOrServices=Preus del venedor (de productes o serveis)
 CustomCode=Duana / mercaderia / codi HS
 CountryOrigin=País d'origen
-Nature=Naturalesa del producte (material / acabat)
+Nature=Naturalesa del producte (material/acabat)
 ShortLabel=Etiqueta curta
 Unit=Unitat
 p=u.
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index a7e67fb92bc..906e3a6f5e4 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=que estic vinculat al projecte
 Time=Temps
 ListOfTasks=Llistat de tasques
 GoToListOfTimeConsumed=Ves al llistat de temps consumit
-GoToListOfTasks=Mostra com a llista
-GoToGanttView=mostra com Gantt
 GanttView=Vista de Gantt
 ListProposalsAssociatedProject=Llista de propostes comercials relacionades amb el projecte
 ListOrdersAssociatedProject=Llista de comandes de vendes relacionades amb el projecte
@@ -188,7 +186,7 @@ PlannedWorkload=Càrrega de treball prevista
 PlannedWorkloadShort=Càrrega de treball
 ProjectReferers=Registres relacionats
 ProjectMustBeValidatedFirst=El projecte primer ha de ser validat
-FirstAddRessourceToAllocateTime=Associa un recurs d'usuari per reservar el temps de la tasca
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Entrada per dia
 InputPerWeek=Entrada per setmana
 InputPerMonth=Entrada per mes
@@ -240,6 +238,7 @@ 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.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Permet comentaris dels usuaris a les tasques
 AllowCommentOnProject=Permetre comentaris dels usuaris als projectes
@@ -265,3 +264,4 @@ InvoiceToUse=Esborrany de factura a utilitzar
 NewInvoice=Nova factura
 OneLinePerTask=Una línia per tasca
 OneLinePerPeriod=Una línia per període
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 26e2cef2915..899f1354d94 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -76,7 +76,7 @@ TypeContact_propal_external_BILLING=Contacte client de facturació pressupost
 TypeContact_propal_external_CUSTOMER=Contacte client seguiment pressupost
 TypeContact_propal_external_SHIPPING=Contacte del client pel lliurament
 # Document models
-DocModelAzurDescription=Un model complet de pressupost (antiga implementació de la plantilla Cyan)
+DocModelAzurDescription=Un model complet de pressupost 
 DocModelCyanDescription=Un model de pressupost complet
 DefaultModelPropalCreate=Model per defecte
 DefaultModelPropalToBill=Model per defecte en tancar un pressupost (a facturar)
diff --git a/htdocs/langs/ca_ES/receiptprinter.lang b/htdocs/langs/ca_ES/receiptprinter.lang
index d2a7476dbab..020308cba2b 100644
--- a/htdocs/langs/ca_ES/receiptprinter.lang
+++ b/htdocs/langs/ca_ES/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Impressora de proves
 CONNECTOR_NETWORK_PRINT=Impresora en xarxa
 CONNECTOR_FILE_PRINT=Impressora local
 CONNECTOR_WINDOWS_PRINT=Impressora local en Windows
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Impresora de proves, no fa res
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=Perfil per defecte
 PROFILE_SIMPLE=Perfil simpre
 PROFILE_EPOSTEP=Perfil Epos Tep
@@ -61,3 +63,33 @@ DOL_VALUE_MONTH_LETTERS=Mes de factura en lletres
 DOL_VALUE_MONTH=Mes de factura
 DOL_VALUE_DAY=Dia de la factura
 DOL_VALUE_DAY_LETTERS=Dia de factura en lletres
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Ref. factura
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Nom del client
+DOL_VALUE_CUSTOMER_LASTNAME=Cognom del client
+DOL_VALUE_CUSTOMER_MAIL=Correu del client
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Mòbil del client
+DOL_VALUE_CUSTOMER_SKYPE=Skype del client
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=El nom de l'empresa
+DOL_VALUE_MYSOC_ADDRESS=La teva adreça d’empresa
+DOL_VALUE_MYSOC_ZIP=El teu codi postal
+DOL_VALUE_MYSOC_TOWN=La teva ciutat
+DOL_VALUE_MYSOC_COUNTRY=El teu país
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=ID IVA intracomunitari
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Cognom del venedor
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 3e141657411..5b2c35e1295 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Nom del venedor
 CSSUrlForPaymentForm=Url del full d'estil CSS per al formulari de pagament
 NewStripePaymentReceived=S'ha rebut un nou pagament de Stripe
 NewStripePaymentFailed=S'ha intentat el pagament de Stripe però, ha fallat
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Clau secreta de test
 STRIPE_TEST_PUBLISHABLE_KEY=Clau de test publicable
 STRIPE_TEST_WEBHOOK_KEY=Clau de prova de Webhook
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Enllaç a la configuració de Stripe WebHook per truc
 ToOfferALinkForLiveWebhook=Enllaç a la configuració de Stripe WebHook per trucar a l’IPN (mode en directe)
 PaymentWillBeRecordedForNextPeriod=El pagament es registrarà per al període següent.
 ClickHereToTryAgain=<a href="%s">Feu clic aquí per tornar-ho a provar ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Degut a les regles d’autenticatització del client, la creació d’una targeta s’ha de fer des del backoffice Stripe. Podeu fer clic aquí per activar el registre de clients de Stripe: %s
+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/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 6aaa092a6e5..a623ab8a9cd 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -133,7 +133,7 @@ TicketsDisableCustomerEmail=Desactiveu sempre els correus electrònics quan es c
 #
 # Index & list page
 #
-TicketsIndex=Tiquet - inici
+TicketsIndex=Àrea de tiquets
 TicketList=Llista de tiquets
 TicketAssignedToMeInfos=Aquesta pàgina mostra la llista de butlletes creada per o assignada a l'usuari actual
 NoTicketsFound=Tiquet no trobat
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index c71ee023a2d..33457aff18a 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -70,7 +70,7 @@ 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 seva empresa o organització. <br>Un usuari <b> extern </b> és un client, proveïdor o altre.  <br> <br>En ambdós casos, els permisos defineixen drets sobre Dolibarr, també l'usuari extern pot tenir un gestor de menú diferent que l'usuari intern (vegeu Inici - Configuració - Visualització)
+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)
 PermissionInheritedFromAGroup=El permís es concedeix ja que ho hereta d'un grup al qual pertany l'usuari.
 Inherited=Heretat
 UserWillBeInternalUser=L'usuari creat serà un usuari intern (ja que no està lligat a un tercer en particular)
@@ -113,3 +113,5 @@ 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
 ValidatorIsSupervisorByDefault=Per defecte, el validador és el supervisor de l’usuari. Deixar buit per mantenir aquest comportament.
+UserPersonalEmail=Correu electrònic personal
+UserPersonalMobile=Telèfon mòbil personal
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index c487d4bb9c9..95f7f8fff4d 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Mostra la pàgina en una nova pestanya
 SetAsHomePage=Indica com a Pàgina principal
 RealURL=URL real
 ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici
-SetHereVirtualHost=<u> Ús amb Apache / NGinx / ...</u> <br> Si podeu crear, en el vostre servidor web (Apache, Nginx, ...), un host virtual dedicat amb PHP habilitat i un directori Root a <br> <strong> %s </strong> <br> i, a continuació, estableixi el nom de l'amfitrió virtual que heu creat a les propietats del lloc web, de manera que la previsualització es pot fer també usant aquest accés dedicat al servidor web en lloc del Dolibarr intern servidor.
+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> 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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Ho sentim, actualment aquest lloc web està fora
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activa la taula del compte del lloc web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per emmagatzemar comptes del lloc web (login/contrasenya) per a cada lloc web de tercers
 YouMustDefineTheHomePage=Primer heu de definir la pàgina d'inici predeterminada
-OnlyEditionOfSourceForGrabbedContentFuture=Advertència: crear una pàgina web mitjançant la importació d'una pàgina web externa està reservada als usuaris experimentats. Depenent de la complexitat de la pàgina d'origen, el resultat de la importació pot diferir de l'original. A més, si la pàgina d'origen utilitza estils CSS comuns o javascript en conflicte, pot trencar l'aspecte o les característiques de l'editor del lloc web quan es treballa en aquesta pàgina. Aquest mètode és una forma més ràpida de crear una pàgina, però es recomana crear la nova pàgina des de zero o des d'una plantilla de pàgina suggerida. <br>Recordeu també que les modificacions de l'origen HTML seran possibles quan el contingut de la pàgina s'hagi iniciat agafant-lo des d'una pàgina externa (l'editor "Online" NO estarà disponible)
+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=Només l'edició de codi HTML és possible quan el contingut s'ha capturat d'un lloc extern
 GrabImagesInto=Agafa també imatges trobades dins del css i a la pàgina.
 ImagesShouldBeSavedInto=Les imatges s'han de desar al directori
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=Per seguir bones pràctiques de SEO, utilitzeu un text
 MainLanguage=Idioma principal
 OtherLanguages=Altres idiomes
 UseManifest=Proporciona un fitxer manifest.json
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index aa95438270a..166b9aaaaf3 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Poznámka: <b> vaše konfigurace PHP </b> momentálně o
 NoMaxSizeByPHPLimit=Poznámka: Ve Vaší PHP konfiguraci není nastaven limit
 MaxSizeForUploadedFiles=Maximální velikost nahrávaných souborů (0 pro zablokování nahrávání)
 UseCaptchaCode=Použít grafický kód (CAPTCHA) na přihlašovací stránce
-AntiVirusCommand= Úplná cesta k antivirovému souboru
-AntiVirusCommandExample= Příklad pro ClamWin: C: \\ PROGRA ~ 1 \\ ClamWin \\ bin \\ clamscan.exe <br> Příklad pro ClamAV: / usr / bin / clamscan
+AntiVirusCommand=Úplná cesta k antivirovému souboru
+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= Další parametry příkazového řádku
-AntiVirusParamExample= Příklad ClamWin: - databáze = &quot;C: \\ Program Files (x86) \\ ClamWin \\ lib&quot;
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Nastavení ú�etního modulu
 UserSetup=Nastavení správy uživatelů
 MultiCurrencySetup=Nastavení více měn
@@ -149,7 +149,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 temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
+PurgeDeleteTemporaryFiles=Odstraňte všechny do�asné soubory (bez rizika ztráty dat). Poznámka: Odstranění se provede pouze v případě, že do�asný adresář byl vytvořen před 24 hodinami.
 PurgeDeleteTemporaryFilesShort=Odstranit do�asné soubory
 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í
@@ -178,8 +178,8 @@ Compression=Komprese
 CommandsToDisableForeignKeysForImport=Příkaz pro zákaz cizích klí�u při importu
 CommandsToDisableForeignKeysForImportWarning=Povinné, pokud chcete být schopni obnovit SQL dump později
 ExportCompatibility=Kompatibilita vytvořeného souboru exportu
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=Použijte --rychlý parametr
+ExportUseMySQLQuickParameterHelp=Parametr '- quick' pomáhá omezit spotřebu RAM u velkých tabulek.
 MySqlExportParameters=MySQL parametry exportu
 PostgreSqlExportParameters= PostgreSQL parametry exportu
 UseTransactionnalMode=Použití transak�ní režim
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funkce zakázána v demu
 FeatureAvailableOnlyOnStable=Funkce je k dispozici pouze v oficiálních stabilních verzích
 BoxesDesc=Widgety jsou oblasti obrazovky, které ukazují krátké informace na některých stránkách. Můžete si vybrat mezi zobrazením/schováním boxu zvolením cílové stránky a kliknutím na 'Aktivovat' nebo kliknutím na popelnici ji zakázat.
 OnlyActiveElementsAreShown=Pouze prvky z <a href="%s">povolených modulů</a> jsou uvedeny.
-ModulesDesc=Moduly / aplikace ur�ují, které funkce jsou v softwaru k dispozici. Některé moduly vyžadují oprávnění, která mají být udělena uživatelům po aktivaci modulu. Klepnutím na tla�ítko zapnuto / vypnuto (na konci linky modulu) aktivujete / deaktivujete modul / aplikaci.
+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=Více modulů naleznete ke stažení na externích webových stránkách ...
 ModulesDeployDesc=Pokud to umožňují oprávnění vašeho souborového systému, můžete pomocí tohoto nástroje nasadit externí modul. Modul bude potom viditelný na kartě <strong> %s </strong>.
 ModulesMarketPlaces=Najděte externí aplikaci / moduly
@@ -212,6 +212,7 @@ CompatibleUpTo=Kompatibilní s verzí %s
 NotCompatible=Tento modul se nezdá být kompatibilní s Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Tento modul vyžaduje aktualizaci souboru Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Podívejte se na trh
+SeeSetupOfModule=Viz nastavení modulu %s
 Updated=Aktualizováno
 Nouveauté=Novinka
 AchatTelechargement=Koupit / stáhnout
@@ -221,6 +222,7 @@ DoliPartnersDesc=Seznam firem, které poskytují vlastní moduly nebo funkce. <b
 WebSiteDesc=Externí webové stránky pro další (doplňkové) moduly ...
 DevelopYourModuleDesc=Některá řešení pro vývoj vlastního modulu ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=widgety k dispozici
 BoxesActivated=Widgety aktivovány
 ActivateOn=Aktivace na
@@ -270,7 +272,7 @@ Emails=Emaily
 EMailsSetup=Nastavení emailů
 EMailsDesc=Tato stránka vám umožňuje předcházet výchozí parametry PHP pro odesílání e-mailů. Ve většině případů v systému Unix / Linux je nastavení PHP správné a tyto parametry jsou zbyte�né.
 EmailSenderProfiles=Profily odesílatelů e-mailů
-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.
+EMailsSenderProfileDesc=Tuto sekci můžete ponechat prázdnou. Pokud sem zadáte nějaké e-maily, budou při psaní nového e-mailu přidány do seznamu možných odesílatelů do combo boxu.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS Port (Výchozí nastavení v php.ini:  <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (Výchozí nastavení v php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Nedefinováno v PHP na Unixových systémech)
@@ -280,7 +282,7 @@ MAIN_MAIL_ERRORS_TO=E-mail, který se používá pro hlášení chyb, vrací e-m
 MAIN_MAIL_AUTOCOPY_TO= Kopírovat (Bcc) všechny odeslané e-maily
 MAIN_DISABLE_ALL_MAILS=Zakázat veškeré odesílání e-mailů (pro testovací ú�ely nebo ukázky)
 MAIN_MAIL_FORCE_SENDTO=Pošlete všechny e-maily do (namísto skute�ných příjemců pro testovací ú�ely)
-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_ENABLED_USER_DEST_SELECT=Při psaní nového e-mailu navrhujte e-maily zaměstnanců (pokud jsou definováni) do seznamu předdefinovaných příjemců
 MAIN_MAIL_SENDMODE=Metoda odesílání e-mailů
 MAIN_MAIL_SMTPS_ID=ID SMTP (pokud odesílající server vyžaduje ověření)
 MAIN_MAIL_SMTPS_PW=Heslo SMTP (pokud server pro odesílání vyžaduje ověření)
@@ -328,7 +330,7 @@ SetupIsReadyForUse=Zavedení modulu je dokon�eno. Musíte však povolit a nasta
 NotExistsDirect=Alternativní kořenový adresář není definován. <br>
 InfDirAlt=Od verze 3 je možné definovat alternativní kořenovou složku. To umožňuje ukládat na stejné místo plug-iny a vlastní šablony. <br> Sta�í vytvořit adresář v kořenovém adresáři Dolibarr (např.: custom). <br>
 InfDirExample= <br> Pak deklarujte v souboru <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ custom' <br> $ dolibarr_main_document_root_alt = '/ cesta / z / dolibarr / htdocs / custom' <br> Pokud jsou tyto řádky komentovány "#" , sta�í odkomentovat odstraněním znaku "#".
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Zde můžete nahrát soubor .zip balí�ku modulů:
 CurrentVersion=Dolibarr aktuální verze
 CallUpdatePage=Projděte stránku, která aktualizuje databázovou strukturu a data: %s.
 LastStableVersion=Poslední stabilní verze
@@ -403,7 +405,7 @@ OldVATRates=Staré Sazba DPH
 NewVATRates=Nová sazba DPH
 PriceBaseTypeToChange=Změňte ceny podle základní referen�ní hodnoty definované na
 MassConvert=Spusťte hromadnou konverzi
-PriceFormatInCurrentLanguage=Price Format In Current Language
+PriceFormatInCurrentLanguage=Formát ceny v aktuálním jazyce
 String=Řetěz
 TextLong=Dlouhý text
 HtmlText=Html text
@@ -426,8 +428,8 @@ ExtrafieldCheckBoxFromList=Zaškrtávací polí�ka z tabulky
 ExtrafieldLink=Odkaz na objekt
 ComputedFormula=Vypo�tené pole
 ComputedFormulaDesc=Zde můžete zadat vzorec pomocí jiných vlastností objektu nebo libovolného kódování PHP pro získání dynamické vypo�tené hodnoty. Můžete použít libovolné kompatibilní formule PHP v�etně "?" operátor stavu a následující globální objekt: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ objekt </strong>. <br> <strong> VAROV�N� </strong>: K dispozici jsou pouze některé vlastnosti objektu $. Pokud potřebujete vlastnosti, které nejsou na�teny, jednoduše přive�te objekt do vzorce, jako ve druhém příkladu. <br> Použití vypo�ítaného pole znamená, že nemůžete zadat libovolnou hodnotu z rozhraní. Také pokud existuje syntaktická chyba, vzorec může vrátit nic. <br> <br> Příklad vzorce: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ objekt-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Příklad pro opětovné na�tení objektu <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetch ($ obj-> id? $ Obj-> id: > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Jiný příklad vzoru pro zatížení objektu a jeho nadřazeného objektu: <br> ($ reloadedobj = new Task )) && ($ reloadedobj-> fetch ($ object-> id)> 0) && ($ secondloadedobj = nový projekt ($ db)) && ($ secondloadedobj-> fetch ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Nadřazený projekt nebyl nalezen'
-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!!
+Computedpersistent=Uložte vypo�ítané pole
+ComputedpersistentDesc=Vypo�ítaná další pole pole budou uložena do databáze, hodnota však bude přepo�ítána pouze při změně objektu tohoto pole. Pokud vypo�ítané pole závisí na jiných objektech nebo globálních datech, může být tato hodnota špatná !!
 ExtrafieldParamHelpPassword=Pokud ponecháte toto pole prázdné, znamená to, že tato hodnota bude uložena bez šifrování (pole musí být skryto pouze s hvězdou na obrazovce). <br> Nastavte "auto" pro použití výchozího šifrovacího pravidla pro uložení hesla do databáze (pak hodnota bude �íst pouze hash, žádný způsob získání původní hodnoty)
 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> ...
@@ -435,7 +437,7 @@ ExtrafieldParamHelpradio=Seznam hodnot musí být řádky s formátovým klí�e
 ExtrafieldParamHelpsellist=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> - idfilter je nutně primární int klí� <br> - filtr může být jednoduchý test = 1) pro zobrazení pouze aktivní hodnoty <br> Můžete také použít $ ID $ ve filtru, který je aktuálním id aktuálního objektu <br> Chcete-li provést SELECT ve filtru, použijte $ SEL $ <br>, pokud chcete filtrovat na extrafields použít syntaxi extra.fieldcode = ... (kde kód pole je kód 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 bylo možné mít seznam v závislosti na jiném seznamu: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filtr
 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
 ExtrafieldParamHelplink=Parametry musí být ObjectName: Classpath <br> Syntaxe: Název_objektu: Classpath <br> Příklady: <br> Societe: societe / class / societe.class.php <br> Kontakt: contact / class / contact.class.php
-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)
+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
 LocalTaxDesc=Některé země mohou uplatnit dvě nebo tři daně na každé �áře faktur. Pokud tomu tak je, vyberte typ druhého a třetího daně a jeho sazbu. Možné typy jsou: <br> 1: místní daň se vztahuje na produkty a služby bez DPH (platí se na základě daně bez daně) <br> 2: místní daň se vztahuje na produkty a služby, v�etně DPH (0%) 3x342fccfda19b 3: místní daň se vztahuje na produkty bez DPH (místní taxa se vypo�ítává z �ástky bez daně) <br> 4: místní daň se vztahuje na produkty v�etně DPH (místní taxa se vypo�ítává z �ástky + hlavní daň) <br> 5: Místní daň platí pro služby bez DPH z �ástky bez daně) <br> 6: Místní daň platí za služby v�etně DPH (místní taxa se vypo�ítává z �ástky + daně)
 SMS=SMS
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Uchovávejte prázdnou pro použití výchozí hodnoty
 DefaultLink=Výchozí odkaz
 SetAsDefault=Nastavit jako výchozí
 ValueOverwrittenByUserSetup=Upozornění: tato hodnota může být přepsána uživatelsky specifickým nastavením (každý uživatel si může nastavit svoji vlastní adresu kliknutí)
-ExternalModule=Externí modul - instalován do adresáře %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Masový �árový kód pro subjekty
 BarcodeInitForProductsOrServices=Masový �árový kód pro produkty nebo služby
 CurrentlyNWithoutBarCode=V sou�asné době máte <strong> %s </strong> záznam na <strong> %s </strong> %s bez definice �árového kódu.
@@ -465,14 +468,14 @@ EnableAndSetupModuleCron=Pokud chcete, aby tato opakovaná faktura byla automati
 ModuleCompanyCodeCustomerAquarium=%s, následovaný kódem zákazníka pro ú�etní kód zákazníka
 ModuleCompanyCodeSupplierAquarium=%s následovaný dodavatelem kód dodavatel kód ú�etnictví
 ModuleCompanyCodePanicum=Vrátit prázdný ú�etní kód.
-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.
+ModuleCompanyCodeDigitaria=Vrací složený ú�etní kód podle jména subjektu. Kód se skládá z předpony, která může být definována na první pozici, po které následuje po�et znaků definovaných v kódu subjektu.
+ModuleCompanyCodeCustomerDigitaria=%s následovaný zkráceným jménem zákazníka o po�et znaků: %s pro kód ú�etnictví zákazníka.
+ModuleCompanyCodeSupplierDigitaria=%s následované zkráceným jménem dodavatele podle po�tu znaků: %s pro ú�etní kód dodavatele.
 Use3StepsApproval=Ve výchozím nastavení musí být nákupní objednávky vytvořeny a schváleny dvěma různými uživateli (jeden krok / uživatel k vytvoření a jeden krok / uživatel ke schválení. Všimněte si, že pokud má uživatel oprávnění k vytvoření a schválení, sta�í jeden krok / uživatel) . Touto volbou můžete požádat o zavedení třetího schvalovacího kroku / schválení uživatele, pokud je �ástka vyšší než ur�ená hodnota (potřebujete tedy 3 kroky: 1 = ověření, 2 = první schválení a 3 = druhé schválení, pokud je dostate�né množství). <br> Pokud je zapotřebí jedno schvalování (2 kroky), nastavte jej na velmi malou hodnotu (0,1), pokud je vždy požadováno druhé schválení (3 kroky).
 UseDoubleApproval=Použijte schválení 3 kroky, kdy �ástka (bez DPH) je vyšší než ...
 WarningPHPMail=UPOZORNĚN�: Je �asto lepší nastavit odchozí e-maily, než použít výchozí nastavení poštovního serveru poskytovatele. Někteří poskytovatelé e-mailů (například Yahoo) vám neumožňují odeslat e-mail z jiného serveru, než je jejich vlastní server. Vaše sou�asné nastavení používá server pro odesílání e-mailů a nikoli server vašeho poskytovatele e-mailu, takže někteří příjemci (ten, který je kompatibilní s omezujícím protokolem DMARC) požádá vašeho poskytovatele e-mailu, aby mohli přijmout váš e-mail a některé poskytovatele e-mailu (jako je Yahoo) může odpovědět "ne", protože server není jejich, takže nemnoho přijatých e-mailů nemůže být přijato (bu�te opatrní také kvótou odesílatele vašeho e-mailu). <br> Pokud má váš poskytovatel e-mailu (například Yahoo) toto omezení, musíte změnit nastavení e-mailu a zvolit druhou metodu "SMTP server" a zadat server SMTP a pověření poskytnuté poskytovatelem e-mailu.
 WarningPHPMail2=Pokud je váš poskytovatel e-mailových služeb SMTP povinen omezit e-mailový klient na některé adresy IP (velmi vzácné), jedná se o adresu IP agentu uživatele pošty (MUA) pro aplikaci ERP CRM: <strong> %s </strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Pokud je název domény ve vaší e-mailové adrese odesílatele chráněn pomocí SPF (zeptejte se poskytovatele e-mailu), musíte do záznamu SPF DNS vaší domény zahrnout následující adresy IP: <strong> %s </strong>.
 ClickToShowDescription=Kliknutím zobrazíte popis
 DependsOn=Tento modul potřebuje modul (y)
 RequiredBy=Tento modul je vyžadován modulem (moduly)
@@ -480,7 +483,7 @@ TheKeyIsTheNameOfHtmlField=Toto je název pole HTML. Technická znalost je potř
 PageUrlForDefaultValues=Musíte zadat relativní cestu URL stránky. Pokud do adresy URL zadáte parametry, budou výchozí hodnoty ú�inné, pokud budou všechny parametry nastaveny na stejnou hodnotu.
 PageUrlForDefaultValuesCreate= <br> Příklad: <br> Formulář pro vytvoření nového subjektu je <strong> %s </strong>. <br> Pro URL externích modulů nainstalovaných do vlastního adresáře nezahrnujte "vlastní /", tak použijte cestu jako <strong> mymodule / mypage.php </strong> a ne vlastní / mymodule / mypage.php. <br> Pokud chcete výchozí hodnotu pouze v případě, že url má nějaký parametr, můžete použít <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> Příklad: <br> Pro stránku, která obsahuje subjekty, je <strong> %s </strong>. <br> Pro adresy URL externích modulů nainstalovaných do vlastního adresáře nezahrnujte "vlastní", takže použijte cestu jako <strong> mymodule / mypagelist.php </strong> a ne vlastní / mymodule / mypagelist.php. <br> Pokud chcete výchozí hodnotu pouze v případě, že url má nějaký parametr, můžete použít <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...)
+AlsoDefaultValuesAreEffectiveForActionCreate=Také si všimněte, že přepsání výchozích hodnot pro vytváření formulářů funguje pouze pro stránky, které byly správně navrženy (takže s parametrem action = create or presend ...)
 EnableDefaultValues=Povolit přizpůsobení výchozích hodnot
 EnableOverwriteTranslation=Povolit použití přepsaného překladu
 GoIntoTranslationMenuToChangeThis=Překlad byl nalezen pro klí� s tímto kódem. Chcete-li tuto hodnotu změnit, musíte ji upravit z Home-Setup-translation.
@@ -520,7 +523,7 @@ Module25Desc=Řízení prodeje objednávek
 Module30Name=Faktury
 Module30Desc=Řízení faktur a dobropisů pro zákazníky. Řízení faktur a dobropisů pro dodavatele
 Module40Name=Dodavatelé
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=Prodejci a řízení nákupu (objednávky a fakturace dodavatelských faktur)
 Module42Name=Debug Logs
 Module42Desc=Zařízení pro protokolování (soubor, syslog, ...). Takové protokoly jsou ur�eny pro technické ú�ely / ladění.
 Module49Name=Redakce
@@ -530,7 +533,7 @@ Module50Desc=Řízení výrobků
 Module51Name=Hromadné e-maily
 Module51Desc=Hromadná správa pošty
 Module52Name=Zásoby
-Module52Desc=Stock management
+Module52Desc=Skladové hospodářství
 Module53Name=Služby
 Module53Desc=Řízení služeb
 Module54Name=Smlouvy/Objednávky
@@ -545,8 +548,8 @@ Module58Name=ClickToDial
 Module58Desc=Integrace ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
 Module59Desc=Přidat funkce pro generování Bookmark4u ú�et z ú�tu Dolibarr
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=Samolepky
+Module60Desc=Správa nálepek
 Module70Name=Intervence
 Module70Desc=Intervence řízení
 Module75Name=Nákladové a výlet poznámky
@@ -564,9 +567,9 @@ Module200Desc=Synchronizace adresářů LDAP
 Module210Name=PostNuke
 Module210Desc=PostNuke integrace
 Module240Name=Exporty dat
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Nástroj pro export dat Dolibarr (s pomocí)
 Module250Name=Import dat
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Nástroj pro import dat do Dolibarru (s pomocí)
 Module310Name=Členové
 Module310Desc=Nadace �lenové vedení
 Module320Name=RSS Feed
@@ -583,7 +586,7 @@ Module510Name=Platy
 Module510Desc=Zaznamenejte a sledujte platby zaměstnanců
 Module520Name=Úvěry
 Module520Desc=Správa úvěrů
-Module600Name=Notifications on business event
+Module600Name=Oznámení o obchodní události
 Module600Desc=Odeslání e-mailových upozornění vyvolaných podnikovou událostí: na uživatele (nastavení definované pro každého uživatele), na kontakty třetích stran (nastavení definováno na každé třetí straně) nebo na konkrétní e-maily
 Module600Long=Všimněte si, že tento modul pošle e-maily v reálném �ase, když nastane konkrétní událost. Pokud hledáte funkci pro zasílání upozornění na události agend, přejděte do nastavení modulu Agenda.
 Module610Name=Varianty produktu
@@ -630,7 +633,7 @@ 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)
 Module10000Name=Webové 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.
+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=Nechte správu požadavků
 Module20000Desc=Definujte a sledujte žádosti o odchod zaměstnanců
 Module39000Name=Množství produktu
@@ -642,7 +645,7 @@ Module50000Desc=Nabídněte zákazníkům platební stránku PayBox (kreditní /
 Module50100Name=POS SimplePOS
 Module50100Desc=Prodejní modul SimplePOS (jednoduché POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Modul Point of Sale TakePOS (POS dotykový displej, pro obchody, bary nebo restaurace).
 Module50200Name=Paypal
 Module50200Desc=Nabídněte zákazníkům platební stránku PayPal online (ú�et PayPal nebo kreditní nebo debetní karty). To může být použito k tomu, aby zákazníci mohli provádět ad hoc platby nebo platby související s konkrétním předmětem Dolibarr (faktura, objednávka atd.)
 Module50300Name=Proužek
@@ -816,7 +819,7 @@ Permission401=Pře�těte slevy
 Permission402=Vytvořit / upravit slevy
 Permission403=Ověřit slevy
 Permission404=Odstranit slevy
-Permission430=Use Debug Bar
+Permission430=Použijte ladicí panel
 Permission511=Pře�těte si platy
 Permission512=Vytvořte / upravte platby platů
 Permission514=Smazat platy
@@ -831,9 +834,9 @@ Permission532=Vytvořit / upravit služby
 Permission534=Odstranit služby
 Permission536=Viz / správa skryté služby
 Permission538=Export služeb
-Permission650=Read Bills of Materials
-Permission651=Create/Update Bills of Materials
-Permission652=Delete Bills of Materials
+Permission650=Pře�těte si kusovníky
+Permission651=Vytvářejte / aktualizujte ú�ty materiálů
+Permission652=Smazat kusovníky
 Permission701=Pře�těte si dary
 Permission702=Vytvořit / upravit dary
 Permission703=Odstranit dary
@@ -849,12 +852,12 @@ Permission1002=Vytvoření/úprava skladišť
 Permission1003=Odstranění skladišť
 Permission1004=Pře�těte skladové pohyby
 Permission1005=Vytvořit / upravit skladové pohyby
-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
+Permission1101=Pře�íst potvrzení o doru�ení
+Permission1102=Vytvářejte / upravujte potvrzení o doru�ení
+Permission1104=Ověřte potvrzení o doru�ení
+Permission1109=Smažte potvrzení o doru�ení
+Permission1121=Pře�těte si návrhy dodavatelů
+Permission1122=Vytvářejte / upravujte návrhy dodavatelů
 Permission1123=Validate supplier proposals
 Permission1124=Send supplier proposals
 Permission1125=Delete supplier proposals
@@ -947,7 +950,7 @@ DictionaryCanton=Stát/Okres
 DictionaryRegion=Regiony
 DictionaryCountry=ZemÄ›
 DictionaryCurrency=Měny
-DictionaryCivility=Zdvořilostní oslovení
+DictionaryCivility=Honorific titles
 DictionaryActions=Typ agendy událostí
 DictionarySocialContributions=Typy sociální nebo fiskální daně
 DictionaryVAT=Sazby DPH nebo daň z prodeje
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Ve výchozím nastavení je navrhovaná daň z prodeje 0, kter
 VATIsUsedExampleFR=Ve Francii to znamená, že spole�nosti nebo organizace mají skute�ný fiskální systém (zjednodušený reálný nebo normální reálný). Systém, v němž je uvedena DPH.
 VATIsNotUsedExampleFR=Ve Francii se jedná o sdružení, která jsou prohlášena za nepodléhající daň z prodeje, nebo spole�nosti, organizace nebo svobodné profese, které si vybraly daňový systém pro mikropodniky (daně z prodeje ve franchise) a zaplatili daň z prodeje bez daně z prodeje bez prohlášení o daních z prodeje. Tato volba zobrazí na fakturách odkaz "Neuplatňuje se daň z prodeje - art-293B CGI".
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Rychlost
 LocalTax1IsNotUsed=Nepoužívejte druhou daň
 LocalTax1IsUsedDesc=Použijte druhý typ daně (jiný než první)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Kurz IRPF ve výchozím nastavení při vytváření prosp
 LocalTax2IsNotUsedDescES=Standardně navrhovaný IRPF je 0. Konec pravidla.
 LocalTax2IsUsedExampleES=Ve Španělsku, na volné noze a nezávislí odborníci, kteří poskytují služby a firmy, kteří se rozhodli daňového systému modulů.
 LocalTax2IsNotUsedExampleES=Ve Španělsku jsou podniky, které nepodléhají daňovému systému modulů.
+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 des 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=Zprávy o místních daních
 CalcLocaltax1=Prodej - Nákupy
 CalcLocaltax1Desc=Přehledy místních daní jsou vypo�ítávány s rozdílem mezi místními nákupy a místními nákupy
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Nákupy
 CalcLocaltax2Desc=Přehledy místních daní jsou sou�tem nákupů místních taxíků
 CalcLocaltax3=Odbyt
 CalcLocaltax3Desc=Přehledy místních daní představují celkový prodej místních tax
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Štítky použité ve výchozím nastavení, pokud nelze najít překlad pro kód
 LabelOnDocuments=Štítek na dokumenty
 LabelOrTranslationKey=Klí� pro ozna�ení nebo překlad
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Zpráva o výdajích ke schválení
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Než za�nete používat Dolibarr, je třeba definovat některé po�áte�ní parametry a povolit / konfigurovat moduly.
 SetupDescription2=Následující dvě �ásti jsou povinné (první dvě položky v nabídce Nastavení):
-SetupDescription3=<a href="%s">%s ->%s</a> <br> Základní parametry používané k přizpůsobení výchozího chování vaší aplikace (např. Pro funkce související se zemí).
-SetupDescription4=<a href="%s">%s -> %s</a> <br> Tento software je sadou mnoha modulů/aplikací, které jsou více �i méně nezávislé. Moduly odpovídající vašim potřebám musí být povoleny a nakonfigurovány. Nové položky/možnosti jsou přidány do menu s aktivací modulu.
+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=Ostatní položky nabídky nastavení řídí volitelné parametry.
 LogEvents=Události bezpe�nostního auditu
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Povolte protokolování pro konkrétní události zabezpe�ení. Ad
 AreaForAdminOnly=Parametry nastavení mohou být nastaveny pouze <b>uživateli administrátora </b> .
 SystemInfoDesc=Systémové informace jsou různé technické informace, které získáte pouze v režimu pro �tení a viditelné pouze pro správce.
 SystemAreaForAdminOnly=Tato oblast je k dispozici pouze uživatelům správce. Uživatelské oprávnění Dolibarr nemůže toto omezení měnit.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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=Parametry ovlivňující vzhled a chování nástroje Dolibarr lze zde změnit.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Pravidla pro generování a ověřování hesel
 DisableForgetPasswordLinkOnLogonPage=Na stránce Přihlášení nezobrazujte odkaz Zapomenuté heslo
 UsersSetup=Uživatelé modul nastavení
 UserMailRequired=K vytvoření nového uživatele potřebujete e-mail
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=setup HRM Modul
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Modely dokumentů faktur
 BillsPDFModulesAccordindToInvoiceType=Modely dokladů faktur podle typu faktury
 PaymentsPDFModules=Vzory platebních dokumentů
 ForceInvoiceDate=Vynutit datum fakturace k datu ověření
-SuggestedPaymentModesIfNotDefinedInInvoice=Navrhované platby režimu na faktuře ve výchozím nastavení, pokud není definován pro faktury
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Navrhněte platbu výběrem na ú�et
 SuggestPaymentByChequeToAddress=Navrhněte platbu šekem na
 FreeLegalTextOnInvoices=Volný text na fakturách
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Nastavení plateb dodavatelů
 PropalSetup=Nastavení modulů komer�ních návrhů
 ProposalsNumberingModules=Modelové modely �íslování návrhů
 ProposalsPDFModules=Komer�ní návrh doklady modely
-SuggestedPaymentModesIfNotDefinedInProposal=Navrhovaný režim platby na návrh ve výchozím nastavení, pokud není definován pro návrh
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Volný text o obchodních návrhů
 WatermarkOnDraftProposal=Vodoznak v návrhových komer�ních návrzích (žádný není prázdný)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zeptejte se na umístění bankovního ú�tu nabídky
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Zadat zdroj datového skladu pro objednávk
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Požádejte o umístění bankovního ú�tu objednávky
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Nastavení řízení nákupních objednávek
 OrdersNumberingModules=Objednávky �íslování modelů
 OrdersModelModule=Objednat dokumenty modely
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Varování, vyšší hodnoty dramaticky
 ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Exportní modely jsou sdílené s každým
 ExportSetup=Nastavení modulu Export
+ImportSetup=Setup of module Import
 InstanceUniqueID=Jedine�né ID instance
 SmallerThan=Menší než
 LargerThan=Větší než
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index a08717ba138..66ebc9db50c 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Faktury dodavatelů
 SupplierBill=Faktura dodavatele
 SupplierBills=Faktury dodavatelů
 Payment=Platba
-PaymentBack=Vrácení platby
-CustomerInvoicePaymentBack=Vrácení platby
+PaymentBack=Vrácení
+CustomerInvoicePaymentBack=Vrácení
 Payments=Platby
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=v měně faktur
 PaidBack=Navrácené
 DeletePayment=Odstranit platby
 ConfirmDeletePayment=Jste si jisti, že chcete smazat tuto platbu?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Platby dodavatele
 ReceivedPayments=Přijaté platby
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Zobrazit fakturu situace
 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
@@ -509,11 +512,11 @@ ToMakePayment=Zaplatit
 ToMakePaymentBack=Vrátit
 ListOfYourUnpaidInvoices=Seznam nezaplacených faktur
 NoteListOfYourUnpaidInvoices=Poznámka: Tento seznam obsahuje pouze faktury pro třetí strany které jsou propojeny na obchodního zástupce.
-RevenueStamp=Kolek
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Tato možnost je k dispozici pouze při vytváření faktury z karty "Zákazník" subjektu
 YouMustCreateInvoiceFromSupplierThird=Tato možnost je k dispozici pouze při vytváření faktury z karty "Prodejce" subjektu
 YouMustCreateStandardInvoiceFirstDesc=Musíte nejprve vytvořit standardní fakturu a převést ji do „šablony“ pro vytvoření nové šablony faktury
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Nastavte datum ukon�ení servisního řádku s dalším datem fa
 AutoFillDateToShort=Nastavte datum ukon�ení
 MaxNumberOfGenerationReached=Maximální po�et gen. dosáhl
 BILL_DELETEInDolibarr=faktura smazána
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/cs_CZ/blockedlog.lang b/htdocs/langs/cs_CZ/blockedlog.lang
index c81d53c65c2..d5505d61df0 100644
--- a/htdocs/langs/cs_CZ/blockedlog.lang
+++ b/htdocs/langs/cs_CZ/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Nezměnitelné záznamy
 ShowAllFingerPrintsMightBeTooLong=Zobrazit všechny archivované záznamy (mohou být dlouhé)
 ShowAllFingerPrintsErrorsMightBeTooLong=Zobrazit všechny neplatné protokoly archivu (mohou být dlouhé)
 DownloadBlockChain=Stažení otisků prstů
-KoCheckFingerprintValidity=Archivovaná položka protokolu není platná. To znamená, že někdo (hacker?) Změnil některé údaje o tomto re po nahrání nebo vymazal předchozí archivovaný záznam (zkontrolujte, zda existuje řádek s předchozím #).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archivovaný záznam protokolu je platný. Údaje na tomto řádku nebyly změněny a záznam je následující.
 OkCheckFingerprintValidityButChainIsKo=Archivovaný protokol se zdá být v porovnání s předchozím protokolem platný, ale řetězec byl dříve poškozen.
 AddedByAuthority=Uloženo do vzdálené autority
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index f5c5835ecc9..27fbe7b11e4 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Přidat tento �lánek
 RestartSelling=Vraťte se na prodej
 SellFinished=Sale complete
 PrintTicket=Tisk dokladu
+SendTicket=Send ticket
 NoProductFound=Žádný �lánek nalezen
 ProductFound=vyhledané výrobky
 NoArticle=Žádný �lánek
@@ -48,6 +49,7 @@ Footer=Zápatí
 AmountAtEndOfPeriod=Částka na konci období (den, měsíc nebo rok)
 TheoricalAmount=Teoretická �ástka
 RealAmount=Skute�ná �ástka
+CashFence=Cash fence
 CashFenceDone=Peněžní oplatek za období
 NbOfInvoices=Některé z faktur
 Paymentnumpad=Zadejte Pad pro vložení platby
@@ -58,8 +60,9 @@ TakeposNeedsCategories=Firma TakePOS potřebuje k tomu produktové kategorie
 OrderNotes=Objednací poznámky
 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 dle sazeb na lístcích
-AutoPrintTickets=Automaticky tisknout vstupenky
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Povolit funkce pro Bar nebo Restaurace
 ConfirmDeletionOfThisPOSSale=Potvrzujete, že jste tento prodej zrušili?
 ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 Browser=Prohlíže�
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 4cc4191e3e9..ce0b18caed1 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Spole�nost %s odstraněna z databáze.
 ListOfContacts=Seznam kontaktů/adres
 ListOfContactsAddresses=Seznam kontaktů/adres
 ListOfThirdParties=Seznam subjektů
-ShowCompany=Zobrazit subjekt
 ShowContact=Zobrazit kontakt
 ContactsAllShort=VÅ¡e (Bez filtru)
 ContactType=Typ kontaktu
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Jméno obchodního zástupce
 SaleRepresentativeLastname=Příjmení obchodního zástupce
 ErrorThirdpartiesMerge=Při odstraňování subjektů došlo k chybě. Zkontrolujte protokol. Změny byly vráceny.
 NewCustomerSupplierCodeProposed=Kód zákazníka nebo dodavatele již byl použit, je doporu�en nový kód
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Typ platby - Zákazník
 PaymentTermsCustomer=Platební podmínky - Zákazník
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index c7e1a7ea7e8..5d746c572bf 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Viz %sanalýza plateb %spro výpo�et skute�ných pl
 SeeReportInDueDebtMode=Viz %sanalýza faktur %s pro výpo�et založený na známých zaznamenaných fakturách, i když ještě nejsou ú�továny v Ledgeru.
 SeeReportInBookkeepingMode=Viz �ást <b> %sKontrola report %s</b> pro výpo�et na <b> Tabulce ú�tů ú�etnictví </b>
 RulesAmountWithTaxIncluded=- Uvedené �ástky jsou se všemi daněmi
-RulesResultDue=- To zahrnuje neuhrazené faktury, výdaje a DPH, zda byly zaplaceny �i nikoliv. <br> - Je založen na ověřených datech faktur a DPH a ke dni splatnosti pro náklady. Platy definované s plat modulem, použije se datum splatnosti platby.
+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=- To zahrnuje skute�né platby na fakturách, nákladů, DPH a platů. <br> - Je založen na datech plateb faktur, náklady, DPH a platů. Datum daru pro dárcovství.
-RulesCADue=- To zahrnuje splatné faktury klienta, zda byly zaplaceny �i nikoliv. <br> - Je založen na datum ověření těchto faktur <br>.
+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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Zahrnuje záznam ve vašem ú�tu Ledger s ú�etními ú�ty, které mají skupinu "EXPENSE" nebo "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Obrat je fakturován sazbou daně z prodeje
 TurnoverCollectedbyVatrate=Obrat shromážděný podle sazby daně z prodeje
 PurchasebyVatrate=Nákup podle sazby daně z prodeje
 LabelToShow=Krátký štítek
+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
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 6cc550bed4b..9ec1ad76886 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Soubor nebyl korektně poslán serverem
 ErrorNoTmpDir=Do�asné directy %s neexistuje.
 ErrorUploadBlockedByAddon=Nahrávání blokováno pluginem PHP / Apache.
 ErrorFileSizeTooLarge=Soubor je příliš velký.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Velikost příliš dlouhá pro typ int (%s �íslice maximum)
 ErrorSizeTooLongForVarcharType=Velikost příliš dlouho typu string (%s znaků maximum)
 ErrorNoValueForSelectType=Vyplňte prosím hodnotu pro vybraný seznam
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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=Pro tohoto �lena bylo nastaveno heslo. Nebyl však vytvořen žádný uživatelský ú�et. Toto heslo je uloženo, ale nemůže být použito pro přihlášení k Dolibarr. Může být použito externím modulem / rozhraním, ale pokud nemáte pro �lena definováno žádné přihlašovací jméno ani heslo, můžete vypnout možnost "Správa přihlášení pro každého �lena" z nastavení modulu �lena. Pokud potřebujete spravovat přihlašovací údaje, ale nepotřebujete žádné heslo, můžete toto pole ponechat prázdné, abyste se tomuto varování vyhnuli. Poznámka: E-mail může být také použit jako přihlašovací jméno, pokud je �len připojen k uživateli.
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index 46aa42ac0a4..bdc4d493fd7 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Tato konfigurace PHP podporuje Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=Tato PHP instalace podporuje UTF8 funkce.
 PHPSupportIntl=Tato instalace PHP podporuje funkce Intl.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maximální velikost relace je nastavena na <b>%s.</b> To by mělo sta�it.
 PHPMemoryTooLow=Maximální velikost relace je nastavena na <b>%s</b> bajtů. To bohužel nesta�í. Zvyšte svůj parametr <b>memory_limit</b> ve Vašem <b>php.ini</b> na minimální velikost <b>%s</b> bajtů.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Vaše instalace PHP nepodporuje Curl.
 ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
 ErrorPHPDoesNotSupportUTF8=Tato PHP instalace nepodporuje UTF8 funkce. Tato funkce je nutná, pro správnou funk�nost Dolibarr. Zkontrolujte Vaše PHP nastavení.
 ErrorPHPDoesNotSupportIntl=Instalace PHP nepodporuje funkce Intl.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
 ErrorDirDoesNotExists=Adresář %s neexistuje.
 ErrorGoBackAndCorrectParameters=Vraťte se zpět a zkontrolujte / opravte špatné parametry.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Aplikace se pokoušela samoinnicializovat, ale st
 YouTryInstallDisabledByFileLock=Aplikace se pokoušela o vlastní inovaci, ale stránky s instalací / upgradem byly zakázány z důvodu zabezpe�ení (existence souboru zámku <strong> install.lock </strong> v adresáři dokumentů dolibarr). <br>
 ClickHereToGoToApp=Kliknutím sem přejdete do aplikace
 ClickOnLinkOrRemoveManualy=Klikněte na následující odkaz. Pokud vždy vidíte stejnou stránku, musíte odstranit / přejmenovat soubor install.lock v adresáři dokumentů.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/cs_CZ/link.lang b/htdocs/langs/cs_CZ/link.lang
index ed6714e9cc6..3d620dcba76 100644
--- a/htdocs/langs/cs_CZ/link.lang
+++ b/htdocs/langs/cs_CZ/link.lang
@@ -1,10 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Odkaz na nový soubor/dokument
-LinkedFiles=Odkaz na soubory a dokumenty
-NoLinkFound=Neregistrovaný odkaz
-LinkComplete=Soubor byl úspěšně propojen
-ErrorFileNotLinked=Soubor nemohl být propojen
+LinkANewFile=Připojit nový soubor/dokument
+LinkedFiles=Připojené soubory a dokumenty
+NoLinkFound=Žádné odkazy
+LinkComplete=Soubor byl úspěšně připojen
+ErrorFileNotLinked=Soubor nemohl být připojen
 LinkRemoved=Odkaz %s byl odstraněn
 ErrorFailedToDeleteLink= Nepodařilo se odstranit odkaz '<b>%s</b>'
 ErrorFailedToUpdateLink= Nepodařilo se aktualizovat odkaz '<b>%s</b>'
-URLToLink=URL to link
+URLToLink=Připojit URL
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index b98921f4106..f154b82748f 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Žádný kontakt / adresa s nalezenou kategorií
 NoContactLinkedToThirdpartieWithCategoryFound=Žádný kontakt / adresa s nalezenou kategorií
 OutGoingEmailSetup=Nastavení odchozí pošty
 InGoingEmailSetup=Příchozí nastavení e-mailu
-OutGoingEmailSetupForEmailing=Nastavení odchozích e-mailů (pro hromadné zasílání e-mailů)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Výchozí nastavení odchozí pošty
 Information=Informace
 ContactsWithThirdpartyFilter=Kontakty s filtrem subjektu
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index d85d85de4e8..827bdef2db1 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 SaveAndNew=Save and new
 TestConnection=Zkušební připojení
 ToClone=Klon
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Vyberte data, která chcete klonovat:
 NoCloneOptionsSpecified=Nejsou definovány žádné údaje ke klonování.
 Of=z
@@ -829,6 +830,8 @@ Gender=Pohlaví
 Genderman=Muž
 Genderwoman=Žena
 ViewList=Zobrazení seznamu
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=povinné
 Hello=Ahoj
 GoodBye=No, nazdar ...
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index 2e234b393ef..568b1eac8c4 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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=Objednávka prodeje byla ověřena
 Notify_ORDER_SENTBYMAIL=Prodejní objednávka byla odeslána mailem
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Objednávka byla odeslána e-mailem
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL stránky
 WEBSITE_TITLE=Titul
 WEBSITE_DESCRIPTION=Popis
 WEBSITE_IMAGE=obraz
-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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Klí�ová slova
 LinesToImport=Řádky, které chcete importovat
 
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 868ea8447a5..b9baf58d160 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Tento nástroj aktualizuje sazbu DPH definovanou na pro
 MassBarcodeInit=Hromadný �árový kód inicializace
 MassBarcodeInitDesc=Tato stránka může být použita k inicializaci �árového kódu na objekty, které nemají definovaný �árový kód. Zkontrolujte před touto akcí, zda je nastavení modulu �árového kódu kompletní.
 ProductAccountancyBuyCode=Ú�etní kód (nákup)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Ú�etní kód (prodej)
 ProductAccountancySellIntraCode=Ú�etní kód (prodej uvnitř Spole�enství)
 ProductAccountancySellExportCode=Ú�etní kód (exportní prodej)
@@ -165,7 +167,7 @@ SuppliersPrices=Ceny prodejců
 SuppliersPricesOfProductsOrServices=Ceny prodejců (produktů nebo služeb)
 CustomCode=Kód cla / komodity / HS
 CountryOrigin=Země původu
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 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 d736ca6c502..46eafc29ec1 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=ÄŒas
 ListOfTasks=Seznam úkolů
 GoToListOfTimeConsumed=Přejít na seznam �asu spotřebovaného
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 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
@@ -188,7 +186,7 @@ PlannedWorkload=Plánované vytížení
 PlannedWorkloadShort=Pracovní zátěž
 ProjectReferers=Související zboží
 ProjectMustBeValidatedFirst=Projekt musí být nejdříve ověřen
-FirstAddRessourceToAllocateTime=Přiřadit zdroj k vy�lenění �asu
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Vstup za den
 InputPerWeek=Vstup za týden
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=Nejnovější %smodifikované projekty
 OtherFilteredTasks=Další filtrované úkoly
 NoAssignedTasks=Nebyly nalezeny žádné přiřazené úkoly (přiřadit projekt / úkoly aktuálnímu uživateli z horního výběrového pole pro zadání �asu na něm)
 ThirdPartyRequiredToGenerateInvoice=Subjekt musí být definován na projektu, aby mohl fakturovat.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Povolení uživatelských komentářů k úkolům
 AllowCommentOnProject=Umožňuje uživatelským komentářům k projektům
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nová faktura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/cs_CZ/receiptprinter.lang b/htdocs/langs/cs_CZ/receiptprinter.lang
index 107887bca71..fd1a14ecd03 100644
--- a/htdocs/langs/cs_CZ/receiptprinter.lang
+++ b/htdocs/langs/cs_CZ/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy Printer
 CONNECTOR_NETWORK_PRINT=Síťová tiskárna
 CONNECTOR_FILE_PRINT=místní tiskárna
 CONNECTOR_WINDOWS_PRINT=Místní tiskárna Windows
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Fake tiskárna pro zkoušku, nedělá nic
 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=Výchozí profil
 PROFILE_SIMPLE=Zjednodušený profil
 PROFILE_EPOSTEP=Epos Tep Profile
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Faktura 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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Identifika�ní �íslo DPH uvnitř Spole�enství
+DOL_VALUE_MYSOC_CAPITAL=Kapitál
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/cs_CZ/stripe.lang b/htdocs/langs/cs_CZ/stripe.lang
index 763e4862427..a0dd5814103 100644
--- a/htdocs/langs/cs_CZ/stripe.lang
+++ b/htdocs/langs/cs_CZ/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Název dodavatele
 CSSUrlForPaymentForm=CSS styly url platebního formuláře
 NewStripePaymentReceived=Byla obdržena nová platba Stripe
 NewStripePaymentFailed=Pokus o novou Stripe platbu, ta ale selhala
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Tajný testovací klí�
 STRIPE_TEST_PUBLISHABLE_KEY=Testovatelný klí� pro publikování
 STRIPE_TEST_WEBHOOK_KEY=Testovací klí� Webhook
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Odkaz na nastavení Stripe WebHook pro volání IPN (
 ToOfferALinkForLiveWebhook=Odkaz na nastavení Stripe WebHook pro volání IPN (provozní režim)
 PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
 ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index d96e14e53df..265e3f116ec 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -70,7 +70,7 @@ 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=<b>Interní</b> uživatel je uživatel, který je sou�ástí vaší firmy / nadace. <br> <b>Externí</b> uživatel je zákazník, dodavatel nebo jiný. <br><br> V obou případech se oprávněními definují práva na Dolibarr. Externí uživatel navíc může mít jinou nabídku menu než-li interní (viz Domů - Nastavení - Zobrazení)
+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)
 PermissionInheritedFromAGroup=Povolení uděleno, neboť je zděděno z některé uživatelské skupiny.
 Inherited=Zděděný
 UserWillBeInternalUser=Vytvořený uživatel bude interní (protože není spojen s žádnou třetí stranou)
@@ -113,3 +113,5 @@ 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=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 47303baa66c..9abca0118ab 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Zobrazit stránku v nové kartě
 SetAsHomePage=Nastavit jako domovskou stránku
 RealURL=real URL
 ViewWebsiteInProduction=Pohled webové stránky s použitím domácí adresy URL
-SetHereVirtualHost= <u> Použití s Apache / NGinx / ... </u> <br> Pokud můžete vytvořit na svém webovém serveru (Apache, Nginx, ...) vyhrazený virtuální hostitel s PHP povoleným a kořenový adresář na <br> <strong> %s </strong> <br> pak nastavit název virtuálního hostitele, který jste vytvořili ve vlastnostech webových stránek, takže náhled lze provést také pomocí tohoto vyhrazeného přístupu k webovým serverům místo interního serveru Dolibarr.
+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> 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>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=Zkontrolujte také, že virtuální hostitel má oprávnění <strong> %s </strong> na souborech do <br> <strong> %s </strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 WEBSITE_USE_WEBSITE_ACCOUNTS=Povolte tabulku ú�tu webových stránek
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivujte tabulku pro ukládání ú�tů webových stránek (login / heslo) pro každý web / třetí stranu
 YouMustDefineTheHomePage=Nejprve musíte definovat výchozí domovskou stránku
-OnlyEditionOfSourceForGrabbedContentFuture=Upozornění: Vytvoření webové stránky importováním externí webové stránky je vyhrazeno pro zkušené uživatele. V závislosti na složitosti zdrojové stránky se může výsledek importu lišit od původního. Také pokud zdrojová stránka používá běžné styly CSS nebo konfliktní javascript, může při práci na této stránce narušit vzhled nebo funkce editoru webových stránek. Tato metoda je rychlejší způsob, jak vytvořit stránku, ale doporu�uje se vytvořit novou stránku od za�átku nebo od navržené šablony stránky. <br> Upozorňujeme také, že úpravy HTML zdroje budou možné, pokud bude obsah stránky inicializován tak, že jej budete chytat z externí stránky (editor "Online" NEN� dostupný)
+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=Pouze vydání zdroje HTML je možné, pokud byl obsah chycen z externího webu
 GrabImagesInto=Uchopte také obrázky do css a stránky.
 ImagesShouldBeSavedInto=Obrázky je třeba uložit do adresáře
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 83a89ffb0d7..d4dde827a10 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Bemærk: <b> din </b> PHP konfiguration begrænser i øj
 NoMaxSizeByPHPLimit=Bemærk: Ingen grænse er sat i din PHP-konfiguration
 MaxSizeForUploadedFiles=Maksimale størrelse for uploadede filer (0 til disallow enhver upload)
 UseCaptchaCode=Brug grafisk kode på loginsiden
-AntiVirusCommand= Fuld sti til antivirus kommando
-AntiVirusCommandExample= Eksempel på ClamWin: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe <br> Eksempel på ClamAV: / usr / bin / clamscan
+AntiVirusCommand=Fuld sti til antivirus kommando
+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= Flere parametre på kommandolinjen
-AntiVirusParamExample= Eksempel for ClamWin: - database = "C: \\ Programmer (x86) \\ ClamWin \\ lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Opsætning af regnskabsmodul
 UserSetup=Brugerstyring opsætning
 MultiCurrencySetup=Multi-valuta opsætning
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funktionen slået fra i demo
 FeatureAvailableOnlyOnStable=Funktionen er kun tilgængelig på officielle stabile versioner
 BoxesDesc=Widgets er komponenter, der viser nogle oplysninger, som du kan tilføje for at tilpasse nogle sider. Du kan vælge mellem at vise widgeten eller ej ved at vælge målside og klikke på 'Aktiver' eller ved at klikke på papirkurven for at deaktivere den.
 OnlyActiveElementsAreShown=Kun elementer fra de <a href="%s">aktiverede moduler</a> er vist.
-ModulesDesc=Modulerne / applikationerne bestemmer hvilke funktioner der er tilgængelige i softwaren. Nogle moduler kræver tilladelser til brugere efter aktivering af modulet. Klik på tænd / sluk-knappen (ved slutningen af modullinjen) for at aktivere / deaktivere et modul / program.
+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=Du kan finde flere moduler som kan downloades på eksterne hjemmesider på internettet ...
 ModulesDeployDesc=Hvis tilladelser i dit filsystem tillader det, kan du bruge dette værktøj til at installere et eksternt modul. Modulet vil så være synligt på fanen <strong> %s</strong>.
 ModulesMarketPlaces=Finde eksterne app/moduler
@@ -212,6 +212,7 @@ CompatibleUpTo=Kompatibel med version %s
 NotCompatible=Dette modul virker ikke kompatibelt med din Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Dette modul kræver en opdatering til din Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Se på markedspladsen
+SeeSetupOfModule=See setup of module %s
 Updated=Opdater
 Nouveauté=Nyhed
 AchatTelechargement=Køb / Download
@@ -221,6 +222,7 @@ DoliPartnersDesc=Liste over virksomheder, der leverer specialudviklede moduler e
 WebSiteDesc=Eksterne websites til flere (tredjeparts) tillægsmoduler ...
 DevelopYourModuleDesc=Nogle løsninger til at udvikle dit eget modul ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Bokse til rådighed
 BoxesActivated=Bokse aktiveret
 ActivateOn=Aktivér om
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Holde tomt for at bruge standard værdi
 DefaultLink=Standard link
 SetAsDefault=Indstillet som standard
 ValueOverwrittenByUserSetup=Advarsel, denne værdi kan blive overskrevet af bruger-specifik opsætning (hver bruger kan indstille sin egen clicktodial url)
-ExternalModule=Eksternt modul - Installeret i mappe %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for tredjepart
 BarcodeInitForProductsOrServices=Mass barcode init eller nulstil for produkter eller tjenester
 CurrentlyNWithoutBarCode=I øjeblikket har du <strong> %s </strong> post på <strong> %s </strong> %s uden stregkode defineret.
@@ -947,7 +950,7 @@ DictionaryCanton=Stater / provinser
 DictionaryRegion=Regioner
 DictionaryCountry=Lande
 DictionaryCurrency=Valuta
-DictionaryCivility=Titel for høflighed
+DictionaryCivility=Honorific titles
 DictionaryActions=Begivenhedstyper
 DictionarySocialContributions=Typer af sociale eller skattemæssige afgifter
 DictionaryVAT=Momssatser
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Den foreslåede moms er som standard 0, som kan bruges til sage
 VATIsUsedExampleFR=I Frankrig betyder det, at virksomheder eller organisationer har et rigtigt finanssystem (forenklet reel eller normal reel). Et system, hvor moms er erklæret.
 VATIsNotUsedExampleFR=I Frankrig betyder det foreninger, der ikke er momsregistrerede, eller selskaber, organisationer eller liberale erhverv, der har valgt mikrovirksomhedens skattesystem (Salgsskat i franchise) og betalt en franchise Salgsskat uden nogen momsafgift. Dette valg vil vise referencen "Ikke gældende salgsafgift - art-293B CGI" på fakturaer.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Hyppighed
 LocalTax1IsNotUsed=Brug ikke anden skat
 LocalTax1IsUsedDesc=Brug en anden type afgift (bortset fra den første)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=IRPF-kursen som standard ved oprettelse af emner. fakturae
 LocalTax2IsNotUsedDescES=Som standard den foreslåede IRPF er 0. Slut på reglen.
 LocalTax2IsUsedExampleES=I Spanien, freelancere og selvstændige, der leverer tjenesteydelser og virksomheder, der har valgt at skattesystemet i de moduler.
 LocalTax2IsNotUsedExampleES=I Spanien er de virksomheder, der ikke er underlagt skattesystemer for moduler.
+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 des 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=Rapporter om lokale skatter
 CalcLocaltax1=Salg - Køb
 CalcLocaltax1Desc=Lokale skatter rapporter beregnes med forskellen mellem localtaxes salg og localtaxes køb
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Køb
 CalcLocaltax2Desc=Lokale skatter rapporter er de samlede køb af lokale afgifter
 CalcLocaltax3=Salg
 CalcLocaltax3Desc=Lokale skatter rapporter er det samlede salg af localtaxes
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan findes for kode
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Etiket eller oversættelsestast
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Udgiftsrapporten godkendes
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Før du begynder at bruge Dolibarr, skal nogle indledende parametre defineres og moduler aktiveres / konfigureres.
 SetupDescription2=Følgende to afsnit er obligatoriske (de to første indgange i opsætningsmenuen):
-SetupDescription3=<a href="%s">%s -&gt; %s</a> <br> Grundlæggende parametre, der bruges til at tilpasse din applikations standardopførsel (f.eks. Til landrelaterede funktioner).
-SetupDescription4=<a href="%s">%s -&gt; %s</a> <br> Denne software er en pakke med mange moduler / applikationer, alle mere eller mindre uafhængige. De moduler, der er relevante for dine behov, skal være aktiveret og konfigureret. Nye elementer / indstillinger føjes til menuer med aktivering af et modul.
+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=Andre opsætningsmenuindgange styrer valgfrie parametre.
 LogEvents=Sikkerhed revision arrangementer
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Aktivér logføring til specifikke sikkerhedshændelser. Administra
 AreaForAdminOnly=Opsætningsparametre kan kun indstilles af <b> administratorbrugere</b>.
 SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read only mode og synlig kun for administratorer.
 SystemAreaForAdminOnly=Dette område er kun tilgængeligt for administratorbrugere. Dolibarr bruger tilladelser kan ikke ændre denne begrænsning.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Hvis du har en ekstern revisor / bogholder, kan du her redigere dens oplysninger.
 AccountantFileNumber=Revisor kode
 DisplayDesc=Parametre, der påvirker udseende og opførsel af Dolibarr kan ændres her.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Regler for at generere og validere adgangskoder
 DisableForgetPasswordLinkOnLogonPage=Vis ikke linket "Glemt adgangskode" på siden Login
 UsersSetup=Opsætning af brugermodul
 UserMailRequired=Email nødvendig for at oprette en ny bruger
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=HRM modul opsætning
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Faktura dokumenter modeller
 BillsPDFModulesAccordindToInvoiceType=Faktura dokumenter modeller efter faktura type
 PaymentsPDFModules=Betalingsdokumenter modeller
 ForceInvoiceDate=Force fakturadatoen til bekræftelse dato
-SuggestedPaymentModesIfNotDefinedInInvoice=Foreslåede betalinger tilstand på fakturaen som standard, hvis ikke defineret for faktura
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Foreslå betaling ved tilbagetrækning på konto
 SuggestPaymentByChequeToAddress=Foreslå betaling med check til
 FreeLegalTextOnInvoices=Fri tekst på fakturaer
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Opsætning af leverandørbetalinger
 PropalSetup=Modulopsætning for tilbud
 ProposalsNumberingModules=Nummerering af tilbud
 ProposalsPDFModules=Skabelon for tilbud
-SuggestedPaymentModesIfNotDefinedInProposal=Foreslået betalingsmetode på forslag som standard, hvis ikke defineret til forslag
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Fri tekst på tilbud
 WatermarkOnDraftProposal=Vandmærke på udkast til tilbud (intet, hvis tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Anmode om en bankkonto destination for forslag
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Anmode om lagerkilde for ordre
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Anmode om købskonto bestemmelsessted
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Salgsordrer ledelsesopsætning
 OrdersNumberingModules=Ordrer nummerressourcer moduler
 OrdersModelModule=Bestil dokumenter modeller
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Advarsel, højere værdier bremser dram
 ModuleActivated=Modul %s er aktiveret og forsinker grænsefladen
 EXPORTS_SHARE_MODELS=Eksportmodeller deles med alle
 ExportSetup=Opsætning af modul Eksport
+ImportSetup=Setup of module Import
 InstanceUniqueID=Forekomstets unikke ID
 SmallerThan=Mindre end
 LargerThan=Større end
@@ -1979,5 +1991,7 @@ MakeAnonymousPing=Lav en anonym Ping '+1' til Dolibarr foundation-serveren (udf
 FeatureNotAvailableWithReceptionModule=Funktion ikke tilgængelig, når modulmodtagelse er aktiveret
 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 text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 0eede26674c..b53f6bad382 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -59,16 +59,16 @@ SupplierBill=Leverandørfaktura
 SupplierBills=leverandørfakturaer
 Payment=Betaling
 PaymentBack=Tilbagebetaling
-CustomerInvoicePaymentBack=Betaling tilbage
+CustomerInvoicePaymentBack=Tilbagebetaling
 Payments=Betalinger
 PaymentsBack=restitutioner
 paymentInInvoiceCurrency=i fakturaer valuta
 PaidBack=Tilbagebetalt
 DeletePayment=Slet betaling
 ConfirmDeletePayment=Er du sikker på, at du vil slette denne betaling?
-ConfirmConvertToReduc=Vil du konvertere denne %s til en absolut rabat?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=Beløbet gemmes mellem alle rabatter og kan bruges som en rabat på en aktuel eller en fremtidig faktura for denne kunde.
-ConfirmConvertToReducSupplier=Vil du konvertere denne %s til en absolut rabat?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=Beløbet gemmes blandt alle rabatter og kan bruges som en rabat på en aktuel eller en fremtidig faktura for denne leverandør.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Modtagne betalinger
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Vis faktura status
 UseSituationInvoices=Tillad midlertidig faktura
 UseSituationInvoicesCreditNote=Tillad midlertidig faktura kreditnota
 Retainedwarranty=Opretholdt garanti
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Tilbageholdt garanti standart procent
+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=At betale på %s
 toPayOn=at betale på %s
 RetainedWarranty=Opholdt garanti
@@ -509,7 +512,7 @@ ToMakePayment=Betale
 ToMakePaymentBack=Tilbagebetalt
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
 NoteListOfYourUnpaidInvoices=Bemærk: Denne liste indeholder kun fakturaer til tredjeparter, som du er knyttet til som salgsrepræsentant.
-RevenueStamp=Indtægtsstempel
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Denne indstilling er kun tilgængelig, når du opretter en faktura fra fanen "Kund" fra tredjepart
 YouMustCreateInvoiceFromSupplierThird=Denne indstilling er kun tilgængelig, når du opretter en faktura fra fanen "Sælger" fra tredjepart
 YouMustCreateStandardInvoiceFirstDesc=Du skal først oprette en standardfaktura og konvertere den til "skabelon" for at oprette en ny skabelonfaktura
@@ -575,3 +578,4 @@ AutoFillDateTo=Indstil slutdato for servicelinje med næste faktura dato
 AutoFillDateToShort=Indstil slutdato
 MaxNumberOfGenerationReached=Maks antal gener. nået
 BILL_DELETEInDolibarr=Faktura slettet
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/da_DK/blockedlog.lang b/htdocs/langs/da_DK/blockedlog.lang
index 84d8d52f33a..c76c9e72916 100644
--- a/htdocs/langs/da_DK/blockedlog.lang
+++ b/htdocs/langs/da_DK/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Uændrede logfiler
 ShowAllFingerPrintsMightBeTooLong=Vis alle arkiverede logfiler (kan være lang)
 ShowAllFingerPrintsErrorsMightBeTooLong=Vis alle ikke-gyldige arkivlogfiler (kan være lange)
 DownloadBlockChain=Download fingeraftryk
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Arkiveret log synes at være gyldig i forhold til den foregående, men kæden blev ødelagt tidligere.
 AddedByAuthority=Gemt i ekstern myndighed
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index d0d8da4afe5..a2749d3ffcf 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Tilføj denne artikel
 RestartSelling=GÃ¥ tilbage til salg
 SellFinished=Salg gennemført
 PrintTicket=Udskriv billet
+SendTicket=Send ticket
 NoProductFound=Ingen artikel fundet
 ProductFound=Varen findes
 NoArticle=Ingen artikel
@@ -48,6 +49,7 @@ Footer=Sidefod
 AmountAtEndOfPeriod=Beløb ved udgangen af perioden (dag, måned eller år)
 TheoricalAmount=Teoretisk mængde
 RealAmount=Reelt beløb
+CashFence=Cash fence
 CashFenceDone=Cash fence gjort for perioden
 NbOfInvoices=Antal fakturaer
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS har brug for produkt kategorier for at fungere
 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index ce8b8830ca0..970ecf1e4e1 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company " %s" slettet fra databasen.
 ListOfContacts=Liste over kontakter/adresser
 ListOfContactsAddresses=Liste over kontakter/adresser
 ListOfThirdParties=Liste over tredjeparter
-ShowCompany=Vis tredjepart
 ShowContact=Vis kontakt
 ContactsAllShort=Alle (intet filter)
 ContactType=Type af kontakt
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Fornavn på salgsrepræsentant
 SaleRepresentativeLastname=Efternavn på salgsrepræsentant
 ErrorThirdpartiesMerge=Der opstod en fejl ved sletning af tredjeparter. Kontroller loggen. Ændringer er blevet vendt tilbage.
 NewCustomerSupplierCodeProposed=Kunde- eller leverandørkode, der allerede er brugt, foreslås en ny kode
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Betalingstype - Kunde
 PaymentTermsCustomer=Betalingsbetingelser - Kunde
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index ce9ae06ce02..6b19d13f78a 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Se %sanalyse af betaling%s for en beregning af faktis
 SeeReportInDueDebtMode=Se %sanalyse af faktura%s for en beregning baseret på kendte registrerede fakturaer, selvom de endnu ikke er opført i hovedbogen.
 SeeReportInBookkeepingMode=Se <b> %skassekladde report%s </b> til en beregning på <b> kasssekladdens tabelen </b>
 RulesAmountWithTaxIncluded=- De viste beløb er med alle inkl. moms
-RulesResultDue=- Det inkluderer udestående fakturaer, udgifter, moms, donationer, uanset om de er betalt eller ej. Inkluderer også betalte lønninger. <br> - Det er baseret på bekræftesesdatoen for fakturaer og moms og på forfaldsdagen for udgifter. For lønninger, der er defineret med Lønmodul, anvendes datoen for betaling.
+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=- Den omfatter de reelle betalinger foretaget på fakturaer, udgifter, moms og løn. <br> - Det er baseret på betalingsdatoer for fakturaer, udgifter, moms og løn. Donationsdatoen for donation.
-RulesCADue=- Det inkluderer kundens fakturaer, uanset om de er betalt eller ej. <br> - Det er baseret på valideringsdatoen for disse fakturaer. <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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Det indeholder post i din hovedbog med kontor, der har gruppen "EXPENSE" eller "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Omsætning faktureret ved salgskurs
 TurnoverCollectedbyVatrate=Omsætning opkrævet ved salgskurs
 PurchasebyVatrate=Køb ved salgskurs
 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 8a0ee4bad7e..8eb3fb29a3f 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Fil ikke modtaget helt af serveren.
 ErrorNoTmpDir=Midlertidig directy %s ikke eksisterer.
 ErrorUploadBlockedByAddon=Upload blokeret af en PHP / Apache plugin.
 ErrorFileSizeTooLarge=Filstørrelse er for stor.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Størrelse for lang tid for int type (%s cifre maksimum)
 ErrorSizeTooLongForVarcharType=Størrelse for lang tid for streng type (%s tegn maksimum)
 ErrorNoValueForSelectType=Please fill value for select list
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index 5adaa0794ca..692e45b5abb 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Dette PHP understøtter Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=Dette PHP understøtter UTF8 funktioner.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Din PHP max session hukommelse er sat <b>til %s.</b> Dette skulle være nok.
 PHPMemoryTooLow=Din PHP max-sessionshukommelse er indstillet til <b> %s </ b> bytes. Dette er for lavt. Skift din <b> php.ini </ b> for at indstille parameteren <b> memory_limit </ b> til mindst <b> %s </ b> bytes.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
 ErrorPHPDoesNotSupportUTF8=Din PHP-installation understøtter ikke UTF8-funktioner. Dolibarr kan ikke fungere korrekt. Løs dette inden du installerer 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 ikke eksisterer.
 ErrorGoBackAndCorrectParameters=Gå tilbage og kontroller / korrigér parametrene.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Programmet forsøgte at opgradere selv, men insta
 YouTryInstallDisabledByFileLock=Programmet forsøgte at opgradere selv, men installerings- / opgraderingssiderne er blevet deaktiveret for sikkerhed (ved at der findes en låsfil <strong> install.lock </ strong> i dolibarr-dokumenter-mappen). <br>
 ClickHereToGoToApp=Klik her for at gå til din ansøgning
 ClickOnLinkOrRemoveManualy=Klik på følgende link. Hvis du altid ser den samme side, skal du fjerne / omdøbe filen install.lock i dokumentmappen.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/da_DK/link.lang b/htdocs/langs/da_DK/link.lang
index fdcf07aeff4..bf3e4545fe4 100644
--- a/htdocs/langs/da_DK/link.lang
+++ b/htdocs/langs/da_DK/link.lang
@@ -1,10 +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
+LinkANewFile=Link en ny fil / et dokument
+LinkedFiles=Sammenkædede filer og dokumenter
+NoLinkFound=Ingen registrerede links
+LinkComplete=Filen er blevet linket korrekt
+ErrorFileNotLinked=Filen kunne ikke forbindes
+LinkRemoved=Linket %s er blevet fjernet
+ErrorFailedToDeleteLink= Kunne ikke fjerne linket '<b> %s </b>'
+ErrorFailedToUpdateLink= Kunne ikke opdatere linket '<b> %s </b>'
+URLToLink=URL til link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 3aea0b5baea..ac4731f9f95 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Udgående e-mail opsætning
 InGoingEmailSetup=Indgående e-mail opsætning
-OutGoingEmailSetupForEmailing=Udgående e-mail opsætning (til masse emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Standard udgående e-mail opsætning
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 2f9e64a0919..0496ed4d3b8 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Gem og bliv
 SaveAndNew=Gem og nyt
 TestConnection=Test forbindelse
 ToClone=Klon
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Vælg de data, du vil klone:
 NoCloneOptionsSpecified=Ingen data at klone defineret.
 Of=af
@@ -829,6 +830,8 @@ Gender=Køn
 Genderman=Mand
 Genderwoman=Kvinde
 ViewList=Vis liste
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obligatorisk
 Hello=Hallo
 GoodBye=Farvel
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Vælg dine grafindstillinger for at oprette en graf
 Measures=Foranstaltninger
 XAxis=X-akse
 YAxis=Y-akse
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 2ac1a8ed8d7..47fee11ebee 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL til side
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Beskrivelse
 WEBSITE_IMAGE=Billede
-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 __WEBSITEKEY__ in the path if path depends on website name.
+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=nøgleord
 LinesToImport=Linjer at importere
 
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 42ce2440c93..d6fc860186e 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Produkt ref.
 ProductLabel=Produktmærke
 ProductLabelTranslated=Oversat produktmærke
-ProductDescription=Product description
+ProductDescription=Produkt beskrivelse
 ProductDescriptionTranslated=Oversat produktbeskrivelse
 ProductNoteTranslated=Oversat produkt notat
 ProductServiceCard=Produkter / Tjenester kortet
@@ -17,11 +17,13 @@ Create=Opret
 Reference=Reference
 NewProduct=Ny vare
 NewService=Ny ydelse
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChange=Global momsopdatering
+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=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Regnskabskode (salg)
 ProductAccountancySellIntraCode=Regnskabskode (salg inden for Fællesskabet)
 ProductAccountancySellExportCode=Regnskabskode (salg eksport)
@@ -29,14 +31,14 @@ ProductOrService=Vare eller ydelse
 ProductsAndServices=Varer og ydelser
 ProductsOrServices=Varer eller ydelser
 ProductsPipeServices=Produkter | Services
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
+ProductsOnSale=Produkter til salg
+ProductsOnPurchase=Produkter til køb
 ProductsOnSaleOnly=Varer kun til salg
 ProductsOnPurchaseOnly=Varer kun til indkøb
 ProductsNotOnSell=Varer, der ikke er til salg og ikke kan købes
 ProductsOnSellAndOnBuy=Produkter til salg og til køb
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
+ServicesOnSale=Tjenester til salg
+ServicesOnPurchase=Tjenester til køb
 ServicesOnSaleOnly=Ydelser kun til salg
 ServicesOnPurchaseOnly=Ydelser kun til indkøb
 ServicesNotOnSell=Ydelse, der ikke er til salg og ikke kan købes
@@ -48,10 +50,10 @@ CardProduct0=Vare
 CardProduct1=Ydelse
 Stock=Varelager
 MenuStocks=Lagre
-Stocks=Stocks and location (warehouse) of products
+Stocks=Lagre og placering (lager) af produkter
 Movements=Bevægelser
 Sell=Sælge
-Buy=Purchase
+Buy=Køb
 OnSell=Til salg
 OnBuy=Til indkøb
 NotOnSell=Ikke til salg
@@ -66,17 +68,17 @@ ProductStatusNotOnBuyShort=Ikke til indkøb
 UpdateVAT=Opdater moms
 UpdateDefaultPrice=Opdater standardpris
 UpdateLevelPrices=Opdater priser for hvert niveau
-AppliedPricesFrom=Applied from
+AppliedPricesFrom=Anvendt fra
 SellingPrice=Salgspris
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=Salgspris (ekskl. Skat)
 SellingPriceTTC=Salgspris (inkl. moms)
-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.
+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.
 CostPriceUsage=Denne værdi kan bruges til margenberegning.
 SoldAmount=Solgt beløb
 PurchasedAmount=Købt beløb
 NewPrice=Ny pris
-MinPrice=Min. sell price
+MinPrice=Min. salgspris
 EditSellingPriceLabel=Rediger salgsprisetiket
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere end det minimum, der er tilladt for denne vare (%s uden moms). Denne meddelelse kan også ses, hvis du bruger en for høj rabat.
 ContractStatusClosed=Lukket
@@ -85,7 +87,7 @@ ErrorProductBadRefOrLabel=Forkert værdi for reference eller etiket.
 ErrorProductClone=Der opstod et problem under forsøg på at klone produktet eller tjenesten.
 ErrorPriceCantBeLowerThanMinPrice=Fejl, prisen kan ikke være lavere end minimumsprisen.
 Suppliers=Leverandører
-SupplierRef=Vendor SKU
+SupplierRef=Sælger SKU
 ShowProduct=Vis vare
 ShowService=Vis ydelse
 ProductsAndServicesArea=Varer og ydelser
@@ -94,7 +96,7 @@ ServicesArea=Ydelser
 ListOfStockMovements=Liste over lagerbevægelser
 BuyingPrice=Købspris
 PriceForEachProduct=Produkter med specifikke priser
-SupplierCard=Vendor card
+SupplierCard=Sælgerkort
 PriceRemoved=Pris fjernet
 BarCode=Stregkode
 BarcodeType=Stregkodetype
@@ -102,7 +104,7 @@ SetDefaultBarcodeType=Vælg stregkodetype
 BarcodeValue=Stregkodeværdi
 NoteNotVisibleOnBill=Note (ikke synlig på fakturaer, tilbud ...)
 ServiceLimitedDuration=Hvis varen er en ydelse med begrænset varighed:
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesAbility=Flere prissegmenter pr. Produkt / service (hver kunde er i et prissegment)
 MultiPricesNumPrices=Antal priser
 AssociatedProductsAbility=Aktivér virtuelle produkter (sæt)
 AssociatedProducts=Virtuelle produkter
@@ -116,7 +118,7 @@ CategoryFilter=Kategori filter
 ProductToAddSearch=Søg produkt for at tilføje
 NoMatchFound=Ingen match fundet
 ListOfProductsServices=Liste over produkter / tjenester
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=Liste over produkter / tjenester, der er komponent (er) i dette virtuelle produkt / kit
 ProductParentList=Liste over produkter / services med dette produkt som en komponent
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet en vare/ydelse
@@ -129,15 +131,15 @@ ImportDataset_service_1=Ydelser
 DeleteProductLine=Slet varelinje
 ConfirmDeleteProductLine=Er du sikker på du vil slette denne varelinje?
 ProductSpecial=Særlig
-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=Min. købsmængde
+PriceQtyMin=Prismængde min.
+PriceQtyMinCurrency=Pris (valuta) for denne mængde. (ingen rabat)
+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
+PredefinedProductsToSell=Foruddefineret produkt
+PredefinedServicesToSell=Foruddefineret service
 PredefinedProductsAndServicesToSell=Predefinerede produkter / tjenester til salg
 PredefinedProductsToPurchase=Predefineret produkt til køb
 PredefinedServicesToPurchase=Predefinerede tjenester til køb
@@ -153,8 +155,8 @@ 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
 ClonePricesProduct=Klonpriser
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
+CloneCategoriesProduct=Klon tags / kategorier knyttet
+CloneCompositionProduct=Klon virtuelt produkt / service
 CloneCombinationsProduct=Klon produkt varianter
 ProductIsUsed=Denne vare er brugt
 NewRefForClone=Ref. for nye vare/ydelse
@@ -162,10 +164,10 @@ SellingPrices=Salgspriser
 BuyingPrices=Købspriser
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+SuppliersPricesOfProductsOrServices=Sælgerpriser (af produkter eller tjenester)
 CustomCode=Told / vare / HS-kode
 CountryOrigin=Oprindelsesland
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Kort etiket
 Unit=Enhed
 p=u.
@@ -210,7 +212,7 @@ unitDM=dm
 unitCM=cm
 unitMM=mm
 unitFT=ft
-unitIN=in
+unitIN=i
 unitM2=Kvadratmeter
 unitDM2=dm²
 unitCM2=cm²
@@ -218,7 +220,7 @@ unitMM2=mm²
 unitFT2=ft²
 unitIN2=in²
 unitM3=Kubikmeter
-unitDM3=dm³
+unitDM3=dm
 unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
@@ -238,8 +240,8 @@ UseMultipriceRules=Brug prissegmentregler (defineret i opsætning af produktmodu
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% rabat over %s
 KeepEmptyForAutoCalculation=Hold tom for at få dette beregnet automatisk ud fra vægt eller volumen af ​​produkter
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantRefExample=Eksempler: COL, STØRRELSE
+VariantLabelExample=Eksempler: Farve, størrelse
 ### composition fabrication
 Build=Fremstille
 ProductsMultiPrice=Produkter og priser for hvert prissegment
@@ -250,18 +252,18 @@ Quarter1=1st. Kvarter
 Quarter2=2nd. Kvarter
 Quarter3=3rd. Kvarter
 Quarter4=4th. Kvarter
-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>.
+BarCodePrintsheet=Udskriv stregkode
+PageToGenerateBarCodeSheets=Med dette værktøj kan du udskrive ark med stregkode-klistermærker. Vælg format for din klistermærkeside, type stregkode og stregkodes værdi, og klik derefter på knappen <b> %s </b>.
 NumberOfStickers=Antal klistermærker til udskrivning på side
 PrintsheetForOneBarCode=Udskriv flere klistermærker for en stregkode
 BuildPageToPrint=Generer side, der skal udskrives
 FillBarCodeTypeAndValueManually=Udfyld stregkode type og værdi manuelt.
 FillBarCodeTypeAndValueFromProduct=Udfyld stregkode type og værdi fra stregkode for et produkt.
 FillBarCodeTypeAndValueFromThirdParty=Udfyld stregkode type og værdi fra stregkode for en tredjepart.
-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:
+DefinitionOfBarCodeForProductNotComplete=Definition af type eller værdi af stregkode er ikke komplet for produkt %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition af type eller værdi af stregkode ikke komplet til tredjepart %s.
+BarCodeDataForProduct=Stregkodeinformation for produktet %s:
+BarCodeDataForThirdparty=Stregkodeinformation fra tredjepart %s:
 ResetBarcodeForAllRecords=Definer stregkodeværdi for alle poster (dette vil også nulstille stregkodeværdi allerede defineret med nye værdier)
 PriceByCustomer=Forskellige priser for hver kunde
 PriceCatalogue=En enkelt salgspris pr. Produkt / service
@@ -270,28 +272,28 @@ AddCustomerPrice=Tilføj pris ved kunde
 ForceUpdateChildPriceSoc=Indstil samme pris på kundernes datterselskaber
 PriceByCustomerLog=Log af tidligere kundepriser
 MinimumPriceLimit=Minimumsprisen kan ikke være lavere end %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=Minimum anbefalet pris er: %s
 PriceExpressionEditor=Pris Udtryks Editor
 PriceExpressionSelected=Udvalgt prisudtryk
 PriceExpressionEditorHelp1="pris = 2 + 2" eller "2 + 2" til indstilling af prisen. Brug ; at adskille udtryk
 PriceExpressionEditorHelp2=Du kan få adgang til ExtraFields med variabler som <b> #extrafield_myextrafieldkey # </b> og globale variabler med <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=I både produkt / service og leverandørpriser er der disse variabler tilgængelige: <br> <b> # tva_tx # # localtax1_tx # # localtax2_tx # # vægt # # længde # # overflade # # pris_min # </b>
+PriceExpressionEditorHelp4=Kun i produkt / service pris: <b> # leverandør_min_pris # </b> <br> Kun i sælgerpriser: <b> # leverandør_kvantitet # og # leverandør_tva_tx # a09a4b73917
 PriceExpressionEditorHelp5=Tilgængelige globale værdier:
 PriceMode=Pris-tilstand
 PriceNumeric=Numero
 DefaultPrice=Standard pris
 ComposedProductIncDecStock=Forøg / sænk lagerbeholdning ved forældreændring
-ComposedProduct=Child products
+ComposedProduct=Børneprodukter
 MinSupplierPrice=Min købskurs
 MinCustomerPrice=Mindste salgspris
 DynamicPriceConfiguration=Dynamisk priskonfiguration
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=Du kan definere matematiske formler til beregning af kunde- eller leverandørpriser. Sådanne formler kan bruge alle matematiske operatorer, nogle konstanter og variabler. Du kan her definere de variabler, du vil bruge. Hvis variablen har brug for en automatisk opdatering, kan du definere den eksterne URL, så Dolibarr kan opdatere værdien automatisk.
 AddVariable=Tilføj variabel
 AddUpdater=Tilføj opdaterer
 GlobalVariables=Globale variabler
 VariableToUpdate=Variabel for opdatering
-GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaters=Eksterne opdateringer til variabler
 GlobalVariableUpdaterType0=JSON data
 GlobalVariableUpdaterHelp0=Analyserer JSON-data fra den angivne webadresse, VALUE angiver placeringen af ​​den relevante værdi,
 GlobalVariableUpdaterHelpFormat0=Formatér for anmodning {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -309,7 +311,7 @@ WarningSelectOneDocument=Vælg mindst et dokument
 DefaultUnitToShow=Enhed
 NbOfQtyInProposals=Antal i forslag
 ClinkOnALinkOfColumn=Klik på et link i kolonne %s for at få en detaljeret visning ...
-ProductsOrServicesTranslations=Products/Services translations
+ProductsOrServicesTranslations=Produkter / tjenester oversættelser
 TranslatedLabel=Oversat etiket
 TranslatedDescription=Oversat beskrivelse
 TranslatedNote=Oversatte noter
@@ -317,10 +319,10 @@ ProductWeight=Vægt for 1 produkt
 ProductVolume=Volumen for 1 produkt
 WeightUnits=Vægt enhed
 VolumeUnits=Volumen enhed
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=Bredde enhed
+LengthUnits=Længde enhed
+HeightUnits=Højdeenhed
+SurfaceUnits=Overfladeenhed
 SizeUnits=Størrelsesenhed
 DeleteProductBuyPrice=Slet købspris
 ConfirmDeleteProductBuyPrice=Er du sikker på, at du vil slette denne købspris?
@@ -329,11 +331,11 @@ ProductSheet=Vareside
 ServiceSheet=Serviceblad
 PossibleValues=Mulige værdier
 GoOnMenuToCreateVairants=Gå på menu %s - %s for at forberede attributvarianter (som farver, størrelse, ...)
-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
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductFournDesc=Tilføj en funktion til at definere beskrivelser af produkter, der er defineret af leverandørerne, ud over beskrivelser til kunder
+ProductSupplierDescription=Leverandørbeskrivelse for produktet
+UseProductSupplierPackaging=Brug emballage til leverandørpriser (genberegn mængder i henhold til emballage, der er angivet på leverandørpris, når du tilføjer / opdaterer linje i leverandørdokumenter)
+PackagingForThisProduct=Emballage
+QtyRecalculatedWithPackaging=Mængden af linjen blev beregnet om efter leverandøremballage
 
 #Attributes
 VariantAttributes=Variant attributter
@@ -367,17 +369,17 @@ UsePercentageVariations=Brug procentvise variationer
 PercentageVariation=Procentvis variation
 ErrorDeletingGeneratedProducts=Der opstod en fejl under forsøg på at slette eksisterende varianter
 NbOfDifferentValues=Antal forskellige værdier
-NbProducts=Number of products
+NbProducts=Antal produkter
 ParentProduct=Forældrevarer
 HideChildProducts=Skjul varevarianter
 ShowChildProducts=Vis variantprodukter
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+NoEditVariants=Gå til Parent-produktkort og rediger variantens prispåvirkning under fanen Varianter
 ConfirmCloneProductCombinations=Vil du gerne kopiere alle varianter til det andet overordnede produkt med den givne reference?
 CloneDestinationReference=Bestemmelsesproduktreference
 ErrorCopyProductCombinations=Der opstod en fejl under kopiering af varianter af varen
 ErrorDestinationProductNotFound=Destination produkt ikke fundet
 ErrorProductCombinationNotFound=Varevariant ikke fundet
-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=Handling kun tilgængelig på variant af produkt
+ProductsPricePerCustomer=Produktpriser pr. Kunde
+ProductSupplierExtraFields=Yderligere attributter (leverandørpriser)
+DeleteLinkedProduct=Slet det underordnede produkt, der er knyttet til kombinationen
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 132f59035a3..0637091484c 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Tid
 ListOfTasks=Liste over opgaver
 GoToListOfTimeConsumed=GÃ¥ til listen over tid forbrugt
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planlagt arbejdsbyrde
 PlannedWorkloadShort=arbejdsbyrde
 ProjectReferers=Relaterede emner
 ProjectMustBeValidatedFirst=Projektet skal bekræftes først
-FirstAddRessourceToAllocateTime=Tildel en brugerressource til opgaven for at allokere tid
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Indgang pr. Dag
 InputPerWeek=Indgang pr. Uge
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=Seneste %s ændrede projekter
 OtherFilteredTasks=Andre filtrerede opgaver
 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=Tillad brugernes kommentarer til opgaver
 AllowCommentOnProject=Tillad brugernes kommentarer til projekter
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Ny faktura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/da_DK/receiptprinter.lang b/htdocs/langs/da_DK/receiptprinter.lang
index 53dfdcad15f..6f52edb7a45 100644
--- a/htdocs/langs/da_DK/receiptprinter.lang
+++ b/htdocs/langs/da_DK/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy Printer
 CONNECTOR_NETWORK_PRINT=Netværksprinter
 CONNECTOR_FILE_PRINT=Lokal printer
 CONNECTOR_WINDOWS_PRINT=Lokal Windows Printer
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Falsk printer til test, gør ingenting
 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:hemmeligt@computernavn/arbejdsgruppe/kvitteringsprinter
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=Standard profil
 PROFILE_SIMPLE=Enkel profil
 PROFILE_EPOSTEP=Epos Tep Profile
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Faktura 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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Moms ID inden for Fællesskabet
+DOL_VALUE_MYSOC_CAPITAL=Egenkapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/da_DK/stripe.lang b/htdocs/langs/da_DK/stripe.lang
index 8a6e6cc98fb..7ea3e6c6d93 100644
--- a/htdocs/langs/da_DK/stripe.lang
+++ b/htdocs/langs/da_DK/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Navn på leverandør
 CSSUrlForPaymentForm=CSS stilark url for betalingsformular
 NewStripePaymentReceived=Ny Stripe betaling modtaget
 NewStripePaymentFailed=Ny Stripe betaling forsøgt men mislykkedes
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Hemmelig testnøgle
 STRIPE_TEST_PUBLISHABLE_KEY=Udgivelig testnøgle
 STRIPE_TEST_WEBHOOK_KEY=Webhook testnøgle
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index f970ceaa08e..465b8ad793b 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -70,7 +70,7 @@ ExportDataset_user_1=Brugere og deres egenskaber
 DomainUser=Domænebruger %s
 Reactivate=Genaktiver
 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.<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.<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)
 PermissionInheritedFromAGroup=Tilladelse gives, fordi arvet fra en af en brugers gruppe.
 Inherited=Arvelige
 UserWillBeInternalUser=Oprettet brugeren vil blive en intern bruger (fordi der ikke er knyttet til en bestemt tredjepart)
@@ -110,3 +110,8 @@ UserLogged=Bruger logget
 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
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 317c15c1b37..c6b7dec2547 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Se side i ny fane
 SetAsHomePage=Angiv som hjemmeside
 RealURL=Rigtig webadresse
 ViewWebsiteInProduction=Se websitet ved hjælp af hjemmesider
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+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> 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>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=Kontroller også, at den virtuelle vært har tilladelse <strong> %s </strong> på filer til <br> <strong> %s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktivér webstedets kontobord
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=Du skal først definere standard startside
-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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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=Kun udgave af HTML-kilde er mulig, når indhold blev taget fra et eksternt websted
 GrabImagesInto=Grib også billeder fundet i css og side.
 ImagesShouldBeSavedInto=Billeder skal gemmes i biblioteket
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 4afdce2c5dd..11e60ccc00b 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -19,8 +19,6 @@ InternalUsers=interne Nutzer
 ExternalUsers=externe Nutzer
 GUISetup=Anischt
 NextValue=Nächste Wert
-AntiVirusCommandExample=Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
-AntiVirusParamExample=Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 URL=URL oder Link
 YouCanSubmitFile=You can upload the .zip file of module package from here:
 Module50Name=Produkte und Services
diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang
index d15ee7cc57c..d250ef21a6a 100644
--- a/htdocs/langs/de_AT/bills.lang
+++ b/htdocs/langs/de_AT/bills.lang
@@ -6,6 +6,8 @@ InvoiceProFormaAsk=Proformarechnung
 InvoiceProFormaDesc=<b>Proformarechnung</b> entspricht dem Wert der echten Rechnung, wird aber nicht verbucht.
 ConsumedBy=Consumed von
 CardBill=Rechnungskarte
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 BillShortStatusValidated=Bestätigt
 BillShortStatusClosedUnpaid=geschlossen
 ValidateBill=Validate Rechnung
@@ -21,7 +23,7 @@ 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
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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
diff --git a/htdocs/langs/de_AT/other.lang b/htdocs/langs/de_AT/other.lang
index 51e1f322638..a3a26cd55b0 100644
--- a/htdocs/langs/de_AT/other.lang
+++ b/htdocs/langs/de_AT/other.lang
@@ -21,4 +21,3 @@ EMailTextInterventionValidated=Eingriff %s freigegeben
 ThisIsListOfModules=Dies ist eine Liste der Module, die von dieser Demo-Profil (nur gängigsten Module sind in dieser Demo) vorgewählt. Bearbeiten, um eine personalisierte Demo haben und klicken Sie auf &quot;Start&quot;.
 SelectAColor=Wählen Sie eine Farbe
 WEBSITE_TITLE=Titel
-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 __WEBSITEKEY__ in the path if path depends on website name.
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 7fcee10eb8a..c1aba0657cb 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -53,9 +53,7 @@ NextValueForDeposit=Nächster Wert (Anzahlung)
 MustBeLowerThanPHPLimit=Hinweis: <b>Deine</b> PHP Konfigurationslimite für Uploads ist aktuell  <b>%s</b> %s pro Datei - unabhängig vom Wert dieses Parameters.
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Grössenbeschränkungen hinterlegt
 MaxSizeForUploadedFiles=Maximale Grösse für Dateiuploads (0 verbietet jegliche Uploads)
-AntiVirusCommandExample=Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
 AntiVirusParam=Weitere Parameter auf der Kommandozeile
-AntiVirusParamExample=Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 MultiCurrencySetup=Mehrfachwährungen konfigurieren
 MenuIdParent=Eltern-Menü-ID
 DetailPosition=Reihungsnummer für definition der Menüposition
@@ -94,7 +92,6 @@ AddDropDatabase=DROP DATABASE Befehl hinzufügen
 AddDropTable=DROP TABLE Befehl hinzufügen
 IgnoreDuplicateRecords=Fehler durch doppelte Zeilen ignorieren (INSERT IGNORE)
 BoxesDesc=Boxen (Widgets) sind Informationsblöcke, die man für personalisierte Ansichten verwenden kann. Gib bei einer Box an, auf welcher Ansicht Sie erscheinen soll und Klicke auf "Aktivieren" - oder entferne eine Box über das Papierkorbsymbol.
-ModulesDesc=Über Module steuerst du die Funktionsvielfalt deiner Dolibarr - Umgebung. Schalte die gewünschten Module einfach mit dem Schiebeschalter daneben ein und aus. Setze dann benutzerspezifische Rechte für deine Anwender.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Websites
 ModulesDeployDesc=Hier kannst du Module und Apps von Drittanbietern in deine Umgebung einbinden. Dazu braucht es lokale Schreibrechte auf deiner Webserverumgebung. Diese Module erscheinen danach hier im Tab "<strong>%s</strong>"
 ModulesMarketPlaces=Suche externe Module
@@ -415,8 +412,6 @@ CompanyInfo=Firma / Organisation
 CompanyZip=PLZ
 DoNotSuggestPaymentMode=Nicht vorschlagen
 SetupDescription1=Der Setupbereich erlaubt das konfigurieren ihrer Dolibarr Installation vor der ersten Verwendung.
-SetupDescription3=<a href="%s">%s -&gt; %s</a> <br> Grundlegende Parameter zum Anpassen des Standardverhaltens Ihrer Anwendung (z. B. für länderbezogene Funktionen).
-SetupDescription4=Die Parameter im Menü <a href="%s">%s-> %s</a> sind notwenig, da Dolibarr ein modulares monolithisches ERP/CRM-System ist. Neue Funktionen werden für jedes aktivierte Modul zum Menü hinzugefügt.
 InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos Browser
 InfoOS=Infos OS
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index 58df948fa26..c653f5b376c 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -24,14 +24,11 @@ NoInvoiceToCorrect=Ich habe keine Rechnung zu korrigieren.
 InvoiceHasAvoir=Korrigiert durch eine oder mehrere Gutschriften
 CardBill=Rechnungsübersicht
 InvoiceLine=Rechnungsposition
-CustomerInvoicePaymentBack=Gutschrift
 paymentInInvoiceCurrency=In Rechnungswährung
 PaidBack=Zurückbezahlt
 DeletePayment=Zahlung löschen
 ConfirmDeletePayment=Nur zur Sicherheit: Willst du diese Zahlung wirklich löschen?
-ConfirmConvertToReduc=Willst du diese %s in einen absoluten Rabatt umwandeln?
 ConfirmConvertToReduc2=Der Betrag wird in den Gutschriften gespeichert und kann für diesen Kunden in einer offenen oder künftigen Rechnung als Rabatt verwendet werden.
-ConfirmConvertToReducSupplier=Willst du diese %s in einen Rabatt umwandeln?
 ConfirmConvertToReducSupplier2=Der Betrag wird in den Gutschriften gespeichert und kann für diesen Lieferanten in einer offenen oder künftigen Rechnung als Rabatt verwendet werden.
 SupplierPayments=Lieferantenzahlungen
 ReceivedPayments=Zahlungseingang
@@ -179,7 +176,7 @@ 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
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 TypeContact_invoice_supplier_external_BILLING=Lieferanten - Rechnungskontakt
 TypeContact_invoice_supplier_external_SHIPPING=Lieferanten - Versandkontakt
 InvoiceFirstSituationAsk=Erste Situation Rechnung
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 04657d94f4e..29c7c3a46b4 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -128,7 +128,6 @@ RequiredIfCustomer=Erforderlich falls Geschäftspartner Kunde oder Interessent i
 RequiredIfSupplier=Erforderlich, wenn der Partner Lieferant ist
 ValidityControledByModule=Durch Modul validiert
 ListOfThirdParties=Liste der Geschäftspartner
-ShowCompany=Geschäftspartner anzeigen
 ShowContact=Zeige Kontaktangaben
 ContactsAllShort=Alle (Kein Filter)
 ContactForOrdersOrShipments=Bestellungs- oder Lieferkontakt
diff --git a/htdocs/langs/de_CH/compta.lang b/htdocs/langs/de_CH/compta.lang
index eecf64ff1d5..1690ed0c885 100644
--- a/htdocs/langs/de_CH/compta.lang
+++ b/htdocs/langs/de_CH/compta.lang
@@ -18,7 +18,6 @@ LastCheckReceiptShort=Letzte %s Scheckeinnahmen
 NoWaitingChecks=Keine Schecks warten auf Einlösung.
 CalcModeVATDebt=Modus <b>%s Mwst. auf Engagement Rechnungslegung %s</b>.
 CalcModeLT2Rec=Modus <b>%sIRPF aufLieferantenrechnungen%s</b>
-RulesResultDue=- Dies beinhaltet ausstehende Rechnungen, Aufwendungen, Mehrwertsteuern, Abgaben, ob sie bezahlt wurden oder nicht. Auch die gezahlten Gehälter. <br> - Es gilt das Freigabedatum von den Rechnungen und MwSt., sowie das Fälligkeitsdatum für Aufwendungen. Für Gehälter definiert mit dem Modul Löhne, wird das Valutadatum der Zahlung verwendet.
 LT2ReportByCustomersES=Bericht von Geschäftspartner EKSt.
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden
 SeeVATReportInInputOutputMode=Siehe <b>%sMwSt.-Einnahmen%s</b>-Bericht für eine standardmässige Berechnung
diff --git a/htdocs/langs/de_CH/orders.lang b/htdocs/langs/de_CH/orders.lang
index d9718fd8eb6..d3413475a4d 100644
--- a/htdocs/langs/de_CH/orders.lang
+++ b/htdocs/langs/de_CH/orders.lang
@@ -43,7 +43,7 @@ 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 (old implementation of Eratosthene template)
+PDFEinsteinDescription=A complete order model 
 PDFEratostheneDescription=A complete order model
 PDFProformaDescription=A complete Proforma invoice template
 OrderCreation=Erstellen einer Bestellung
diff --git a/htdocs/langs/de_CH/other.lang b/htdocs/langs/de_CH/other.lang
index bc96b56d634..4f942e32521 100644
--- a/htdocs/langs/de_CH/other.lang
+++ b/htdocs/langs/de_CH/other.lang
@@ -26,5 +26,4 @@ FileIsTooBig=Dateien sind zu gross
 WebsiteSetup=Einstellungen des Webseitenmoduls
 WEBSITE_PAGEURL=URL für Seite
 WEBSITE_TITLE=Titel
-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 __WEBSITEKEY__ in the path if path depends on website name.
 WEBSITE_KEYWORDS=Stichworte
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index f0153258f68..0f2072b4e04 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -69,7 +69,6 @@ CustomerPrices=Kunden Preise
 SuppliersPrices=Lieferantenpreise
 SuppliersPricesOfProductsOrServices=Anbieterpreise
 CustomCode=Zolltarifnummer (z.B. HSN)
-Nature=Produktart (Rohmaterial / Fertigprodukt)
 kilogram=Kilo
 unitP=Teil
 unitSET=Satz
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index a7baf78b067..e3216933e71 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -22,7 +22,6 @@ LinkedToDolibarrThirdParty=Mit Geschäftspartner verknüpft
 CreateDolibarrThirdParty=Neuen Geschäftspartner erstellen
 ExportDataset_user_1=Benutzer und Eigenschaften
 CreateInternalUserDesc=Hier kannst du interne Benutzer erzeugen.\nExterne Benutzer erzeugst du in den Kontakten deiner Partner.
-InternalExternalDesc=Ein interner Benutzer gehört zu deiner Firma.\nExterne User sind Partner, die Zugriff auf das System erhalten.\nSo oder wird die Reichweite mit Benutzerberechtigungen gesteuert. Man kann internen und externen Benutzern auch verschiedene Ansichten und Menus zuweisen.
 PermissionInheritedFromAGroup=Berechtigung durch eine Gruppenzugehörigkeit gererbt.
 UserWillBeInternalUser=Erstellter Benutzer ist ein intern Benutzer (da mit keinem bestimmten Geschäftspartner verknüpft)
 UserWillBeExternalUser=Erstellter Benutzer ist ein externer Benutzer (da mit einem bestimmten Geschäftspartner verknüpft)
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 715f5a0c6ba..be500d597ed 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Hinweis: <b>Ihre</b> PHP-Einstellungen beschränken die
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Größenbeschränkungen hinterlegt
 MaxSizeForUploadedFiles=Maximale Größe für Dateiuploads (0 verbietet jegliche Uploads)
 UseCaptchaCode=Captcha-Code auf der Anmeldeseite verwenden
-AntiVirusCommand= Vollständiger Pfad zum installierten Virenschutz
-AntiVirusCommandExample= Beispiel für ClamWin: c:\\Programme (x86)\\ClamWin\\bin\\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
+AntiVirusCommand=Vollständiger Pfad zum installierten Virenschutz
+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= Weitere Kommandozeilen-Parameter für den Virenschutz
-AntiVirusParamExample= Beispiel für ClamWin: --database="C:\\Programme (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Buchhaltungsmoduls-Einstellungen
 UserSetup=Benutzerverwaltung Einstellungen
 MultiCurrencySetup=Modul Mehrfachwährungen - Einstellungen
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
 BoxesDesc=Boxen sind Komponenten, die einige Informationen anzeigen, die Sie hinzufügen können, um einige Seiten zu personalisieren. Sie können wählen, ob Sie die Box anzeigen möchten oder nicht, indem Sie die Zielseite auswählen und auf 'Aktivieren' klicken oder indem Sie auf den Papierkorb klicken, um es zu deaktivieren.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
-ModulesDesc=Die Module / Anwendungen bestimmen, welche Funktionen in Dolibarr verfügbar sind. Für einige Module müssen den Benutzern nach der Aktivierung des Moduls Berechtigungen erteilt werden. Klicken Sie auf die Schaltfläche Ein / Aus (am Ende der Modulzeile), um ein Modul / eine Anwendung zu aktivieren / deaktivieren.
+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=Sie finden weitere Module auf externen Web-Sites...
 ModulesDeployDesc=DateiWenn es die Berechtigungen in Ihrem Dateisystem zulassen, können Sie mit diesem Tool ein externes Modul bereitstellen. Das Modul ist dann auf der Registerkarte <strong>%s</strong> sichtbar. 
 ModulesMarketPlaces=Zusatzmodule / Erweiterungen
@@ -212,6 +212,7 @@ CompatibleUpTo=Kompatibel mit Version  %s
 NotCompatible=Dieses Modul scheint nicht mit ihrer Dolibarr Version %s kompatibel zu sein. (Min %s - Max %s).
 CompatibleAfterUpdate=Dieses Modul benötigt ein Upgrade ihrer Dolibarr Installation %s  (Min %s - Max %s).
 SeeInMarkerPlace=siehe Marktplatz
+SeeSetupOfModule=Finden Sie im Modul-Setup %s
 Updated=Aktualisiert
 Nouveauté=Neuheit
 AchatTelechargement=Kaufen / Herunterladen
@@ -221,6 +222,7 @@ DoliPartnersDesc=Liste der Unternehmen, die speziell entwickelte Module oder Fun
 WebSiteDesc=Externe Webseiten mit zusätzlichen Add-on (nicht zum Grundumfang gehörend) Modulen ...
 DevelopYourModuleDesc=einige Lösungen um eigene Module zu entwickeln ...
 URL=Link
+RelativeURL=Relative URL
 BoxesAvailable=Verfügbare Boxen
 BoxesActivated=Boxen aktiviert
 ActivateOn=Aktiv ab
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Leer lassen für Standardwert
 DefaultLink=Standardlink
 SetAsDefault=Als Standard setzen
 ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer überschrieben werden (jeder kann seine eigene ClickToDial-URL setzen)
-ExternalModule=Externes Modul - im Verzeichnis %s installiert
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=alle Barcodes für Geschäftspartner initialisieren
 BarcodeInitForProductsOrServices=Alle Barcodes für Produkte oder Services initialisieren oder zurücksetzen
 CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> %s ohne Barcode.
@@ -947,7 +950,7 @@ DictionaryCanton=Bundesland/Kanton
 DictionaryRegion=Regionen
 DictionaryCountry=Länder
 DictionaryCurrency=Währungen
-DictionaryCivility=Titel & Anreden
+DictionaryCivility=Honorific titles
 DictionaryActions=Typen von Kalender-Ereignissen
 DictionarySocialContributions=Arten von Steuern oder Sozialabgaben
 DictionaryVAT=USt.-Sätze
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle
 VATIsUsedExampleFR=In Frankreich sind damit Unternehmen oder Organisationen gemeint, die ein echtes Steuersystem haben (vereinfacht oder normal). Ein System, in dem die Mehrwertsteuer deklariert wird.
 VATIsNotUsedExampleFR=In Frankreich bedeutet es, dass keine Umsatzsteuer ausgewiesen wird oder Unternehmen, Organisationen oder Freiberufler, die als Kleinunternehmer tätig sind (Privilegiensteuer), Umsatzsteuern zahlen ohne selbst Umsatzsteuer auszuweisen.  Diese Auswahl zeigt den Hinweis "Umsatzsteuer nicht anwendbar - Artikel-293B des CGI" auf Rechnungen an.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Rate
 LocalTax1IsNotUsed=Zweite Steuer nicht nutzen
 LocalTax1IsUsedDesc=Verwende eine zweite Art von Steuer (andere als erste)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Die Einkommenssteuerrate beim Erstellen von Interessenten,
 LocalTax2IsNotUsedDescES=Standardmäßig ist die vorgeschlagene Einkommenssteuer 0. Ende der Regel.
 LocalTax2IsUsedExampleES=In Spanien, Freiberufler und unabhängigen Fachleuten, die ihre Dienstleistungen und Unternehmen, die das Steuersystem von Modulen gewählt haben.
 LocalTax2IsNotUsedExampleES=In Spanien sind das Unternehmen, die nicht dem Steuersystem für Module unterliegen.
+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 des 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=Berichte über lokale Steuern
 CalcLocaltax1=Sales - Käufe
 CalcLocaltax1Desc=Lokale Steuer-Reports werden mit der Differenz von lokalen Verkaufs- und Einkaufs-Steuern berechnet
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Einkauf
 CalcLocaltax2Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Einkäufe
 CalcLocaltax3=Verkauf
 CalcLocaltax3Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Verkäufe
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Bezeichnung wird verwendet falls keine Übersetzung für den Code vorhanden ist.
 LabelOnDocuments=Bezeichnung auf Dokumenten
 LabelOrTranslationKey=Bezeichung oder Übersetzungsschlüssel
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=zu genehmigende Spesenabrechnung
 Delays_MAIN_DELAY_HOLIDAYS=Zu genehmigende Urlaubsanträge
 SetupDescription1=Bevor Sie mit Dolibarr arbeiten können müssen grundlegende Einstellungen getätigt und Module freigeschalten / konfiguriert werden.
 SetupDescription2=Die folgenden zwei Punkte sind obligatorisch:
-SetupDescription3=<a href="%s">%s -> %s</a>. Basis-Parameter um das Standardverhalten Ihrer Anwendung anzupassen (beispielsweise länderbezogene Funktionen).
-SetupDescription4=<a href="%s">%s -> %s</a><br>Diese Software ist ein Paket aus vielen Modulen/Anwendungen, alle mehr oder weniger unabhängig. Die für Ihre Bedürfnisse notwendigen Module müssen aktiviert und konfiguriert sein. Neue Einträge/Optionen werden der Menüs bei der Modulaktivierung hinzugefügt.
+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=Andere Setup-Menüs verwalten optionale Parameter.
 LogEvents=Protokollierte Ereignisse
 Audit=Protokoll
@@ -1128,7 +1136,7 @@ LogEventDesc=Aktivieren Sie die Protokollierung für bestimmte Sicherheitsereign
 AreaForAdminOnly=Einstellungen können nur durch </b>Administratoren</b> verändert werden.
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=Dieser Bereich steht ausschließlich Administratoren zur Verfügung. Keine der Benutzerberechtigungen kann dies ändern.
-CompanyFundationDesc=Bearbeiten Sie die Informationen des Unternehmens oder Institution. Klicken Sie auf "%s" am Ende der Seite.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Falls Sie einen externen Buchhalter/Treuhänder haben, können Sie hier dessen Informationen hinterlegen.
 AccountantFileNumber=Buchhalter-Code
 DisplayDesc=Hier können Parameter zum Aussehen und Verhalten von Dolibarr angepasst werden.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Regeln für die Erstellung und Freigabe von Passwörte
 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 
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Personal Modul Einstellungen
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=PDF-Rechnungsvorlagen
 BillsPDFModulesAccordindToInvoiceType=Rechnung dokumentiert Modelle nach Rechnungsart
 PaymentsPDFModules=Zahlungsvorlagen
 ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
-SuggestedPaymentModesIfNotDefinedInInvoice=Empfohlene Zahlungsart für Rechnung falls nicht in gesondert definiert
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Bankkonto für Bezahlung per Überweisung
 SuggestPaymentByChequeToAddress=Adresse für Zahlung per Scheck
 FreeLegalTextOnInvoices=Freier Rechtstext für Rechnungen
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Einstellungen für Lieferantenzahlungen
 PropalSetup=Angebotsmoduleinstellungen
 ProposalsNumberingModules=Nummernvergabe für Angebote
 ProposalsPDFModules=Dokumentenvorlage(n)
-SuggestedPaymentModesIfNotDefinedInProposal=Empfohlene Zahlungsart für Angebote, falls im Angebot nicht gesondert definiert
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Freier Rechtstext auf Angeboten
 WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwurf (leerlassen wenn keines benötigt wird)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Fragen Sie nach dem Bankkonto bei einem Angebot
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Frage nach Lager für Aufträge
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Frage nach der Ziel-Bankverbindung der Lieferantenbestellung
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Einstellungen für die Verwaltung von Verkaufsaufträgen
 OrdersNumberingModules=Nummernvergabe für Bestellungen
 OrdersModelModule=Dokumentenvorlage(n)
@@ -1720,7 +1731,7 @@ MultiCompanySetup=Einstellungen des Modul Mandanten
 ##### Suppliers #####
 SuppliersSetup=Einrichtung des Lieferantenmoduls
 SuppliersCommandModel=Vollständige Bestellvorlage
-SuppliersCommandModelMuscadet=Vollständige Bestellvorlage (alte Implementierung der Cornas-Vorlage)
+SuppliersCommandModelMuscadet=Vollständige Bestellvorlage 
 SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung
 SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
 IfSetToYesDontForgetPermission=Wenn ein Wert ungleich Null festgelegt ist, vergessen Sie nicht, Berechtigungen für Gruppen oder Benutzer bereitzustellen, die für die zweite Genehmigung zugelassen sind
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die
 ModuleActivated=Modul %s is aktiviert und verlangsamt die Overfläche
 EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich.
 ExportSetup=Einrichtung Modul Export
+ImportSetup=Setup of module Import
 InstanceUniqueID=Eindeutige ID dieser Instanz
 SmallerThan=Kleiner als
 LargerThan=Größer als
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=Wenn der Text im PDF-Dokument in 2 unterschiedlichen Sprachen enthalten sein soll, also 2 unterschiedlichen Sprachen im gleichen PDF, muss diese zweite Sprache hier angegeben werden so dass das erzeugte PDF 2 unterschiedliche Sprachen in einem Dokument aufweist. Die beim PDF erzeugen eingestellte und die hier angegebene (nur wenige PDF-Vorlagen unterstützen das). Leer lassen, um nur eine Sprache im PDF zu verwenden.
+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=Gib hier den Code für ein FontAwesome icon ein. Wenn du FontAwesome nicht kennst, kannst du den Standard 'fa-address-book' benutzen.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 268e655376c..fbcf4801dab 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Lieferantenrechnungen
 SupplierBill=Lieferantenrechnung
 SupplierBills=Lieferantenrechnungen
 Payment=Zahlung
-PaymentBack=Rückzahlung
-CustomerInvoicePaymentBack=Rückzahlung
+PaymentBack=Rückerstattung
+CustomerInvoicePaymentBack=Rückerstattung
 Payments=Zahlungen
 PaymentsBack=Rückerstattungen
 paymentInInvoiceCurrency=in Rechnungswährung
 PaidBack=Zurück bezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
-ConfirmConvertToReduc=Möchten Sie diese %s in einen absoluten Rabatt umwandeln?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=Der Betrag wird unter allen Rabatten gespeichert und kann als Rabatt für eine aktuelle oder zukünftige Rechnung für diesen Kunden verwendet werden.
-ConfirmConvertToReducSupplier=Möchten Sie diese %s in einen absoluten Rabatt umwandeln?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=Der Betrag wird unter allen Rabatten gespeichert und kann als Rabatt für eine aktuelle oder zukünftige Rechnung dieses Anbieters verwendet werden.
 SupplierPayments=Lieferanten Zahlung
 ReceivedPayments=Erhaltene Zahlungen
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Zeige Fortschritt-Rechnung
 UseSituationInvoices=Fortschritt-Rechnung zulassen
 UseSituationInvoicesCreditNote=Fortschritt-Rechnungsgutschrift zulassen
 Retainedwarranty=Zurückbehaltene Garantie
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Zurückbehaltene Garantie in Prozent
+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=Zu zahlen am %s
 toPayOn=zu zahlen am %s
 RetainedWarranty=Zurückbehaltene Garantie
@@ -509,11 +512,11 @@ ToMakePayment=Bezahlen
 ToMakePaymentBack=Rückzahlung
 ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen
 NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind.
-RevenueStamp=Steuermarke
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Diese Option ist nur verfügbar, wenn Sie eine Rechnung auf der Registerkarte "Kunde" eines Drittanbieters erstellen
 YouMustCreateInvoiceFromSupplierThird=Diese Option ist nur verfügbar, wenn Sie eine Rechnung auf der Registerkarte "Kreditor" eines Drittanbieters erstellen
 YouMustCreateStandardInvoiceFirstDesc=Zuerst muss eine Standardrechnung erstellt werden, dies kann dann in eine neue Rechnungsvorlage konvertiert werden
-PDFCrabeDescription=Rechnung PDF-Vorlage Crabe. Eine vollständige Rechnungsvorlage (alte Implementierung der Sponge-Vorlage)
+PDFCrabeDescription=Rechnung PDF-Vorlage Crabe. Eine vollständige Rechnungsvorlage 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Enddatum der Dienstleistung auf das Rechnungsdatum setzen
 AutoFillDateToShort=Enddatum festlegen
 MaxNumberOfGenerationReached=Maximal Anzahl Generierungen erreicht
 BILL_DELETEInDolibarr=Rechnung gelöscht
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/de_DE/blockedlog.lang b/htdocs/langs/de_DE/blockedlog.lang
index d77cda25f7e..b42f38edc50 100644
--- a/htdocs/langs/de_DE/blockedlog.lang
+++ b/htdocs/langs/de_DE/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unveränderbare Logs
 ShowAllFingerPrintsMightBeTooLong=Unveränderbare Logs anzeigen (kann lange dauern...)
 ShowAllFingerPrintsErrorsMightBeTooLong=Non valid Logs anzeigen (kann lange dauern)
 DownloadBlockChain=Fingerprints herunterladen
-KoCheckFingerprintValidity=Archived Log eintrag ist nicht gültig. Jemand hat den Originellen Eintrag verändert (Hacker ?), oder der originelle Eintrag wurde gelöscht. 
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Der archivierte Logeintrag ist gültig. Die Daten in dieser Zeile wurden nicht geändert und der Eintrag folgt dem vorherigen.
 OkCheckFingerprintValidityButChainIsKo=Der archivierte Logeintrag scheint im Vergleich zum vorherigen gültig zu sein, aber die vorangehende Eintragskette wurde beschädigt.
 AddedByAuthority=In der Remote-Instanz gespeichert
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 6e1862a76e5..ea36609a634 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=In Warenkorb legen
 RestartSelling=zurück zum Verkauf
 SellFinished=Verkauf abgeschlossen
 PrintTicket=Kassenbon drucken
+SendTicket=Send ticket
 NoProductFound=Kein Artikel gefunden
 ProductFound=Produkt gefunden
 NoArticle=Kein Artikel
@@ -48,6 +49,7 @@ Footer=Fusszeile
 AmountAtEndOfPeriod=Betrag am Ende der Periode (Tag, Monat oder Jahr)
 TheoricalAmount=Theoretischer Betrag
 RealAmount=Realer Betrag
+CashFence=Cash fence
 CashFenceDone=Kassenschnitt im Zeitraum durchgeführt
 NbOfInvoices=Anzahl der Rechnungen
 Paymentnumpad=Art des Pads zur Eingabe der Zahlung
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS benötigt Produktkategorien, um zu funktionieren
 OrderNotes=Bestellhinweise
 CashDeskBankAccountFor=Standardkonto für Zahlungen in
 NoPaimementModesDefined=In der TakePOS-Konfiguration ist kein Zahlungsmodus definiert
-TicketVatGrouped=Mehrwertsteuer nach Ticketangaben gruppieren
-AutoPrintTickets=Tickets automatisch drucken
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Aktivieren Sie Funktionen für Bar oder Restaurant
 ConfirmDeletionOfThisPOSSale=Bestätigen Sie die Löschung dieses aktuellen Verkaufs?
 ConfirmDiscardOfThisPOSSale=Möchten Sie diesen aktuellen Verkauf verwerfen?
@@ -87,7 +90,19 @@ HeadBar=Kopfleiste
 SortProductField=Feld zum Sortieren von Produkten
 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.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Druckmethode
 ReceiptPrinterMethodDescription=Leistungsstarke Methode mit vielen Parametern. Vollständig anpassbar mit Vorlagen. Kann nicht aus der Cloud drucken.
 ByTerminal=By terminal
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 451828dd7aa..862481c2ae1 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Firma "%s" aus der Datenbank gelöscht.
 ListOfContacts=Liste der Kontakte
 ListOfContactsAddresses=Liste der Kontakte
 ListOfThirdParties=Liste der Partner
-ShowCompany=Partner anzeigen
 ShowContact=Kontakt  anzeigen
 ContactsAllShort=Alle  (kein Filter)
 ContactType=Kontaktart
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Vorname des Vertreter
 SaleRepresentativeLastname=Nachname des Vertreter
 ErrorThirdpartiesMerge=Es gab einen Fehler beim Löschen des Partners. Bitte Details sind im Prokoll zu finden. Die Löschung wurden rückgängig gemacht.
 NewCustomerSupplierCodeProposed=Kunden- oder Lieferantennummer wird bereits verwendet. \nEine neue Nummer wird empfohlen.
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Zahlungsart - Kunde
 PaymentTermsCustomer=Zahlungsbedingung - Kunde
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 565102ea3c7..11b23d8e79e 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Zeige %sZahlungsanalyse%s für die Berechnung der akt
 SeeReportInDueDebtMode=Zeige %sRechnungsanalyse%s für die Berechnung der aktuellen Rechnungen auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
 SeeReportInBookkeepingMode=Siehe <b>%sBuchungsreport%s</b> für die Berechnung via <b>Hauptbuch </b>
 RulesAmountWithTaxIncluded=- Angezeigte Beträge enthalten alle Steuern
-RulesResultDue=- Dies beinhaltet ausstehende Rechnungen, Aufwendungen, Umsatzsteuern, Abgaben, ob sie bezahlt wurden oder nicht. Auch die gezahlten Gehälter. <br> - Es gilt das Freigabedatum von den Rechnungen und USt., sowie das Fälligkeitsdatum für Aufwendungen. Für Gehälter definiert mit dem Modul Löhne, wird das Valutadatum der Zahlung verwendet.
+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=- Es sind nur tatsächliche Zahlungen für Rechnungen, Kostenabrechnungen, USt und Gehälter enthalten. <br>- Bei Rechnungen, Kostenabrechnungen, USt und Gehälter gilt das Zahlugnsdatum. Bei Spenden gilt das Spendendatum.
-RulesCADue=- Es enthält die fälligen Rechnungen des Kunden, ob sie bezahlt werden oder nicht. <br> - Es basiert auf dem Validierungsdatum dieser Rechnungen. <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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Verrechneter Umsatz pro Steuersatz
 TurnoverCollectedbyVatrate=Realisierter Umsatz pro Steuersatz
 PurchasebyVatrate=Einkäufe pro Steuersatz
 LabelToShow=Kurzbezeichnung
+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
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 0b38b138aa3..9ad6bef1441 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -59,6 +59,7 @@ 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.
 ErrorFileSizeTooLarge=Die Größe der gewählten Datei übersteigt den zulässigen Maximalwert.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Die Größe überschreitet das Maximum für den Typ 'int' (%s Ziffern maximal)
 ErrorSizeTooLongForVarcharType=Die Größe überschreitet das Maximum für den Typ 'string' (%s Zeichen maximal)
 ErrorNoValueForSelectType=Bitte Wert für Auswahlliste eingeben
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Fehler, die Sprache der überset
 ErrorBatchNoFoundForProductInWarehouse=Für das Produkt "%s" wurde im Lager "%s" keine Los / Seriennummer gefunden.
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Bestand nicht ausreichend für diese Los / Seriennummer für das Produkt "%s" im Lager "%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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index eef58425e45..024bb2f2b61 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Ihre PHP-Konfiguration unterstützt cURL.
 PHPSupportCalendar=Ihre PHP-Konfiguration unterstützt die Kalender-Erweiterungen.
 PHPSupportUTF8=Ihre PHP-Konfiguration unterstützt die UTF8-Funktionen.
 PHPSupportIntl=Ihre PHP-Konfiguration unterstützt die Internationalisierungs-Funktionen.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Dieses PHP unterstützt %s-Funktionen.
 PHPMemoryOK=Die Sitzungsspeicherbegrenzung ihrer PHP-Konfiguration steht auf <b>%s</b>. Dies sollte ausreichend sein.
 PHPMemoryTooLow=Der maximale PHP-Sitzungsspeicher ist auf <b>%s</b> Bytes gesetzt. Dieser Wert ist zu niedrig. Ändern sie den Parameter <b>memory_limit</b> in der <b>php.ini</b> auf mindestens <b>%s</b> Bytes!
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Ihre PHP-Version unterstützt die Erweiterung Curl ni
 ErrorPHPDoesNotSupportCalendar=Ihre PHP-Installation unterstützt die Kalender-Erweiterungen nicht.
 ErrorPHPDoesNotSupportUTF8=Ihre PHP-Installation unterstützt die UTF8-Funktionen nicht. Dolibarr wird nicht korrekt funktionieren. Beheben Sie das Problem vor der Installation.
 ErrorPHPDoesNotSupportIntl=Ihre PHP-Konfiguration unterstützt keine Internationalisierungsfunktion (intl-extension).
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Ihre PHP-Installation unterstützt keine %s-Funktionen.
 ErrorDirDoesNotExists=Das Verzeichnis %s existiert nicht.
 ErrorGoBackAndCorrectParameters=Gehen Sie zurück und prüfen/korrigieren Sie die Parameter.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Die Anwendung hat versucht, sich selbst zu aktual
 YouTryInstallDisabledByFileLock=Die Anwendung hat versucht, sich selbst zu aktualisieren, aber die Installations-/Upgrade-Seiten wurden aus Sicherheitsgründen deaktiviert (durch die Existenz einer Sperrdatei <strong>install.lock</strong> im Dokumenten-Verzeichnis).<br>
 ClickHereToGoToApp=Hier klicken um zu Ihrer Anwendung zu kommen
 ClickOnLinkOrRemoveManualy=Klicken Sie auf den folgenden Link. Wenn Sie immer die gleiche Seite sehen, müssen Sie die Datei install.lock im Dokumenten-Verzeichnis entfernen/umbenennen.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/de_DE/link.lang b/htdocs/langs/de_DE/link.lang
index 9c561230019..2c9e412b742 100644
--- a/htdocs/langs/de_DE/link.lang
+++ b/htdocs/langs/de_DE/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Der Link %s wurde entfernt
 ErrorFailedToDeleteLink= Fehler beim entfernen des Links  '<b>%s</b>'
 ErrorFailedToUpdateLink= Fehler beim aktualisieren des Link  '<b>%s</b>'
 URLToLink=URL zum verlinken
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 04567ddd4d6..a2f484938be 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
 NoContactLinkedToThirdpartieWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
 OutGoingEmailSetup=Postausgang
 InGoingEmailSetup=Posteingang
-OutGoingEmailSetupForEmailing=Einstellung ausgehende E-Mails (für den Massenversand)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Standardeinstellungen für ausgehende E-Mails
 Information=Information
 ContactsWithThirdpartyFilter=Kontakte mit Drittanbieter-Filter
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index a3c7af845ec..47e0eedd055 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Speichern und bleiben
 SaveAndNew=Speichern und neu
 TestConnection=Verbindung testen
 ToClone=Duplizieren
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Wählen Sie die zu duplizierenden Daten:
 NoCloneOptionsSpecified=Keine Duplikationsoptionen ausgewählt.
 Of=von
@@ -829,6 +830,8 @@ Gender=Geschlecht
 Genderman=männlich
 Genderwoman=weiblich
 ViewList=Listenansicht
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Pflichtfeld
 Hello=Hallo
 GoodBye=Auf Wiedersehen
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Wählen Sie Ihre Diagrammoptionen aus, um ein Diagra
 Measures=Maße
 XAxis=X-Achse
 YAxis=Y-Achse
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 3550d747799..dfff5494aa3 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -141,7 +141,7 @@ OrderByEMail=E-Mail (Feld mit automatischer E-Mail-Syntaxprüfung)
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=Ein vollständiges Bestellmodell (alte Implementierung der Eratosthene-Vorlage)
+PDFEinsteinDescription=Ein vollständiges Bestellmodell 
 PDFEratostheneDescription=Ein komplettes Bestellmodell
 PDFEdisonDescription=Eine einfache Bestellvorlage
 PDFProformaDescription=Eine vollständige Proforma-Rechnungsvorlage
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 3e0794697c4..eeead24c7dd 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 OnlyOneFieldForXAxisIsPossible=Derzeit ist nur 1 Feld als X-Achse möglich. Es wurde nur das erste selektierte Feld ausgewählt.
 AtLeastOneMeasureIsRequired=Es ist mindestens 1 Feld für Maßnahmen erforderlich
 AtLeastOneXAxisIsRequired=Es ist mindestens 1 Feld für die X-Achse erforderlich
-
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=Kundenbestellung freigegeben
 Notify_ORDER_SENTBYMAIL=Kundenbestellung per E-Mail versendet
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL der Seite
 WEBSITE_TITLE=TItel
 WEBSITE_DESCRIPTION=Beschreibung
 WEBSITE_IMAGE=Bild
-WEBSITE_IMAGEDesc=Relativer Pfad zur Bildimage-Datei. Kann auch leer bleiben, da selten benutzt (es kann für die Anzeige von dynamischen Inhalten für Thumbnails in einer Liste von Blogposts verwendet werden). Benutze __WEBSITEKEY__ im Pfad, wenn sich der Pfad auf einen Website-Namen bezieht.
+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=Schlüsselwörter
 LinesToImport=Positionen zum importieren
 
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index fab2a70242b..8dc1242398a 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Dieses Tool aktualisiert den für <b><u>ALLE</u></b> Pr
 MassBarcodeInit=Initialisierung Barcodes
 MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
 ProductAccountancyBuyCode=Rechnungscode (Einkauf)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Buchhaltungscode (Verkauf)
 ProductAccountancySellIntraCode=Buchungscode (Verkauf innerhalb der Gemeinschaft)
 ProductAccountancySellExportCode=Kontierungscode (Verkauf Export)
@@ -165,7 +167,7 @@ SuppliersPrices=Lieferanten Preise
 SuppliersPricesOfProductsOrServices=Herstellerpreise (von Produkten oder Dienstleistungen)
 CustomCode=Zolltarifnummer
 CountryOrigin=Urspungsland
-Nature=Produkttyp  (Material / Fertig)
+Nature=Nature of product (material/finished)
 ShortLabel=Kurzbezeichnung
 Unit=Einheit
 p=u.
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index d235de8b9d5..03dcfa404f7 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=Projekt mit dem ich verbunden bin
 Time=Zeitaufwand
 ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
-GoToListOfTasks=Als Liste anzeigen
-GoToGanttView=als Gantt zeigen
 GanttView=Gantt-Diagramm
 ListProposalsAssociatedProject=Liste der projektbezogenen Angebote
 ListOrdersAssociatedProject=Liste der projektbezogenen Kundenaufträge
@@ -188,7 +186,7 @@ PlannedWorkload=Geplante Auslastung
 PlannedWorkloadShort=Arbeitsaufwand
 ProjectReferers=Verknüpfte Einträge
 ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
-FirstAddRessourceToAllocateTime=Benutzer eine Ressource pro Aufgabe zuordnen, um eine Zeitspanne einzuräumen
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Eingang pro Tag
 InputPerWeek=Eingang pro Woche
 InputPerMonth=Eingang pro Monat
@@ -240,6 +238,7 @@ LatestModifiedProjects=Neueste %s modifizierte Projekte
 OtherFilteredTasks=Andere gefilterte Aufgaben
 NoAssignedTasks=Keine zugewiesenen Aufgaben gefunden (dem aktuellen Benutzer über das obere Auswahlfeld Projekt / Aufgaben zuweisen, um die Zeit einzugeben)
 ThirdPartyRequiredToGenerateInvoice=Für das Projekt muss ein Drittanbieter definiert werden, um es in Rechnung stellen zu können.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Alle Benutzerkommentare zur Aufgabe
 AllowCommentOnProject=Benutzer dürfen Projekte kommentieren
@@ -265,3 +264,4 @@ InvoiceToUse=Zu verwendender Rechnungsentwurf
 NewInvoice=Neue Rechnung
 OneLinePerTask=Eine Zeile pro Aufgabe
 OneLinePerPeriod=Eine Zeile pro Zeitraum
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index e16a3f5eef5..df4124f1b8b 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -76,7 +76,7 @@ TypeContact_propal_external_BILLING=Kontakt für Kundenrechnungen
 TypeContact_propal_external_CUSTOMER=Kundenkontakt für Angebot
 TypeContact_propal_external_SHIPPING=Kundenkontakt für Lieferung
 # Document models
-DocModelAzurDescription=Ein vollständiges Angebotsmodell (alte Implementierung der Cyan-Vorlage)
+DocModelAzurDescription=Ein vollständiges Angebotsmodell 
 DocModelCyanDescription=Ein vollständiges Angebotsmodell
 DefaultModelPropalCreate=Erstellung Standardvorlage
 DefaultModelPropalToBill=Standard-Template, wenn Sie ein Angebot schließen wollen (zur Verrechung)
diff --git a/htdocs/langs/de_DE/receiptprinter.lang b/htdocs/langs/de_DE/receiptprinter.lang
index ef7e4748fd7..93f5e4bef5e 100644
--- a/htdocs/langs/de_DE/receiptprinter.lang
+++ b/htdocs/langs/de_DE/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy Drucker
 CONNECTOR_NETWORK_PRINT=Netzwerk-Drucker
 CONNECTOR_FILE_PRINT=lokaler Drucker
 CONNECTOR_WINDOWS_PRINT=lokaler Windows Drucker
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Simulierter Drucker zum Testen, hat keine Funktion
 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=Standardprofil
 PROFILE_SIMPLE=einfaches Profil
 PROFILE_EPOSTEP=Epos Tep Profil
@@ -61,3 +63,33 @@ DOL_VALUE_MONTH_LETTERS=Rechnungsmonat (Abkürzung)
 DOL_VALUE_MONTH=Rechnungsmonat
 DOL_VALUE_DAY=Rechnungstag
 DOL_VALUE_DAY_LETTERS=Rechnungstag (Abkürzung)
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Rechnungs Nr.
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=innergemeinschaftliche Umsatzsteuer-ID
+DOL_VALUE_MYSOC_CAPITAL=Kapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index 249be384aa5..e8913c6833a 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name des Lieferanten
 CSSUrlForPaymentForm=CSS-Datei für das Zahlungsmodul
 NewStripePaymentReceived=Neue Stripezahlung erhalten
 NewStripePaymentFailed=Neue Stripezahlung versucht, aber fehlgeschlagen
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Geheimer Testschlüssel
 STRIPE_TEST_PUBLISHABLE_KEY=Öffentlicher Testschlüssel
 STRIPE_TEST_WEBHOOK_KEY=Webhook Testschlüssel
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link zum Einrichten von Stripe WebHook zum Aufruf von
 ToOfferALinkForLiveWebhook=Link zum Einrichten von Stripe WebHook zum Aufruf von IPN (Livemodus)
 PaymentWillBeRecordedForNextPeriod=Die Zahlung wird für den folgenden Zeitraum erfasst.
 ClickHereToTryAgain=<a href="%s">Hier klicken und nochmal versuchen...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Aufgrund der strengen Kundenauthentifizierungsregeln muss die Erstellung einer Karte im Stripe-Backoffice erfolgen. Klicken Sie hier, um zum Stripe-Kundeneintrag zu wechseln: %s
+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/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 28c3db26415..9aa6e40068b 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -70,7 +70,7 @@ 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 oder 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, Lieferant oder Sonstiges.<br><br>In beiden Fällen können Berechtigungen in Dolibarr definiert werden. Externe Benutzer können auch ein anderes Menü angezeigt bekommen als interne Benutzer (Siehe Start - Einstellungen - Anzeige).
+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)
 PermissionInheritedFromAGroup=Berechtigung durch eine Gruppenzugehörigkeit geerbt.
 Inherited=Geerbt
 UserWillBeInternalUser=Erstellter Benutzer ist intern (mit keinem bestimmten Partner verknüpft)
@@ -113,3 +113,5 @@ CantDisableYourself=Sie können Ihr eigenes Benutzerkonto nicht 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=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index cddab17114f..bfe140a6001 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Seite in neuem Tab anzeigen
 SetAsHomePage=Als Startseite festlegen
 RealURL=Echte URL
 ViewWebsiteInProduction=Anzeige der Webseite über die Startseite\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nüber die URL der Homepage
-SetHereVirtualHost=<u>Mit Apache/NGinx/... nutzen</u><br>Wenn auf dem Webserver (Apache, Nginx, ...) ein dedizierter, virtueller Host mit PHP und einem Root Verzeichnis in<br><strong>%s</strong><br>eingerichtet werden kann, dann muss der Name des virtuellen Hosts aus den Einstellungen der Webseite verwendet werden. Dann kann die Vorschau auch diesen dedizierten Webserver nutzen anstelle des internen Dolibarr Servers.
+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>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
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Diese Website ist derzeit offline. Bitte kommen S
 WEBSITE_USE_WEBSITE_ACCOUNTS=Benutzertabelle für Webseite aktivieren
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiviere die Benutzertabelle, um Webseiten-Konten (Login/Kennwort) für jede Website / jeden Drittanbieter zu speichern
 YouMustDefineTheHomePage=Zuerst muss die Startseite definiert sein
-OnlyEditionOfSourceForGrabbedContentFuture=Warnung: Die Erstellung einer Website durch importieren einer externen Seite ist erfahrenen Nutzern vorbehalten. Abhängig von der Komplexität der Quellseite, weicht das Importergebnis möglichweise von Original ab. Falls die Quellseite Standard-CSS oder konfliktträchtiges Javascript nutzt, kann das das Layout oder die Features des Webseiten-Editors beschädigen, wenn an dieser Seite gearbeitet wird. Diese Methode ist ein schnellerer Weg, um Webseiten zu erstellen aber es wird empfohlen, neue Webseiten von grundauf neu zu erstellen oder eine empfohlene Seitenvorlage zu nutzen.<br>Bitte auch beachten, dass Änderungen am HTML-Quellcode erst möglich sind, wenn der Seiteninhalt von der externen Seite übertragen wurde  (Der "Online" Editor ist NICHT verfügbar.)
+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=Der HTML Code kann nur editiert werden, wenn der Inhalt von einer externen Site geladen wurde
 GrabImagesInto=Auch Bilder aus CSS und Seite übernehmen
 ImagesShouldBeSavedInto=Bilder sollten im Verzeichnis gespeichert werden
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=Verwende für gute SEO-Ergebnisse einen Text zwischen
 MainLanguage=Hauptsprache
 OtherLanguages=Andere Sprachen
 UseManifest=Eine manifest.json-Datei bereitstellen
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 4b8ac4651a9..6a7c7ab2627 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Σημείωση: <b>Η διαμό�φωση PHP σας
 NoMaxSizeByPHPLimit=Σημείωση: Κανένα ό�ιο δεν έχει ο�ιστεί στη διαμό�φωση του PHP σας
 MaxSizeForUploadedFiles=Μέγιστο μέγεθος για μεταφό�τωση α�χείων (0 απο��ίπτει οποιοδήποτε μεταφό�τωση)
 UseCaptchaCode=Χ�ησιμοποιήστε το γ�αφικό κώδικα (CAPTCHA) στη σελίδα εισόδου
-AntiVirusCommand= Πλή�ης διαδ�ομή για την εντολή του antivirus
-AntiVirusCommandExample= Πα�άδειγμα για  ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Πα�άδειγμα για ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Πλή�ης διαδ�ομή για την εντολή του antivirus
+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= Πε�ισσότε�ες πα�άμετ�οι στην γ�αμμή εντολής
-AntiVirusParamExample= Πα�άδειγμα για το ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Εγκατάσταση Λογιστικο� module
 UserSetup=Ρ�θμιση χ�ήστη
 MultiCurrencySetup=Ρ�θμιση πολλαπλών νομισμάτων
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Δυνατότητα απενε�γοποίησης στο
 FeatureAvailableOnlyOnStable=Το χα�ακτη�ιστικό είναι διαθέσιμο μόνο σε επίσημες σταθε�ές εκδόσεις
 BoxesDesc=Τα γ�αφικά στοιχεία είναι στοιχεία που εμφανίζουν ο�ισμένες πλη�οφο�ίες που μπο�είτε να π�οσθέσετε για να π�οσα�μόσετε ο�ισμένες σελίδες. Μπο�είτε να επιλέξετε μεταξ� εμφάνισης του γ�αφικο� στοιχείου ή όχι επιλέγοντας τη σελίδα π�οο�ισμο� και κάνοντας κλικ στην επιλογή &#39;Ενε�γοποίηση&#39; ή κάνοντας κλικ στο καλάθι απο��ιμάτων για να το απενε�γοποιήσετε.
 OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενε�γοποιημένα modules</a> π�οβάλλονται.
-ModulesDesc=Οι ενότητες / εφα�μογές καθο�ίζουν ποιες λειτου�γίες είναι διαθέσιμες στο λογισμικό. Ο�ισμένες ενότητες απαιτο�ν δικαιώματα που θα χο�ηγο�νται στους χ�ήστες μετά την ενε�γοποίηση της ενότητας. Κάντε κλικ στο πλήκτ�ο ενε�γοποίησης / απενε�γοποίησης (στο τέλος της γ�αμμής μονάδας) για να ενε�γοποιήσετε / απενε�γοποιήσετε μια ενότητα / εφα�μογή.
+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=Μπο�είτε να β�είτε πε�ισσότε�ες ενότητες για να κατεβάσετε σε εξωτε�ικές ιστοσελίδες στο Internet ...
 ModulesDeployDesc=Εάν το επιτ�έπουν τα δικαιώματα στο σ�στημα α�χείων σας, μπο�είτε να χ�ησιμοποιήσετε αυτό το ε�γαλείο για την ανάπτυξη εξωτε�ικής μονάδας. Η ενότητα θα είναι στη συνέχεια ο�ατή στην κα�τέλα <strong>%s</strong> .
 ModulesMarketPlaces=Β�είτε εξωτε�ική εφα�μογή / ενότητες
@@ -212,6 +212,7 @@ CompatibleUpTo=Συμβατό με την έκδοση %s
 NotCompatible=Αυτή η ενότητα δεν φαίνεται συμβατή με το Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Αυτή η ενότητα απαιτεί ενημέ�ωση του Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Δές στην Αγο�ά
+SeeSetupOfModule=Δείτε την ��θμιση του module %s
 Updated=Ενημε�ωμένο
 Nouveauté=Καινοτομία
 AchatTelechargement=Αγό�ασε / Μεταφό�τωσε
@@ -221,6 +222,7 @@ DoliPartnersDesc=Κατάλογος εται�ειών που πα�έχουν 
 WebSiteDesc=Εξωτε�ικοί ιστότοποι για πε�ισσότε�ες π�όσθετες (μη πυ�ήνες) ενότητες ...
 DevelopYourModuleDesc=Με�ικές λ�σεις για να αναπτ�ξεις το δικό σου μοντέλο...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Διαθέσιμα Widgets
 BoxesActivated=Ενε�γοποιημένα Widgets
 ActivateOn=Ενε�γοποιήστε στις
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Αφήστε κενό για να χ�ησιμοποιήσ
 DefaultLink=Π�οεπιλεγμένος σ�νδεσμος
 SetAsDefault=Ο�ισμός ως π�οεπιλογή
 ValueOverwrittenByUserSetup=Π�οσοχή, αυτή η τιμή μπο�εί να αντικατασταθεί από επιλογή του χ�ήστη (ο κάθε χ�ήστης μπο�εί να κάνει τον δικό του σ�νδεσμο clicktodial)
-ExternalModule=Εξωτε�ικό module - Εγκατεστημένο στον φάκελο %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Μαζικός κώδικας barcode για τ�ίτους
 BarcodeInitForProductsOrServices=Όγκος barcode init ή επαναφο�ά για π�οϊόντα ή υπη�εσίες
 CurrentlyNWithoutBarCode=Επί του πα�όντος, έχετε <strong>%s</strong> �εκό� για <strong>%s</strong> %s χω�ίς barcode ο�ίζεται.
@@ -503,7 +506,7 @@ DAV_ALLOW_ECM_DIRTooltip=Ο �ιζικός κατάλογος όπου όλα τ
 # Modules
 Module0Name=Χ�ήστες και Ομάδες
 Module0Desc=Διαχεί�ιση χ�ηστών / ε�γαζομένων και ομάδων
-Module1Name=Τ�ίτους
+Module1Name=Πελάτες/Συνε�γάτες
 Module1Desc=Διαχεί�ιση εται�ειών και επαφών (πελάτες, π�οοπτικές ...)
 Module2Name=Εμπο�ικό
 Module2Desc=Εμπο�ική διαχεί�ιση
@@ -947,7 +950,7 @@ DictionaryCanton=Κ�άτη / Επα�χίες
 DictionaryRegion=Πε�ιοχές
 DictionaryCountry=Χώ�ες
 DictionaryCurrency=�όμισμα
-DictionaryCivility=Τίτλος της ευγένειας
+DictionaryCivility=Honorific titles
 DictionaryActions=Τ�ποι συμβάντων ημε�ήσιας διάταξης
 DictionarySocialContributions=Είδη κοινωνικών ή φο�ολογικών φό�ων
 DictionaryVAT=Τιμές ΦΠΑ ή φό�ου επί των πωλήσεων
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Από π�οεπιλογή, ο π�οτεινόμενος φό
 VATIsUsedExampleFR=Στη Γαλλία, σημαίνει ότι οι εται�είες ή οι ο�γανώσεις έχουν ένα π�αγματικό φο�ολογικό σ�στημα (απλοποιημένο π�αγματικό ή κανονικό π�αγματικό). Ένα σ�στημα στο οποίο δηλώνεται ο ΦΠΑ.
 VATIsNotUsedExampleFR=Στη Γαλλία, δηλώνονται ενώσεις που δεν έχουν δηλωθεί ως φό�ος πωλήσεων ή εται�είες, ο�γανώσεις ή ελε�θε�α επαγγέλματα που επέλεξαν το φο�ολογικό σ�στημα των μικ�οεπιχει�ήσεων (Φό�ος πωλήσεων σε franchise) και κατέβαλαν φό�ο επί των πωλήσεων χω�ίς καμία δήλωση φό�ου επί των πωλήσεων. Αυτή η επιλογή θα εμφανίζει στα τιμολόγια την αναφο�ά &quot;Μη εφα�μοστέος φό�ος πωλήσεων - art-293B του CGI&quot;.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Τιμή
 LocalTax1IsNotUsed=Μην χ�ησιμοποιείτε δε�τε�ο φό�ο
 LocalTax1IsUsedDesc=Χ�ησιμοποιήστε έναν δε�τε�ο τ�πο φό�ου (εκτός από τον π�ώτο)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Το ποσοστό IRPF από π�οεπιλογή κα
 LocalTax2IsNotUsedDescES=Από π�οεπιλογή, το π�οτεινόμενο IRPF είναι 0. Τέλος κανόνα.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=Στην Ισπανία είναι επιχει�ήσεις που δεν υπόκεινται σε φο�ολογικό σ�στημα ενοτήτων.
+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 des 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=Αναφο�ές για τοπικο�ς φό�ους
 CalcLocaltax1=Πωλήσεις - Αγο�ές
 CalcLocaltax1Desc=Οι αναφο�ές τοπικών φό�ων υπολογίζονται με τη διαφο�ά μεταξ� τοπικών πωλήσεων και τοπικών αγο�ών
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Αγο�ές
 CalcLocaltax2Desc=Οι αναφο�ές τοπικών φό�ων είναι το σ�νολο των τοπικών αγο�ών
 CalcLocaltax3=Πωλήσεις
 CalcLocaltax3Desc=Οι αναφο�ές τοπικών φό�ων είναι το σ�νολο των τοπικών πωλήσεων
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Ετικέτα που χ�ησιμοποιείται από π�οεπιλογή εάν δεν υπά�χει μετάφ�αση για τον κώδικα
 LabelOnDocuments=Ετικέτα στα έγγ�αφα
 LabelOrTranslationKey=Κλειδί ετικέτας ή μετάφ�ασης
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Έκθεση εξόδων για έγκ�ιση
 Delays_MAIN_DELAY_HOLIDAYS=Αφήστε τα αιτήματα για έγκ�ιση
 SetupDescription1=Π�ιν ξεκινήσετε τη χ�ήση του Dolibarr π�έπει να ο�ιστο�ν ο�ισμένες α�χικές πα�άμετ�οι και να ενε�γοποιηθο�ν / διαμο�φωθο�ν οι ενότητες.
 SetupDescription2=Οι ακόλουθες δ�ο ενότητες είναι υποχ�εωτικές (οι δ�ο π�ώτες καταχω�ίσεις στο μενο� Ρ�θμιση):
-SetupDescription3=<a href="%s">%s -&gt; %s</a> <br> Βασικές πα�άμετ�οι που χ�ησιμοποιο�νται για την π�οσα�μογή της π�οεπιλεγμένης συμπε�ιφο�άς της εφα�μογής σας (π.χ. για λειτου�γίες που σχετίζονται με τη χώ�α).
-SetupDescription4=<a href="%s">%s -&gt; %s</a> <br> Αυτό το λογισμικό είναι μια σουίτα από πολλές ενότητες / εφα�μογές, όλες λίγο πολ� ανεξά�τητες. Οι ενότητες που σχετίζονται με τις ανάγκες σας π�έπει να είναι ενε�γοποιημένες και �υθμισμένες. Τα νέα στοιχεία / επιλογές π�οστίθενται στα μενο� με την ενε�γοποίηση μιας ενότητας.
+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=Security audit events
 Audit=Ιστο�ικό εισόδου χ�ηστών
@@ -1128,7 +1136,7 @@ LogEventDesc=Ενε�γοποιήστε την καταγ�αφή για συγ
 AreaForAdminOnly=Οι πα�άμετ�οι εγκατάστασης μπο�ο�ν να ο�ιστο�ν μόνο από <b>χ�ήστες διαχει�ιστή</b> .
 SystemInfoDesc=Οι πλη�οφο�ίες συστήματος είναι διάφο�ες τεχνικές πλη�οφο�ίες που λαμβάνετε μόνο στη λειτου�γία ανάγνωσης και είναι ο�ατές μόνο για τους διαχει�ιστές.
 SystemAreaForAdminOnly=Αυτή η πε�ιοχή είναι διαθέσιμη μόνο σε χ�ήστες διαχει�ιστή. Τα δικαιώματα χ�ήστη Dolibarr δεν μπο�ο�ν να αλλάξουν αυτόν τον πε�ιο�ισμό.
-CompanyFundationDesc=Επεξε�γαστείτε τις πλη�οφο�ίες της εται�είας / εται�είας. Κάντε κλικ στο κουμπί &quot;%s&quot; στο κάτω μέ�ος της σελίδας.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Εάν έχετε έναν εξωτε�ικό λογιστή / λογιστή, μπο�είτε να επεξε�γαστείτε εδώ τις πλη�οφο�ίες του.
 AccountantFileNumber=Λογιστικό κώδικα
 DisplayDesc=Οι πα�άμετ�οι που επη�εάζουν την εμφάνιση και συμπε�ιφο�ά του Dolibarr μπο�ο�ν να τ�οποποιηθο�ν εδώ.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Κανόνες δημιου�γίας και επικ
 DisableForgetPasswordLinkOnLogonPage=�α μην εμφανίζεται ο σ�νδεσμος &quot;Ξεχασμένος κωδικός π�όσβασης&quot; στη σελίδα Σ�νδεση
 UsersSetup=Ρυθμίσεις α�θ�ώματος χ�ηστών
 UserMailRequired=Απαιτείται ηλεκτ�ονικό ταχυδ�ομείο για τη δημιου�γία νέου χ�ήστη
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Ρ�θμιση μονάδας HRM
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Μοντέλα εγγ�άφων τιμολογίου
 BillsPDFModulesAccordindToInvoiceType=Τα μοντέλα εγγ�άφων τιμολογίου σ�μφωνα με τον τ�πο τιμολογίου
 PaymentsPDFModules=Μοντέλα εγγ�άφων πλη�ωμής
 ForceInvoiceDate=Μετάβαση ημε�ομηνίας ισχ�ος τιμολογίου σε ημε�ομηνία επικ��ωσης
-SuggestedPaymentModesIfNotDefinedInInvoice=Π�οτεινόμενη μέθοδος πλη�ωμής στο τιμολόγιο από π�οεπιλογή, εάν δεν έχει ο�ιστεί για τιμολόγιο
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Π�οτείνετε την πλη�ωμή μέσω απόσυ�σης στο λογα�ιασμό
 SuggestPaymentByChequeToAddress=Π�οτείνετε πλη�ωμή με επιταγή π�ος
 FreeLegalTextOnInvoices=Ελε�θε�ο κείμενο στα τιμολόγια
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Ρυθμίσεις πλη�ωμών π�ομηθευτή
 PropalSetup=Ρ�θμιση ενότητας εμπο�ικών π�οτάσεων
 ProposalsNumberingModules=Μοντέλα α�ιθμοδότησης εμπο�ικών π�οτάσεων
 ProposalsPDFModules=Μοντέλα εγγ�άφων εμπο�ικών π�οτάσεων
-SuggestedPaymentModesIfNotDefinedInProposal=Π�οτεινόμενη μέθοδος πλη�ωμών σχετικά με π�όταση από π�οεπιλογή, εάν δεν ο�ίζεται για π�όταση
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Ελε�θε�ο κείμενο στις π�οσφο�ές
 WatermarkOnDraftProposal=Υδατογ�άφημα σε π�οσχέδια εμπο�ικών π�οτάσεων (κανένα εάν δεν είναι κενό)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τ�απεζικό λογα�ιασμό π�οο�ισμο� της π�οσφο�άς
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ζητήστε από την αποθήκη
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ζητήστε τον π�οο�ισμό του τ�απεζικο� λογα�ιασμο� της εντολής αγο�άς
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Ρ�θμιση διαχεί�ισης πα�αγγελιών πωλήσεων
 OrdersNumberingModules=Μοντέλα α�ίθμησης πα�αγγελιών
 OrdersModelModule=Πα�αγγείλετε μοντέλα εγγ�άφων
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Π�οειδοποίηση, οι υψη
 ModuleActivated=Η ενότητα %s ενε�γοποιείται και επιβ�αδ�νει τη διεπαφή
 EXPORTS_SHARE_MODELS=Τα μοντέλα εξαγωγής είναι κοινά με όλους
 ExportSetup=Ρ�θμιση εξαγωγής της ενότητας
+ImportSetup=Setup of module Import
 InstanceUniqueID=Μοναδικό αναγνω�ιστικό της πα�ουσίας
 SmallerThan=Μικ�ότε�η από
 LargerThan=Μεγαλ�τε�ο από
@@ -1979,5 +1991,7 @@ MakeAnonymousPing=Δημιου�γήστε ένα ανώνυμο Ping &#39;+1&#3
 FeatureNotAvailableWithReceptionModule=Η λειτου�γία δεν είναι διαθέσιμη όταν είναι ενε�γοποιημένη η λειτου�γία Υποδοχή
 EmailTemplate=Π�ότυπο email
 EMailsWillHaveMessageID=Τα μην�ματα ηλεκτ�ονικο� ταχυδ�ομείου θα έχουν μια ετικέτα "Αναφο�ές" που ται�ιάζουν με αυτή τη σ�νταξη
-PDF_USE_ALSO_LANGUAGE_CODE=Εάν θέλετε να έχετε κάποιο τίτλο κειμένου σε PDF που έχετε αντιγ�άψει σε 2 διαφο�ετικές γλώσσες στο ίδιο πα�αγόμενο PDF, π�έπει να ο�ίσετε εδώ αυτή τη δε�τε�η γλώσσα, έτσι ώστε το πα�αγόμενο PDF να πε�ιέχει 2 διαφο�ετικές γλώσσες στην ίδια σελίδα, αυτή που επιλέχθηκε κατά τη δημιου�γία PDF και αυτή (μόνο με�ικά π�ότυπα PDF υποστη�ίζουν αυτό). Κ�ατήστε κενό για 1 γλώσσα ανά PDF.
+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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 1262a205dea..f38dfa9741f 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Τιμολόγια π�ομηθευτών
 SupplierBill=Τιμολόγιο π�ομηθευτή
 SupplierBills=Τιμολόγια Π�ομηθευτή
 Payment=Πλη�ωμή
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Πλη�ωμές
 PaymentsBack=Επιστ�οφές χ�ημάτων
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Διαγ�αφή Πλη�ωμής
 ConfirmDeletePayment=Είστε σίγου�οι ότι θέλετε να διαγ�άψετε την πλη�ωμή;
-ConfirmConvertToReduc=Θέλετε να μετατ�έψετε αυτό το %s σε απόλυτη έκπτωση;
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=Το ποσό θα αποθηκευτεί σε όλες τις εκπτώσεις και θα μπο�ο�σε να χ�ησιμοποιηθεί ως έκπτωση για ένα τ�έχον ή μελλοντικό τιμολόγιο για αυτόν τον πελάτη.
-ConfirmConvertToReducSupplier=Θέλετε να μετατ�έψετε αυτό το %s σε απόλυτη έκπτωση;
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=Το ποσό θα αποθηκευτεί σε όλες τις εκπτώσεις και θα μπο�ο�σε να χ�ησιμοποιηθεί ως έκπτωση για ένα τ�έχον ή μελλοντικό τιμολόγιο για αυτόν τον π�ομηθευτή.
 SupplierPayments=Πλη�ωμές π�ομηθευτών
 ReceivedPayments=Ληφθείσες Πλη�ωμές
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Εμφάνιση κατάστασης τιμολογίου
 UseSituationInvoices=�α επιτ�έπεται το τιμολόγιο κατάστασης
 UseSituationInvoicesCreditNote=Επιτ�έψτε το πιστωτικό σημείωμα τιμολογίου κατάστασης
 Retainedwarranty=Διατη�ημένη εγγ�ηση
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Διατη�ημένο ποσοστό εξόφλησης εγγ�ησης
+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=�α πλη�ώσετε για %s
 toPayOn=να πλη�ώσει για %s
 RetainedWarranty=Διατη�ημένη εγγ�ηση
@@ -259,7 +262,7 @@ SendReminderBillByMail=Αποστολή υπενθ�μισης με email
 RelatedCommercialProposals=Σχετικές π�οσφο�ές
 RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Π�ος επικ��ωση
-DateMaxPayment=Πλη�ωμή λόγω πλη�ωμής
+DateMaxPayment=Π�οθεσμία Πλη�ωμής
 DateInvoice=Ημε�ομηνία τιμολογίου
 DatePointOfTax=Point of tax
 NoInvoice=Δεν υπά�χει τιμολόγιο
@@ -285,9 +288,9 @@ ExportDataset_invoice_1=Τιμολόγια πελατών και λεπτομέ
 ExportDataset_invoice_2=Πλη�ωμές και τιμολόγια πελατών
 ProformaBill=Proforma Bill:
 Reduction=Μείωση
-ReductionShort=Δίσκος.
+ReductionShort=Έκπτωση
 Reductions=Μειώσεις
-ReductionsShort=Δίσκος.
+ReductionsShort=Έκπτωση
 Discounts=Εκπτώσεις
 AddDiscount=Δημιου�γία απόλυτη έκπτωση
 AddRelativeDiscount=Δημιου�γία σχετική έκπτωση
@@ -509,11 +512,11 @@ ToMakePayment=Πλη�ωμή
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=Κατάλογος των απλή�ωτων τιμολογίων
 NoteListOfYourUnpaidInvoices=Σημείωση: Αυτή η λίστα πε�ιέχει μόνο τα τιμολόγια για λογα�ιασμό Πελ./Π�ομ. που συνδέονται με τον εκπ�όσωπο πώλησης.
-RevenueStamp=Revenue stamp
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Αυτή η επιλογή είναι διαθέσιμη μόνο όταν δημιου�γείτε τιμολόγιο από την κα�τέλα &quot;Πελάτης&quot; τ�ίτου μέ�ους
 YouMustCreateInvoiceFromSupplierThird=Αυτή η επιλογή είναι διαθέσιμη μόνο κατά τη δημιου�γία τιμολογίου από την κα�τέλα &quot;Π�ομηθευτής&quot; τ�ίτου μέ�ους
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Π�ότυπο τιμολόγιο PDF Crabe. Ένα πλή�ες π�ότυπο τιμολογίου (παλιά εφα�μογή του π�οτ�που Sponge)
+PDFCrabeDescription=Π�ότυπο τιμολόγιο PDF Crabe. Ένα πλή�ες π�ότυπο τιμολογίου 
 PDFSpongeDescription=Τιμολόγιο π�ότυπο PDF Σφουγγά�ι. Ένα πλή�ες π�ότυπο τιμολογίου
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
 TerreNumRefModelDesc1=Επιστ�έψετε α�ιθμό με μο�φή %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικά τιμολόγια όπου yy είναι το έτος, mm είναι ο μήνας και nnnn είναι μια ακολουθία α�ίθμησης χω�ίς διάλειμμα και χω�ίς επιστ�οφή στο 0
@@ -575,3 +578,4 @@ AutoFillDateTo=Ο�ίστε την ημε�ομηνία λήξης της γ�α
 AutoFillDateToShort=Ο�ίστε την ημε�ομηνία λήξης
 MaxNumberOfGenerationReached=Μέγιστος α�ιθμός γονιδίων. επιτευχθεί
 BILL_DELETEInDolibarr=Το τιμολόγιο διαγ�άφηκε
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/el_GR/blockedlog.lang b/htdocs/langs/el_GR/blockedlog.lang
index 5bf526aa5be..8172e83ec81 100644
--- a/htdocs/langs/el_GR/blockedlog.lang
+++ b/htdocs/langs/el_GR/blockedlog.lang
@@ -1,54 +1,54 @@
-BlockedLog=Unalterable Logs
+BlockedLog=Μη τ�οποποιήσιμα α�χεία καταγ�αφής
 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 re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
-OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
-OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
-AddedByAuthority=Stored into remote authority
-NotAddedByAuthorityYet=Not yet stored into remote authority
+BlockedLogDesc=Αυτή η ενότητα πα�ακολουθεί ο�ισμένα γεγονότα σε ένα μη αναστ�έψιμο α�χείο καταγ�αφής (το οποίο δεν μπο�είτε να τ�οποποιήσετε αφο� καταγ�αφεί) σε μια αλυσίδα μπλοκ, σε π�αγματικό χ�όνο. Αυτή η ενότητα πα�έχει συμβατότητα με τις απαιτήσεις των νόμων ο�ισμένων χω�ών (όπως η Γαλλία με το νόμο Finance 2016 - Norme NF525).
+Fingerprints=Α�χειοθετημένα συμβάντα και δακτυλικά αποτυπώματα
+FingerprintsDesc=Αυτό είναι το ε�γαλείο για να πε�ιηγηθείτε ή να εξαγάγετε τα μη αναστ�έψιμα α�χεία καταγ�αφής. Ανεπιθ�μητα α�χεία καταγ�αφής δημιου�γο�νται και α�χειοθετο�νται τοπικά σε ένα ειδικό τ�απέζι, σε π�αγματικό χ�όνο, όταν καταγ�άφετε ένα επιχει�ηματικό γεγονός. Μπο�είτε να χ�ησιμοποιήσετε αυτό το ε�γαλείο για να εξαγάγετε αυτό το α�χείο και να το αποθηκε�σετε σε εξωτε�ική υποστή�ιξη (ο�ισμένες χώ�ες, όπως η Γαλλία, ζητήστε να το κάνετε κάθε χ�όνο). Σημειώστε ότι δεν υπά�χει καμία δυνατότητα για να καθα�ίσετε αυτό το α�χείο καταγ�αφής και κάθε αλλαγή που π�οσπάθησε να γίνει απευθείας σε αυτό το α�χείο καταγ�αφής (π.χ. από έναν χάκε�) θα αναφέ�εται με μη έγκυ�ο δακτυλικό αποτ�πωμα. Εάν θέλετε π�αγματικά να καθα�ίσετε αυτόν τον πίνακα επειδή χ�ησιμοποιήσατε την εφα�μογή σας για δοκιμαστικό σκοπό και θέλετε να καθα�ίσετε τα δεδομένα σας για να ξεκινήσετε την πα�αγωγή σας, μπο�είτε να ζητήσετε από τον μεταπωλητή ή τον ολοκλη�ωτή σας να επαναφέ�ει τη βάση δεδομένων σας (όλα τα δεδομένα θα κατα�γηθο�ν).
+CompanyInitialKey=Το α�χικό κλειδί της επιχεί�ησης (μπλοκ του μπλοκ γενεσίας)
+BrowseBlockedLog=Μη τ�οποποιήσιμα κο�μο�ς
+ShowAllFingerPrintsMightBeTooLong=Εμφάνιση όλων των α�χειοθετημένων α�χείων καταγ�αφής (μπο�εί να είναι μακ�ά)
+ShowAllFingerPrintsErrorsMightBeTooLong=Εμφάνιση όλων των μη έγκυ�ων α�χείων καταγ�αφής α�χείων (μπο�εί να είναι μεγάλο)
+DownloadBlockChain=Κατεβάστε τα δακτυλικά αποτυπώματα
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Η α�χειοθετημένη εγγ�αφή είναι έγκυ�η. Τα δεδομένα αυτής της γ�αμμής δεν τ�οποποιήθηκαν και η καταχώ�ιση ακολουθεί την π�οηγο�μενη.
+OkCheckFingerprintValidityButChainIsKo=Το α�χειοθετημένο ημε�ολόγιο φαίνεται έγκυ�ο σε σ�γκ�ιση με το π�οηγο�μενο, αλλά η αλυσίδα είχε καταστ�αφεί π�οηγουμένως.
+AddedByAuthority=Αποθηκε�εται σε απομακ�υσμένη εξουσία
+NotAddedByAuthorityYet=Δεν έχει ακόμη αποθηκευτεί σε απομακ�υσμένη α�χή
 ShowDetails=Εμφάνιση αποθηκευμένων λεπτομε�ιών
-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
+logPAYMENT_VARIOUS_CREATE=Η πλη�ωμή (δεν έχει εκχω�ηθεί σε τιμολόγιο) δημιου�γήθηκε
+logPAYMENT_VARIOUS_MODIFY=Η πλη�ωμή (δεν έχει εκχω�ηθεί σε τιμολόγιο) τ�οποποιήθηκε
+logPAYMENT_VARIOUS_DELETE=Πλη�ωμή (δεν έχει εκχω�ηθεί σε τιμολόγιο) λογική διαγ�αφή
+logPAYMENT_ADD_TO_BANK=Η πλη�ωμή π�οστέθηκε στην τ�άπεζα
+logPAYMENT_CUSTOMER_CREATE=Η πλη�ωμή του πελάτη δημιου�γήθηκε
+logPAYMENT_CUSTOMER_DELETE=Λογική διαγ�αφή πλη�ωμής πελατών
+logDONATION_PAYMENT_CREATE=Η πλη�ωμή δω�εάς δημιου�γήθηκε
+logDONATION_PAYMENT_DELETE=Δω�εά λογική διαγ�αφή πλη�ωμής
+logBILL_PAYED=Πλη�ωμή τιμολογίου πελάτη
+logBILL_UNPAYED=Το τιμολόγιο πελατών έχει ο�ιστεί ως μη πλη�ωμένο
 logBILL_VALIDATE=Το τιμολόγιο πελάτη επικυ�ώθηκε
-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
+logBILL_SENTBYMAIL=Τα τιμολόγια πελατών αποστέλλονται ταχυδ�ομικώς
+logBILL_DELETE=Το τιμολόγιο πελατών διαγ�άφηκε λογικά
+logMODULE_RESET=Η μονάδα BlockedLog απενε�γοποιήθηκε
+logMODULE_SET=Η μονάδα BlockedLog ήταν ενε�γοποιημένη
 logDON_VALIDATE=Επικ��ωση δω�εάς
 logDON_MODIFY=Μετατ�οπή δω�εάς
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence recording
-BlockedLogBillDownload=Customer invoice download
-BlockedLogBillPreview=Customer invoice preview
-BlockedlogInfoDialog=Log Details
-ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
-DownloadLogCSV=Export archived logs (CSV)
-logDOC_PREVIEW=Preview of a validated document in order to print or download
-logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
-ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
-BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
-OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
-RestrictYearToExport=Restrict month / year to export
+logDON_DELETE=Δω�εά λογική διαγ�αφή
+logMEMBER_SUBSCRIPTION_CREATE=Δημιου�γία συνδ�ομής μέλους
+logMEMBER_SUBSCRIPTION_MODIFY=Η συνδ�ομή μέλους τ�οποποιήθηκε
+logMEMBER_SUBSCRIPTION_DELETE=Συνδ�ομή λογικής διαγ�αφής μέλους
+logCASHCONTROL_VALIDATE=Εγγ�αφή φ�άχτη μετ�ητών
+BlockedLogBillDownload=Λήψη τιμολογίου πελατών
+BlockedLogBillPreview=Π�οβολή τιμολογίου πελατών
+BlockedlogInfoDialog=Στοιχεία καταγ�αφής
+ListOfTrackedEvents=Λίστα συμβάντων που πα�ακολουθο�νται
+Fingerprint=Δακτυλικό αποτ�πωμα
+DownloadLogCSV=Εξαγωγή α�χειοθετημένων α�χείων καταγ�αφής (CSV)
+logDOC_PREVIEW=Π�οεπισκόπηση ενός επικυ�ωμένου εγγ�άφου για εκτ�πωση ή λήψη
+logDOC_DOWNLOAD=Λήψη επικυ�ωμένου εγγ�άφου για εκτ�πωση ή αποστολή
+DataOfArchivedEvent=Πλή�η δεδομένα α�χειοθετημένου γεγονότος
+ImpossibleToReloadObject=Το α�χικό αντικείμενο (πληκτ�ολογήστε %s, id %s) δεν είναι συνδεδεμένο (ανατ�έξτε στη στήλη &quot;Πλή�ες α�χείο δεδομένων&quot; για να λάβετε αναλλοίωτα αποθηκευμένα δεδομένα)
+BlockedLogAreRequiredByYourCountryLegislation=Μπο�είτε να ζητήσετε από τη νομοθεσία της χώ�ας σας τη λειτου�γική μονάδα Unalterable Logs. Η απενε�γοποίηση αυτής της ενότητας μπο�εί να καταστήσει τυχόν μελλοντικές συναλλαγές άκυ�ες σε σχέση με το νόμο και τη χ�ήση νόμιμου λογισμικο�, καθώς δεν μπο�ο�ν να επικυ�ωθο�ν από φο�ολογικό έλεγχο.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Το μη τ�οποποιημένο τμήμα καταγ�αφής ενε�γοποιήθηκε λόγω της νομοθεσίας της χώ�ας σας. Η απενε�γοποίηση αυτής της ενότητας μπο�εί να καταστήσει τυχόν μελλοντικές συναλλαγές άκυ�ες σε σχέση με το νόμο και τη χ�ήση νόμιμου λογισμικο�, καθώς δεν μπο�ο�ν να επικυ�ωθο�ν από φο�ολογικό έλεγχο.
+BlockedLogDisableNotAllowedForCountry=Κατάλογος χω�ών όπου η χ�ήση αυτής της λειτου�γικής μονάδας είναι υποχ�εωτική (απλά για να αποφευχθεί η απενε�γοποίηση της μονάδας από λάθος, εάν η χώ�α σας β�ίσκεται σε αυτή τη λίστα, δεν είναι δυνατή η απενε�γοποίηση της ενότητας χω�ίς την π�ώτη επεξε�γασία αυτής της λίστας. κ�ατήστε ένα κομμάτι στο μη αναστ�έψιμο α�χείο καταγ�αφής).
+OnlyNonValid=Μη έγκυ�η
+TooManyRecordToScanRestrictFilters=Πά�α πολλές εγγ�αφές για σά�ωση / ανάλυση. Πε�ιο�ίστε τη λίστα με πιο πε�ιο�ιστικά φίλτ�α.
+RestrictYearToExport=Πε�ιο�ίστε μήνα / έτος για εξαγωγή
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 3f41980eefb..3dc213913e9 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Π�οσθέστε αυτό το π�οϊόν
 RestartSelling=Επιστ�έψτε στην πώληση
 SellFinished=Ολοκλη�ωμένη πώληση
 PrintTicket=Εκτ�πωση Απόδειξης
+SendTicket=Send ticket
 NoProductFound=Το π�οϊόν δεν β�έθηκε
 ProductFound=Το π�οϊόν β�έθηκε
 NoArticle=Κανένα π�οϊόν
@@ -48,6 +49,7 @@ Footer=Υποσέλιδο
 AmountAtEndOfPeriod=Ποσό στο τέλος της πε�ιόδου (ημέ�α, μήνας ή έτος)
 TheoricalAmount=Θεω�ητικό ποσό
 RealAmount=Π�αγματικό ποσό
+CashFence=Cash fence
 CashFenceDone=Μετ�ητά φ�άχτη για την πε�ίοδο
 NbOfInvoices=Πλήθος τιμολογίων
 Paymentnumpad=Τ�πος πλακέτας για να πληκτ�ολογήσετε την πλη�ωμή
@@ -58,8 +60,9 @@ TakeposNeedsCategories=Το TakePOS χ�ειάζεται κατηγο�ίες π
 OrderNotes=Σημειώσεις Πα�αγγελίας
 CashDeskBankAccountFor=Π�οεπιλεγμένος λογα�ιασμός που θα χ�ησιμοποιηθεί για πλη�ωμές σε
 NoPaimementModesDefined=Δεν έχει �υθμιστεί η λειτου�γία π�ατη�ίου που έχει ο�ιστεί στη διαμό�φωση του TakePOS
-TicketVatGrouped=Φό�ος ΦΠΑ βάσει ποσοστο� σε εισιτή�ια
-AutoPrintTickets=Αυτόματη εκτ�πωση εισιτη�ίων
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Ενε�γοποιήστε τις λειτου�γίες του μπα� ή του εστιατο�ίου
 ConfirmDeletionOfThisPOSSale=Επιβεβαιώνετε τη διαγ�αφή αυτής της τ�έχουσας πώλησης;
 ConfirmDiscardOfThisPOSSale=Θέλετε να απο��ίψετε αυτήν την τ�έχουσα πώληση;
@@ -87,7 +90,19 @@ HeadBar=Μπά�α Κεφαλίδας
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index a3d237a88d9..d5121eceabd 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -32,7 +32,7 @@ PriceFormatInCurrentLanguage=Μο�φή εμφάνισης τιμής στην 
 ThirdPartyName=Όνομα τ�ίτου μέ�ους
 ThirdPartyEmail=Ηλεκτ�ονικό ταχυδ�ομείο τ�ίτου μέ�ους
 ThirdParty=Τ�ίτο μέ�ος
-ThirdParties=Τ�ίτους
+ThirdParties=Πελάτες/Συνε�γάτες
 ThirdPartyProspects=Π�οοπτικές
 ThirdPartyProspectsStats=Π�οοπτικές
 ThirdPartyCustomers=Πελάτες
@@ -325,7 +325,6 @@ CompanyDeleted="%s" διαγ�άφηκε από την βάση δεδομένω
 ListOfContacts=Λίστα αντιπ�οσώπων
 ListOfContactsAddresses=Λίστα αντιπ�οσώπων
 ListOfThirdParties=Κατάλογος τ�ίτων με�ών
-ShowCompany=Εμφάνιση τ�ίτου μέ�ους
 ShowContact=Εμφάνιση Π�οσώπου Επικοινωνίας
 ContactsAllShort=Όλα (Χω�ίς Φίλτ�ο)
 ContactType=Τ�πος αντιπ�οσώπου επικοινωνίας
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Πα�ουσιάστηκε σφάλμα κατά τη διαγ�αφή των τ�ίτων. Ελέγξτε το α�χείο καταγ�αφής. Οι αλλαγές έχουν επανέλθει.
 NewCustomerSupplierCodeProposed=Κωδικός πελάτη ή π�ομηθευτή που έχει ήδη χ�ησιμοποιηθεί, π�οτείνεται ένας νέος κωδικός
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Τ�πος Πλη�ωμής - Πελάτης
 PaymentTermsCustomer=Ό�οι πλη�ωμής - Πελάτης
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 751a1c0d199..d187476e8bb 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Ανατ�έξτε στο %sanalysis of payments%s γ
 SeeReportInDueDebtMode=Ανατ�έξτε στο %sanalysis των τιμολογίων%s για έναν υπολογισμό βασισμένο σε γνωστά καταγεγ�αμμένα τιμολόγια, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο Ledger.
 SeeReportInBookkeepingMode=Δείτε <b>%sBookeeping report%s</b> για έναν υπολογισμό στον <b>πίνακα &quot;</b> <b>Λογα�ιασμός Λογιστη�ίου&quot;</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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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=- Πε�ιλαμβάνει τα οφειλόμενα τιμολόγια του πελάτη, είτε πλη�ώνονται είτε όχι. <br> - Βασίζεται στην ημε�ομηνία επικ��ωσης αυτών των τιμολογίων. <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=- Πε�ιλαμβάνει όλες τις π�αγματικές πλη�ωμές τιμολογίων που εισπ�άττονται από πελάτες. <br> - Βασίζεται στην ημε�ομηνία πλη�ωμής αυτών των τιμολογίων <br>
 RulesCATotalSaleJournal=Πε�ιλαμβάνει όλες τις πιστωτικές γ�αμμές από το πε�ιοδικό Sale.
 RulesAmountOnInOutBookkeepingRecord=Πε�ιλαμβάνει την εγγ�αφή στον Λογα�ιασμό σας με Λογα�ιασμο�ς Λογα�ιασμο� που έχει την ομάδα &quot;ΕΞΟΔΑ&quot; ή &quot;ΕΙΣΟΔΟΣ&quot;
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Ο κ�κλος ε�γασιών τιμολογείται απ
 TurnoverCollectedbyVatrate=Ο κ�κλος ε�γασιών που εισπ�άττεται από το φο�ολογικό συντελεστή πώλησης
 PurchasebyVatrate=Ποσοστό φό�ου επί των πωλήσεων
 LabelToShow=Σ�ντομη ετικέτα
+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
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 86b72eb9710..f83468b7f5f 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Ο διακομιστής δεν έλαβε ολόκλη�ο τ
 ErrorNoTmpDir=Ο π�οσω�ινός φάκελος %s δεν υπά�χει.
 ErrorUploadBlockedByAddon=Η μεταφό�τωση απετ�άπει από ένα PHP / Apache plugin.
 ErrorFileSizeTooLarge=Το μέγεθος του α�χείου είναι πολ� μεγάλο.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Το μέγεθος είναι υπε�βολικά μεγάλο για τιμή τ�που ακε�αίου (%s είναι το μέγιστο πλήθος ψηφίων)
 ErrorSizeTooLongForVarcharType=Το μέγεθος είναι υπε�βολικά μεγάλο για τιμή τ�που αλφα�ιθμητικο� (%s είναι το μέγιστο πλήθος χα�ακτή�ων)
 ErrorNoValueForSelectType=Πα�ακαλο�με συμπλη�ώστε τιμή για την αναδυόμενη λίστα επιλογής
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η πα�άμετ�ος PHP upload_max_filesize (%s) είναι υψηλότε�η από την πα�άμετ�ο PHP post_max_size (%s). Αυτό δεν είναι μια σταθε�ή ��θμιση.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index 8a2d7b31c46..b791f0313f3 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Αυτή η PHP υποστη�ίζει το Curl.
 PHPSupportCalendar=Αυτή η PHP υποστη�ίζει επεκτάσεις ημε�ολογίων.
 PHPSupportUTF8=Αυτή η PHP υποστη�ίζει τις λειτου�γίες UTF8.
 PHPSupportIntl=Αυτή η PHP υποστη�ίζει τις λειτου�γίες Intl.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Η PHP υποστη�ίζει %s λειτου�γίες .
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Η μνήμη συνεδ�ίας PHP max έχει ο�ιστεί σε <b>%s</b> bytes. Αυτό είναι πολ� χαμηλό. Αλλάξτε το <b>php.ini</b> για να �υθμίσετε την πα�άμετ�ο <b>memory_limit</b> σε τουλάχιστον bytes <b>%s</b> .
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Η εγκατάσταση της php δεν υποσ
 ErrorPHPDoesNotSupportCalendar=Η εγκατάσταση της PHP δεν υποστη�ίζει επεκτάσεις του php calendar.
 ErrorPHPDoesNotSupportUTF8=Η εγκατάσταση της PHP δεν υποστη�ίζει λειτου�γίες UTF8. Το Dolibarr δεν μπο�εί να λειτου�γήσει σωστά. Επιλ�στε αυτό π�ιν εγκαταστήσετε Dolibarr.
 ErrorPHPDoesNotSupportIntl=Η εγκατάσταση της PHP δεν υποστη�ίζει τις λειτου�γίες Intl.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Η εγκατάσταση της PHP σας δεν υποστη�ίζει %s λειτου�γίες .
 ErrorDirDoesNotExists=Κατάλογος %s δεν υπά�χει.
 ErrorGoBackAndCorrectParameters=Επιστ�έψτε και ελέγξτε / διο�θώστε τις πα�αμέτ�ους.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Η εφα�μογή π�οσπάθησε να α
 YouTryInstallDisabledByFileLock=Η εφα�μογή π�οσπάθησε να αυτο-αναβαθμιστεί, αλλά οι σελίδες εγκατάστασης / αναβάθμισης έχουν απενε�γοποιηθεί για λόγους ασφαλείας (με την �πα�ξη ενός α�χείου κλειδώματος <strong>install.lock</strong> στον κατάλογο εγγ�άφων dolibarr). <br>
 ClickHereToGoToApp=Κάντε κλικ εδώ για να μεταβείτε στην αίτησή σας
 ClickOnLinkOrRemoveManualy=Κάντε κλικ στον πα�ακάτω σ�νδεσμο. Εάν βλέπετε πάντα την ίδια σελίδα, π�έπει να κατα�γήσετε / μετονομάσετε το α�χείο install.lock στον κατάλογο εγγ�άφων.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/el_GR/link.lang b/htdocs/langs/el_GR/link.lang
index 2b285448666..7694f341249 100644
--- a/htdocs/langs/el_GR/link.lang
+++ b/htdocs/langs/el_GR/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Ο σ�νδεσμος %s έχει αφαι�εθεί
 ErrorFailedToDeleteLink= Απέτυχε η αφαί�εση του συνδέσμου '<b>%s</b>'
 ErrorFailedToUpdateLink= Απέτυχε η ενημέ�ωση του σ�νδεσμο '<b>%s</b>'
 URLToLink=Διε�θυνση URL για σ�νδεση
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index c1661e2340f..42f4399baf0 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -11,16 +11,16 @@ MailFrom=Αποστολέας
 MailErrorsTo=Σφάλματα σε
 MailReply=Απάντηση σε
 MailTo=Πα�αλήπτης(ες)
-MailToUsers=To user(s)
+MailToUsers=Στο χ�ήστη (ες)
 MailCC=Αντιγ�αφή σε
-MailToCCUsers=Copy to users(s)
+MailToCCUsers=Αντιγ�αφή σε χ�ήστες
 MailCCC=Cached copy to
-MailTopic=Email topic
+MailTopic=Θέμα ηλεκτ�ονικο� ταχυδ�ομείου
 MailText=Μήνυμα
 MailFile=Επισυναπτώμενα Α�χεία
 MailMessage=Κείμενο email
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
+SubjectNotIn=Όχι στο θέμα
+BodyNotIn=Όχι στο Σώμα
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -47,19 +47,19 @@ 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
+ConfirmResetMailing=Π�οειδοποίηση, ενε�γοποιώντας εκ νέου την αποστολή e-mail <b>%s</b> , θα επιτ�έψετε την <b>επανάδοση</b> αυτο� του μην�ματος ηλεκτ�ονικο� ταχυδ�ομείου σε μαζική αλληλογ�αφία. Είστε βέβαιοι ότι θέλετε να το κάνετε αυτό;
+ConfirmDeleteMailing=Είστε βέβαιοι ότι θέλετε να διαγ�άψετε αυτό το μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου;
+NbOfUniqueEMails=Α�ιθμός μοναδικών μηνυμάτων ηλεκτ�ονικο� ταχυδ�ομείου
+NbOfEMails=Α�ιθμός Emails
 TotalNbOfDistinctRecipients=Number of distinct recipients
 NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
-NoRecipientEmail=No recipient email for %s
+NoRecipientEmail=Δεν υπά�χει ηλεκτ�ονικό ταχυδ�ομείο πα�αλήπτη για %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
+BadEMail=Κακή τιμή για το μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου
 ConfirmCloneEMailing=Are you sure you want to clone this emailing?
 CloneContent=Clone message
 CloneReceivers=Cloner recipients
@@ -67,31 +67,31 @@ DateLastSend=Ημε�ομηνία τελευταίας αποστολής
 DateSending=Date sending
 SentTo=Sent to <b>%s</b>
 MailingStatusRead=Ανάγνωση
-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 <b>-</b> mail <b>%s κατα�γείται</b> σωστά από τη λίστα αλληλογ�αφίας
+ActivateCheckReadKey=Το κλειδί που χ�ησιμοποιείται για την κ�υπτογ�άφηση της διε�θυνσης URL που χ�ησιμοποιείται για τη λειτου�γία &quot;Έγγ�αφο ανάγνωσης&quot; και &quot;Κατά�γηση εγγ�αφής&quot;
+EMailSentToNRecipients=Το μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου αποστέλλεται στους πα�αλήπτες %s.
+EMailSentForNElements=Το ηλεκτ�ονικό ταχυδ�ομείο στάλθηκε για στοιχεία %s.
 XTargetsAdded=<b>%s</b> πα�αλήπτες που π�οστέθηκαν στο κατάλογο των στόχων
-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.
+OnlyPDFattachmentSupported=Αν τα έγγ�αφα PDF δημιου�γήθηκαν ήδη για τα αντικείμενα που θα αποσταλο�ν, θα επισυνάπτονται στο ηλεκτ�ονικό ταχυδ�ομείο. Εάν όχι, δεν θα αποσταλεί κανένα μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου (επίσης, σημειώστε ότι μόνο έγγ�αφα pdf υποστη�ίζονται ως συνημμένα στη μαζική αποστολή σε αυτή την έκδοση).
+AllRecipientSelected=Οι πα�αλήπτες της εγγ�αφής %s έχουν επιλεγεί (αν είναι γνωστό το email τους).
+GroupEmails=Ομαδικά μην�ματα ηλεκτ�ονικο� ταχυδ�ομείου
+OneEmailPerRecipient=Ένα μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου ανά πα�αλήπτη (από π�οεπιλογή, επιλέγεται ένα μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου ανά εγγ�αφή)
+WarningIfYouCheckOneRecipientPerEmail=Π�οειδοποίηση, αν επιλέξετε αυτό το πλαίσιο, σημαίνει ότι θα αποσταλεί μόνο ένα μήνυμα ηλεκτ�ονικο� ταχυδ�ομείου για πολλές διαφο�ετικές εγγ�αφές, επομένως εάν το μήνυμά σας πε�ιέχει μεταβλητές υποκατάστασης που αναφέ�ονται σε δεδομένα ενός α�χείου, δεν είναι δυνατή η αντικατάστασή τους.
+ResultOfMailSending=Αποτέλεσμα της μαζικής αποστολής ηλεκτ�ονικο� ταχυδ�ομείου
+NbSelected=Ο α�ιθμός είναι επιλεγμένος
+NbIgnored=Ο α�ιθμός αγνοήθηκε
+NbSent=Ο α�ιθμός αποστέλλεται
+SentXXXmessages=%s αποστέλλεται μήνυμα (ες).
 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
+MailingModuleDescContactsByCompanyCategory=Επαφές ανά κατηγο�ία τ�ίτων
 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.
+MailingModuleDescEmailsFromFile=Τα μην�ματα ηλεκτ�ονικο� ταχυδ�ομείου από το α�χείο
+MailingModuleDescEmailsFromUser=Εισαγωγή μηνυμάτων ηλεκτ�ονικο� ταχυδ�ομείου από το χ�ήστη
+MailingModuleDescDolibarrUsers=Χ�ήστες με μην�ματα ηλεκτ�ονικο� ταχυδ�ομείου
+MailingModuleDescThirdPartiesByCategories=Τ�ίτα μέ�η (κατά κατηγο�ίες)
+SendingFromWebInterfaceIsNotAllowed=Η αποστολή από τη διεπαφή ιστο� δεν επιτ�έπεται.
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Σει�ά %s στο α�χείο
@@ -119,9 +119,9 @@ DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Μπο�είτε να χ�ησιμοποιήσετε το <b>κόμμα</b> σαν διαχω�ιστή για να καθο�ίσετε πολλο�ς πα�αλήπτες.
 TagCheckMail=Πα�ακολο�θηση άνοιγμα της αλληλογ�αφίας
 TagUnsubscribe=link διαγ�αφής
-TagSignature=Signature of sending user
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
+TagSignature=Υπογ�αφή του χ�ήστη αποστολής
+EMailRecipient=Email πα�αλήπτη
+TagMailtoEmail=E-mail πα�αλήπτη (συμπε�ιλαμβανομένου του συνδέσμου html &quot;mailto:&quot;)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
@@ -139,22 +139,22 @@ NbOfTargetedContacts=Τ�έχων α�ιθμός των στοχευμένων 
 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
+AdvTgtTitle=Συμπλη�ώστε τα πεδία εισαγωγής για να επιλέξετε εκ των π�οτέ�ων τα τ�ίτα μέ�η ή τις επαφές / διευθ�νσεις που θέλετε να στοχε�σετε
+AdvTgtSearchTextHelp=Χ�ησιμοποιήστε %% ως μπαλαντέ�. Για πα�άδειγμα, για να β�είτε όλα τα στοιχεία όπως το <b>jean, joe, jim</b> , μπο�είτε να εισάγετε το <b>j%%</b> , μπο�είτε επίσης να χ�ησιμοποιήσετε. ως διαχω�ιστικό για αξία και χ�ήση! για εκτός αυτής της τιμής. Για πα�άδειγμα, το <b>jean, joe, jim%%;! Jimo;! Jima%</b> θα στοχε�σει όλους τους Jean, joe, ξεκινήστε με τον Jim αλλά όχι το jimo και όχι με όλα όσα α�χίζουν με jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Ελάχιστη τιμή
 AdvTgtMaxVal=Μέγιστη τιμή
 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
+AdvTgtTypeOfIncudeHelp=Στόχευση ηλεκτ�ονικο� ταχυδ�ομείου τ�ίτου μέ�ους και ηλεκτ�ονικο� ταχυδ�ομείου της επαφής τ�ίτου μέ�ους, ή απλώς ηλεκτ�ονικο� ταχυδ�ομείου τ�ίτου μέ�ους ή απλά ηλεκτ�ονικο� ταχυδ�ομείου επικοινωνίας
 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
+AdvTgtAddContact=Π�οσθέστε μην�ματα ηλεκτ�ονικο� ταχυδ�ομείου σ�μφωνα με τα κ�ιτή�ια
 AdvTgtLoadFilter=Load filter
 AdvTgtDeleteFilter=Delete filter
 AdvTgtSaveFilter=Save filter
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Π�οεπιλεγμένη ��θμιση εξε�χόμενων email
 Information=Πλη�οφο�ίες
-ContactsWithThirdpartyFilter=Contacts with third-party filter
+ContactsWithThirdpartyFilter=Επαφές με φίλτ�ο τ�ίτου μέ�ους
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 6971d613515..8c10cd22771 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Εξοικονομήστε και μείνετε
 SaveAndNew=Αποθήκευση και �έο
 TestConnection=Δοκιμή Σ�νδεσης
 ToClone=Κλωνοποίηση
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Επιλέξτε τα δεδομένα που θέλετε να κλωνοποιήσετε:
 NoCloneOptionsSpecified=Δεν καθο�ίστηκαν δεδομένα π�ος κλωνοποίηση.
 Of=του
@@ -829,6 +830,8 @@ Gender=Φ�λο
 Genderman=Άνδ�ας
 Genderwoman=Γυναίκα
 ViewList=Π�οβολή λίστας
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Υποχ�εωτικό
 Hello=Χαί�ετε
 GoodBye=Αντιο σας
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Επιλέξτε τις επιλογές γ�αφή
 Measures=Μετ�ήσεις
 XAxis=Άξονας Χ
 YAxis=Άξονας Υ
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index c63a3955e87..15ec472fef1 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 OnlyOneFieldForXAxisIsPossible=Μόνο 1 πεδίο είναι επί του πα�όντος δυνατός ως Άξονας Χ. Έχει επιλεγεί μόνο το π�ώτο επιλεγμένο πεδίο.
 AtLeastOneMeasureIsRequired=Απαιτείται τουλάχιστον 1 πεδίο για μέτ�ηση
 AtLeastOneXAxisIsRequired=Απαιτείται τουλάχιστον 1 πεδίο για τον άξονα Χ
-
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=Η εντολή πώλησης έχει επικυ�ωθεί
 Notify_ORDER_SENTBYMAIL=Η εντολή πωλήσεων αποστέλλεται μέσω ταχυδ�ομείου
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Η εντολή αγο�άς στάλθηκε μέσω ηλεκτ�ονικο� ταχυδ�ομείου
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=Σ�νδεσμος URL της σελίδας
 WEBSITE_TITLE=Τίτλος
 WEBSITE_DESCRIPTION=Πε�ιγ�αφή
 WEBSITE_IMAGE=Εικόνα
-WEBSITE_IMAGEDesc=Σχετική διαδ�ομή των μέσων εικόνας. Μπο�είτε να το κ�ατήσετε κενό, καθώς σπάνια χ�ησιμοποιείται (μπο�εί να χ�ησιμοποιηθεί από το δυναμικό πε�ιεχόμενο για να εμφανιστεί μια μικ�ογ�αφία σε μια λίστα με ανα�τήσεις ιστολογίου). Χ�ησιμοποιήστε το __WEBSITEKEY__ στη διαδ�ομή εάν η διαδ�ομή εξα�τάται από το όνομα του ιστότοπου.
+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=Λέξεις κλειδιά
 LinesToImport=Γ�αμμές για εισαγωγή
 
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 305f375aae5..8aacaf0bf5a 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Αυτό το ε�γαλείο ενημε�ώνει τ
 MassBarcodeInit=Μαζική barcode init
 MassBarcodeInitDesc=Αυτή η σελίδα μπο�εί να χ�ησιμοποιείται για να π�οετοιμάσει ένα barcode σε αντικείμενα που δεν έχουν barcode. Ελέγξτε π�ιν από την εγκατάσταση του module barcode αν έχει ολοκλη�ωθεί.
 ProductAccountancyBuyCode=Λογιστικός Κωδικός (Αγο�ά)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Λογιστικός Κωδικός (Πώληση)
 ProductAccountancySellIntraCode=Κωδικός λογιστικής (ενδοκοινοτική πώληση)
 ProductAccountancySellExportCode=Λογιστικός κωδικός (εξαγωγή πώλησης)
@@ -165,7 +167,7 @@ SuppliersPrices=Τιμές πωλητών
 SuppliersPricesOfProductsOrServices=Τιμές πωλητών (π�οϊόντων ή υπη�εσιών)
 CustomCode=Τελωνείο / εμπο�ε�ματα / κωδικός ΕΣ
 CountryOrigin=Χώ�α π�οέλευσης
-Nature=Φ�ση του π�οϊόντος (υλικό / έτοιμο)
+Nature=Nature of product (material/finished)
 ShortLabel=Σ�ντομη ετικέτα
 Unit=Μονάδα
 p=Μονάδα
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index a9273d9d0f2..a94c36251e3 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=που είμαι συνδεδεμένος με το έ
 Time=Χ�όνος
 ListOfTasks=Κατάλογος ε�γασιών
 GoToListOfTimeConsumed=Μεταβείτε στη λίστα του χ�όνου που καταναλώνετε
-GoToListOfTasks=Εμφάνιση ως λίστα
-GoToGanttView=δείτε ως Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=Κατάλογος των εμπο�ικών π�οτάσεων που σχετίζονται με το έ�γο
 ListOrdersAssociatedProject=Κατάλογος πα�αγγελιών πωλήσεων που σχετίζονται με το έ�γο
@@ -188,7 +186,7 @@ PlannedWorkload=Σχέδιο φό�του ε�γασίας
 PlannedWorkloadShort=Φό�τος ε�γασίας
 ProjectReferers=Σχετικά αντικείμενα
 ProjectMustBeValidatedFirst=Το έ�γο π�έπει να επικυ�ωθεί π�ώτα
-FirstAddRessourceToAllocateTime=Εκχω�ήστε μια πηγή χ�ήστη σε ε�γασία για να διαθέσετε χ�όνο
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Εισαγωγή ανά ημέ�α
 InputPerWeek=Εισαγωγή ανά εβδομάδα
 InputPerMonth=Είσοδος / εισαγωγή ανά μήνα
@@ -240,6 +238,7 @@ LatestModifiedProjects=Τελευταία τ�οποποιημένα έ�γα %s
 OtherFilteredTasks=Άλλες φιλτ�α�ισμένες ε�γασίες
 NoAssignedTasks=Δεν εντοπίστηκαν καθήκοντα που έχουν ανατεθεί (αναθέστε το έ�γο / ε�γασίες στον τ�έχοντα χ�ήστη από το κο�υφαίο πλαίσιο επιλογής για να εισάγετε χ�όνο σε αυτό)
 ThirdPartyRequiredToGenerateInvoice=Ένα τ�ίτο μέ�ος π�έπει να ο�ιστεί στο έ�γο για να μπο�εί να το τιμολογεί.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Επιτ�έψτε στα σχόλια των χ�ηστών τις ε�γασίες
 AllowCommentOnProject=�α επιτ�έπεται στα σχόλια των χ�ηστών τα έ�γα
@@ -265,3 +264,4 @@ InvoiceToUse=Π�οσχέδιο τιμολογίου π�ος χ�ήση
 NewInvoice=�έο τιμολόγιο
 OneLinePerTask=Μια γ�αμμή ανά ε�γασία
 OneLinePerPeriod=Μία γ�αμμή ανά πε�ίοδο
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/el_GR/receiptprinter.lang b/htdocs/langs/el_GR/receiptprinter.lang
index 49ca178442c..a0d9eff853e 100644
--- a/htdocs/langs/el_GR/receiptprinter.lang
+++ b/htdocs/langs/el_GR/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Εκτυπωτής Dummy
 CONNECTOR_NETWORK_PRINT=Δικτυακός εκτυπωτής
 CONNECTOR_FILE_PRINT=Τοπικός εκτυπωτής
 CONNECTOR_WINDOWS_PRINT=Τοπικός εκτυπωτής Windows
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Εικονικός εκτυπωτής για ελέγχους, δεν κάνει τίποτα
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb: // FooUser: μυστικό @ computername / workgroup / Εκτυπωτής πα�αλαβής
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=Π�οεπιλεγμένο π�οφίλ
 PROFILE_SIMPLE=Απλό π�οφίλ
 PROFILE_EPOSTEP=Epos Π�οφίλ Tep
@@ -61,3 +63,33 @@ DOL_VALUE_MONTH_LETTERS=Μήνας τιμολογίου με γ�άμματα
 DOL_VALUE_MONTH=Μήνας τιμολογίου
 DOL_VALUE_DAY=Ημέ�α τιμολογίου
 DOL_VALUE_DAY_LETTERS=Ημέ�α τιμολογίου με γ�άμματα
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Ενδοκοινοτικό ΑΦΜ
+DOL_VALUE_MYSOC_CAPITAL=Κεφάλαιο Κίνησης
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index 28c49089cf9..3b1466bcad6 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Όνομα του πωλητή
 CSSUrlForPaymentForm=Url CSS φ�λλο στυλ για το έντυπο πλη�ωμής
 NewStripePaymentReceived=Πλη�ωμή της νέας ταινίας Stripe
 NewStripePaymentFailed=Η πλη�ωμή του νέου Stripe π�οσπάθησε αλλά απέτυχε
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Μυστικό κλειδί δοκιμής
 STRIPE_TEST_PUBLISHABLE_KEY=Κλειδί ελέγχου δοκιμαστικής έκδοσης
 STRIPE_TEST_WEBHOOK_KEY=Πλήκτ�ο δοκιμής Webhook
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Σ�νδεση με τη ��θμιση Stripe WebHoo
 ToOfferALinkForLiveWebhook=Σ�νδεση στη ��θμιση Stripe WebHook για κλήση του IPN (ζωντανή λειτου�γία)
 PaymentWillBeRecordedForNextPeriod=Η πλη�ωμή θα καταγ�αφεί για την επόμενη πε�ίοδο.
 ClickHereToTryAgain=<a href="%s">Κάντε κλικ εδώ για να δοκιμάσετε ξανά ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Λόγω ισχυ�ών κανόνων αυθεντικότητας πελατών, η δημιου�γία μιας κά�τας π�έπει να γίνεται από το Stripe backoffice. Μπο�είτε να κάνετε κλικ εδώ για να μεταφε�θείτε στην εγγ�αφή πελάτη Stripe: %s
+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/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index b31fdbc0741..bc56e33fb69 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -70,7 +70,7 @@ 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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Δημιου�γήθηκε χ�ήστη θα είναι ένας εσωτε�ικός χ�ήστης (επειδή δεν συνδέεται με ένα συγκεκ�ιμένο τ�ίτο μέ�ος)
@@ -113,3 +113,5 @@ CantDisableYourself=Δεν μπο�είτε να απενε�γοποιήσετ
 ForceUserExpenseValidator=Έγκ�ιση έκθεσης εξόδου ισχ�ος
 ForceUserHolidayValidator=Έγκ�ιση αίτησης για άδεια εξόδου
 ValidatorIsSupervisorByDefault=Από π�οεπιλογή, ο επικυ�ωτής είναι ο επόπτης του χ�ήστη. Κ�ατήστε κενό για να διατη�ήσετε αυτή τη συμπε�ιφο�ά.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 706b8c5caf1..b64c183fce7 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Π�οβολή σελίδας σε νέα κα�τέλα
 SetAsHomePage=Ο�ισμός σαν α�χική σελίδα
 RealURL=Π�αγματική διε�θυνση URL
 ViewWebsiteInProduction=Π�οβάλετε τον ιστότοπο χ�ησιμοποιώντας τις διευθ�νσεις URL για το σπίτι
-SetHereVirtualHost=<u>Χ�ήση με Apache / NGinx / ...</u> <br> Αν μπο�είτε να δημιου�γήσετε στον διακομιστή ιστο� (Apache, Nginx, ...) ένα ειδικό εικονικό κεντ�ικό υπολογιστή με ενε�γοποιημένη την PHP και έναν κατάλογο Root σε <br> <strong>%s</strong> <br> στη συνέχεια, ο�ίστε το όνομα του εικονικο� κεντ�ικο� υπολογιστή που έχετε δημιου�γήσει στις ιδιότητες του ιστότοπου, οπότε η π�οεπισκόπηση μπο�εί να γίνει επίσης χ�ησιμοποιώντας αυτήν την αποκλειστική π�όσβαση στο διακομιστή web αντί για τον εσωτε�ικό διακομιστή Dolibarr.
+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>Χ�ήση με ενσωματωμένο διακομιστή 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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Λυπο�μαστε, αυτός ο ιστότο
 WEBSITE_USE_WEBSITE_ACCOUNTS=Ενε�γοποιήστε τον πίνακα λογα�ιασμο� web site
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ενε�γοποιήστε τον πίνακα για να αποθηκε�σετε λογα�ιασμο�ς ιστότοπων (login / pass) για κάθε ιστότοπο / τ�ίτο μέ�ος
 YouMustDefineTheHomePage=Π�έπει π�ώτα να ο�ίσετε την π�οεπιλεγμένη Α�χική σελίδα
-OnlyEditionOfSourceForGrabbedContentFuture=Π�οειδοποίηση: Η δημιου�γία μιας ιστοσελίδας με την εισαγωγή μιας εξωτε�ικής ιστοσελίδας π�οο�ίζεται αποκλειστικά για έμπει�ους χ�ήστες. Ανάλογα με την πολυπλοκότητα της σελίδας πηγής, το αποτέλεσμα της εισαγωγής μπο�εί να διαφέ�ει από το π�ωτότυπο. Επίσης, αν η α�χική σελίδα χ�ησιμοποιεί κοινά στυλ CSS ή αντιφατικό javascript, μπο�εί να σπάσει το βλέμμα ή τα χα�ακτη�ιστικά του επεξε�γαστή ιστότοπου κατά την ε�γασία σε αυτή τη σελίδα. Αυτή η μέθοδος είναι ένας πιο γ�ήγο�ος τ�όπος για να δημιου�γήσετε μια σελίδα, αλλά συνιστάται η δημιου�γία της νέας σελίδας από την α�χή ή ενός π�οτεινόμενου π�οτ�που σελίδας. <br> Σημειώστε επίσης ότι οι τ�οποποιήσεις της πηγής HTML θα είναι δυνατές όταν το πε�ιεχόμενο της σελίδας έχει α�χικοποιηθεί, α�πάζοντάς το από μια εξωτε�ική σελίδα (ο εκδότης &quot;Online&quot; ΔΕ� θα είναι διαθέσιμος)
+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=Μόνο έκδοση πηγής HTML είναι δυνατή όταν το πε�ιεχόμενο έχει ληφθεί από έναν εξωτε�ικό ιστότοπο
 GrabImagesInto=Πιάσε επίσης τις εικόνες που β�έθηκαν στο css και τη σελίδα.
 ImagesShouldBeSavedInto=Οι εικόνες π�έπει να αποθηκε�ονται στον κατάλογο
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=Για καλές π�ακτικές SEO, χ�ησιμ
 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
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index d4c9f69d86a..0490a990d18 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,10 +1,18 @@
 # Dolibarr language file - Source file is en_US - admin
+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
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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.
 YouCanSubmitFile=You can upload the .zip file of module package from here:
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
+ExternalModule=External module
 Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+DictionaryCivility=Honorific titles
 DictionaryVAT=GST Rates or Sales Tax Rates
 ValueOfConstantKey=Value of a configuration constant
+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.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 OptionVatMode=GST due
 SuppliersCommandModel=Complete template of Purchase Order
 SuppliersInvoiceModel=Complete template of Vendor Invoice
diff --git a/htdocs/langs/en_AU/bills.lang b/htdocs/langs/en_AU/bills.lang
index c77da1a3417..0488d509e28 100644
--- a/htdocs/langs/en_AU/bills.lang
+++ b/htdocs/langs/en_AU/bills.lang
@@ -1,4 +1,8 @@
 # Dolibarr language file - Source file is en_US - bills
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 BankCode=BSB
@@ -11,4 +15,5 @@ MenuCheques=Cheques
 NewChequeDeposit=New Cheque deposit
 Cheques=Cheques
 NbCheque=Number of cheques
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+RevenueStamp=Tax stamp
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
diff --git a/htdocs/langs/en_AU/cashdesk.lang b/htdocs/langs/en_AU/cashdesk.lang
index adbd9cf9e57..690785ca368 100644
--- a/htdocs/langs/en_AU/cashdesk.lang
+++ b/htdocs/langs/en_AU/cashdesk.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 NoVAT=No GST for this sale
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
diff --git a/htdocs/langs/en_AU/compta.lang b/htdocs/langs/en_AU/compta.lang
index 83b73fd798d..b5831e1cb0e 100644
--- a/htdocs/langs/en_AU/compta.lang
+++ b/htdocs/langs/en_AU/compta.lang
@@ -8,7 +8,6 @@ CheckReceipt=Cheque deposit
 CheckReceiptShort=Cheque deposit
 NewCheckDeposit=New cheque deposit
 DateChequeReceived=Cheque received date
-RulesResultDue=- It includes outstanding invoices, expenses, GST, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and GST and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, 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_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 3f3f6558559..02f884882dd 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,9 +1,17 @@
 # Dolibarr language file - Source file is en_US - admin
+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
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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.
 YouCanSubmitFile=You can upload the .zip file of module package from here:
+ExternalModule=External module
 Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+DictionaryCivility=Honorific titles
 LocalTax1Management=PST Management
 ValueOfConstantKey=Value of a configuration constant
 CompanyZip=Postal code
+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.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 LDAPFieldZip=Postal code
 SuppliersCommandModel=Complete template of Purchase Order
 SuppliersInvoiceModel=Complete template of Vendor Invoice
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 41895afffce..f435d660136 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -10,6 +10,8 @@ ErrorDecimalLargerThanAreForbidden=Error: A precision higher than <b>%s</b> is n
 ErrorReservedTypeSystemSystemAuto=Entry of 'system' and 'systemauto' for this type is reserved. You can use 'user' as a value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0 (zero)
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to prevent any uploads)
+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
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 CurrentValueSeparatorThousand=Thousands separator
 PositionByDefault=Default position
 MenusDesc=Menu managers set the content of the two menu bars (horizontal and vertical).
@@ -18,6 +20,7 @@ PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined by Syslog modul
 ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted but no other data will be removed.
 ImportPostgreSqlDesc=To import a backup file, you must use the pg_restore command from the command line:
 CommandsToDisableForeignKeysForImportWarning=This is mandatory if you want to restore your sql dumps later
+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 from external websites on the Internet...
 ModulesMarketPlaces=Find external applications and modules
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is enabled
@@ -42,11 +45,16 @@ UMaskExplanation=This parameter allows you to define permissions set by default
 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:
+ExternalModule=External module
 Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module50200Name=PayPal
+DictionaryCivility=Honorific titles
 DictionaryAccountancyJournal=Finance journals
 ValueOfConstantKey=Value of a configuration constant
 CompanyZip=Postcode
+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.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 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
 SuppliersCommandModel=Complete template of Purchase Order
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index 0d3b3922da9..b500a49afcd 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -2,6 +2,10 @@
 InvoiceDeposit=Deposit invoice
 InvoiceDepositAsk=Deposit invoice
 InvoiceDepositDesc=This kind of invoice is raised when a deposit has been received.
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 PaymentHigherThanReminderToPay=Payment higher than balance outstanding
 ConfirmValidatePayment=Are you sure you want to validate this payment? No changes can be made once payment is validated.
 ShowInvoiceDeposit=Show deposit invoice
@@ -21,6 +25,7 @@ PrettyLittleSentence=Accept the amount of payments due by cheques issued in my n
 MenuCheques=Cheques
 Cheques=Cheques
 NbCheque=Number of cheques
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+RevenueStamp=Tax stamp
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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/cashdesk.lang b/htdocs/langs/en_GB/cashdesk.lang
index 0188074370e..87ee48c4d72 100644
--- a/htdocs/langs/en_GB/cashdesk.lang
+++ b/htdocs/langs/en_GB/cashdesk.lang
@@ -6,3 +6,5 @@ NewSell=New sale
 RestartSelling=Go back to sales
 NoProductFound=No product found
 NoArticle=No product
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
diff --git a/htdocs/langs/en_GB/projects.lang b/htdocs/langs/en_GB/projects.lang
index f506b1a134e..be0ee26f4eb 100644
--- a/htdocs/langs/en_GB/projects.lang
+++ b/htdocs/langs/en_GB/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referrers tab.
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
diff --git a/htdocs/langs/en_GB/users.lang b/htdocs/langs/en_GB/users.lang
index 33514bcb0de..99d06414135 100644
--- a/htdocs/langs/en_GB/users.lang
+++ b/htdocs/langs/en_GB/users.lang
@@ -5,6 +5,7 @@ RemoveFromGroup=Remove from a group
 ConfirmPasswordReset=Confirm password change
 NonAffectedUsers=Non-assigned users
 UsePersonalValue=Use a personal choice
+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)
 PermissionInheritedFromAGroup=Permission granted through inherited rights from one of the user groups.
 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)
diff --git a/htdocs/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
index ef8e16da6ad..66eedde4939 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.
+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>
+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.
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 74c99fddfd7..ad87b77f8aa 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,5 +1,9 @@
 # Dolibarr language file - Source file is en_US - admin
+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
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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.
 YouCanSubmitFile=You can upload the .zip file of module package from here:
+ExternalModule=External module
 Module20Name=Quotations
 Module20Desc=Management of quotations
 Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
@@ -10,7 +14,11 @@ Permission25=Send quotations
 Permission26=Close quotations
 Permission27=Delete quotations
 Permission28=Export quotations
+DictionaryCivility=Honorific titles
 ValueOfConstantKey=Value of a configuration constant
+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.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 PropalSetup=Quotation module setup
 ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
diff --git a/htdocs/langs/en_IN/bills.lang b/htdocs/langs/en_IN/bills.lang
index fd7a230ef58..2f4fcf8b1e9 100644
--- a/htdocs/langs/en_IN/bills.lang
+++ b/htdocs/langs/en_IN/bills.lang
@@ -1,3 +1,8 @@
 # Dolibarr language file - Source file is en_US - bills
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 RelatedCommercialProposals=Related quotations
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+RevenueStamp=Tax stamp
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
diff --git a/htdocs/langs/en_IN/other.lang b/htdocs/langs/en_IN/other.lang
index 9389a3062de..47ee7b86fa1 100644
--- a/htdocs/langs/en_IN/other.lang
+++ b/htdocs/langs/en_IN/other.lang
@@ -3,4 +3,3 @@ Notify_PROPAL_VALIDATE=Quotation validated
 Notify_PROPAL_SENTBYMAIL=Quotation sent by mail
 NumberOfProposals=Number of quotations
 NumberOfUnitsProposals=Number of units on quotations
-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 __WEBSITEKEY__ in the path if path depends on website name.
diff --git a/htdocs/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang
index bece63d2190..a8becbc9085 100644
--- a/htdocs/langs/en_IN/projects.lang
+++ b/htdocs/langs/en_IN/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 OppStatusPROPO=Quotation
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 50e919e9565..1451ea1c508 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-FONTFORPDF=helvetica
+FONTFORPDF=helvética
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
@@ -19,23 +19,578 @@ 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=Conexión de base de datos
+NoTemplateDefined=No hay plantilla para este tipo de email
+AvailableVariables=Variables disponibles de substitución
+EmptySearchString=Ingresar una cadena de búsqueda no vacía
+NoRecordFound=Sin registros
+NoRecordDeleted=Sin registros eliminados
+NotEnoughDataYet=Sin datos suficientes
+NoError=Sin error
+ErrorFieldRequired=El campo '%s' es requerido
+ErrorFieldFormat=El campo '%s' tiene un valor erroneo
+ErrorFileDoesNotExists=El campo %s no existe
+ErrorFailedToOpenFile=Fallo abrir archivo %s
+ErrorCanNotCreateDir=No se puede crear la carpeta %s
+ErrorCanNotReadDir=No se puede leer la carpeta %s
+ErrorConstantNotDefined=El parámetro %s no está definido
+ErrorSQL=Error SQL
+ErrorLogoFileNotFound=El archivo del logo '%s' no fue encontrado
+ErrorGoToGlobalSetup=Ir a configuración de 'Empresa/Organización' para solucionar esto
+ErrorGoToModuleSetup=Ir al Módulo de configuración para solucionar esto
+ErrorFailedToSendMail=Falló el envío del email (remitente=%s, receptor=%s)
+ErrorFileNotUploaded=El archivo no fue cargado. Controle que el tamaño no exceda el máximo permitido, que haya espacio disponible en el disco y que no haya ya un archivo con el mismo nombre en la carpeta.
+ErrorInternalErrorDetected=Se detectó un error
+ErrorWrongHostParameter=Parámetros de host equivocados
+ErrorYourCountryIsNotDefined=Su país no está definido. Vaya a Inicio-Configuración-Editar e ingrese el formulario nuevamente.
+ErrorRecordIsUsedByChild=Falló la eliminación de este registro.  Este registro es usado por al menos un registro hijo.
+ErrorWrongValue=Valor erróneo
+ErrorWrongValueForParameterX=Valor erróneo para el parámetro %s
+ErrorNoRequestInError=Ningún pedido en error
+ErrorServiceUnavailableTryLater=El servicio no está disponible al momento. Intente nuevamente luego.
+ErrorDuplicateField=Valor duplicado en un campo único.
+ErrorSomeErrorWereFoundRollbackIsDone=Se encontró algunos errores. Los cambios fueron echados para atrás.
+ErrorConfigParameterNotDefined=El parámetro <b>%s</b> no está definido en el archivo de configuración de Dolibarr <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Falló la busqueda del usuario <b>%s</b> en la base de datos de Dolibarr.
+ErrorNoVATRateDefinedForSellerCountry=Error, no se ha definido tasa de IVA para el país '%s'.
+ErrorNoSocialContributionForSellerCountry=Error, no se ha definido tasa de impuestos sociales/fiscales para el país '%s'.
+ErrorFailedToSaveFile=Error, no se pudo guardar el archivo.
+ErrorCannotAddThisParentWarehouse=Ud. está intentando agregar un depósito padre el cuál ya es hijo de un depósito existente
+MaxNbOfRecordPerPage=Máx. número de registros por página
+NotAuthorized=Ud. no está autorizado para hacer eso.
+SelectDate=Elegir una fecha
+SeeHere=Ver aquí
+ClickHere=Hacer click aquí
+BackgroundColorByDefault=Color del fondo por defecto
+FileRenamed=El archivo fue renombrado con éxito.
+FileGenerated=El archivo fue generado con éxito.
+FileSaved=El archivo fue guardado con éxito.
+FileUploaded=El archivo fue cargado con éxito
+FileTransferComplete=Archivo(s) cargado con éxito
+FilesDeleted=Archivo(s) eliminados con éxito
+FileWasNotUploaded=Se eligió un archivo para adjuntar pero aún no fue cargado.  Haga click en "Adjuntar archivo" para eso.
+NbOfEntries=No. de entradas
+GoToWikiHelpPage=Leer ayuda en línea (Se necesita acceso a Internet)
+GoToHelpPage=Leer ayuda
+LevelOfFeature=Nivel de características
+NotDefined=Sin definir
+DolibarrInHttpAuthenticationSoPasswordUseless=El modo de autenticación en Dolibarr se configuro a <b>%s</b> en el archivo de configuración <b>conf.php</b>. <br>Esto significa que la base de datos de las contraseñas es externa a Dolibarr, por lo que el cambio de este campo puede no tener efecto.
+Undefined=Indefinido
+PasswordForgotten=¿Olvidó la contraseña?'
+NoAccount=¿No tiene cuenta?
+SeeAbove=Ver arriba
+LastConnexion=Último acceso
+PreviousConnexion=Acceso previo
+ConnectedOnMultiCompany=Conectado en el entorno
+AuthenticationMode=Modo de autenticación
+RequestedUrl=URL requerido
+DatabaseTypeManager=Administrador de tipo de base de datos
+RequestLastAccessInError=Error en el último requerimiento de acceso a la base de datos
+ReturnCodeLastAccessInError=Código de respuesta para el último error al requerir acceso a la base de datos
+InformationLastAccessInError=Información del último error al requerir acceso a la base de datos
+YouCanSetOptionDolibarrMainProdToZero=Puede leer el archivo log o establecer la opción $dolibarr_main_prod a 0 en su archivo de configuración para obtener más información.
+InformationToHelpDiagnose=Esta información puede ser útil para propósitos de diagnóstico (puede poner la opción $dolibarr_main_prod a '1' para sacar dichas noticias)
+TechnicalID=ID técnico
+LineID=ID línea
+PrecisionUnitIsLimitedToXDecimals=Dolibarr fue configurada para limitar la precisión en el precio de la unidad a <b>%s</b> decimales.
+DoTest=Prueba
+ToFilter=Filtro
+WarningYouHaveAtLeastOneTaskLate=Atención, usted tiene al menos un elemento que a excedido el tiempo de tolerancia.
+yes=si
 All=Todos
+MediaBrowser=Explorador de medios
+Under=bajo
+Period=Período
+PeriodEndDate=Fecha final para el período
+SelectedPeriod=Período elegido
+PreviousPeriod=Período previo
+NotClosed=Sin cerrar
+Enabled=Habilitado
+Enable=Habilitar
+Disable=Deshabilitar
+Disabled=Cancelado
+Add=Agregar
+AddLink=Agregar enlace
+RemoveLink=Quitar enlace
+AddToDraft=Agregar a borrador
+Update=Actualizar
+CloseBox=Quitar widget de su tablero
+ConfirmSendCardByMail=¿Desea Ud, enviar esta tarjeta por email a <b>%s</b>?
 Delete=Borrar
+Remove=Quitar
+Cancel=Cancelar
+Validate=Confirmar
+ValidateAndApprove=Confirmar y Aprobar
+ToValidate=Para confirmar
+NotValidated=Sin confirmar
+Save=Guardar
+SaveAs=Guarda Como
+TestConnection=Probar conexión
+ToClone=Clonar
+ConfirmCloneAsk=¿Estás seguro que quieres clonar el objeto <b>%s</b>?
+ConfirmClone=Elija datos que quiere clonar:
+NoCloneOptionsSpecified=Datos para clonar sin definir
+Run=Correr
+Show=Mostrar
+Hide=Esconder
+ShowCardHere=Mostrar tarjeta
+SearchOf=Buscar
+Valid=Valida
+ReOpen=Re-abrir
+Upload=Cargar
+ResizeOrCrop=Redimensionar o Recortar
+Recenter=Recentrar
 Groups=Los grupos
+NoUserGroupDefined=No hay grupo de usuario definido
+PasswordRetype=Repetir su contraseña
+NoteSomeFeaturesAreDisabled=Notar que muchas características/módulos están des habilitados en esta demostración.
+NameSlashCompany=Nombre/Compañía
+PersonalValue=Valor personal
+CurrentValue=Valor corriente
+MultiLanguage=Multi-idioma
+DateOfLine=Fecha de línea
+DurationOfLine=Duración de línea
+Model=Plantilla de doc
+DefaultModel=Plantilla predeterminada para doc
+Action=Evento
+About=De nosotros
+AmountByMonth=Monto por mes
+Limit=Limite
+Limits=Limites
+Logout=Salir
+NoLogoutProcessWithAuthMode=Sin características de desconexión con el modo de autenticación <b>%s</b>
 Connection=Iniciar Sesión
 Setup=Preparar
+Previous=Previos
+Cards=Tarjeta
+Card=Tarjeta
+HourStart=Hora de comienzo
 DateCreation=Fecha de Creación
+DateModification=Fecha modificación
+DateLastModification=Fecha última modificación
+DateDue=Fecha vencimiento
+DateValue=Fecha del valor
+DateValueShort=Fecha del valor
+DateOperation=Fecha de operación
+DateOperationShort=Fecha Oper.
+DateRequest=Fecha requerimiento
+DateProcess=Fecha procesado
+DateBuild=Fecha construcción del informe
+DatePayment=Fecha de pago
+DateApprove=Fecha aprovación
+DateApprove2=Fecha aprobación (segunda aprobación)
+RegistrationDate=Fecha de registro
+UserCreation=Usuario de creación
+UserModification=Usuario de modificación
+UserValidation=Usuario de confirmación
+UserCreationShort=Crear usuario
+UserModificationShort=Modif. usuario
+UserValidationShort=Confir. usuario
+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)
+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
+AmountInvoiced=Monto facturado
+AmountInvoicedHT=Monto facturado (con imp.)
+AmountInvoicedTTC=Monto facturado (neto)
+AmountPayment=Monto pagado
+AmountHTShort=Monto (neto)
+AmountTTCShort=Monto (con imp.)
+AmountHT=Monto (neto)
+AmountTTC=Monto (con imp.)
+AmountVAT=Monto impuesto
+MulticurrencyAlreadyPaid=Ya pagado, moneda original
+MulticurrencyRemainderToPay=Faltante a pagar, moneda original
 MulticurrencyPaymentAmount=Monto del pago, moneda original
+MulticurrencyAmountHT=Monto (neto), moneda original
+MulticurrencyAmountTTC=Monto (inc. imp.), moneda original
+MulticurrencyAmountVAT=Monto del impuesto, moneda original
+AmountLT1=Monto del impuesto 2
+AmountLT2=Monto del impuesto 3
+AmountLT1ES=Monto RE
+AmountLT2ES=Monto IRPF
+AmountTotal=Monto total
+AmountAverage=Monto promedio
+PriceQtyMinHT=Precio por cant. mínimo (neto)
+PriceQtyMinHTCurrency=Precio por cant. mínimo (neto) (moneda)
+TotalHTShort=Total (neto)
+TotalHT100Short=Total 100%% (neto)
+TotalHTShortCurrency=Total (neto en moneda)
+TotalTTCShort=Total (incl. imp.)
+TotalHT=Total (neto)
+TotalHTforthispage=Total (neto) para esta página
+Totalforthispage=Total para esta página
+TotalTTC=Total (incl. imp.)
+TotalTTCToYourCredit=Total (incl. impuesto) para su crédito
+TotalVAT=Impuesto total
+TotalLT1=Impuesto total 2
+TotalLT2=Total impuesto 3
+HT=Neto
+TTC=Con imp.
+INCVATONLY=Inc. IVA
+INCT=Inc. todos los impuestos
+VAT=Impuesto de ventas
+VATs=Impuesto ventas
+LT1=Impuesto ventas 2
+LT1Type=Impuesto ventas tipo 2
+LT2=Impuesto ventas 3
+LT2Type=Impuesto ventas tipo 3
+LT2IN=SGSR
+LT1GC=Ctvs. adicionales
+VATRate=Tasa Impuesto
+VATCode=Código Tasa Impuesto
+VATNPR=Tas impuesto NPR
+DefaultTaxRate=Tasa de impuesto predeterminada
+Average=Promedio
+RemainToPay=Remanente a pagar
+Module=Módulo/Aplicación
+Modules=Módulos/Aplicaciones
+Option=Opciones
 List=Lista
+FullList=Toda la lista
 RefSupplier=Ref. Proveedor
+CommercialProposalsShort=Propuesta comercial
+Comment=Comentar
+ActionsToDo=Eventos a cumplir
+ActionsToDoShort=Para hacer
+ActionsDoneShort=Hecho
+ActionNotApplicable=No aplicables
+ActionRunningNotStarted=Para comenzar
+LatestLinkedEvents=Últimos eventos %s enlazados
 CompanyFoundation=Empresa / Organización
+Accountant=Contador
+ContactsForCompany=Contactos para esta tercera parte
+ContactsAddressesForCompany=Contactos/direcciones para esta tercer parte
+AddressesForCompany=Dirección para esta tercera parte
+ActionsOnCompany=Eventos para esta tercera parte
+ActionsOnContact=Eventos para este contacto/dirección
+ActionsOnContract=Evento para este contacto
+ActionsOnProduct=Eventos respecto a este producto
+NActionsLate=%s tarde
+ToDo=Para hacer
+Completed=Completado
+RequestAlreadyDone=Requerimiento ya guardado
+FilterOnInto=Criterio de búsqueda '<strong>%s</strong>' en los campos %s
+RemoveFilter=Quitar filtro
+ChartGenerated=Gráfico generado
+ChartNotGenerated=El gráfico no se generó
+GeneratedOn=Construido en %s
+Generate=Generado
+DolibarrStateBoard=Estadísticas de Base de Datos
+DolibarrWorkBoard=Items Abiertos
+NoOpenedElementToProcess=No hay elementos abiertos para procesar
+NotYetAvailable=Todavía no disponible
+Categories=Etiquetas/categorías
+to=para
+To=para
+Qty=Ctd
+ChangedBy=Cambiado por
+ResultKo=Falla
+Reporting=Informando
+Reportings=Informando
+StatusInterInvoiced=Facturado
 Opened=Abierto
+ClosedAll=Cerrado (todo)
+ByCompanies=Por terceros
+ByUsers=Por usuarios
+Rejects=Rechazos
+NextStep=Próximo paso
+None=Ninguna
+Late=Tarde
+LateDesc=Un item se define como Demorado en relación\na la configuración del sistema en el menú\nInicio - Configuraciones - Alertas.
+NoItemLate=No hay último item
+Photo=Fotografía
+Photos=Fotografías
+AddPhoto=Agregar foto
+DeletePicture=Eliminar foto
+ConfirmDeletePicture=¿Confirma eliminar foto?
 Login=Iniciar Sesión
+LoginEmail=Ingreso (email)
+LoginOrEmail=Usuario o email
+CurrentLogin=Usuario actual
+EnterLoginDetail=Ingresar datos de usuario actual
+January=Enero
+February=Febrero
+March=Marzo
+April=Abril
+May=Mayo
+June=Junio
+July=Julio
+August=Agosto
+September=Septiembre
+October=Octubre
+November=Noviembre
+Month01=Enero
+Month02=Febrero
+Month03=Marzo
+Month04=Abril
+Month05=Mayo
+Month06=Junio
+Month07=Julio
+Month08=Agosto
+Month09=Septiembre
+Month10=Octubre
+Month11=Noviembre
+Month12=Diciembre
+MonthShort01=Ene
+MonthShort04=Abr
+MonthShort08=Ago
+MonthShort12=Dic
+MonthVeryShort02=V
+MonthVeryShort03=Ma
+MonthVeryShort05=Ma
+AttachedFiles=Adjuntar archivos y documentos
+JoinMainDoc=Unir documento principal
+ReportName=Nombre de informe
+ReportPeriod=Período del informe
+Fill=Llenar
+Reset=Resetear
+NotAllowed=No permitido
+ReadPermissionNotAllowed=Leer permisos no permitidos
+AmountInCurrency=Monto en la moneda %s
+FindBug=Informar un error
+NbOfThirdParties=Número de terceras partes
+NbOfLines=Número de líneas
+NbOfObjectReferers=Número de items relacionados
+DateFromTo=Desde %s a %s
+DateFrom=Desde %s
+Check=Cheque
+Uncheck=Sin marcar
+Internals=Interno
+Externals=Externo
+Warning=Atención
+Warnings=Alarmas
+BuildDoc=Construir Doc
+Entity=Entorno
+CustomerPreview=Vista previa cliente
+SupplierPreview=Vista previa proveedor
+ShowCustomerPreview=Mostrar vista previa cliente
+ShowSupplierPreview=Mostrar vista previa proveedor
+Currency=Moneda
+InfoAdmin=Información para administradores
+Undo=Deshacer
+UndoExpandAll=Deshacer expandir
+Reason=Motivo
+FeatureNotYetSupported=Característica todavía sin soportar
+Response=Responder
+SendByMail=Enviar por email
+MailSentBy=Email enviado por
+TextUsedInTheMessageBody=Cuerpo del mensaje
+SendMail=Enviar email
+NoEMail=Sin email
+NoMobilePhone=Sin teléfono Mobil
+FollowingConstantsWillBeSubstituted=Las siguientes constantes serán reemplazadas\ncon los correspondientes valores.
+BackToList=Volver a la lista
+GoBack=Retroceder
+CanBeModifiedIfOk=Puede modificarse si es válida
+CanBeModifiedIfKo=Puede modificarse si no es válida
+RecordCreatedSuccessfully=Registro creado con éxito
+RecordsModified=%s registro(s) modificados
+RecordsDeleted=%s registro(s) eliminados
+RecordsGenerated=%s registro(s) generados
+AutomaticCode=Código automático
+FeatureDisabled=Característica deshabilitada
+MoveBox=Mover el widget
+Offered=Ofertado
+NotEnoughPermissions=Ud. no tiene permiso para esta acción
+SessionName=Nombre de sesión
+Receive=Recibir
+CompleteOrNoMoreReceptionExpected=Completo o no se espera más
+ExpectedValue=Valor Esperado
+YouCanChangeValuesForThisListFromDictionarySetup=Ud. puede cambiar los valores de esta lista\ndesde menu Configuración - Diccionarios
+YouCanChangeValuesForThisListFrom=Ud. puede cambiar los valores de esta lista\ndesde menú %s
+YouCanSetDefaultValueInModuleSetup=Ud. puede establecer el valor predeterminado cuando se\ncrea un nuevo registro en la configuración del módulo
+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
+DateOfSignature=Fecha de firma
+HidePassword=Mostrar comándos con contraseña escondida
+UnHidePassword=Mostrar comando real con contraseña visible
+RootOfMedias=Carpeta raíz de medios públicos (/medios)
+AddNewLine=Agregar nueva línea
+AddFile=Agregar archivo
+FreeZone=No hay producto/servicio predefinido
+FreeLineOfType=Item libre del tipo:
+CloneMainAttributes=Clonar objeto con principales atributos
+PDFMerge=Unir PDF
+Merge=Unir
+DocumentModelStandardPDF=Plantilla de PDF standard
+PrintContentArea=Mostrar area principal del contenido a imprimir
+MenuManager=Administrador de menú
+WarningYouAreInMaintenanceMode=Atención, esta en modo mantenimiento:\nsolo usuarios <b>%s</b> tienen permitido\nusar la aplicación en este modo.
+CoreErrorTitle=Error de sistema
+CoreErrorMessage=Perdón, a ocurrido un error. Haga contacto\ncon su administrador de sistema para chequear\nlos logs o deshabilitar $dolibarr_main_prod=1 para\nobtener más información.
+ValidatePayment=Confirmar pago
+FieldsWithAreMandatory=Los campos con <b>%s</b> son mandatorios
+FieldsWithIsForPublic=Los campos con <b>%s</b> son mostrados en la lista pública de miembros. Si no desea esto, quite el tilde en la casilla "público".
+AccordingToGeoIPDatabase=(de acuerdo a la conversión GeoIP)
+RequiredField=Campo requerido
+ToTest=Prueba
+ValidateBefore=El item debe ser validado antes de usar esta característica
+TotalizableDesc=El campo se puede totalizar en la lista
+Private=Contacot Privado
+Hidden=Escondido
+Source=Fuente
+IM=Mensaje instantáneo
+NewAttribute=Nuevo atributo
+AttributeCode=Código de atributo
+URLPhoto=URL de la foto/logo
+SetLinkToAnotherThirdParty=Enlazar a otra tercera parte
+LinkToProposal=Enlazar a propuesta
+LinkToOrder=Enlazar a orden
+LinkToSupplierOrder=Enlazar a orden de compra
+LinkToSupplierProposal=Enlazar a propuesta de proveedor
+LinkToContract=Enlazar a contacto
+ClickToEdit=Hacer click para editar
+ClickToRefresh=Hacer click para refrescar
+EditHTMLSource=Editar Fuente HTML
+ObjectDeleted=El objeto %s se eliminó
+ByCountry=Por país
+ByTown=Por ciudad
+BySalesRepresentative=Por representante de ventas
+LinkedToSpecificUsers=Enlazado a un contacto particular de usuario
+NoResults=Sin resultados
+AdminTools=Herramientas de Admin
+SystemTools=Herramientas de sistema
+ModulesSystemTools=Herramientas de módulos
+NoPhotoYet=No hay fotos disponibles todavía
+Dashboard=Escritorio
+MyDashboard=Mi Escritorio
+from=desde
+toward=en dirección a
+SelectTargetUser=Seleccione usuario/empleado al que apuntar
+HelpCopyToClipboard=Use Ctrl+C para copiar al clipboard
+SaveUploadedFileWithMask=Guardar archivo en el servidor con el nombre "<strong>%s</strong>" (de lo contrario "%s")
+OriginFileName=Nombre de archivo original
+SetDemandReason=Establecer fuente
+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.
+Denied=Negado
+ListOfTemplates=Lista de plantillas
+Gender=Género
+ViewList=Vista de lista
+Mandatory=Mandatorio
+Sincerely=Sinceramente
+ConfirmDeleteObject=¿Está seguro que quiere eliminar este objeto?
+DeleteLine=Eliminar línea
+ConfirmDeleteLine=¿Está seguro que quiere eliminar esta línea?
+NoPDFAvailableForDocGenAmongChecked=No hay disponible ningún PDF para la generación del documento entre los registros chequeados
+TooManyRecordForMassAction=Se eligió demasiados documentos para una acción en masa. La acción tiene una restricción de %s registros.
+NoRecordSelected=No se eligió registros
+MassFilesArea=�rea para archivos construidos desde acciones en masa
+ShowTempMassFilesArea=Mostrar área de archivos construidos por acción en masa
+ConfirmMassDeletion=Confirmar Eliminar en Masa
+ConfirmMassDeletionQuestion=¿Esta seguro que quiere eliminar %s registro(s) seleccionado(s)?
+RelatedObjects=Objetos Relacionados
+ClassifyBilled=Clasificar como facturado
+ClassifyUnbilled=Clasificar como sin facturar
+FrontOffice=Oficina frontal
+BackOffice=Oficina treasera
+Exports=Exporta
+ExportFilteredList=Exportar lista filtrada
+ExportList=Exportar lista
+ExportOptions=Exportar Opciones
+ExportOfPiecesAlreadyExportedIsEnable=Exportar piezas que ya fueron exportadas está habilitado
+ExportOfPiecesAlreadyExportedIsDisable=Exportar piezas que ya fueron exportadas está deshabilitado
+AllExportedMovementsWereRecordedAsExported=Todos los movimientos de exportaciones fueron registrados como exportados
+NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos de exportados pueden registrarse como exportados
+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
+SetMultiCurrencyCode=Fijar moneda
+BulkActions=Acciones a granel
+ClickToShowHelp=Haga click para mostrar la herramienta de ayuda
+WebSiteAccounts=Cuentas de sitio web
+ExpenseReport=Informe de gasto
 ExpenseReports=Reporte de gastos
+HRAndBank=HR y Banco
+TitleSetToDraft=Volver a borrador
+ConfirmSetToDraft=¿Está seguro que quiere volver al estado Borrador?
+ImportId=Importar id
+EMailTemplates=Plantillas de emails
+FileNotShared=Archivo no compartido con público externo
+Project=Projecto
+Projects=Projectos
+LineNb=Línea no.
+IncotermLabel=Incotérminos
+TabLetteringCustomer=Escritos de clientes
+TabLetteringSupplier=Escritos de proveedores
+TuesdayMin=Mar
+WednesdayMin=Mie
+ShortTuesday=Ma
+SelectMailModel=Elegir plantilla de email
+SetRef=Fijar ref
+Select2ResultFoundUseArrows=Se encontró algunos resultados. Use las flechas para elegir.
+Select2NotFound=No se encontró resultados
+Select2Enter=Ingresar
+Select2MoreCharacter=o un carácter más
+Select2MoreCharactersMore=<strong> Buscar sintaxis: </strong><br><kbd><strong> |</strong></kbd><kbd> O</kbd> (alb)<br><kbd><strong>*</strong></kbd><kbd> Cualquier carácter </kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Comenzar con</kbd> (^ab)<br><kbd><strong> $</strong></kbd><kbd> Terminado con</kbd> (ab$)<br>
+SearchIntoProjects=Projectos
 SearchIntoCustomerInvoices=Facturas de clientes
 SearchIntoSupplierInvoices=Facturas de proveedores
+SearchIntoCustomerOrders=Ordenes de Venta
 SearchIntoSupplierOrders=Ordenes de compra
 SearchIntoCustomerProposals=Propuestas de clientes
+SearchIntoSupplierProposals=Propuestas de proveedores
 SearchIntoContracts=Los contratos
 SearchIntoExpenseReports=Reporte de gastos
+SearchIntoLeaves=Abandonar
+CommentAdded=Comentario agregado
+CommentDeleted=Comentario eliminado
+Everybody=Todos
+Quarterly=Cuatrimestral
+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
+NoFilesUploadedYet=Por favor cargue un documento primero
+SeePrivateNote=Vea nota privada
+PaymentInformation=Información de pago
+ToClose=Para cerrar
+ToProcess=Para procesar
+ToApprove=Para aprobar
+GlobalOpenedElemView=Visión global
+NoArticlesFoundForTheKeyword=No se encontró artículo para la clave  '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=Ningún artículo para la categoría
+ToAcceptRefuse=Aceptar | rechazar
+ContactDefault_agenda=Evento
+ContactDefault_commande=Orden
+ContactDefault_invoice_supplier=Factura de Proveedor
+ContactDefault_order_supplier=Orden de Compra
+ContactDefault_project=Projecto
+ContactDefault_propal=Propuesta
+ContactDefault_supplier_proposal=Propuesta de proveedor
+ContactAddedAutomatically=Contacto agregado desde roles de terceros
+CustomReports=Informes de clientes
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 02bd9beb325..00418e48cfe 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -147,7 +147,6 @@ 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 (al final de la línea del módulo) para habilitar / 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
@@ -333,7 +332,6 @@ LinkToTest=Enlace de clic generado para el usuario <strong>%s</strong>(haga clic
 KeepEmptyToUseDefault=Manténgalo 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 establecer su propia URL de clicktodial)
-ExternalModule=Módulo externo: instalado en el directorio %s
 BarcodeInitForthird-parties=Inicio masivo de código de barras para terceros.
 BarcodeInitForProductsOrServices=Inicialización o reinicio masivo del código de barras para productos o servicios
 CurrentlyNWithoutBarCode=Actualmente, tiene <strong>%s</strong> registros en <strong>%s</strong> %s sin código de barras definido.
@@ -701,7 +699,6 @@ DictionaryCompanyType=Tipos de terceros
 DictionaryCompanyJuridicalType=Entidades legales de terceros
 DictionaryProspectLevel=Potencial de prospecto
 DictionaryCanton=Estados / Provincias
-DictionaryCivility=Título de civilidad
 DictionarySocialContributions=Tipos de impuestos sociales o fiscales.
 DictionaryVAT=Tipos de IVA o tasas de impuestos a las ventas
 DictionaryRevenueStamp=Cantidad de estampillas fiscales
@@ -810,8 +807,6 @@ Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Depósito de cheques no hecho
 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):
-SetupDescription3=<a href="%s">%s -&gt; %s</a> <br> Parámetros básicos utilizados para personalizar el comportamiento predeterminado de su aplicación (por ejemplo, para funciones relacionadas con el país).
-SetupDescription4=<a href="%s">%s -&gt; %s</a> <br> Este software es un conjunto de muchos módulos / aplicaciones, todos más o menos independientes. Los módulos relevantes a sus necesidades deben estar habilitados y configurados. Los nuevos elementos / opciones se agregan a los menús con la activación de un módulo.
 SetupDescription5=Otras entradas del menú de configuración manejan parámetros opcionales.
 LogEvents=Eventos de auditoría de seguridad
 InfoDolibarr=Sobre Dolibarr
@@ -825,7 +820,6 @@ ListOfSecurityEvents=Lista de eventos de seguridad de Dolibarr
 LogEventDesc=Habilitar el registro para eventos de seguridad específicos. Administradores el registro a través del menú <b>%s - %s</b> . Advertencia, esta característica puede generar una gran cantidad de datos en la base de datos.
 AreaForAdminOnly=Los parámetros de configuración solo pueden modificarse por <b>usuarios administradores</b>.
 SystemInfoDesc=La información del sistema es información técnica miscelánea que obtienes en modo solo lectura y visible solo para los administradores.
-CompanyFundationDesc=Edite la información de la empresa / entidad. Click en el botón "%s" en el fondo de la página.
 AccountantDesc=Si tiene un contador / contador 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).
@@ -955,7 +949,6 @@ BillsPDFModules=Modelos de documentos de factura
 BillsPDFModulesAccordindToInvoiceType=Documentos de facturas de modelos según 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 por defecto si no está definido para la factura
 SuggestPaymentByRIBOnAccount=Sugerir pago por retiro en cuenta
 SuggestPaymentByChequeToAddress=Sugerir pago por cheque a
 FreeLegalTextOnInvoices=Texto libre en las facturas
@@ -966,7 +959,6 @@ SupplierPaymentSetup=Configuración de pagos de proveedores
 PropalSetup=Configuración del módulo Cotizaciones
 ProposalsNumberingModules=Módulos de numeración de cotizaciones
 ProposalsPDFModules=Modelos de documentos de cotizaciones
-SuggestedPaymentModesIfNotDefinedInProposal=Modo de pago sugerido en la propuesta por defecto si no está definido para la propuesta
 FreeLegalTextOnProposal=Texto libre en cotizaciones
 WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por el destino de la cuenta bancaria
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index 002ed8b69e6..aeb6b873638 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -43,8 +43,8 @@ CustomersInvoices=Facturas de clientes
 SupplierInvoice=Factura del proveedor
 SupplierBill=Factura del proveedor
 SupplierBills=facturas de proveedores
-PaymentBack=Pago de vuelta
-CustomerInvoicePaymentBack=Pago de vuelta
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 paymentInInvoiceCurrency=en la moneda de las facturas
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Seguro que quieres eliminar este pago?
@@ -383,11 +383,10 @@ ToMakePayment=Paga
 ToMakePaymentBack=Pagar
 ListOfYourUnpaidInvoices=Lista de facturas impagas
 NoteListOfYourUnpaidInvoices=Nota: Esta lista contiene solo facturas para terceros a los que está vinculado como representante de ventas.
-RevenueStamp=Sello de ingresos
 YouMustCreateInvoiceFromThird=Esta opción solo está disponible cuando se crea una factura desde la pestaña &quot;Cliente&quot; de un tercero
 YouMustCreateInvoiceFromSupplierThird=Esta opción solo está disponible cuando se crea una factura desde la pestaña &quot;Proveedor&quot; de un tercero
 YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva factura de plantilla
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index 9fb429628b9..4a4fb6fe85e 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -134,9 +134,7 @@ SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálc
 SeeReportInDueDebtMode=Consulte %sanálisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se contabilizaron en Libro mayor.
 SeeReportInBookkeepingMode=Consulte <b>%sInforme de facturación%s</b> para realizar un cálculo en <b>Tabla Libro mayor contable</b>
 RulesAmountWithTaxIncluded=- Las cantidades que se muestran son con todos los impuestos incluidos
-RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios pagados. <br> - Se basa en la fecha de validación de facturas e IVA y en la fecha de vencimiento de los gastos. Para los salarios definidos con el módulo Salario, se usa la fecha de valor del pago.
 RulesResultInOut=- Incluye los pagos reales realizados en facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. La fecha de donación para la donación.
-RulesCADue=- Incluye las facturas debidas del cliente, ya sean pagadas o no. <br> - Se basa en la fecha de validación de estas facturas. <br>
 RulesCAIn=- Incluye todos los pagos efectivos de las facturas recibidas de los clientes. <br> - Se basa en la fecha de pago de estas facturas. <br>
 RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario Sale.
 RulesAmountOnInOutBookkeepingRecord=Incluye registro en su Libro mayor con cuentas de contabilidad que tiene el grupo "GASTOS" o "INGRESOS"
diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
index aa0e3ce2f9a..0d92dd33451 100644
--- a/htdocs/langs/es_CL/other.lang
+++ b/htdocs/langs/es_CL/other.lang
@@ -171,6 +171,5 @@ LibraryUsed=Biblioteca utilizada
 LibraryVersion=Versión de biblioteca
 NoExportableData=No se pueden exportar datos (no hay módulos con datos exportables cargados o sin permisos)
 WebsiteSetup=Configuración del sitio web del módulo
-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 __WEBSITEKEY__ in the path if path depends on website name.
 WEBSITE_KEYWORDS=Palabras clave
 LinesToImport=Líneas para importar
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index ef999f10803..62693a1c76b 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -109,7 +109,6 @@ CustomerPrices=Precios de cliente
 SuppliersPrices=Precios del proveedor
 SuppliersPricesOfProductsOrServices=Precios de venta (de productos o servicios).
 CustomCode=Código de Aduanas / Productos / HS
-Nature=Naturaleza del producto (material / acabado)
 ProductCodeModel=Plantilla de referencia de producto
 ServiceCodeModel=Plantilla de referencia de servicio
 AlwaysUseNewPrice=Utilice siempre el precio actual del producto/servicio
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index b21b59af6e9..c6ee5dbe200 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -51,7 +51,6 @@ ProgressCalculated=Progreso calculado
 Time=Hora
 ListOfTasks=Lista de tareas
 GoToListOfTimeConsumed=Ir a la lista de tiempo consumido
-GoToListOfTasks=Mostrar como lista
 ListProposalsAssociatedProject=Listado de las propuestas comerciales relacionadas con el proyecto.
 ListOrdersAssociatedProject=Lista de pedidos relacionados con el proyecto.
 ListInvoicesAssociatedProject=Listado de facturas de clientes relacionadas con el proyecto.
@@ -132,7 +131,6 @@ DocumentModelTimeSpent=Plantilla de informe de proyecto para el tiempo empleado.
 PlannedWorkload=Carga de trabajo planificada
 ProjectReferers=Artículos relacionados
 ProjectMustBeValidatedFirst=El proyecto debe ser validado primero
-FirstAddRessourceToAllocateTime=Asignar un recurso de usuario a la tarea para asignar tiempo
 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
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index e85460ffd30..5ae76dc82e1 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -66,7 +66,6 @@ NoMaxSizeByPHPLimit=Nota: en la configuración de su PHP no está definido un l
 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 para ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br> Ejemplo para ClamAv: /usr/bin/clamscan
 AntiVirusParam=Más parámetros en la línea de comando
 ComptaSetup=Configuración del módulo contable
 UserSetup=Configuración de la administración de usuarios
@@ -138,7 +137,6 @@ 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 permisos para ser otorgados a los usuarios después de activar el módulo. Haga clic en el botón de encendido / apagado (al final de la línea del módulo) para habilitar / 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
@@ -744,7 +742,6 @@ 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 por defecto si no está definido para la factura
 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.
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index 7ca34488db8..b2c2ff15057 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -38,8 +38,8 @@ InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
 CustomersInvoices=Facturas de clientes
 SupplierBills=proveedores facturas
-PaymentBack=Devolución de pago
-CustomerInvoicePaymentBack=Devolución de pago
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 paymentInInvoiceCurrency=en facturas moneda
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Estás seguro de que quieres eliminar este pago?
@@ -336,9 +336,8 @@ 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 ingresos
 YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva factura de plantilla
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index be705a0bacc..a8bd33a6a73 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -135,7 +135,6 @@ SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálc
 SeeReportInDueDebtMode=Consulte %sanálisis de facturas%s para un cálculo basado en facturas registradas conocidas, incluso si aún no se han contabilizado en el Libro mayor.
 SeeReportInBookkeepingMode=Consulte <b> %sRestauración report%s </b> para obtener un cálculo de la <b> tabla del Libro mayor de contabilidad </b>
 RulesAmountWithTaxIncluded=- Las cantidades mostradas están con todos los impuestos incluidos.
-RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios pagados. <br> - Se basa en la fecha de validación de las facturas y el IVA y en la fecha de vencimiento de los gastos. Para los salarios definidos con el módulo Salario, se utiliza la fecha de valor del pago.
 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.
 RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario Sale.
 RulesAmountOnInOutBookkeepingRecord=Incluye el registro en su Libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 15b828ed627..c73942cac1e 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -69,9 +69,7 @@ NoMaxSizeByPHPLimit=Nota: No hay límite en tu configuración de PHP
 MaxSizeForUploadedFiles=Tamaño máximo de los archivos cargados (0 para rechazar cualquier subida)
 UseCaptchaCode=Utilizar código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand= Ruta completa al comando antivirus
-AntiVirusCommandExample= Ejemplo para ClamWin: c:\\Progra ~ 1\\ClamWin\\bin\\clamscan.exe <br> Ejemplo para ClamAv: / usr / bin / clamscan
 AntiVirusParam= Más parámetros de línea de comandos
-AntiVirusParamExample= Ejemplo para ClamWin: --database
 ComptaSetup=Configuración del módulo de contabilidad
 UserSetup=Configuración de gestión de usuarios
 MultiCurrencySetup=Configuración de múltiples divisas
@@ -146,7 +144,6 @@ FeatureDisabledInDemo=Función desactivada en demostración
 FeatureAvailableOnlyOnStable=Característica sólo está disponible en las 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 deshabilitarla.
 OnlyActiveElementsAreShown=Solo se muestran elementos de <a href
-ModulesDesc=Los módulos / aplicaciones determinan qué funciones están disponibles en el software. Algunos módulos requieren permisos para ser otorgados a los usuarios después de activar el módulo. Haga clic en el botón de encendido / apagado (al final de la línea del módulo) para habilitar / 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 estará visible en la pestaña <strong> %s </strong>.
 ModulesMarketPlaces=Buscar aplicaciones / módulos externos
 ModulesDevelopYourModule=Desarrolle su propia aplicación / módulos
@@ -155,6 +152,7 @@ DOLISTOREdescriptionLong=En lugar de encender <a href
 CompatibleUpTo=Compatible con la versión 1 %s.
 NotCompatible=Este módulo no parece compatible con Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Ver en el mercado
+SeeSetupOfModule=Consulte la 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 mercado oficial de módulos externos ERP / CRM de Dolibarr
@@ -921,7 +919,6 @@ BillsPDFModules=Modelos de documentos de factura
 BillsPDFModulesAccordindToInvoiceType=La factura documenta los modelos según el tipo de factura.
 PaymentsPDFModules=Modelos de documentos de pago
 ForceInvoiceDate=Forzar la fecha de la factura a la fecha de validación
-SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pagos sugerido en la factura por defecto si no se define para la factura
 SuggestPaymentByRIBOnAccount=Sugerir pago por retiro en cuenta
 SuggestPaymentByChequeToAddress=Sugerir pago con cheque a
 FreeLegalTextOnInvoices=Texto libre en las facturas
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index c3ea6b5330e..b334bd80e13 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Nota: Su PHP limita el tamaño máximo de archivos a sub
 NoMaxSizeByPHPLimit=Ninguna limitación interna en su servidor PHP
 MaxSizeForUploadedFiles=Tamaño máximo de los documentos a subir (0 para prohibir la subida)
 UseCaptchaCode=Utilización de código gráfico (CAPTCHA) en la página de inicio de sesión
-AntiVirusCommand= Ruta completa hacia el comando del antivirus
-AntiVirusCommandExample= Ejemplo para ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Ejemplo para ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Ruta completa hacia el comando del antivirus
+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= Parámetros complementarios en la línea de comandos
-AntiVirusParamExample= Ejemplo para ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuración del módulo Contabilidad
 UserSetup=Configuración gestión de los usuarios
 MultiCurrencySetup=Configuración del módulo multidivisa
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Opción deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionaliad disponible únicamente en versiones oficiales estables
 BoxesDesc=Los paneles son componentes que muestran algunos datos que pueden añadirse para personalizar algunas páginas. Puede elegir entre mostrar o no el panel mediante la selección de la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para desactivarlo.
 OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
-ModulesDesc=Los módulos/aplicaciones definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de encendido/apagado (al final de la línea del módulo) para activar/desactivar un módulo/aplicación.
+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=Puede encontrar más módulos para descargar en sitios web externos en Internet ...
 ModulesDeployDesc=Si los permisos en su sistema de archivos lo permiten, puede utilizar esta herramienta para instalar un módulo externo. El módulo estará entonces visible en la pestaña <strong>%s</strong>.
 ModulesMarketPlaces=Buscar módulos externos...
@@ -212,6 +212,7 @@ CompatibleUpTo=Compatible con la versión %s
 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 la tienda
+SeeSetupOfModule=Vea la configuración del módulo %s
 Updated=Actualizado
 Nouveauté=Novedad
 AchatTelechargement=Comprar/Descargar
@@ -221,6 +222,7 @@ DoliPartnersDesc=Lista de empresas que ofrecen módulos y desarrollos a medida.<
 WebSiteDesc=Sitios web de referencia para encontrar más módulos (no core)...
 DevelopYourModuleDesc=Algunas soluciones para desarrollar su propio módulo ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Paneles disponibles
 BoxesActivated=Paneles activados
 ActivateOn=Activar en
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Deje este campo vacío para usar el valor por defecto
 DefaultLink=Enlace por defecto
 SetAsDefault=Establecer por defecto
 ValueOverwrittenByUserSetup=Atención: Este valor puede ser sobreescrito por un valor específico de la configuración del usuario (cada usuario puede tener su propia url clicktodial)
-ExternalModule=Módulo externo - Instalado en el directorio %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Inicialización masiva de códigos de barras para terceros
 BarcodeInitForProductsOrServices=Inicio masivo de código de barras para productos o servicios
 CurrentlyNWithoutBarCode=Actualmente tiene <strong>%s</strong> registros de <strong>%s</strong> %s sin código de barras definido.
@@ -947,7 +950,7 @@ DictionaryCanton=Provincias
 DictionaryRegion=Regiones
 DictionaryCountry=Países
 DictionaryCurrency=Monedas
-DictionaryCivility=Tratamiento (Sr. Sra. etc.)
+DictionaryCivility=Honorific titles
 DictionaryActions=Tipos de eventos de la agenda
 DictionarySocialContributions=Tipos de impuestos sociales o fiscales
 DictionaryVAT=Tasa de IVA (Impuesto sobre ventas en EEUU)
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=El tipo de IVA propuesto por defecto es 0. Este es el caso de a
 VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el IVA.
 VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de IVA o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (IVA en franquicia), pagando un IVA en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación  "IVA no aplicable - art-293B del CGI" en las facturas.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Tasa
 LocalTax1IsNotUsed=No sujeto
 LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del IVA)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=El tipo de IRPF propuesto por defecto en las creaciones de
 LocalTax2IsNotUsedDescES=El tipo de IRPF propuesto por defecto es 0. Final de regla.
 LocalTax2IsUsedExampleES=En España, se trata de personas físicas: autónomos y profesionales independientes que prestan servicios y empresas que han elegido el régimen fiscal de módulos.
 LocalTax2IsNotUsedExampleES=En España, se trata de empresas no sujetas al régimen fiscal de módulos.
+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 des 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=Informes de impuestos locales
 CalcLocaltax1=Ventas - Compras
 CalcLocaltax1Desc=Los informes se calculan con la diferencia entre las ventas y las compras
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Compras
 CalcLocaltax2Desc=Los informes se basan en el total de las compras
 CalcLocaltax3=Ventas
 CalcLocaltax3Desc=Los informes se basan en el total de las ventas
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Etiqueta que se utilizará si no se encuentra traducción para este código
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Clave de traducción o cadena
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de gastos no aprobado
 Delays_MAIN_DELAY_HOLIDAYS=Días libres a aprobar
 SetupDescription1=Antes de comenzar a usar 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ú Configuración):
-SetupDescription3=<a href="%s">%s->%s</a> <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>Este software es una colección de varios módulos, todos más o menos independientes. 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.
+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=Las otras entradas de configuración gestionan parámetros opcionales.
 LogEvents=Auditoría de la seguridad de eventos
 Audit=Auditoría
@@ -1128,7 +1136,7 @@ LogEventDesc=Activa el registro de eventos de seguridad aquí. Los administrador
 AreaForAdminOnly=Los parámetros de configuración solamente pueden ser tratados por <b>usuarios administrador</b>
 SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
 SystemAreaForAdminOnly=Esta área está disponible solo para usuarios administradores. Los permisos de usuario de Dolibarr no pueden cambiar esta restricción.
-CompanyFundationDesc=Edite la información de la empresa o institución. Haga clic en el botón "%s" a pié de página.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Si tiene un contable/asesor externo, puede editar aquí su información.
 AccountantFileNumber=Código contable
 DisplayDesc=Los parámetros que afectan el aspecto y el comportamiento de Dolibarr se pueden modificar aquí.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Reglas para generar y validar contraseñas.
 DisableForgetPasswordLinkOnLogonPage=No mostrar el vínculo "Contraseña olvidada" en la página de login
 UsersSetup=Configuración del módulo usuarios
 UserMailRequired=E-Mail necesario para crear un usuario nuevo
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Setup del módulo RRHH
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Modelo de documento de facturas
 BillsPDFModulesAccordindToInvoiceType=Modelos de documentos de facturas según tipo de factura
 PaymentsPDFModules=Modelo de documentos de pago
 ForceInvoiceDate=Forzar la fecha de factura a la fecha de validación
-SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pago sugeridas para las facturas si no están definidas explícitamente
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Sugerir el pago por domiciliación en la cuenta
 SuggestPaymentByChequeToAddress=Sugerir el pago por cheque a
 FreeLegalTextOnInvoices=Texto libre en facturas
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Configuración de pagos a proveedores
 PropalSetup=Configuración del módulo Presupuestos
 ProposalsNumberingModules=Módulos de numeración de presupuestos
 ProposalsPDFModules=Modelos de documentos de presupuestos
-SuggestedPaymentModesIfNotDefinedInProposal=Formas de pago sugeridas en presupuestos si no están definidas para los mismos
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Almacén a utilizar para el pedido
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por cuenta bancaria a usar en el pedido a proveedor
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Configuración de Gestión de Pedidos
 OrdersNumberingModules=Módulos de numeración de los pedidos
 OrdersModelModule=Modelos de documentos de pedidos
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores altos ralentiz
 ModuleActivated=El módulo %s está activado y ralentiza dramáticamente la interfaz
 EXPORTS_SHARE_MODELS=Los modelos de exportación son compartidos con todos.
 ExportSetup=Configuración del módulo de exportación.
+ImportSetup=Setup of module Import
 InstanceUniqueID=ID única de la instancia
 SmallerThan=Menor que
 LargerThan=Mayor que
@@ -1979,5 +1991,7 @@ 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 correos electrónicos tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 8e7f5965969..e482f089e54 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Facturas de proveedores
 SupplierBill=Factura proveedor
 SupplierBills=Facturas de proveedores
 Payment=Pago
-PaymentBack=Reembolso
-CustomerInvoicePaymentBack=Reembolso
+PaymentBack=Devolución
+CustomerInvoicePaymentBack=Devolución
 Payments=Pagos
 PaymentsBack=Reembolsos
 paymentInInvoiceCurrency=en la divisa de las facturas
 PaidBack=Reembolsado
 DeletePayment=Eliminar el pago
 ConfirmDeletePayment=¿Está seguro de querer eliminar este pago?
-ConfirmConvertToReduc=¿Desea convertir este %s en un descuento absoluto?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=El importe se guardará entre todos los descuentos y podría utilizarse como un descuento para una factura actual o futura para este cliente.
-ConfirmConvertToReducSupplier=¿Desea convertir este %s en un descuento absoluto?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=El importe se guardará entre todos los descuentos y podría utilizarse como un descuento para una factura actual o futura de este proveedor.
 SupplierPayments=Pagos a proveedor
 ReceivedPayments=Pagos recibidos
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Ver situación factura
 UseSituationInvoices=Permitir factura de situación
 UseSituationInvoicesCreditNote=Permitir factura de situación de abono
 Retainedwarranty=Garantía retenida
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Porcentaje predeterminado de garantía retenida
+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=Para pagar en %s
 toPayOn=pagar en %s
 RetainedWarranty=Garantía retenida
@@ -509,11 +512,11 @@ ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
 ListOfYourUnpaidInvoices=Listado de facturas impagadas
 NoteListOfYourUnpaidInvoices=Nota: Este listado incluye solamente los terceros de los que usted es comercial.
-RevenueStamp=Timbre fiscal
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Esta opción solo está disponible al crear una factura desde la pestaña 'cliente' del tercero
 YouMustCreateInvoiceFromSupplierThird=Esta opción solo está disponible al crear una factura desde la pestaña 'proveedor' del tercero
 YouMustCreateStandardInvoiceFirstDesc=Tiene que crear una factura estandar antes de convertirla a "plantilla" para crear una nueva plantilla de factura
-PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa (antigua implementación de la plantilla Sponge)
+PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Establecer fecha de finalización para la línea de servicio con
 AutoFillDateToShort=Definir fecha de finalización
 MaxNumberOfGenerationReached=Máximo número de generaciones alcanzado
 BILL_DELETEInDolibarr=Factura eliminada
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/es_ES/blockedlog.lang b/htdocs/langs/es_ES/blockedlog.lang
index d3e4fc44d0a..d18c47c2657 100644
--- a/htdocs/langs/es_ES/blockedlog.lang
+++ b/htdocs/langs/es_ES/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Registros inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos los registros archivados (puede ser largo)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos los registros de archivo no válidos (puede ser largo)
 DownloadBlockChain=Descargar huellas dactilares
-KoCheckFingerprintValidity=El registro archivado no es válido. Significa que alguien (¿un pirata informático?) Modificó algunos datos de este registro archivado después de que se grabó, o borró el registro archivado anterior (verifique que exista la línea con el # anterior).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=El registro archivado es válido. Significa que no se modificó ningún dato en esta línea y el registro sigue a la anterior.
 OkCheckFingerprintValidityButChainIsKo=El registro archivado parece válido en comparación con el anterior, pero la cadena se dañó anteriormente.
 AddedByAuthority=Almacenado en autoridad remota
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 3ed336cddc7..c348ec90580 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Añadir este artículo
 RestartSelling=Retomar la venta
 SellFinished=Venta completada
 PrintTicket=Imprimir
+SendTicket=Send ticket
 NoProductFound=Ningún artículo encontrado
 ProductFound=Producto encontrado
 NoArticle=Ningún artículo
@@ -48,6 +49,7 @@ Footer=Pié de página
 AmountAtEndOfPeriod=Importe al final del período (día, mes o año)
 TheoricalAmount=Importe teórico
 RealAmount=Importe real
+CashFence=Cash fence
 CashFenceDone=Cierre de caja realizado para el período.
 NbOfInvoices=Nº de facturas
 Paymentnumpad=Tipo de Pad para introducir el pago.
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS necesita categorías de productos para trabajar
 OrderNotes=Pedidos
 CashDeskBankAccountFor=Cuenta por defecto a usar para cobros en
 NoPaimementModesDefined=No hay modo de pago definido en la configuración de TakePOS
-TicketVatGrouped=Agrupar por tipo de IVA en los tickets
-AutoPrintTickets=Imprimir tickets automáticamente
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Habilitar características para Bar o Restaurante
 ConfirmDeletionOfThisPOSSale=¿Está seguro de querer eliminar la venta actual?
 ConfirmDiscardOfThisPOSSale=¿Quiere descartar esta venta?
@@ -87,7 +90,19 @@ HeadBar=Cabecera
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 3beee367458..0a98814f97f 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=La empresa "%s" ha sido eliminada
 ListOfContacts=Listado de contactos
 ListOfContactsAddresses=Listado de contactos
 ListOfThirdParties=Listado de terceros
-ShowCompany=Mostrar tercero
 ShowContact=Mostrar contacto
 ContactsAllShort=Todos (sin filtro)
 ContactType=Tipo de contacto
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Nombre del comercial
 SaleRepresentativeLastname=Apellidos del comercial
 ErrorThirdpartiesMerge=Se produjo un error al eliminar los terceros. Por favor, compruebe el log. Los cambios han sido anulados.
 NewCustomerSupplierCodeProposed=Código de cliente o proveedor ya utilizado, se sugiere un nuevo código
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Tipo de pago - Cliente
 PaymentTermsCustomer=Condiciones de pago - Cliente
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index c2c829d861d..19261fa227b 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálc
 SeeReportInDueDebtMode=Consulte %sanálisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se han contabilizado en Libro mayor.
 SeeReportInBookkeepingMode=Consulte el <b>%sInforme de facturación%s</b> para realizar un cálculo en la <b>Tabla Libro mayor</b>
 RulesAmountWithTaxIncluded=- Los importes mostrados son con todos los impuestos incluídos.
-RulesResultDue=- Incluye las facturas pendientes, los gastos, el IVA,  las donaciones pagadas o no. También se incluyen los salarios pagados.<br>- Se basa en la fecha de la validación de las facturas e IVA y en la fecha de vencimiento de los gastos. Para los salarios definidos con el módulo de Salarios, se usa la fecha de valor del pago.
+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=- Incluye los pagos realizados sobre las facturas, las gastos y el IVA. <br>- Se basa en las fechas de pago de las facturas, gastos e IVA. La fecha de donación para las donaciones
-RulesCADue=- Incluye las facturas a clientes, estén pagadas o no.<br>- Se basa en la fecha de validación de las mismas.<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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Incluye registro en su libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Volumen de ventas emitidas por tipo de impuesto
 TurnoverCollectedbyVatrate=Volumen de ventas cobradas por tipo de impuesto
 PurchasebyVatrate=Compra por tasa de impuestos
 LabelToShow=Etiqueta corta
+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
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 4c32a8ed7a8..9d8bb8cf2dd 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Archivo no recibido íntegramente por el servidor.
 ErrorNoTmpDir=Directorio temporal de recepción %s inexistente
 ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
 ErrorFileSizeTooLarge=El tamaño del fichero es demasiado grande.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Longitud del campo demasiado largo para el tipo int (máximo %s cifras)
 ErrorSizeTooLongForVarcharType=Longitud del campo demasiado largo para el tipo cadena (máximo %s cifras)
 ErrorNoValueForSelectType=Los valores de la lista deben ser indicados
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index 462b4d627af..17812d15fbd 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Este PHP soporta Curl
 PHPSupportCalendar=Este PHP admite extensiones de calendarios.
 PHPSupportUTF8=Este PHP soporta las funciones UTF8.
 PHPSupportIntl=Este PHP soporta las funciones Intl.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Este PHP soporta las funciones %s.
 PHPMemoryOK=Su memoria máxima de sesión PHP esta definida a <b>%s</b>. Esto debería ser suficiente.
 PHPMemoryTooLow=Su memoria máxima de sesión PHP está definida en <b>%s</b> bytes. Esto es muy poco. Se recomienda modificar el parámetro <b>memory_limit</b> de su archivo <b>php.ini</b> a por lo menos <b>%s</b> bytes.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Su PHP no soporta Curl.
 ErrorPHPDoesNotSupportCalendar=Su instalación de PHP no admite extensiones de calendario.
 ErrorPHPDoesNotSupportUTF8=Este PHP no soporta las funciones UTF8. Resuelva el problema antes de instalar Dolibarr ya que no podrá funcionar correctamente.
 ErrorPHPDoesNotSupportIntl=Este PHP no soporta las funciones Intl.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Su instalación de PHP no soporta las funciones %s.
 ErrorDirDoesNotExists=El directorio <b>%s</b> no existe o no es accesible.
 ErrorGoBackAndCorrectParameters=Vuelva atrás y corrija los parámetros inválidos...
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=La aplicación intenta instalar la actualización
 YouTryInstallDisabledByFileLock=La aplicación intenta instalar la actualización, pero las páginas de instalación/actualización se han desactivado por razones de seguridad (mediante el archivo de bloqueo <strong>install.lock</strong> del directorio de documentos de dolibarr). <br>
 ClickHereToGoToApp=Haga clic aquí para ir a su aplicación
 ClickOnLinkOrRemoveManualy=Haga clic en el siguiente enlace y si siempre llega a esta página, debe eliminar manualmente el archivo install.lock del directorio de documentos
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/es_ES/link.lang b/htdocs/langs/es_ES/link.lang
index 1f9c077de3a..7bfa0b17d00 100644
--- a/htdocs/langs/es_ES/link.lang
+++ b/htdocs/langs/es_ES/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=El vínculo %s ha sido eliminado
 ErrorFailedToDeleteLink= Error al eliminar el vínculo '<b>%s</b>'
 ErrorFailedToUpdateLink= Error al actualizar el vínculo '<b>%s</b>'
 URLToLink=URL a enlazar
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index a8d72baaba2..a8930d2dd3d 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No se han encontrado contactos/direcciones con alguna
 NoContactLinkedToThirdpartieWithCategoryFound=No se han encontrado contactos/direcciones con alguna categoría
 OutGoingEmailSetup=Configuración del correo saliente
 InGoingEmailSetup=Configuración del correo entrante
-OutGoingEmailSetupForEmailing=Configuración de correo saliente (para correo masivo)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Configuración de correo saliente predeterminada
 Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index d72146a9945..026de108ad1 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Guardar y permanecer
 SaveAndNew=Guardar y nuevo
 TestConnection=Probar la conexión
 ToClone=Copiar
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Seleccione los datos que desea copiar:
 NoCloneOptionsSpecified=No hay datos definidos para copiar
 Of=de
@@ -829,6 +830,8 @@ Gender=Sexo
 Genderman=Hombre
 Genderwoman=Mujer
 ViewList=Vista de listado
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obligatorio
 Hello=Hola
 GoodBye=Adiós
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Seleccione sus opciones de gráfico para construir u
 Measures=Medidas
 XAxis=Eje X
 YAxis=Eje Y
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index d74254a2e71..9ede964857b 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 OnlyOneFieldForXAxisIsPossible=Actualmente solo es posible 1 campo como X-Axis. Solo se ha seleccionado el primer campo seleccionado.
 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=Validación pedido de cliente
 Notify_ORDER_SENTBYMAIL=Envío pedido de cliente por e-mail
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedido a proveedor por e-mail
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL de la página
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descripción
 WEBSITE_IMAGE=Imagen
-WEBSITE_IMAGEDesc=Ruta relativa de las imágenes. Puede mantenerla vacía, ya que rara vez se usa (puede ser usada por el contenido dinámico para mostrar una vista previa de una lista de publicaciones de blog). Use __WEBSITEKEY__ en la ruta si depende del nombre del sitio web.
+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=Claves
 LinesToImport=Líneas a importar
 
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 2ed6f756286..83090c479e6 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=¡Esta herramienta actualiza la tasa de IVA definida en
 MassBarcodeInit=Inicialización masiva de códigos de barra
 MassBarcodeInitDesc=Puede usar esta página para inicializar el código de barras en los objetos que no tienen un código de barras definido. Compruebe antes que el módulo de códigos de barras esté configurado correctamente.
 ProductAccountancyBuyCode=Código contable (compras)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Código contable (ventas)
 ProductAccountancySellIntraCode=Código contable (venta intracomunitaria)
 ProductAccountancySellExportCode=Código de contabilidad (venta de exportación)
@@ -165,7 +167,7 @@ SuppliersPrices=Precios de proveedores
 SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicios)
 CustomCode=Código aduanero
 CountryOrigin=País de origen
-Nature=Naturaleza del producto (materia prima/acabado)
+Nature=Nature of product (material/finished)
 ShortLabel=Etiqueta corta
 Unit=Unidad
 p=u.
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index c4298377e9e..89bfa4e3b90 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=que estoy vinculado al proyecto
 Time=Tiempo
 ListOfTasks=Listado de tareas
 GoToListOfTimeConsumed=Ir al listado de tiempos consumidos
-GoToListOfTasks=Mostrar como listado
-GoToGanttView=mostrar como Gantt
 GanttView=Vista de Gantt
 ListProposalsAssociatedProject=Listado de presupuestos asociados al proyecto
 ListOrdersAssociatedProject=Listado de pedidos de clientes asociados al proyecto
@@ -188,7 +186,7 @@ PlannedWorkload=Carga de trabajo prevista
 PlannedWorkloadShort=Carga de trabajo
 ProjectReferers=Items relacionados
 ProjectMustBeValidatedFirst=El proyecto debe validarse primero
-FirstAddRessourceToAllocateTime=Asignar un usuario a la tarea para asignar tiempo
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Entrada por día
 InputPerWeek=Entrada por semana
 InputPerMonth=Entrada por mes
@@ -240,6 +238,7 @@ LatestModifiedProjects=Últimos %s proyectos modificados
 OtherFilteredTasks=Otras tareas filtradas
 NoAssignedTasks=Sin tareas asignadas ( Asigne proyectos/tareas al usuario actual desde el selector superior  para indicar tiempos en ellas)
 ThirdPartyRequiredToGenerateInvoice=Se debe definir un tercero en el proyecto para poder facturarlo.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Permitir comentarios de los usuarios sobre las tareas
 AllowCommentOnProject=Permitir comentarios de los usuarios en los proyectos
@@ -265,3 +264,4 @@ InvoiceToUse=Borrador de factura para usar
 NewInvoice=Nueva factura
 OneLinePerTask=Una línea por tarea
 OneLinePerPeriod=Una línea por período
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/es_ES/receiptprinter.lang b/htdocs/langs/es_ES/receiptprinter.lang
index f72e8676fd9..4876103a07b 100644
--- a/htdocs/langs/es_ES/receiptprinter.lang
+++ b/htdocs/langs/es_ES/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Impresora de pruebas
 CONNECTOR_NETWORK_PRINT=Impresora de red
 CONNECTOR_FILE_PRINT=Impresora Local
 CONNECTOR_WINDOWS_PRINT=Impresora local de Windows
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Impresora falsa para pruebas
 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=Perfil por defecto
 PROFILE_SIMPLE=Perfil simple
 PROFILE_EPOSTEP=Perfil Epos Tep
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Ref. factura
+DOL_PRINT_OBJECT_LINES=Invoice lines
+DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
+DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
+DOL_VALUE_CUSTOMER_MAIL=Customer mail
+DOL_VALUE_CUSTOMER_PHONE=Customer phone
+DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
+DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
+DOL_VALUE_MYSOC_NAME=Your company name
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Número de IVA intracomunitario
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index b7f92f55d9d..d34c8786689 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Nombre del vendedor
 CSSUrlForPaymentForm=Url de la hoja de estilo CSS para el formulario de pago
 NewStripePaymentReceived=Nuevo pago de Stripe recibido
 NewStripePaymentFailed=Nuevo pago de Stripe intentado, pero ha fallado
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Clave secreta test
 STRIPE_TEST_PUBLISHABLE_KEY=Clave de test publicable
 STRIPE_TEST_WEBHOOK_KEY=Clave de prueba Webhook
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Enlace para configurar Stripe WebHook para llamar a l
 ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar a la IPN (modo real)
 PaymentWillBeRecordedForNextPeriod=El pago se registrará para el próximo período.
 ClickHereToTryAgain=<a href="%s">Haga clic aquí para volver a intentarlo ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Debido a las fuertes reglas de autenticación del cliente, la creación de una tarjeta debe realizarse desde la oficina administrativa de Stripe. Puede hacer clic aquí para activar el registro de cliente de Stripe: %s
+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/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index 62e0d03710c..b843c3e6ba4 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -70,7 +70,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 pertenece a su empresa/organización.<br>Un usuario <b>externo</b> es un usuario cliente, proveedor u otro.<br><br>En los 2 casos, los permisos de usuarios definen los derechos de acceso, pero el usuario externo puede además tener  un gestor de menús diferente al usuario interno (véase Inicio - Configuración - Entorno)
+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)
 PermissionInheritedFromAGroup=El permiso se concede ya que lo hereda de un grupo al cual pertenece el usuario.
 Inherited=Heredado
 UserWillBeInternalUser=El usuario creado será un usuario interno (ya que no está ligado a un tercero en particular)
@@ -113,3 +113,5 @@ CantDisableYourself=No puede deshabilitar su propio registro de usuario
 ForceUserExpenseValidator=Forzar validador de informes de gastos
 ForceUserHolidayValidator=Forzar validador de solicitud de días libres
 ValidatorIsSupervisorByDefault=Por defecto, el validador es el supervisor del usuario. Mantener vacío para mantener este comportamiento.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index fdbed999abc..f0b7e73215f 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Ver página en una pestaña nueva
 SetAsHomePage=Establecer como Página de inicio
 RealURL=URL Real
 ViewWebsiteInProduction=Ver sitio web usando la URL de inicio
-SetHereVirtualHost=Si puede crear, en su servidor web (Apache, Nginx...), un Host Virtual con PHP activado y un directorio Root en <br><strong>%s</strong> <br>introduzca aquí el nombre del host virtual que ha creado, así que la previsualización puede verse usando este acceso directo al servidor, y no solo usando el servidor de Dolibarr
+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=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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Lo sentimos, este sitio web está actualmente fue
 WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar tabla de cuentas del sitio web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilitar tabla para almacenar cuentas del sitio web (inicio de sesión/contraseña) para cada sitio web/tercero
 YouMustDefineTheHomePage=Antes debe definir la página de inicio por defecto
-OnlyEditionOfSourceForGrabbedContentFuture=Atención: la creación de una página web mediante la importación de una página web externa está reservada para usuarios experimentados. Dependiendo de la complejidad de la página de origen, el resultado de la importación puede diferir una vez importado del original. Además, si la página de origen utiliza un estilo CSS común o un javascript no compatible, puede interrumpir el aspecto o las características del editor del sitio web al trabajar en esta página. Este método es una forma más rápida de tener una página, pero se recomienda crear su nueva página desde cero o desde una plantilla de página sugerida.<br>También tenga en cuenta que solo será posible la edición de código HTML cuando el contenido de una página se haya inicializado al agarrar desde una página externa (el editor "en línea" NO estará disponible)
+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=Nota: solo será posible editar una fuente HTML cuando el contenido de una página se integre utilizando una página externa
 GrabImagesInto=Obtener también imágenes encontradas en css y página.
 ImagesShouldBeSavedInto=Las imágenes deben guardarse en el directorio
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=Para buenas prácticas de SEO, use un texto de entre 5
 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
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 9673e5b8955..02dbd732725 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -70,9 +70,7 @@ NoMaxSizeByPHPLimit=Nota: No hay límite establecido en la configuración de PHP
 MaxSizeForUploadedFiles=El tamaño máximo para los archivos subidos (0 para no permitir ninguna carga)
 UseCaptchaCode=Utilizar el código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa del comando del antivirus
-AntiVirusCommandExample=Ejemplo para ClamWin: c:\\ Progra~1\\ClamWin\\bin\\clamscan.exe<br>Ejemplo para ClamAV: /usr/bin/clamscan
 AntiVirusParam=Más parámetros de línea de comandos
-AntiVirusParamExample=Ejemplo para ClamWin: --database="C:\\Archivos de programa (x86)\\ClamWin\\lib"
 ComptaSetup=Establecer modulo de Contabilidad
 UserSetup=Establecer usuario Administrador
 MultiCurrencySetup=Configurar multidivisas
@@ -153,7 +151,6 @@ FeatureDisabledInDemo=Característica deshabilitada en versión demo
 FeatureAvailableOnlyOnStable=Característica unicamente disponible en versiones oficiales estables
 BoxesDesc=Widgets son componentes mostrando alguna información que tu puedes agregar para personalizar algunas páginas. Tu puedes elegir entre mostrar el widget o no al seleccionar la página objetivo y haciendo click en 'Activar', o haciendo click en la papelera de reciclaje para deshabilitarlos.
 OnlyActiveElementsAreShown=Solo elementos de <a href="%s">\nmodulos habilitados</a> son\n mostrados.
-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 (al final de la línea del módulo) para habilitar/deshabilitar un módulo/aplicación.
 ModulesMarketPlaceDesc=Tu puedes encontrar mas módulos para descargar en sitios web externos en el Internet
 ModulesDeployDesc=Si los permisos en tu sistema de archivos lo permiten, puedes usar esta herramienta para utilizar un módulo externo. El módulo  entonces sera visible en la pestaña <strong>%s</strong>.
 ModulesMarketPlaces=Encontrar App/módulos externos
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index a6ee51cba02..63ece735923 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -26,6 +26,8 @@ NoInvoiceToCorrect=Ninguna factura para corregir
 InvoiceHasAvoir=Fue fuente de una o varias notas de crédito
 InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
 PaymentAmount=Importe de pago
 BillStatusPaid=Pagado
@@ -43,5 +45,5 @@ CreditNote=Nota de crédito
 ReasonDiscount=Razón
 PaymentTypeCB=Tarjeta de crédito
 PaymentTypeShortCB=Tarjeta de crédito
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 72b4040e785..4ffbf46023e 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -7,8 +7,8 @@ DeleteContact=Eliminar un contacto/dirección
 ConfirmDeleteContact=¿Estás seguro que quieres borrar este contacto y toda la información heredada?
 MenuNewProspect=Nuevo prospecto
 MenuNewSupplier=Nuevo vendedor
-NewCompany=Nueva compañía (prospecto, cliente, vendedor)
-NewThirdParty=Nuevo tercero (prospecto, cliente, vendedor)
+NewCompany=Nueva compañía (cliente potencial, cliente, proveedor)
+NewThirdParty=Nuevo tercero (cleinte potencial, cliente, proveedor)
 CreateThirdPartyAndContact=Crear un tercero + un contacto hijo
 IdThirdParty=ID de tercero
 IdCompany=ID de empresa
@@ -24,6 +24,7 @@ PriceFormatInCurrentLanguage=Formato de visualización de precios en el idioma y
 ThirdPartyEmail=Correo electrónico del tercero
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
 ThirdPartySuppliers=Vendedores
+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
@@ -119,8 +120,18 @@ CompanyHasRelativeDiscount=Éste cliente tiene un descuento por defecto de <b>%s
 CompanyHasNoRelativeDiscount=Este cliente no tiene ningún descuento relativo por defecto
 HasRelativeDiscountFromSupplier=Tiene un descuento predeterminado de <b> %s%% </b> de este proveedor
 HasNoRelativeDiscountFromSupplier=No tiene un descuento relativo predeterminado de este proveedor.
+CompanyHasAbsoluteDiscount=Este cliente aún tiene descuentos disponibles (notas de crédito o pagos) por <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Este cliente aún tiene descuentos disponibles (notas de crédito o pagos) por <b>%s</b> %s
 CompanyHasCreditNote=Este cliente aún tiene notas de crédito por <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=No se tiene un descuento disponible con este proveedor
+HasAbsoluteDiscountFromSupplier=Se tiene descuentos disponibles (notas de credito o pagos) por <b>%s</b>%s para este proveedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Se tiene descuentos disponibles (notas de credito o pagos) por <b>%s</b>%s para este proveedor
+HasCreditNoteFromSupplier=Se tienen notas de crédito por <b>%s</b>%s para este proveedor
 CompanyHasNoAbsoluteDiscount=Este cliente no tiene descuentos fijos disponibles
+CustomerAbsoluteDiscountAllUsers=Descuento absoluto para el cliente (autorizado para todos los usuarios)
+CustomerAbsoluteDiscountMy=Descuento absoluto para el cliente (autorizado por usted mismo)
+SupplierAbsoluteDiscountAllUsers=Descuento absoluto con proveedor (dado por todos los usuarios)
+SupplierAbsoluteDiscountMy=Descuento absoluto con proveedor (dado por usted mismo)
 DiscountNone=Ninguno
 ContactId=ID de contacto
 NoContactDefinedForThirdParty=No se ha definido un contacto para este tercero
@@ -128,16 +139,33 @@ NoContactDefined=No hay contacto definido
 DefaultContact=Contacto/dirección por defecto
 DeleteACompany=Eliminar empresa
 PersonalInformations=Datos personales
+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
 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
 ListOfContactsAddresses=Lista de contactos/direcciones
+ListOfThirdParties=Lista de terceros
 ContactsAllShort=Todos (Sin filtro)
 ContactForOrdersOrShipments=Contacto de la orden o del envío
 ContactForInvoices=Contacto de facturación
 NoContactForAnyOrderOrShipments=Este contacto no es un contacto para cualquier pedido o envío
+NewContactAddress=Nuevo contacto/dirección
 EditCompany=Editar empresa
+ThisUserIsNot=Este usuario no es un cliente potencial, cliente ni proveedor
+VATIntraCheckDesc=El numero de control de IVA intracomunitario debe incluir el prefijo del país. El enlace <b>%s</b> permite consultar al servicio de control de números de IVA intracomunitario (VIES). Se requiere acceso a Internet desde el servidor para que este servicio funcione.
+VATIntraCheckableOnEUSite=Verificar el numero de control de IVA intracomunitario en la web de la Comisión Europea
+VATIntraManualCheck=También puedes verificar manualmente desde el sitio web de la comision europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible realizar la verificación. El servicio de comprobación no es prestado por el país miembro (%s).
+NorProspectNorCustomer=No es cliente potencial, ni cliente
+JuridicalStatus=Tipo de entidad legal
 OthersNotLinkedToThirdParty=Otros, no vinculado a un tercero
 ProspectStatus=Estatus del cliente potencial
 TE_MEDIUM=Mediana empresa
@@ -152,22 +180,37 @@ ChangeContactInProcess=Cambiar estado a 'Contacto en proceso'
 ChangeContactDone=Cambiar estado a 'Contacto realizado'
 NoParentCompany=Ninguno
 DolibarrLogin=Login de usuario
+ExportDataset_company_1=Terceros (Empresas/fundaciones/personas físicas) y sus propiedades
+ExportDataset_company_2=Contactos y propiedades
+ImportDataset_company_1=Terceros y sus propiedades
+ImportDataset_company_2=Contactos/Direcciones adicionales del tercero
+ImportDataset_company_3=Cuentas de banco del tercero
+ImportDataset_company_4=Representante de ventas del tercero (asigna representantes de ventas/usuarios de companias)
+PriceLevel=Nivel de precio
+PriceLevelLabels=Etiquetas de nivel de precios
 DeleteFile=Borrar archivo
 ConfirmDeleteFile=¿Seguro que quieres borrar este archivo?
 AllocateCommercial=Asignado al representante de ventas
 Organization=Organización
+FiscalYearInformation=Año fiscal
 FiscalMonthStart=Més de inicio del año fiscal
+YouMustAssignUserMailFirst=Debe crear un correo electrónico para este usuario primero para poder agregarle notificaciones de 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 clientes potenciales
+ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Terceros/Contactos
 LastModifiedThirdParties=Últimos %s Terceros modificados
 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)
 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/other.lang b/htdocs/langs/es_MX/other.lang
index 3404c216e5d..ac900b15595 100644
--- a/htdocs/langs/es_MX/other.lang
+++ b/htdocs/langs/es_MX/other.lang
@@ -2,4 +2,3 @@
 Tools=Herramientas
 TMenuTools=Herramientas
 Notify_COMPANY_CREATE=Tercero creado
-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 __WEBSITEKEY__ in the path if path depends on website name.
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index ed1fa38ddd0..659e7e79f39 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionProgram=Versión del programa
 VersionLastInstall=Instalar versión inicial
-AntiVirusCommandExample=Ejemplo para ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Ejemplo para ClamAv: /usr/bin/clamscan
 ExampleOfDirectoriesForModelGen=Ejemplo de sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module30Name=Facturas
 Permission91=Consultar impuestos e IGV
diff --git a/htdocs/langs/es_PE/bills.lang b/htdocs/langs/es_PE/bills.lang
index 3267ce16011..688939af29d 100644
--- a/htdocs/langs/es_PE/bills.lang
+++ b/htdocs/langs/es_PE/bills.lang
@@ -5,9 +5,11 @@ InvoiceAvoir=Nota de crédito
 InvoiceAvoirAsk=Nota de crédito para corregir factura
 InvoiceCustomer=Factura de cliente
 CustomerInvoice=Factura de cliente
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 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)
 CreditNote=Nota de crédito
 VATIsNotUsedForInvoice=* IGV no aplicable  art-293B del CGI
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
diff --git a/htdocs/langs/es_PE/mrp.lang b/htdocs/langs/es_PE/mrp.lang
index 14a870e357b..a699d3a726f 100644
--- a/htdocs/langs/es_PE/mrp.lang
+++ b/htdocs/langs/es_PE/mrp.lang
@@ -1,14 +1,55 @@
 # Dolibarr language file - Source file is en_US - mrp
+Mrp=Órdenes de Fabricación
+MO=Orden de Fabricación
+MRPDescription=Modulo para gestionar la producción y órdenes de fabricación (OF).
 MRPArea=�rea PRM
-MenuBOM=Listas de material
+MrpSetupPage=Configuración del modulo PRM
+MenuBOM=Lista de materiales
 LatestBOMModified=Últimas%s Lista de materiales modificados
+LatestMOModified=Últimas %s Órdenes de Fabricación modificadas
 BillOfMaterials=Lista de Material
 ListOfBOMs=Listado de Lista De Material - BOM
+ListOfManufacturingOrders=Lista de Órdenes de Fabricación
 NewBOM=Nueva lista de material
+ProductBOMHelp=Producto para crear con este BOM. <br>Nota: Productos con la propiedad 'Naturaleza del producto'= 'Materia prima' no serán visibles en esta lista.
 BOMsNumberingModules=Plantillas de numeración BOM
+BOMsModelModule=Plantillas de documento BOM
+MOsNumberingModules=Numeración de plantillas MO
+MOsModelModule=Plantillas de documento MO
 FreeLegalTextOnBOMs=Texto libre en documento BOM
 WatermarkOnDraftBOMs=Marca de agua en BOM borrador
+FreeLegalTextOnMOs=Texto libre en documento MO
+WatermarkOnDraftMOs=Marca de agua en borrador MO
+ConfirmCloneBillOfMaterials=Está seguro de clonar esta lista de materiales %s?
+ConfirmCloneMo=Está seguro de clonar la Orden de Fabricación %s?
 ValueOfMeansLoss=Valor de 0.95 significa un promedio de 5%% pérdidas durante la producción
-DeleteBillOfMaterials=Borrar Lista De Materiales
+DeleteBillOfMaterials=Eliminar Lista De Materiales
 ConfirmDeleteBillOfMaterials=Está seguro de borrar esta Lista de Materiales
 ConfirmDeleteMo=Está seguro de borrar esta Lista de Materiales
+NewMO=Nueva Orden de Fabricación
+QtyToProduce=Cantidad a producir
+DateEndPlannedMo=Fecha de fin planeada
+KeepEmptyForAsap=Vacío si es 'Tan pronto como sea posible'
+EstimatedDurationDesc=Duración estimada a fabricar el producto usando este BOM
+ConfirmValidateBom=Está seguro de validar el BOM con la referencia <strong>%s</strong> (Usted podrá usarlo para crear nuevas órdenes de fabricación)
+ConfirmCloseBom=Está seguro de cancelar este BOM (Ya no podrá usarlo para crear nuevas órdenes de fabricación)
+ConfirmReopenBom=Está seguro de re-abrir este BOM (Podrá usarlo para crear nuevas órdenes de fabricación)
+QtyFrozen=Cant. Congelada
+QuantityFrozen=Cantidad congelada
+QuantityConsumedInvariable=Cuando está marcada, la cantidad consumida es siempre el valor asignado y no depende de la cantidad producida
+DisableStockChangeHelp=Cuando está marcada, el stock no cambia en este producto, cualquiera que sea la cantidad consumida.
+BomAndBomLines=Lista de materiales y lineas
+BOMLine=Linea de BOM
+CreateMO=Crear MO
+ToConsume=Consumir
+ToProduce=Producir
+QtyAlreadyConsumed=Cant. consumida
+QtyAlreadyProduced=Cant. producida
+ConsumeOrProduce=Consumir o Producir
+ConsumeAndProduceAll=Consumir y Producir Todo
+TheProductXIsAlreadyTheProductToProduce=El producto a agregar es el producto a producir
+ForAQuantityOf1=Para una cantidad a producir de 1 BOM
+ConfirmValidateMo=Está seguro de validar esta Orden de Fabricación?
+AddNewConsumeLines=Agregar nueva linea para consumir
+ProductsToConsume=Productos para consumir
+ProductsToProduce=Productos para producir
diff --git a/htdocs/langs/es_VE/bills.lang b/htdocs/langs/es_VE/bills.lang
index 753248eaf0d..e5e74735485 100644
--- a/htdocs/langs/es_VE/bills.lang
+++ b/htdocs/langs/es_VE/bills.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - bills
 BillsCustomersUnpaid=Facturas a clientes pendientes de cobro
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 CreateCreditNote=Crear factura de abono
 BillShortStatusConverted=Pagada
 CustomerBillsUnpaid=Facturas a clientes pendientes de cobro
@@ -8,5 +10,5 @@ PaymentConditionShortPT_ORDER=Pedido
 PaymentTypeShortTRA=A validar
 VATIsNotUsedForInvoice=-
 LawApplicationPart1=-
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_VE/other.lang b/htdocs/langs/es_VE/other.lang
index 74603c3a3e3..6f639e2a2ca 100644
--- a/htdocs/langs/es_VE/other.lang
+++ b/htdocs/langs/es_VE/other.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - other
 SourcesRepository=Repositorio de fuentes
 WEBSITE_DESCRIPTION=Descripcion
-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 __WEBSITEKEY__ in the path if path depends on website name.
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 7e62c9545de..61216902bb9 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Märkus: PHP seadistustes pole piiri määratletud
 MaxSizeForUploadedFiles=Üleslaetava faili maksimaalne suurus (0 keelab failide üleslaadimise)
 UseCaptchaCode=Kasuta sisselogimise lehel graafilist koodi (CAPTCHA)
-AntiVirusCommand= Täielik süsteemi rada antiviiruse käsuni
-AntiVirusCommandExample= ClamWini põhine näide: C:\\Program~1\\ClamWin\\bin\\clamscan.exe<br>ClamAV põhine näide: /usr/bin/clamscan
+AntiVirusCommand=Täielik süsteemi rada antiviiruse käsuni
+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= Lisaparameetrid, mida käsureal edastada
-AntiVirusParamExample= ClamWini põhine näide: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Raamatupidamise mooduli seadistamine
 UserSetup=Kasutajate haldamise seadistamine
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Demoversioonis blokeeritud funktsionaalsus
 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=Näidatakse ainult elemente <a href="%s">sisse lülitatud moodulitest</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 (at end of module line) to enable/disable a module/application.
+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=Alla laadimiseks leiad rohkem mooduleid Internetist.
 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=Otsi katsetuskärgus rakendusi/mooduleid
@@ -212,6 +212,7 @@ CompatibleUpTo=Ãœhilduv versioooniga %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=Uuendatud
 Nouveauté=Novelty
 AchatTelechargement=Osta / Laadi alla
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=External websites for more add-on (non-core) modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Saadaolevad vidinad
 BoxesActivated=Aktiveeritud vidinad
 ActivateOn=Aktiveeri lehel
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Jäta tühjaks vaikeväärtuse kasutamiseks
 DefaultLink=Vaikimisi link
 SetAsDefault=Määra vaikimisi
 ValueOverwrittenByUserSetup=Hoiatus: kasutaja võib selle väärtuse üle kirjutada oma seadetega (iga kasutaja saab määratleda isikliku clicktodial URLi)
-ExternalModule=Väline moodul - paigaldatud kausta %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass-vöötkoodi loomine kolmandatele osapooltele
 BarcodeInitForProductsOrServices=Toodete/teenuste jaoks massiline vöötkoodide loomine või lähtestamine
 CurrentlyNWithoutBarCode=Praegu on teil <strong>%s</strong> kirje <strong>%s</strong> %s kohta ilma vöötkoodi määramata.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Piirkonnad
 DictionaryCountry=Riigid
 DictionaryCurrency=Valuutad
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Käibe- või müügimaksumäärad
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Määr
 LocalTax1IsNotUsed=Ära kasuta teist maksu
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Vaikimisi pakutud IRPF on 0. Reegli lõpp.
 LocalTax2IsUsedExampleES=Hispaanias on nad vabakutselised ja spetsialistid, kes pakuvad teenuseid ja ettevõtted, kes on valinud moodulipõhise maksusüsteemi.
 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 des 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=Müügid - Ostud
 CalcLocaltax1Desc=Kohalike maksude aruannete arvutamiseks kasutatakse kohalike maksude müügi ja kohalike maksude ostude vahet
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Ostud
 CalcLocaltax2Desc=Kohalike maksude aruanded on kohalike maksude ostude summas
 CalcLocaltax3=Müügid
 CalcLocaltax3Desc=Kohalike maksude aruanded on kohalike maksude müükide summas
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Vaikimisi kasutatav silt, kui koodile ei leitud tõlke vastet
 LabelOnDocuments=Dokumentide silt
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Süsteemi info sisaldab mitmesugust tehnilist infot, mida ei saa muuta ning mis on nähtav vaid administraatoritele.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Kasutajate mooduli seadistamine
 UserMailRequired=Email required to create a new user
+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 #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Arve dokumentide mudelid
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Sunni arve kuupäevaks arve kinnitamise kuupäev
-SuggestedPaymentModesIfNotDefinedInInvoice=Soovitatav vaikimisi makseviis arvel, kui seda pole arvel määratletud
+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=Vaba tekst arvetel
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=Pakkumiste mooduli seadistamine
 ProposalsNumberingModules=Pakkumiste numeratsiooni mudelid
 ProposalsPDFModules=Pakkumiste dokumentatsiooni mudelid
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Vaba tekst pakkumistel
 WatermarkOnDraftProposal=Vesimärk pakkumiste mustanditel (puudub, kui tühi)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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=Tellimuste numeratsiooni mudelid
 OrdersModelModule=Tellimuste dokumentide mudelid
@@ -1471,7 +1482,7 @@ LDAPFieldCompanyExample=Example: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example: objectsid
 LDAPFieldEndLastSubscription=Tellimuse lõpu kuupäev
-LDAPFieldTitle=Job position
+LDAPFieldTitle=Ametikoht
 LDAPFieldTitleExample=Näide: tiitel
 LDAPFieldGroupid=Group id
 LDAPFieldGroupidExample=Exemple : gidnumber
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index e866e640b5e..8cba62107af 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -66,9 +66,9 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Tagasi makstud
 DeletePayment=Kustuta makse
 ConfirmDeletePayment=Kas olete kindel, et soovite selle makse kustutada?
-ConfirmConvertToReduc=Kas soovite selle %s konverteerida absoluutseks allahindluseks?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=Summa salvestatakse kõigi allahindluste hulka ja seda saab kasutada selle kliendi jooksva või tulevase arve allahindlusena.
-ConfirmConvertToReducSupplier=Kas soovite selle %s konverteerida absoluutseks allahindluseks?
+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=Tarnija maksed
 ReceivedPayments=Laekunud maksed
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Maksa
 ToMakePaymentBack=Maksa tagasi
 ListOfYourUnpaidInvoices=Maksmata arvete nimekiri
 NoteListOfYourUnpaidInvoices=Märkus: see nimekiri sisaldab vaid nende kolmandate isikute arveid, kelle jaoks Sa oled märgitud müügiesindajaks.
-RevenueStamp=Maksumärk
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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.
@@ -575,3 +578,4 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Arve kustutatud
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/et_EE/blockedlog.lang b/htdocs/langs/et_EE/blockedlog.lang
index 1da7967fe88..ac567943c5c 100644
--- a/htdocs/langs/et_EE/blockedlog.lang
+++ b/htdocs/langs/et_EE/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index c9c6fd87412..0a680f21d67 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Lisa see artikkel
 RestartSelling=Mine müümisel tagasi
 SellFinished=Sale complete
 PrintTicket=Trüki tšekk
+SendTicket=Send ticket
 NoProductFound=Artiklit ei leitud
 ProductFound=toodet leitud
 NoArticle=Artiklid puuduvad
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Arveid
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 99c3f2219cf..7e172d130b8 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -2,16 +2,16 @@
 ErrorCompanyNameAlreadyExists=Ettevõte nimega %s on juba olemas. Vali mõni muu.
 ErrorSetACountryFirst=Esmalt vali riik
 SelectThirdParty=Vali kolmas isik
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Kas soovite kindlasti selle ettevõtte ja kogu päritud teabe kustutada?
 DeleteContact=Kustuta kontakt/aadress
-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
+ConfirmDeleteContact=Kas soovite kindlasti selle kontakti ja kogu päritud teabe kustutada?
+MenuNewThirdParty=Uus kolmas osapool
+MenuNewCustomer=Uus klient
+MenuNewProspect=Uus huviline
+MenuNewSupplier=Uus tarnija
 MenuNewPrivateIndividual=Uus eraisik
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
+NewCompany=Uus ettevõte (huviline, klient, müüja)
+NewThirdParty=Uus kolmas osapool (huviline, klient, müüja)
 CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Uus kolmas isik
 CreateThirdPartyAndContact=Create a third party + a child contact
@@ -25,7 +25,7 @@ ThirdPartyContact=Third-party contact/address
 Company=Ettevõte
 CompanyName=Ettevõtte nimi
 AliasNames=Hüüdnimi (ärinimi, kaubamärk, ...)
-AliasNameShort=Alias Name
+AliasNameShort=Varjunimi
 Companies=Ettevõtted
 CountryIsInEEC=Country is inside the European Economic Community
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
@@ -41,17 +41,17 @@ ThirdPartyCustomersWithIdProf12=Klient koos %s või %s
 ThirdPartySuppliers=Tarnijad
 ThirdPartyType=Third-party type
 Individual=Eraisik
-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=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=Report by month
-ReportByCustomers=Report by customer
+ReportByMonth=Aruanne kuude kaupa
+ReportByCustomers=Kliendi aruanne
 ReportByQuarter=Aruanne määra alusel
 CivilityCode=Sisekorraeeskiri
 RegisteredOffice=Peakontor
 Lastname=Perekonnanimi
 Firstname=Eesnimi
-PostOrFunction=Job position
+PostOrFunction=Ametikoht
 UserTitle=Tiitel
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
@@ -78,18 +78,18 @@ Zip=Postiindeks
 Town=Linn
 Web=Veeb
 Poste= Ametikoht
-DefaultLang=Language default
+DefaultLang=Keele vaikeseade
 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
+VATIsNotUsed=Käibemaksu ei kasutata
 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
+PaymentBankAccount=Makse pangakonto
 OverAllProposals=Pakkumised
 OverAllOrders=Tellimused
 OverAllInvoices=Arved
-OverAllSupplierProposals=Price requests
+OverAllSupplierProposals=Hinnapäringud
 ##### Local Taxes #####
 LocalTax1IsUsed=Kasuta teist maksu
 LocalTax1IsUsedES= RE on kasutuses
@@ -98,9 +98,9 @@ LocalTax2IsUsed=Kasuta kolmandat maksu
 LocalTax2IsUsedES= IRPF on kasutuses
 LocalTax2IsNotUsedES= IRPF pole kasutuses
 WrongCustomerCode=Vigane kliendi kood
-WrongSupplierCode=Vendor code invalid
+WrongSupplierCode=Tarnija kood on vale
 CustomerCodeModel=Kliendi koodi mudel
-SupplierCodeModel=Vendor code model
+SupplierCodeModel=Tarnija koodimudel
 Gencod=Vöötkood
 ##### Professional ID #####
 ProfId1Short=Reg nr 1
@@ -108,7 +108,7 @@ ProfId2Short=Reg nr 2
 ProfId3Short=Reg nr 3
 ProfId4Short=Reg nr 4
 ProfId5Short=Reg nr 5
-ProfId6Short=Prof. id 6
+ProfId6Short=Reg nr 6
 ProfId1=Registrikood
 ProfId2=Registrikood 2
 ProfId3=Registrikood 3
@@ -263,8 +263,8 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
+VATIntra=KMKR number
+VATIntraShort=KMKR number
 VATIntraSyntaxIsValid=Süntaks on kehtiv
 VATReturn=VAT return
 ProspectCustomer=Huviline/klient
@@ -292,8 +292,8 @@ CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
 SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
 SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Pole
-Vendor=Vendor
-Supplier=Vendor
+Vendor=Tarnija
+Supplier=Tarnija
 AddContact=Uus kontakt
 AddContactAddress=Uus kontakt/aadress
 EditContact=Muuda kontakti
@@ -301,31 +301,30 @@ EditContactAddress=Muuda kontakti/aadressi
 Contact=Kontakt
 ContactId=Contact id
 ContactsAddresses=Kontaktid/aadressid
-FromContactName=Name:
+FromContactName=Nimi:
 NoContactDefinedForThirdParty=Antud kolmanda isikuga pole ühtki kontakti seotud
 NoContactDefined=Kontakti pole määratud
 DefaultContact=Vaikimisi kontakt/aadress
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Vaikekontakti / aadress
 AddThirdParty=Uus kolmas isik
 DeleteACompany=Kustuta ettevõte
 PersonalInformations=Isikuandmed
 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
+CustomerCode=Kliendi kood
+SupplierCode=Tarnija kood
+CustomerCodeShort=Kliendi kood
+SupplierCodeShort=Tarnija kood
+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
-ThisIsModuleRules=Rules for this module
+ThisIsModuleRules=Selle mooduli reeglid
 ProspectToContact=Huviline, kellega ühendust võtta
 CompanyDeleted=Ettevõte &quot;%s&quot; on andmebaasist kustutatud.
 ListOfContacts=Kontaktide/aadresside nimekiri
 ListOfContactsAddresses=Kontaktide/aadresside nimekiri
-ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
+ListOfThirdParties=Kolmandate osapoolte nimekiri
 ShowContact=Näita kontakti
 ContactsAllShort=Kõik (filtrita)
 ContactType=Kontakti liik
@@ -340,7 +339,7 @@ NoContactForAnyProposal=See kontakt ei ole ühegi pakkumisega seotud
 NoContactForAnyContract=See kontakt ei ole ühegi lepinguga seotud
 NoContactForAnyInvoice=See kontakt ei ole ühegi arvega seotud
 NewContact=Uus kontaktisik
-NewContactAddress=New Contact/Address
+NewContactAddress=Uus kontakt/aadress
 MyContacts=Minu kontaktid
 Capital=Kapital
 CapitalOf=%s kapital
@@ -354,7 +353,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Kontrollida pole võimalik. Kontrolli, et liikmesriik (%s) võimaldab teenust kasutada.
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
-Staff=Employees
+Staff=Töötajad
 ProspectLevelShort=Potentsiaalne
 ProspectLevel=Huvilise potentsiaal
 ContactPrivate=Era-
@@ -375,19 +374,19 @@ TE_MEDIUM=Keskmise suurusega ettevõte
 TE_ADMIN=Valitsusasutus
 TE_SMALL=Väikeettevõte
 TE_RETAIL=Jaemüüja
-TE_WHOLE=Wholesaler
+TE_WHOLE=Hulgimüüja
 TE_PRIVATE=Eraisik
 TE_OTHER=Muu
 StatusProspect-1=Ära kontakteeru
 StatusProspect0=Pole kunagi kontakteerutud
-StatusProspect1=To be contacted
+StatusProspect1=Tuleb ühendust võtta
 StatusProspect2=Kontakteerumine teoksil
 StatusProspect3=Kontakteerumine lõpetatud
-ChangeDoNotContact=Muuda staatuseks &quot;Ära kontakteeru&quot;
-ChangeNeverContacted=Muuda staatuseks &quot;Pole kunagi kontakteerutud&quot;
-ChangeToContact=Change status to 'To be contacted'
-ChangeContactInProcess=Muuda staatuseks &quot;Kontakteerumine teoksil&quot;
-ChangeContactDone=Muuda staatuseks &quot;Kontakteerumine teostatud&quot;
+ChangeDoNotContact=Muuda staatuseks 'Ära kontakteeru'
+ChangeNeverContacted=Muuda staatuseks 'Pole kunagi kontakteerutud'
+ChangeToContact=Muuda staatuseks 'Tuleb ühendust võtta'
+ChangeContactInProcess=Muuda staatuseks 'Kontakteerumine teoksil'
+ChangeContactDone=Muuda staatuseks 'Kontakteerumine teostatud'
 ProspectsByStatus=Huvilised staatuse järgi
 NoParentCompany=Mitte ükski
 ExportCardToFormat=Ekspordi kaart formaati
@@ -404,15 +403,15 @@ PriceLevel=Price Level
 PriceLevelLabels=Price Level Labels
 DeliveryAddress=Tarneaadress
 AddAddress=Lisa aadress
-SupplierCategory=Vendor category
+SupplierCategory=Tarnija kategooria
 JuridicalStatus200=Sõltumatu
 DeleteFile=Kustuta fail
 ConfirmDeleteFile=Oled sa kindel, et soovid selle faili kustutada?
 AllocateCommercial=Assigned to sales representative
 Organization=Organisatsioon
-FiscalYearInformation=Fiscal Year
+FiscalYearInformation=Eelarveaasta
 FiscalMonthStart=Majandusaasta esimene kuu
-SocialNetworksInformation=Social networks
+SocialNetworksInformation=Sotsiaalvõrgud
 SocialNetworksFacebookURL=Facebook URL
 SocialNetworksTwitterURL=Twitter URL
 SocialNetworksLinkedinURL=Linkedin URL
@@ -421,25 +420,25 @@ 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=Last %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+ListSuppliersShort=Tarnijate nimekiri
+ListProspectsShort=Huviliste nimekiri
+ListCustomersShort=Klientide nimekiri
+ThirdPartiesArea=Kolmandad isikud/Kontaktid
+LastModifiedThirdParties=Viimati muudetud %s  kolmandad isikud
+UniqueThirdParties=Kolmandaid isikuid kokku
 InActivity=Ava
 ActivityCeased=Suletud
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services into %s
+ThirdPartyIsClosed=Kolmas osapool on suletud
+ProductsIntoElements=Toodete / teenuste loetelu %s
 CurrentOutstandingBill=Hetkel maksmata summa
 OutstandingBill=Suurim võimalik maksmata arve
 OutstandingBillReached=Max. for outstanding bill reached
-OrderMinAmount=Minimum amount for order
+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.
 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=Merge third parties
+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.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
@@ -447,9 +446,10 @@ 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
+PaymentTypeCustomer=Makse tüüp - klient
+PaymentTermsCustomer=Maksetingimused - klient
 PaymentTypeSupplier=Payment Type - Vendor
 PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 7b481d6ec18..51037afab90 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -78,15 +78,15 @@ 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
+AccountancyTreasuryArea=Arveldused ja maksed
 NewPayment=Uus makse
 PaymentCustomerInvoice=Müügiarve makse
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=Ostuarve makse
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=KM makse
 ListPayment=Maksete nimekiri
 ListOfCustomerPayments=Klientide maksete nimekiri
-ListOfSupplierPayments=List of vendor payments
+ListOfSupplierPayments=Tarnija maksete nimekiri
 DateStartPeriod=Perioodi alguse kuupäev
 DateEndPeriod=Perioodi lõpu kuupäev
 newLT1Payment=New tax 2 payment
@@ -106,7 +106,7 @@ VATPayments=Sales tax payments
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
-Refund=Refund
+Refund=Tagasimakse
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näita käibemaksu makset
 TotalToPay=Kokku maksta
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Näidatud summad sisaldavad kõiki makse
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 1c9d5419603..caaab19cf77 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Fail ei jõudnud täielikult serverisse.
 ErrorNoTmpDir=Ajutist kausta %s ei ole olemas.
 ErrorUploadBlockedByAddon=PHP/Apache pistik blokeeris üleslaadimise.
 ErrorFileSizeTooLarge=Fail on liiga suur.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Liiga pikk täisarvu tüübi jaoks (maksimaalselt %s numbrit)
 ErrorSizeTooLongForVarcharType=Liiga pikk sõne tüübi jaoks (maksimaalselt %s tähemärki)
 ErrorNoValueForSelectType=Palun sisesta nimekirja väärtused
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index c09d2515759..4a90a8ebd5b 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Antud PHP poolt kasutatav sessiooni maksimaalne mälu on <b>%s</b>. See peaks olema piisav.
 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.
@@ -26,6 +27,7 @@ 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=Kausta %s ei ole olemas.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/et_EE/link.lang b/htdocs/langs/et_EE/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/et_EE/link.lang
+++ b/htdocs/langs/et_EE/link.lang
@@ -8,3 +8,4 @@ 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/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index 124100ca5fc..3df50cb7057 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informatsioon
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 2cfc2cf6a14..47507ee7b1b 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -31,7 +31,7 @@ Translation=Tõlge
 EmptySearchString=Enter a non empty search string
 NoRecordFound=Kirjet ei leitud
 NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NotEnoughDataYet=Pole piisavalt andmeid
 NoError=Vigu ei tekkinud
 Error=Viga
 Errors=Vead
@@ -65,19 +65,19 @@ ErrorNoVATRateDefinedForSellerCountry=Viga: riigi '%s' jaoks ei ole käibemaksum
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Viga: faili salvestamine ebaõnnestus.
 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.
+MaxNbOfRecordPerPage=Maksimaalne kirjete arv ühel lehel
+NotAuthorized=Teil pole selleks õigusi.
 SetDate=Sea kuupäev
 SelectDate=Vali kuupäev
 SeeAlso=Vaata lisaks %s
 SeeHere=Vaata siia
 ClickHere=Klõpsa siia
-Here=Here
+Here=Siin
 Apply=Rakenda
 BackgroundColorByDefault=Vaikimisi taustavärv
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
-FileSaved=The file was successfully saved
+FileRenamed=Fail nimetati edukalt ümber
+FileGenerated=Fail loodi edukalt
+FileSaved=Fail salvestati edukalt
 FileUploaded=Fail on edukalt üles laetud
 FileTransferComplete=File(s) uploaded successfully
 FilesDeleted=File(s) successfully deleted
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=Kloonitavad andmed pole määratletud.
 Of=/
@@ -213,7 +214,7 @@ Parameter=Parameeter
 Parameters=Parameetrid
 Value=Väärtus
 PersonalValue=Isiklik väärtus
-NewObject=New %s
+NewObject=Uus %s
 NewValue=Uus väärtus
 CurrentValue=Praegune väärtus
 Code=Kood
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=Nimekirja vaade
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Tere
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index b90544436d0..45f1f704e4f 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Tiitel
 WEBSITE_DESCRIPTION=Kirjeldus
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index a84a75db6e5..1334c8a4108 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Päritolumaa
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Ãœhik
 p=u.
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index fa8050496d3..a95136a3c6f 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Aeg
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planeeritav koormus
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Uus arve
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/et_EE/receiptprinter.lang b/htdocs/langs/et_EE/receiptprinter.lang
index 105d6ae26db..243c2ee59e4 100644
--- a/htdocs/langs/et_EE/receiptprinter.lang
+++ b/htdocs/langs/et_EE/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Arve viide
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/et_EE/stripe.lang b/htdocs/langs/et_EE/stripe.lang
index bbac6d5d366..748df85ac20 100644
--- a/htdocs/langs/et_EE/stripe.lang
+++ b/htdocs/langs/et_EE/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Müüja nim
 CSSUrlForPaymentForm=Maksmise vormi CSS stiililehtede URL
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index d1dbbce4de2..df908040ddf 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Õigus on antud, kuna see pärineb mõnest grupist, kuhu kasutaja kuulub
 Inherited=Päritud
 UserWillBeInternalUser=Loodav kasutaja on sisemine kasutaja (kuna ei ole seotud mõne kolmanda isikuga)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index 36c1396735d..e4e7e3df2e9 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 5bda14433c6..c9419be95f2 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Oharra: zure PHP konfigurazioan ez da limiterik ezarri
 MaxSizeForUploadedFiles=Igotako fitxategien tamaina maximoa (0 fitxategiak igotzea ezgaitzeko)
 UseCaptchaCode=Sarrera orrian kode grafikoa (CAPTCHA) erabili
-AntiVirusCommand= Biruskontrako komandoaren kokapen osoa
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Biruskontrako komandoaren kokapen osoa
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Kontabilitate moduluaren konfigurazia
 UserSetup=Erabiltzaileen kudeaketaren konfigurazioa
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Demo-an ezgaitutako aukera
 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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=Aktibatu on
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 10f4d1b487c..394296e5cce 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Ordainketak
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Ordainketa ezabatu
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Jasotako ordainketak
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/eu_ES/blockedlog.lang b/htdocs/langs/eu_ES/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/eu_ES/blockedlog.lang
+++ b/htdocs/langs/eu_ES/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index f18207ff5d1..13240b9b76e 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index b5af0e3f49c..dc4f4bcc2c2 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index ab097bae3e3..2d8e20c7ec2 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/eu_ES/link.lang b/htdocs/langs/eu_ES/link.lang
index 35732927962..d3a0fc9370e 100644
--- a/htdocs/langs/eu_ES/link.lang
+++ b/htdocs/langs/eu_ES/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=%s esteka ezabatua izan da
 ErrorFailedToDeleteLink= Ezin izan da '<b>%s</b>' esteka ezabatu
 ErrorFailedToUpdateLink= Ezin izan da '<b>%s</b>' esteka berritu
 URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index b5947e9b94d..3c35c12be7a 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informazioa
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 16b1a073b36..c46d4569b13 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 28e88cf2a2f..83e9970fedc 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Deskribapena
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 473c0b334b0..6cf471d7350 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 7ff3b979bd9..51753eb8d14 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/eu_ES/receiptprinter.lang b/htdocs/langs/eu_ES/receiptprinter.lang
index 3df49b9fe67..896eaa313dd 100644
--- a/htdocs/langs/eu_ES/receiptprinter.lang
+++ b/htdocs/langs/eu_ES/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/eu_ES/stripe.lang b/htdocs/langs/eu_ES/stripe.lang
index da7fcd95ebd..4696e5b8128 100644
--- a/htdocs/langs/eu_ES/stripe.lang
+++ b/htdocs/langs/eu_ES/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index b61662c49ce..2d4f828a737 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index 73ffbc30aa4..edc9561faea 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 4da03d6d6b7..48a9b656aa4 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=نکته: پیکربندی PHP <b>شما</b> حداکث
 NoMaxSizeByPHPLimit=توجه: هیچ محدودیتی در پیکربندی PHP شما وجود ندارد
 MaxSizeForUploadedFiles=حداکثر اندازۀ �ایل بارگذاری شده ( برای عدم اجازۀ ارسال �ایل عدد 0 را وارد نمائید)
 UseCaptchaCode=است�اده از کدهای گرا�یکی (CAPTCHA) در ص�حۀ ورود
-AntiVirusCommand= مسیر کامل خط‌�رمان ویروس‌کش
-AntiVirusCommandExample= مثال برای ClamWin این نشانی: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe <br> برای ClamAv این نشانی: /usr/bin/clamscan
+AntiVirusCommand=مسیر کامل خط‌�رمان ویروس‌کش
+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= پارامترهای بیشتر در خط �رمان
-AntiVirusParamExample= مثال برای ClamWin  به این شکل : --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=برپاسازی واحد حساب‌داری
 UserSetup=برپاسازی مدیریت کاربر
 MultiCurrencySetup=برپاسازی چندگانگی-واحدپولی
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=ویژگی غیر�عال در نسخۀ نمایشی
 FeatureAvailableOnlyOnStable=این ویژگی �قط در نسخه‌های رسمی پایدار در دسترس است
 BoxesDesc=وسایل یا widgets اجزائی هستند که به شما اطلاعاتی برای شخصی‌سازی برخی ص�حات نمایش می‌دهند.شما می‌توانید برای نمایش یا عدم نمایش این وسیله در ص�حۀ مورد نظر ص�حۀ هد� را انتخاب کرده و کلید "�عال‌سازی" را �شار دهید، یا این‌که بر روی سطل‌آشغال کلیک کرده یا آن را �عال نمائید.
 OnlyActiveElementsAreShown=تنها عناصیر مربوط به <a href="%s">واحد‌های �عال</a> نمایش داده می‌شوند.
-ModulesDesc=این واحد‌ها/برنامه‌ها تعیین می‌کنند کدام قابلیت‌ها در نرم‌ا�زار �عال شوند. برخی واحد‌ها نیازمند مجوزدادن به کاربرن هستند تا امکان دسترسی به آن‌ها �راهم باشد. (در انتهای سطر مربوط به واحد) روی کلید روش/خاموش کلیک کنید تا واحد/برنامۀ مورد نظر را �عال/غیر�عال نمائید.
+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=می‌توانید واحد‌های بیشتری برای دریا�ت در سایت‌های موجود روی اینترنت پیدا کنید...
 ModulesDeployDesc=اگر مجوزهای موجود روی سرویس‌دهندۀ شما اجازه دهد، شما می‌توانید این ابزار را برای به کار گر�تن یک واحد بیرونی است�اده نمائید. این واحد در زبانۀ <strong>%s</strong> قابل نمایش خواهد بود. 
 ModulesMarketPlaces=پیدا کردن واحد‌ها/برنامه‌های بیرونی
@@ -212,6 +212,7 @@ CompatibleUpTo=سازگار با نسخۀ %s
 NotCompatible=به نظر نمی‌رسد این واحد با نسخۀ %s Dolibarr  نصب شده سازگار باشد (سازگاری حداقل با %s و حداکثر با %s ).
 CompatibleAfterUpdate=این واحد نیازمند روزآمدسازی Dolibarr نسخۀ %s است (حداقل %s - حداکثر %s)
 SeeInMarkerPlace=نمایش در بازارچه
+SeeSetupOfModule=See setup of module %s
 Updated=روزآمد شده
 Nouveauté=تازگی
 AchatTelechargement=خرید / بارگیری
@@ -221,6 +222,7 @@ DoliPartnersDesc=�هرست شرکت‌هائی که واحد‌ها یا قاب
 WebSiteDesc=سایت‌های دیگر برای واحد‌های ا�زودنی (غیر هسته‌) دیگر...
 DevelopYourModuleDesc=چند راه برای توسعه دادن و ایجاد واحد دل‌خواه....
 URL=نشانی‌اینترنتی
+RelativeURL=Relative URL
 BoxesAvailable=وسایل در دسترس
 BoxesActivated=وسایل �عال شده
 ActivateOn=�عال کردن در
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=برای است�اده از مقدار پیش‌�رض چ
 DefaultLink=پیوند پیش‌�رض
 SetAsDefault=ثبت پیش‌�رض
 ValueOverwrittenByUserSetup=هشدار! این مقدار ممکناست با تغییر تنظیمات برپاسازی کاربر بازنویسی شود (هر کاربر می‌تواند نشانی مخصوص به خود را برای clicktodial تولید کند)
-ExternalModule=واحد خارجی - نصب شده در پوشه %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=ایجاد دستجمعی بارکد برای اشخاص‌سوم
 BarcodeInitForProductsOrServices=ایجاد یا بازسازی بارکد برای محصولات یا خدمات
 CurrentlyNWithoutBarCode=در حال حاضر شما  <strong>%s</strong> ردی� در  <strong>%s</strong> %s دارید که برای آن‌ها بارکد تعری� نشده.
@@ -947,7 +950,7 @@ DictionaryCanton=ایالت‌ها/استان‌ها
 DictionaryRegion=مناطق
 DictionaryCountry=کشورها
 DictionaryCurrency=واحد پول
-DictionaryCivility=عنوان اجتماعی
+DictionaryCivility=Honorific titles
 DictionaryActions=انواع برگزاری جلسات
 DictionarySocialContributions=انواع مالیات‌های اجتماعی یا مالیات‌های مرتبط با سیاست‌های مالی
 DictionaryVAT=نرخ مالیات‌بر‌ارزش‌ا�زوده یا مالیات‌بر‌�روش
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=مالیات بر �روش مطروحه به طور پیش‌
 VATIsUsedExampleFR=در �رانسه، به این معناست که شرکت‌ها و موسسات یک سامانۀ سیاست‌مالی حقیقی دارند (حقیقی ساده یا حقیقی عادی).  سامانه‌ای که در آن مالیات بر ارزش ا�زوده تعری� می‌شود.
 VATIsNotUsedExampleFR=در �رانسه، این بدان معناست که مؤسساتی که برای آن‌ها مالیات بر �روش تعری� نشده یا شرکت‌ها، سازمان‌ها یا مشاغل آزادی که سامانۀ سیاست مالی ریزسازمانی برگزیده‌اند (مالیات بر �روش طی �رانچایز-�رداد-حق‌امتیاز) و بدون تعری� مالیات بر�روش مبلغ مالیات �روش �رانچایز را پرداخت کرده‌اند. این انتخاب به صورت مراجع "مالیات بر �روش اختصاص داده نمی‌شود - art-293B of CGI" در صورت‌حساب نمایش داده خواهد شد.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=نرخ
 LocalTax1IsNotUsed=آیا مالیات دوم است�اده نشود
 LocalTax1IsUsedDesc=است�اده از نوع دوم مالیات (غیر از نوع اول)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=نرخ پیش‌�رض IRPF در هنگام ساخت مش
 LocalTax2IsNotUsedDescES=به طور پیش‌�رض IRPF  مطروحه برابر با 0 است. پایان قاعده.
 LocalTax2IsUsedExampleES=در اسپانیا، خوداشتغالان، و متخصصین مستقل که ارائه دهندۀ خدمات هستند و شرکت‌هائی که سامانۀ مالیاتی modules را برگزیده‌اند.
 LocalTax2IsNotUsedExampleES=در اسپانیا مشاغلی هستند که درسامانۀ مالیاتی 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 des 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=گزارش مالیات‌های محلی
 CalcLocaltax1=�روش‌ها - خرید‌ها
 CalcLocaltax1Desc=گزارش مالیات‌های محلی با محاسبۀ ت�اوت مالیات‌بر�روش محلی و مالیات‌‌برخرید محلی به دست می‌آید
@@ -1018,6 +1025,7 @@ CalcLocaltax2=خریدها
 CalcLocaltax2Desc=گزارش مالیات‌های محلی جمع مالیات‌بر�روش‌های محلی است
 CalcLocaltax3=�روش‌ها
 CalcLocaltax3Desc=گزارش مالیات محلی جمع مالیات‌بر�روش محلی است
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=این برچسب در حالتی که هیچ ترجمه‌ای برای کد یا�ت نشود است�اده خواهد شد
 LabelOnDocuments=برچسب روی مستندات
 LabelOrTranslationKey=برچسب یا کلید ترجمه
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=گزارش‌هزینه‌های منتظر ت
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=پیش از شروع است�اده از Dolibarr ابتدا باید مقادیر مختل�ی را تعری� کنید و واحد‌های مختل� �عال/پیکربندی شوند
 SetupDescription2=دو واحد بعدی الزامی هستند (دو ورودی اول در �هرست برپاسازی):
-SetupDescription3=<a href="%s">%s->%s</a><br> مؤل�ه‌های بنیادین مورد است�اده برای تعیین‌ ر�تار پیش‌�رض برنامۀ شما (مثلا برای قابلیت‌های مربوط به کشور).
-SetupDescription4=<a href="%s">%s->%s</a><br> این نرم‌ا�زار مجموعه‌ای از برنامه‌ها/واحدهای متنوع است که همگی کم و بیش از یکدیگر مستقل هستند. واحدهای مربوط به نیاز شما باید �عال و پیکربندی شوند. با �عال کردن این واحدها گزینه‌ها/عناوین مربوطه به �هرست‌ها اضا�ه خواهد شد.
+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=رویدادهای بازرسی امنیتی
 Audit=بازرسی
@@ -1128,7 +1136,7 @@ LogEventDesc=�عال کردن گزارش‌گیری برای روی‌داده
 AreaForAdminOnly=مقادیر برپاسازی تنها توسط <b>کاربران مدیر</b> قابل تنظیم است.
 SystemInfoDesc=اطلاعات سامانه، اطلاعاتی �نی است که در حالت �قط خواندنی است و تنها برای مدیران قابل نمایش است.
 SystemAreaForAdminOnly=این ناحیه تنها برای کاربران مدیر در دسترس است. مجوزهای کاربران Dolibarr  این محدودیت‌ها را تغییر نمی‌دهد.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=در صورتی‌که شما یک حساب‌دار/د�تردار بیرونی دارید، می‌توانید اطلاعات وی را این‌جا ویرایش نمائید
 AccountantFileNumber=کد حساب‌دار
 DisplayDesc=مقادیری که بر شکل و ر�تار Dolibarr اثرگذارند از این‌جا قابل تغییرند.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=قواعد تولید و اعتبارسنجی گذرو
 DisableForgetPasswordLinkOnLogonPage=در ص�حۀ ورود پیوند "�راموشی گذرواژه" نمایش داده نشود
 UsersSetup=برپاسازی واحد کاربران
 UserMailRequired=برای ایجاد یک کاربر جدید یک رایانامه لازم است
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=برپاسازی واحد مدیریت منابع انسانی
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=شکل مستندهای صورت‌حساب
 BillsPDFModulesAccordindToInvoiceType=شکل مستندهای صورت‌حساب با توجه به نوع صورت‌حساب
 PaymentsPDFModules=شکل مستندات پرداخت
 ForceInvoiceDate=الزام تاریخ صورت‌حساب به تاریخ تائیداعتبار
-SuggestedPaymentModesIfNotDefinedInInvoice=حالت‌های پیشنهادی و پیش‌�رض پرداخت در صورت‌حساب در صورتی که تعیین نشده باشد
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=پیشنهاد پرداخت در صر�‌نظر کردن از حساب
 SuggestPaymentByChequeToAddress=پیشنهاد پرداخت با چک به
 FreeLegalTextOnInvoices=متن دل‌خواه بر روی صورت‌حساب‌ها
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=برپاسازی پرداخت‌های �روشندگان
 PropalSetup=راه اندازی ماژول طرح های تجاری
 ProposalsNumberingModules=مدل شماره طرح تجاری
 ProposalsPDFModules=شکل‌های مستندات پیشنهاد‌های تجاری
-SuggestedPaymentModesIfNotDefinedInProposal=روش پرداخت پشنهادی پیش‌�رض در پیشنهاد در صورتی که در ص�حۀ ایجاد آن تعری� نشده باشد
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=متن دل‌خواه بر روی پیشنهادات تجاری
 WatermarkOnDraftProposal=نقش پس‌زمینه بر روی پیشنهادات تجاری پیش‌نویس (هیچ در صورت خالی بودن)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=درخواست مقصد حساب‌بانکی پیشنهاد
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=پرسش انبار منبع در خصوص
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=پرسش حساب بانکی مقصد در مورد س�ارش خرید
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=برپاسازی مدیریت س�ارشات �روش
 OrdersNumberingModules=روش‌های شماره‌گذاری س�ارشات
 OrdersModelModule=شکل‌های مستندات س�ارش
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=هشدار! مقادیر بزرگ خر
 ModuleActivated=واحد %s �عال شده و باعث کاهش سرعت رابط کاربری می‌شود
 EXPORTS_SHARE_MODELS=اشکال صادارات با همگان به اشتراک گذاشته شدند
 ExportSetup=برپاسازی واحد صادرات
+ImportSetup=Setup of module Import
 InstanceUniqueID=شناسۀ منحصر به‌�رد نمونه
 SmallerThan=کوچک‌تر از
 LargerThan=بزرگتر از
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 32d7c870906..1d081bbe11c 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=صورت‌حاسب‌های �روشنده
 SupplierBill=صورت‌حساب �روشنده
 SupplierBills=صور‌ت‌حساب تامین‌کنندگان
 Payment=پرداخت
-PaymentBack=برگشت پرداخت
-CustomerInvoicePaymentBack=برگشت پرداخت
+PaymentBack=بازپس‌گیری
+CustomerInvoicePaymentBack=بازپس‌گیری
 Payments=پرداخت‌ها
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=به واحد‌پولی صورت‌حساب
 PaidBack=پرداخت برگردانده شد
 DeletePayment=حذ� پرداخت
 ConfirmDeletePayment=آیا مطمئنید که می‌خواهید این پرداخت را حذ� کنید؟
-ConfirmConvertToReduc=آیا می‌خواهید این %s را به یک تخ�ی�ت مطلق تبدیل کنید؟
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=این مبلغ در میان همۀ تخ�ی�‌ها ذخیره خواهد شد و می‌تواند به‌عنوان یک صورت‌حساب �علی یا آینده برای این مشتری مورد است�اده قرار گیرد.
-ConfirmConvertToReducSupplier=آیا می‌خواهید این %s را به یک تخ�ی�ت مطلق تبدیل کنید؟
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=این مبلغ در میان همۀ تخ�ی�‌ها ذخیره خواهد شد و می‌تواند به‌عنوان یک صورت‌حساب �علی یا آینده برای این �روشنده مورد است�اده قرار گیرد.
 SupplierPayments=پرداخت‌های �روشندگان
 ReceivedPayments=پول‌های دریا�تی
@@ -219,7 +219,10 @@ ShowInvoiceSituation=نمایش صورت‌حساب وضعیت
 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
@@ -509,11 +512,11 @@ ToMakePayment=پرداخت
 ToMakePaymentBack=پس‌دادن‌پرداخت
 ListOfYourUnpaidInvoices=�هرست صورت‌حساب‌های پرداخت نشده
 NoteListOfYourUnpaidInvoices=نکته: این �هرست تنها دربردارندۀ صورت‌حساب‌های شخص‌سوم‌هائی است که شما آن‌ها را به‌عنوان نمایندۀ �روش پیوند کرده‌اید.
-RevenueStamp=تمبر درآمد
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=این گزینه تنها وقتی �عال است که شما صورت‌حساب را از زبانۀ "مشتری" یک شخص سوم می‌سازید
 YouMustCreateInvoiceFromSupplierThird=این گزینه تنها وقتی �عال است که شما صورت‌حساب را از زبانۀ "�روشنده" یک شخص سوم می‌سازید
 YouMustCreateStandardInvoiceFirstDesc=شما باید ابتدا یک صورت‌حساب استاندارد ساخته و سپس آن را تبدیل به "قالب" کنید تا یک صورت‌حساب قالبی ساخته باشید
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 PDFSpongeDescription=قالب PDF صورت‌حساب Sponge. یک قالب کامل صورت‌حساب 
 PDFCrevetteDescription=قالب PDF صورت‌حساب Crevette. یک قالب کامل صورت‌حساب برای صورت‌حساب‌های وضعیت
 TerreNumRefModelDesc1=بازگرداندن عدد با شکل %syymm-nnnn برای صورت‌حساب‌های استاندارد و %syymm-nnnn برای یادداشت‌های اعتباری که در آن yy نمایندۀ سال، mm ماه و nnnn یک شمارنده بدون توق� و بدون بازگشت به 0 است
@@ -575,3 +578,4 @@ AutoFillDateTo=تنظیم تاریخ پایان برای سطر خدمات با
 AutoFillDateToShort=تنظیم تاریخ پایان
 MaxNumberOfGenerationReached=حداکثر تعداد تولید به‌سررسیده
 BILL_DELETEInDolibarr=صورت‌حساب حذ� شد
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/fa_IR/blockedlog.lang b/htdocs/langs/fa_IR/blockedlog.lang
index 231855e54eb..116a6acbb42 100644
--- a/htdocs/langs/fa_IR/blockedlog.lang
+++ b/htdocs/langs/fa_IR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=گزارش‌کارهای غیرقابل‌تغییر
 ShowAllFingerPrintsMightBeTooLong=نمایش همۀ گزارش‌کار‌های بایگانی شده (ممکن است طولانی باشد)
 ShowAllFingerPrintsErrorsMightBeTooLong=نمایش همۀ گزارش‌کارهای نامعتبر بایگانی (ممکن است طولانی باشد)
 DownloadBlockChain=دریا�ت اثرانگشت‌ها
-KoCheckFingerprintValidity=ورودی گزارش‌کاری بایگانی شده معتبر نیست. این به آن معناست که کس (یک هکر؟) بخشی از داده‌ها را پس از ذخیره دست‌کاری کرده است و یا ردی�‌های بایگانی‌های قدیمی را حذ� کرده است. (بررسی کنید سطر با # پیشین وجود داشته باشد).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=ردی� گزارش‌کار بایگانی شده معتبر است. داده‌های این سطر ویرایش نشده و ورودی به‌دنبال ورودی قبل است. 
 OkCheckFingerprintValidityButChainIsKo=گزارش‌کار بایگانی شده در قیاس با قبلی معتبر است اما زنجیره قبلا خراب شده است. 
 AddedByAuthority=ذخیره شده برای مقام دوردست
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index ff05973a452..c9b346240f6 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=اضا�ه کردن این مقاله
 RestartSelling=بازگشت در �روش
 SellFinished=�روش تکمیل شد
 PrintTicket=چاپ بلیط
+SendTicket=Send ticket
 NoProductFound=مقاله ای یا�ت نشد.
 ProductFound=محصول یا�ته شده
 NoArticle=هیچ مقاله ای یا�ت نشد
@@ -48,6 +49,7 @@ Footer=پاورقی
 AmountAtEndOfPeriod=مبلغ در انتهای دوره (روز، ماه یا سال)
 TheoricalAmount=مبلغ نظری
 RealAmount=مقدار واقعی
+CashFence=Cash fence
 CashFenceDone=حصار نقدی برای دوره تعیین شده
 NbOfInvoices=Nb و از �اکتورها
 Paymentnumpad=نوع بخش‌کناری
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS نیازمند کار با دسته‌بندی م
 OrderNotes=مرتب کردن یادداشت‌ها
 CashDeskBankAccountFor=حساب پیش‌�رض برای ذخیرۀ پرداخت‌ها 
 NoPaimementModesDefined=در پیکربندی TakePOS هیچ حالت پرداختی تعری� نشده است
-TicketVatGrouped=در قبض م.ب.ا.ا توسط نرخ گروه‌بندی شو
-AutoPrintTickets=چاپ خودکار قبوض
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=�عال‌کردن موارد مربوط به کا�ه و رستوران
 ConfirmDeletionOfThisPOSSale=آیا مطمئن هستید می‌خواهید این �روش را حذ� کنید؟
 ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 5b6ec1024b6..46ef83419ac 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted= شرکت "%s" از پایگاه داده حذ� شد.
 ListOfContacts=�هرست طر�‌های‌تماس/نشانی‌ها
 ListOfContactsAddresses=�هرست طر�‌های‌تماس/نشانی‌ها
 ListOfThirdParties=�هرست شخص‌سوم‌ها
-ShowCompany=نمایش شخص‌سوم
 ShowContact=نمایش طر�‌تماس
 ContactsAllShort=همه (بدون صا�ی)
 ContactType=نوع طر�‌تماس
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=نام نمایندۀ �روش
 SaleRepresentativeLastname=نام خانوادگی نمایندۀ �روش
 ErrorThirdpartiesMerge=در هنگام حذ� شخص‌سوم‌ها یک اشکال پیش آمد. لط�ا گزارش‌کار را ببینید. تغییرات انجام نشد.
 NewCustomerSupplierCodeProposed=کد �روشنده یا کد مشتری قبلا است�اده شده است، یک کد جدید پیشنهاد می‌شود
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=نوع پرداخت - مشتری
 PaymentTermsCustomer=شرایط پرداخت - مشتری
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index ff0da8dc752..530a5514a9f 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=برای محاسبۀ پرداخت‌های حقیق
 SeeReportInDueDebtMode=برای محاسبۀ صورت‌حساب‌های ثبت شده که حتی هنوز در د�ترکل حساب نشده‌اند به %sتحلیل صورت‌حساب‌ها %s نگاه کنید.
 SeeReportInBookkeepingMode=برای محاسبه‌ای بر روی <b>جدول حساب‌داری د�ترکل</b> به <b>%sگزارش حساب‌داری%s</b> مراجعه کنید.
 RulesAmountWithTaxIncluded=- تمام مالیات‌ها در مقادیر نمایش داده شده، گنجانده شده‌اند
-RulesResultDue=- این شامل همۀ صورت‌حساب‌های پرداخت‌نشده، هزینه‌ها، مالیات بر ارزش ا�زوده، کمک‌های مالی پرداخت شده و نشده است. همچنین شامل حقوق‌های پرداخت شده می‌باشد. <br> - بسته به تاریخ تائید اعتبار در خصوص صورت‌حساب‌ها و مالیات بر ارزش ا�زوده و بر حسب تاریخ سررسید هزینه‌ها می‌باشد. برای حقوق‌هائی که در واحد حقوق‌ها تعری� شده است، از مقدار تاریخ پرداخت است�اده می‌شود.
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- این شامل همۀ پرداخت‌های واقعی صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش ا�زوده و حقوق‌ها است. <br>- بر حسب تاریخ پرداخت صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش ا�زوده و حقوق‌ها می‌باشد. تاریخ کمک‌مالی برای کمک‌های مالی
-RulesCADue=- شامل صورت‌حساب‌های به موعد رسیدۀ مشتری، چه پرداخت شده باشند یا نه می‌باشد. <br> این بر حسب تاریخ تائید اعتبار این صورت‌حساب‌ها است. <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=- شامل همۀ پرداخت‌های دریا�ت‌شدۀ مؤثر صورت‌حساب‌های مشتریان است. <br> -این بسته به تاریخ پرداخت این صورت‌حساب‌هاست<br>
 RulesCATotalSaleJournal=شامل همۀ سطور بستانکار د�تر�روش‌روزانه است
 RulesAmountOnInOutBookkeepingRecord=شامل همۀ ردی�‌های د�ترکل دارای حساب‌حساب‌داری است که در گروه‌های "هزینه" یا "درآمد" باشند
@@ -255,3 +255,10 @@ TurnoverbyVatrate=گردش‌مالی صورت‌حساب‌شده بر حسب 
 TurnoverCollectedbyVatrate=گردش‌مالی دریا�ت‌شده بر حسب نرخ مالیات بر �روش
 PurchasebyVatrate=خریدها بر اساس نرخ مالیات بر �روش
 LabelToShow=برچسب کوتاه
+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
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 8fba2849bbc..15b5c27c05d 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=�ایل به طور کامل توسط سرور دریا�ت ن
 ErrorNoTmpDir=پوشۀ موقت %s وجود ندارد.
 ErrorUploadBlockedByAddon=امکان ارسال توسط یک ا�زونۀ PHP/Apache مسدود شده است
 ErrorFileSizeTooLarge=حجم �ایل بسیار بزرگ است.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=برای این نوع عددصحیح اندازه بسیار بلند است (حداکثر %s رقم)
 ErrorSizeTooLongForVarcharType=برای این نوع رشتۀ حروقی اندازه بسیار بزرگ است (حداکثر %s نویسه)
 ErrorNoValueForSelectType=لط�ا مقدار مربوط به �هرست انتخاب را وارد کنید
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=یک گذرواژه برای این عضو تنظیم شده است. با این‌حال هیچ حساب کاربری‌ای ساخته نشده است. بنابراین این گذرواژه برای ورود به Dolibarr قابل است�اده نیست. ممکن است برای یک رابط/واحد بیرونی قابل است�اده باشد، اما اگر شما نخواهید هیچ نام کاربری ورود و گذرواژه‌ای برای یک عضو است�اده کنید، شما می‌توانید گزینۀ "ایجاد یک نام‌ورد برای هر عضو" را از برپاسازی واحد اعضاء غیر�عال کنید. در صورتی که نیاز دارید که نام‌ورود داشته باشید اما گذرواژه نداشته باشید، می‌توانید این بخش را خالی گذاشته تا از این هشدار بر حذر باشید. نکته: همچنین نشانی رایانامه می‌تواند در صورتی که عضو به یک‌کاربر متصل باشد، می‌‌تواند مورد است�اده قرار گیرد
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index 9444eb76c8f..40f4347659e 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=این PHP از Curl پشتیبان می‌کند.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=این PHP از توابع UTF8 پشتیبانی می‌کند.
 PHPSupportIntl=این PHP از توابع Intl پشتیبانی می‌کند
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=حداکثر حا�ظۀ اختصاص داده شده به نشست به <b>%s</b> تنظیم شده است. این باید کا�ی باشد.
 PHPMemoryTooLow=حداکثر حا�ظۀ مورد است�اده در یک نشست در PHP شما در حد <b>%s</b> بایت تنظیم شده است. این میزان بسیار کمی است. �ایل <b>php.ini</b> را ویرایش نموده و مقدار <b>memory_limit</b> را حداقل برابر <b>%s</b> بایت تنظیم کنید
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=نسخۀ PHP نصب شدۀ شما از Curl پشتی
 ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
 ErrorPHPDoesNotSupportUTF8=نسخۀ PHP نصب شدۀ شما از توابع UTF8 پشتیبانی نمی‌کند. Dolibarr نمی‌تواند به درستی کار کند. قبل از نصب Dolibarr این مشکل را حل کنید.
 ErrorPHPDoesNotSupportIntl=نسخۀ نصب شدۀ PHP شما از توابع Intl پشتیبانی نمی‌کند.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
 ErrorDirDoesNotExists=پوشۀ %s وجود ندارد.
 ErrorGoBackAndCorrectParameters=به عقب برگردید و مقادیر را بررسی/اصلاح کنید.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=برنامه تلاش کرده است که خود
 YouTryInstallDisabledByFileLock=برنامه تلاش کرده است خود را ارتقا دهد، اما ص�حات نصب/ارتقا به دلایل امنیتی غیر �عال شده است ( چون �ایل ق�ل <strong>install.lock</strong> در پوشۀ documents دلیبار وجود دارد).<br>
 ClickHereToGoToApp=برای مراجعه به برنامه این‌جا کلیک کنید
 ClickOnLinkOrRemoveManualy=روی پیوند مقابل کلیک کنید. اگر همیشه شما همین ص�حه را می‌بینید شما باید �ایل install.lock را از پوشۀ document حذ� کرده یا تغییر نام دهید.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/fa_IR/link.lang b/htdocs/langs/fa_IR/link.lang
index 130af3f943a..012040c2baa 100644
--- a/htdocs/langs/fa_IR/link.lang
+++ b/htdocs/langs/fa_IR/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=پیوند %s برداشته شد
 ErrorFailedToDeleteLink= امکان حذ� پیوند '<b>%s</b>' نبود
 ErrorFailedToUpdateLink= امکان روزآمدسازی پیوند '<b>%s</b>' نبود
 URLToLink=نشانی برای پیوند کردن
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 944ec850582..b25c03b7177 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=اطلاعات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index dfe1207edd1..cc1cc21575b 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 SaveAndNew=Save and new
 TestConnection=آزمایش اتصال
 ToClone=نسخه‌برداری
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=تاریخی که برای نسخه‌برداری مد نظر دارید:
 NoCloneOptionsSpecified=هیچ داده‌ای برای نسخه‌برداری پیدا نشد
 Of=از
@@ -829,6 +830,8 @@ Gender=جنسیت
 Genderman=مرد
 Genderwoman=زن
 ViewList=نمای �هرستی
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=الزامی
 Hello=سلام
 GoodBye=خدانگهدار
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 975f18a065c..f374ef2619e 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=عنوان
 WEBSITE_DESCRIPTION=توصی�
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 35c11214236..e7d131c8f2a 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=این ابزار نرخ مالیات بر ارزش ا
 MassBarcodeInit=تعری� دستجمعی بارکد
 MassBarcodeInitDesc=این ص�حه می‌تواند برای تعری� بارکد اشیائی که برای آن‌ها بارکد تعری� نشده است�اده شود. قبل از است�اده، مطمئن شوید واحد بارکد به خوبی نصب و برپاسازی شده است.
 ProductAccountancyBuyCode=کد حساب‌داری (خرید)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=کد  حساب‌داری (�روش)
 ProductAccountancySellIntraCode=کد حساب‌داری (�روش داخل جامعه‌ای-اروپا)
 ProductAccountancySellExportCode=کد حساب‌داری (�روش صادرات)
@@ -165,7 +167,7 @@ SuppliersPrices=قیمت‌های �روشنده
 SuppliersPricesOfProductsOrServices=قیمت‌های �روشنده (مربوط به محصولات و خدمات)
 CustomCode=گمرک / کالا / کدبندی هماهنگ کالا
 CountryOrigin=کشور مبدا
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=برچسب کوتاه
 Unit=واحد
 p=واحد
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 30cc3fbfbc8..5327af215ec 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=زمان
 ListOfTasks=�هرست وظای�
 GoToListOfTimeConsumed=رجوع به �هرست زمان صر� شده
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=نمای گانت
 ListProposalsAssociatedProject=�هرست پیشنهادهای تجاری مرتبط با طرح
 ListOrdersAssociatedProject=�هرست س�ارش‌های �روش مربوط به طرح
@@ -188,7 +186,7 @@ PlannedWorkload=حجم‌کار برنامه‌ریزی‌شده
 PlannedWorkloadShort=حجم‌کار
 ProjectReferers=موارد مربوط
 ProjectMustBeValidatedFirst=ابتدا باید طرح تائیداعتبار شود
-FirstAddRessourceToAllocateTime=نسبت دادن منابع کاربر برای اختصاص زمان
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=ورودی در روز
 InputPerWeek=ورودی در ه�ته
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=آخرین %s طرح تغییر یا�ته
 OtherFilteredTasks=سایر وظای� گ�زیده شده
 NoAssignedTasks=هیچ وظی�ه‌ای نسبت داده نشده ( طرح/وظی�ه را از بالا به کاربر �علی نسبت دهید تا زمان را روی آن وارد کنید)
 ThirdPartyRequiredToGenerateInvoice=یک طر� سوم باید روی طرح تعری� شود تا امکان صورت‌حساب درست کردن برای آن وجود داشته باشد
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=اجازۀ یادداشت نویسی کاربران روی وظای�
 AllowCommentOnProject=امکان توضیح نویسی بر روی طرح‌ها
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=صورت‌حساب جدید
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/fa_IR/receiptprinter.lang b/htdocs/langs/fa_IR/receiptprinter.lang
index d022c499690..c7a819dbe8a 100644
--- a/htdocs/langs/fa_IR/receiptprinter.lang
+++ b/htdocs/langs/fa_IR/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=شناسۀ داخل-جامعه‌ای م.ب.ا.ا. -اروپا
+DOL_VALUE_MYSOC_CAPITAL=سرمایه
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/fa_IR/stripe.lang b/htdocs/langs/fa_IR/stripe.lang
index 2c086aeb584..aa5ed9a19f9 100644
--- a/htdocs/langs/fa_IR/stripe.lang
+++ b/htdocs/langs/fa_IR/stripe.lang
@@ -32,6 +32,7 @@ VendorName=نام �روشنده
 CSSUrlForPaymentForm=آدرس شیوه نامه CSS برای �رم پرداخت
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 909a1ebbb82..012f6b0d90a 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -70,7 +70,7 @@ 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.<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)
 PermissionInheritedFromAGroup=اجازه‌ها اعطا شده زیرا از یک گروه‌کاربری ارث‌گر�ته شده است
 Inherited=ارث‌گر�ته
 UserWillBeInternalUser=کاربری که ایجاد می‌شود یک کاربر داخلی خواهد بود (زیرا به یک شخص‌سوم معین پیوند نشده است)
@@ -110,3 +110,8 @@ UserLogged=کاربر وارد شده
 DateEmployment=تاریخ شروع استخدام
 DateEmploymentEnd=تاریخ پایان استخدام
 CantDisableYourself=شما نمی‌توانید ردی� کاربری خود را غیر�عال کنید
+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
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 545ff8cf12e..5269bce74f7 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 018aa0ec393..fbfd6d12524 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Huom:<b>Nykyiset </b> PHP-asetukset rajoittavat tiedosto
 NoMaxSizeByPHPLimit=Huom: Rajaa ei ole asetettu PHP-asetuksissa
 MaxSizeForUploadedFiles=Lähetettävien tiedostojen enimmäiskoko (0 estää lähetykset)
 UseCaptchaCode=Käytä graafista koodia (CAPTCHA) kirjautumissivulla
-AntiVirusCommand= Virustorjuntaohjelman polku
-AntiVirusCommandExample= Esim. ClamWin:  C:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe  <br>Esim. ClamAV: /usr/bin/clamscan
+AntiVirusCommand=Virustorjuntaohjelman polku
+AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Lisää parametreja komentorivillä
-AntiVirusParamExample= Esimerkki ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Kirjanpitomoduulin asetukset
 UserSetup=Käyttäjien hallinta-asetukset
 MultiCurrencySetup=Multi-valuutta asetukset
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Ominaisuus on poistettu käytöstä demossa
 FeatureAvailableOnlyOnStable=Ominaisuus käytettävissä vain virallisissa vakaissa versioissa
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button (at end of module line) to enable/disable a module/application.
+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=Etsi ulkoisia sovelluksia/moduuleja
@@ -212,6 +212,7 @@ CompatibleUpTo=Yhteensopiva version %s kanssa
 NotCompatible=Moduuli ei ole yhteensopiva Dolibarr - version %s kanssa. (Min %s -  Max %s)
 CompatibleAfterUpdate=Moduuli vaatii Dolibarr - version %s päivittämisen. (Min %s - Max %s)
 SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=See setup of module %s
 Updated=Päivitetty
 Nouveauté=Novelty
 AchatTelechargement=Osta / Lataa
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=External websites for more add-on (non-core) modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=Osoite
+RelativeURL=Relative URL
 BoxesAvailable=Widgetit saatavilla
 BoxesActivated=Widget aktivoitu
 ActivateOn=Aktivoi
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Pidä tyhjänä käyttääksesi oletusarvoa
 DefaultLink=Oletuslinkki
 SetAsDefault=Aseta oletukseksi
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=Ulkoinen moduuli - asennettu hakemistoon %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Alueiden
 DictionaryCountry=Maat
 DictionaryCurrency=Valuutat
-DictionaryCivility=Siviilisääty
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=ALV- ja Myyntiveroprosentit
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Kurssi
 LocalTax1IsNotUsed=Älä käytä toista veroa
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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=Raportit paikallisista veroista
 CalcLocaltax1=Myynnit - Ostot
 CalcLocaltax1Desc=Paikallisten verojen raportit on laskettu paikallisverojen myyntien ja ostojen erotuksena
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Ostot
 CalcLocaltax2Desc=Veroraportit on laskettu hankintojen veroista
 CalcLocaltax3=Myynti
 CalcLocaltax3Desc=Veroraportit on laskettu myyntien veroista
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Label käyttää oletusarvoisesti, jos ei ole käännös löytyy koodi
 LabelOnDocuments=Label asiakirjoihin
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Hyväksyttävissä olevat kuluraportit
 Delays_MAIN_DELAY_HOLIDAYS=Hyväksyttävissä olevat vapaa-anomukset
 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Auditointi
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Järjestelmän tiedot ovat erinäiset tekniset tiedot saavat lukea vain tila ja näkyvissä vain järjestelmänvalvojat.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Käyttäjät moduuli setup
 UserMailRequired=Email required to create a new user
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Henkilöstöhallinta moduulin asetukset
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Laskun asiakirjojen malleja
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Force laskun päivämäärästä validointiin päivämäärä
-SuggestedPaymentModesIfNotDefinedInInvoice=Ehdotetut maksut tilassa lasku automaattisesti, jos ei ole määritetty lasku
+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=Laskun viesti
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Toimittajamaksujen asetukset
 PropalSetup=Kaupalliset ehdotuksia moduulin asetukset
 ProposalsNumberingModules=Kaupalliset ehdotus numerointiin modules
 ProposalsPDFModules=Kaupalliset ehdotus asiakirjojen malleja
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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=Tilaukset numerointiin modules
 OrdersModelModule=Tilaa asiakirjojen malleja
@@ -1823,7 +1834,7 @@ MailToSendInvoice=Asiakkaiden laskut
 MailToSendShipment=Lähetykset
 MailToSendIntervention=Interventions
 MailToSendSupplierRequestForQuotation=Tarjouspyyntö
-MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierOrder=Ostotilaukset
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Sopimukset
 MailToThirdparty=Sidosryhmät
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Varoitus, suuremmat arvot hidastavat me
 ModuleActivated=Moduuli %son aktiivinen ja hidastaa ohjelmaa
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Vienti-moduulin asetukset
+ImportSetup=Setup of module Import
 InstanceUniqueID=Instanssin ID
 SmallerThan=Pienempi kuin
 LargerThan=Suurempi kuin
@@ -1979,5 +1991,7 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index c7e0beebf89..b13aef1031d 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Toimittajien laskut
 SupplierBill=Vendor invoice
 SupplierBills=tavarantoimittajien laskut
 Payment=Maksu
-PaymentBack=Maksun
-CustomerInvoicePaymentBack=Maksun
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Maksut
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Takaisin maksu
 DeletePayment=Poista maksu
 ConfirmDeletePayment=Oletko varma, että haluat poistaa tämän suorituksen?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Maksut toimittajille
 ReceivedPayments=Vastaanotetut maksut
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Näytä tilannetilasku
 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
@@ -509,11 +512,11 @@ ToMakePayment=Maksa
 ToMakePaymentBack=Takaisin maksu
 ListOfYourUnpaidInvoices=Luettelo maksamattomista laskuista
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -528,8 +531,8 @@ TypeContact_facture_external_BILLING=Asiakkaan lasku yhteystiedot
 TypeContact_facture_external_SHIPPING=Asiakas merenkulku yhteystiedot
 TypeContact_facture_external_SERVICE=Asiakaspalvelu ottaa yhteyttä
 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_BILLING=Toimittajan laskun kontakti
+TypeContact_invoice_supplier_external_SHIPPING=Toimittajan toimitus kontakti
 TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 # Situation invoices
 InvoiceFirstSituationAsk=First situation invoice
@@ -575,3 +578,4 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Lasku poistettu
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/fi_FI/blockedlog.lang b/htdocs/langs/fi_FI/blockedlog.lang
index cc69e90c513..f9a07298706 100644
--- a/htdocs/langs/fi_FI/blockedlog.lang
+++ b/htdocs/langs/fi_FI/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 5bbd311f27a..81fe61276e5 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Lisää tämä artikkeli
 RestartSelling=Mene takaisin myydä
 SellFinished=Myynti valmis
 PrintTicket=Tulosta lippu
+SendTicket=Send ticket
 NoProductFound=Ei artikkeli löydetty
 ProductFound=Tuote löytyy
 NoArticle=Ei artikkeli
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb laskuista
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 6bcc497776c..db7da866e5b 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -54,10 +54,10 @@ Firstname=Etunimi
 PostOrFunction=Asema
 UserTitle=Titteli
 NatureOfThirdParty=Sidosryhmän luonne
-NatureOfContact=Nature of Contact
+NatureOfContact=Yhteyshenkilön luonne
 Address=Osoite
-State=Valtio / Lääni
-StateCode=State/Province code
+State=Postialue
+StateCode=Postinumero
 StateShort=Valtio
 Region=Alue
 Region-State=Alue - Osavaltio
@@ -79,7 +79,7 @@ Town=Postitoimipaikka
 Web=Kotisivut
 Poste= Asema
 DefaultLang=Oletuskieli
-VATIsUsed=Myyntivero
+VATIsUsed=Käytettävä myyntivero
 VATIsUsedWhenSelling=Määrittää sisällyttääkö sidosryhmä myyntiveron omien asiakkaidensa laskuun.
 VATIsNotUsed=Myyntivero ei käytössä
 CopyAddressFromSoc=Kopioi osoite sidosryhmän tiedoista
@@ -100,7 +100,7 @@ LocalTax2IsNotUsedES= IRPF ei käytössä
 WrongCustomerCode=Asiakastunnus vihreellinen
 WrongSupplierCode=Toimittajan tunnus virheellinen
 CustomerCodeModel=Asiakastunnuksen malli
-SupplierCodeModel=Vendor code model
+SupplierCodeModel=Toimittajakoodin malli
 Gencod=Viivakoodi
 ##### Professional ID #####
 ProfId1Short=Prof id 1
@@ -310,12 +310,12 @@ AddThirdParty=Luo sidosryhmä
 DeleteACompany=Poista yritys
 PersonalInformations=Henkilötiedot
 AccountancyCode=Kirjanpito tili
-CustomerCode=Asiakastunnua
+CustomerCode=Asiakastunnus
 SupplierCode=Toimittajatunnus
-CustomerCodeShort=Asiakastunnua
+CustomerCodeShort=Asiakastunnus
 SupplierCodeShort=Toimittajatunnus
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
+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
@@ -325,16 +325,15 @@ CompanyDeleted=Yritys " %s" poistettu tietokannasta.
 ListOfContacts=Yhteystietoluettelo
 ListOfContactsAddresses=Yhteystietoluettelo
 ListOfThirdParties=Sidosryhmäluettelo
-ShowCompany=Näytä sidosryhmä
 ShowContact=Näytä yhteystiedot
 ContactsAllShort=Kaikki (Ei suodatinta)
 ContactType=Yhteystiedon tyyppi
 ContactForOrders=Tilauksen yhteystiedon
 ContactForOrdersOrShipments=Tilauksen tai lähetyksen yhteystiedot
-ContactForProposals=Tarjouksen yhteystiedon
-ContactForContracts=Sopimukset yhteystiedot
+ContactForProposals=Tarjouksen yhteyshenkilö
+ContactForContracts=Sopimuksen yhteyshenkilö
 ContactForInvoices=Laskut yhteystiedot
-NoContactForAnyOrder=Tämä yhteyshenkilö ei ole yhteyttä mihinkään jotta
+NoContactForAnyOrder=Tämä yhteyshenkilö ei ole yhteyshenkilönä yhdessäkään tilauksessa.
 NoContactForAnyOrderOrShipments=Tämä yhteystieto ei ole yhteystietona missään tilauksessa tai toimituksessa
 NoContactForAnyProposal=Tämä yhteys ei ole yhteyttä mihinkään kaupalliseen ehdotus
 NoContactForAnyContract=Tämä yhteys ei ole yhteyttä mihinkään sopimukseen
@@ -345,7 +344,7 @@ MyContacts=Omat yhteystiedot
 Capital=Pääoma
 CapitalOf=%s:n pääoma
 EditCompany=Muokkaa yritystä
-ThisUserIsNot=This user is not a prospect, customer or vendor
+ThisUserIsNot=Tämä ei ole prospekti, asiakas tai toimittaja
 VATIntraCheck=Shekki
 VATIntraCheckDesc=ALV-tunnuksen täytyy sisältää maatunnus. Linkki <b>%s</b> käyttää European VAT checker service (VIES)  - palvelua ja tarvii internet-yhteyden Dolibarr-palvelimeen
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -353,7 +352,7 @@ VATIntraCheckableOnEUSite=Tarkasta ALV-tunnus E.U: n sivuilta
 VATIntraManualCheck=Voit tehdä tarkastuksen myös käsin E.U: n sivuilla <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tarkistaminen ei mahdollista. Jäsenvaltio ei toimita tarkastuspalvelua ( %s).
 NorProspectNorCustomer=Ei mahdollinen asiakas eikä asiakas
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Yritysmuoto
 Staff=Työntekijät
 ProspectLevelShort=Potenttiaali
 ProspectLevel=Prospekti potentiaali
@@ -363,7 +362,7 @@ ContactVisibility=Näkyvyys
 ContactOthers=Muu
 OthersNotLinkedToThirdParty=Toiset, jotka eivät liity kolmasosaa osapuoli
 ProspectStatus=Prospektin tila
-PL_NONE=Aucun
+PL_NONE=Ei mitään
 PL_UNKNOWN=Tuntematon
 PL_LOW=Matala
 PL_MEDIUM=Keskitaso
@@ -399,16 +398,16 @@ 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=Sidosryhmien pankkitilit
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+ImportDataset_company_4=Kolmansien osapuolten myyjät (lisää myyjät/käyttäjät yrityskohtaisesti)
 PriceLevel=Hintataso
-PriceLevelLabels=Price Level Labels
+PriceLevelLabels=Hintaryhmät
 DeliveryAddress=Toimitusosoite
 AddAddress=Lisää osoite
-SupplierCategory=Vendor category
+SupplierCategory=Toimittaja kategoria
 JuridicalStatus200=Itsenäinen
 DeleteFile=Poista tiedosto
 ConfirmDeleteFile=Oletko varma, että haluat poistaa tämän tiedoston?
-AllocateCommercial=Liitä myyntiedustajaan
+AllocateCommercial=Liitetty myyntiedustajaan
 Organization=Organisaatio
 FiscalYearInformation=Tilikausi
 FiscalMonthStart=Tilikauden aloituskuukausi
@@ -419,14 +418,14 @@ 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.
+YouMustAssignUserMailFirst=Aseta sähköposti että voi lisätä sähköpostimuistukset käyttöön
 YouMustCreateContactFirst=Voidaksesi lisätä sähköposti muistutukset, täytyy ensin täyttää yhteystiedot sidosryhmän oikealla sähköpostiosoitteella
 ListSuppliersShort=Toimittajaluettelo
 ListProspectsShort=Luettelo mahdollisista asiakkaista
 ListCustomersShort=Asiakasluettelo
 ThirdPartiesArea=Sidosryhmät/yhteystiedot
 LastModifiedThirdParties=Last %s modified Third Parties
-UniqueThirdParties=Total of Third Parties
+UniqueThirdParties=Yhteensä sidosryhmiä
 InActivity=Avoinna
 ActivityCeased=Kiinni
 ThirdPartyIsClosed=Sidosryhmä on suljettu
@@ -446,7 +445,8 @@ SaleRepresentativeLogin=Myyntiedustajan kirjautuminen
 SaleRepresentativeFirstname=Myyntiedustajan etunimi
 SaleRepresentativeLastname=Myyntiedustajan sukunimi
 ErrorThirdpartiesMerge=Sidosryhmän poistossa tapahtui virhe. Tarkista virhe lokitiedostosta. Muutoksia ei tehty
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
+NewCustomerSupplierCodeProposed=Tuotekoodi käytössä, käytä uutta koodia
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Maksutapa - Asiakas
 PaymentTermsCustomer=Maksuehdot - Asiakas
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index c193b43978e..88b914cd030 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index f568deeb469..f2f1ba0fb15 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Tiedosto ei saanut kokonaan palvelimelta.
 ErrorNoTmpDir=Tilapäinen directy %s ei ole.
 ErrorUploadBlockedByAddon=Lähetä estetty PHP / Apache plugin.
 ErrorFileSizeTooLarge=Tiedoston koko on liian suuri.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Koko liian pitkä int tyyppi (%s merkkiä maksimi)
 ErrorSizeTooLongForVarcharType=Koko liian pitkä jono tyyppi (%s merkkiä maksimi)
 ErrorNoValueForSelectType=Please fill value for select list
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index f01edcad905..03c084676eb 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Sinun PHP max istuntojakson muisti on <b>asetettu %s.</b> Tämän pitäisi olla tarpeeksi.
 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.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Sinun PHP asennuksesi ei tue 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=Hakemiston %s ei ole olemassa.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/fi_FI/link.lang b/htdocs/langs/fi_FI/link.lang
index e794e091a48..2db365c6329 100644
--- a/htdocs/langs/fi_FI/link.lang
+++ b/htdocs/langs/fi_FI/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=%s linkki on poistettu
 ErrorFailedToDeleteLink= Linkin '<b>%s</b>' poisto ei onnistunut
 ErrorFailedToUpdateLink= Linkin '<b>%s</b>' päivitys ei onnistunut
 URLToLink=URL linkiksi
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index 77d9cde2195..005cf01f18a 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index e38ede431d7..779f8b5c519 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 SaveAndNew=Save and new
 TestConnection=Testaa yhteys
 ToClone=Klooni
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Choose data you want to clone:
 NoCloneOptionsSpecified=Ei tietoja kloonata määritelty.
 Of=ja
@@ -829,6 +830,8 @@ Gender=Sukupuoli
 Genderman=Mies
 Genderwoman=Nainen
 ViewList=Näytä lista
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Pakollinen
 Hello=Terve
 GoodBye=Näkemiin
@@ -954,7 +957,7 @@ SearchIntoTasks=Tehtävät
 SearchIntoCustomerInvoices=Asiakkaiden laskut
 SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Asiakkaan tilaukset
-SearchIntoSupplierOrders=Purchase orders
+SearchIntoSupplierOrders=Ostotilaukset
 SearchIntoCustomerProposals=Tarjoukset asiakkaille
 SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
@@ -969,7 +972,7 @@ CommentPage=Comments space
 CommentAdded=Kommentti lisätty
 CommentDeleted=Kommentti poistettu
 Everybody=Yhteiset hanke
-PayedBy=Paid by
+PayedBy=Maksettu toimesta
 PayedTo=Paid to
 Monthly=Monthly
 Quarterly=Quarterly
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index 9eb16bfb4cb..6ad75f3c205 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -141,7 +141,7 @@ OrderByEMail=Sähköposti
 OrderByWWW=Online
 OrderByPhone=Puhelin
 # Documents models
-PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEinsteinDescription=A complete order model 
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Yksinkertainen tilausmalli
 PDFProformaDescription=A complete Proforma invoice template
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 3e05eb44a04..5cd5ddd1758 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titteli
 WEBSITE_DESCRIPTION=Kuvaus
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 91ccfbb1d6f..15cb4c2d1e9 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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=Kirjanpitotili (ostot)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Kirjanpitotili (myynti)
 ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
 ProductAccountancySellExportCode=Kirjanpitotili (Vientimyynti)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Alkuperä maa
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Yksikkö
 p=u.
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 54314312026..f21074d9938 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -4,92 +4,90 @@ ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
 ProjectsArea=Projects Area
-ProjectStatus=Project status
+ProjectStatus=Projektin tila
 SharedProject=Yhteiset hanke
 PrivateProject=Hankkeen yhteystiedot
-ProjectsImContactFor=Projects for I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
+ProjectsImContactFor=Omat projektit
+AllAllowedProjects=Omat ja muiden projektit 
 AllProjects=Kaikki hankkeet
 MyProjectsDesc=This view is limited to projects you are a contact for
-ProjectsPublicDesc=Tämä näkemys esitetään kaikki hankkeet sinulla voi lukea.
+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ämä näkemys esitetään kaikki hankkeet ja tehtävät sinulla voi lukea.
+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
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects 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.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
+ImportDatasetTasks=Projektien tehtävät
+ProjectCategories=Projektien/Tehtävien kategoriat
 NewProject=Uusi projekti
-AddProject=Create project
+AddProject=Perusta projekti
 DeleteAProject=Poista hanke
 DeleteATask=Poista tehtävä
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
+ConfirmDeleteAProject=Oletko varma että haluat poistaa tämän projektin?
+ConfirmDeleteATask=Oletko varma että haluat poistaa tämän tehtävän?
+OpenedProjects=Avoimet projektit
+OpenedTasks=Avoimet tehtävät
 OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
 OpportunitiesStatusForProjects=Leads amount of projects by status
-ShowProject=Näytä hankkeen
+ShowProject=Näytä projekti
 ShowTask=Näytä tehtävä
-SetProject=Aseta hankkeen
+SetProject=Aseta projekti
 NoProject=Ei hanke määritellään
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Projektien määrä
+NbOfTasks=Tehtävien määrä
 TimeSpent=Käytetty aika
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
 TimesSpent=Käytetty aika
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
+TaskId=Tehtävän ID
+RefTask=Tehtävän viittaus
+LabelTask=Tehtävän merkki
 TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Käyttäjä
 TaskTimeNote=Huomautus
-TaskTimeDate=Date
+TaskTimeDate=Päivämäärä
 TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Käytetty aika
 MyTimeSpent=Oma käytetty aika
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTime=Laskuta käytetty aika
+BillTimeShort=Laskutettava aika
+TimeToBill=Laskuttamaton aika
+TimeBilled=Laskutettu aika
 Tasks=Tehtävät
 Task=Tehtävä
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Tehtävän alkupäivä
+TaskDateEnd=Tehtävän loppupäivä
+TaskDescription=Tehtävän kuvaus
 NewTask=Uusi tehtävä
-AddTask=Create task
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddTask=Perusta tehtävä
+AddTimeSpent=Kirjaa käytetty aika
+AddHereTimeSpentForDay=Lisää tähän käytetty aika tälle päivälle/tehtävälle
+AddHereTimeSpentForWeek=Lisää tähän käytetty aika tälle viikolle/tehtävälle
 Activity=Toiminto
 Activities=Tehtävät / toiminnot
 MyActivities=Omat tehtävät / toiminnot
-MyProjects=Omat hankkeet
-MyProjectsArea=My projects Area
-DurationEffective=Todellisen keston
-ProgressDeclared=Declared progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
+MyProjects=Omat projektit
+MyProjectsArea=Omat projektit - alue
+DurationEffective=Todellisen kesto
+ProgressDeclared=Julkaistu eteneminen
+TaskProgressSummary=Tehtien eteneminen
+CurentlyOpenedTasks=Avoimet tehtävät
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+ProgressCalculated=Lasketut projektit
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Aika
-ListOfTasks=List of tasks
+ListOfTasks=Tehtävälista
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
-GanttView=Gantt View
+GanttView=GANTT näkymä
 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
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Liittyvät tuotteet
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Uusi lasku
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/fi_FI/receiptprinter.lang b/htdocs/langs/fi_FI/receiptprinter.lang
index f50113846a2..72c80718a92 100644
--- a/htdocs/langs/fi_FI/receiptprinter.lang
+++ b/htdocs/langs/fi_FI/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy tulostin
 CONNECTOR_NETWORK_PRINT=Verkkotulostin
 CONNECTOR_FILE_PRINT=Paikallinen tulostin
 CONNECTOR_WINDOWS_PRINT=Paikallinen Windows tulostin
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Olematon tulostin testiä varten, ei tee mitään
 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=Oletus profiili
 PROFILE_SIMPLE=Yksinkertainen profiili
 PROFILE_EPOSTEP=Epos Tep profiili
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Laskun 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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Pääoma
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/fi_FI/stripe.lang b/htdocs/langs/fi_FI/stripe.lang
index 8ca2b1b040f..c14c2d42860 100644
--- a/htdocs/langs/fi_FI/stripe.lang
+++ b/htdocs/langs/fi_FI/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Nimi myyjä
 CSSUrlForPaymentForm=CSS-tyylisivu url maksun muodossa
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index a4c8f7b7cec..780bb758259 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Lupa myönnettiin, koska periytyy yhden käyttäjän ryhmä.
 Inherited=Peritty
 UserWillBeInternalUser=Luotu käyttäjä on sisäinen käyttäjä (koska ei liity erityistä kolmannelle osapuolelle)
@@ -113,3 +113,5 @@ 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
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 2a68da89c30..3685a0886b6 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Aseta kotisivuksi
 RealURL=Lue URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 6fe29d6202b..fa89f84c97c 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -14,8 +14,16 @@ WarningModuleNotActive=Le module <b>%s</b> doit être activé
 WarningOnlyPermissionOfActivatedModules=Seules les permissions liées à des modules activés sont montrées ici. Vous pouvez activer d'autres modules sur la page Accueil->Configuration->Modules.
 FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la configuration)
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
+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
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+YouCanSubmitFile=You can upload the .zip file of module package from here:
 Module20Name=Propales
 Module30Name=Factures
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+ValueOfConstantKey=Value of a configuration constant
+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.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 Target=Objectif
 SuppliersCommandModel=Complete template of Purchase Order
 SuppliersInvoiceModel=Complete template of Vendor Invoice
diff --git a/htdocs/langs/fr_BE/bills.lang b/htdocs/langs/fr_BE/bills.lang
index bffa158d338..21de194f376 100644
--- a/htdocs/langs/fr_BE/bills.lang
+++ b/htdocs/langs/fr_BE/bills.lang
@@ -14,8 +14,12 @@ UsedByInvoice=Utilisée pour payer la facture %s
 PredefinedInvoices=Factures prédéfinies
 SupplierBills=factures fournisseurs
 Payment=Paiement
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Paiements
 DeletePayment=Supprimer paiement
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ReceivedPayments=Paiements reçus
 ReceivedCustomersPayments=Paiements reçus de clients
 ReceivedCustomersPaymentsToValid=Paiements à valider de clients
@@ -39,5 +43,5 @@ PaymentTypeShortLIQ=En espèces
 PaymentTypeCB=Carte de crédit
 PaymentTypeShortCB=Carte de crédit
 Cash=En espèces
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 0e082ab6de8..b933b9d4c2e 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -19,6 +19,8 @@ UploadNewTemplate=Télécharger un nouveau modèle (s)
 SecurityFilesDesc=Définissez ici les options liées à la sécurité concernant le téléchargement de fichiers.
 AllowToSelectProjectFromOtherCompany=Sur le document d'un tiers, peut choisir un projet lié à un autre tiers
 NextValueForDeposit=Valeur suivante (acompte)
+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
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 MultiCurrencySetup=Configuration multi-devises
 NotConfigured=Module / Application non configuré
 AllWidgetsWereEnabled=Tous les widgets disponibles sont activés
@@ -57,6 +59,7 @@ ModuleFamilyInterface=Interfaces avec les systèmes externes
 ThisIsAlternativeProcessToFollow=Il s'agit d'une configuration alternative à traiter manuellement:
 NotExistsDirect=Le répertoire racine alternatif n'est pas défini dans un répertoire existant.
 InfDirAlt=Depuis la version 3, il est possible de définir un autre répertoire racine. Cela vous permet de stocker, dans un répertoire dédié, des plug-ins et des modèles personnalisés. <br> Créez simplement un répertoire à la racine de Dolibarr (par exemple: personnalisé).
+YouCanSubmitFile=You can upload the .zip file of module package from here:
 LastStableVersion=Dernière version stable
 LastActivationDate=Dernière date d'activation
 LastActivationAuthor=Dernier auteur d'activation
@@ -98,6 +101,7 @@ Module2610Desc=Activer le serveur REST de services API de les services
 Module2660Name=WebServices appel ( client SOAP )
 Module4000Name=Gestion des ressources humaines
 Module10000Name=Sites Internet
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module55000Name=Sondage, enquête ou vote
 Permission45=Exportation de projets
 Permission76=Exporter des données
@@ -125,16 +129,20 @@ DictionaryVAT=Taux de TPS/TVH ou de Taxes de Ventes
 DictionaryAccountancyJournal=Revues comptables
 DictionaryProspectStatus=Status prospection
 SetupNotSaved=Le programme d'installation n'a pas été enregistré
+ValueOfConstantKey=Value of a configuration constant
 CurrentNext=Actuel / Suivant
 DefaultMaxSizeList=Longueur maximale des listes
 CompanyObject=Objet de la compagnie
 ShowBugTrackLink=Afficher le lien "Signaler un défaut"
+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.
 InfoDolibarr=À propos de Dolibarr
 InfoBrowser=À propos du navigateur
 InfoWebServer=À propos du serveur Web
 InfoPHP=À propos de PHP
 InfoPerf=À propos des performances
 AreaForAdminOnly=Les paramètres d'installation peuvent être définis par <b> utilisateurs d'administrateur </ b> uniquement.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 DictionaryDesc=Insérez toutes les données de référence. Vous pouvez ajouter vos valeurs par défaut.
 MiscellaneousDesc=Tous les autres paramètres liés à la sécurité sont définis ici.
 UnitPriceOfProduct=Prix unitaire (no tax) d'un produit
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index 910c77067a3..eaa8825ba8a 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -5,8 +5,12 @@ InvoiceDepositDesc=Ce type de facture se fait lorsque l'acompte a été reçu.
 invoiceAvoirWithLines=Créer l'avoir avec les même lignes que la factures dont il est issu
 InvoiceHasAvoir=Était une source d'une ou de plusieurs notes de crédit
 PredefinedInvoices=Facture prédéfinie
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 paymentInInvoiceCurrency=en factures de devises
 ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 PaymentTypeDC=Carte de débit / crédit
 PaymentTypePP=Pay Pal
 CreateCreditNote=Créer avoir
@@ -83,7 +87,7 @@ PaymentTypeShortTRA=Brouillon
 ChequeMaker=Émetteur du chèque/transfert
 DepositId=Identifiant de dépot
 YouMustCreateStandardInvoiceFirstDesc=Vous devez d'abord créer une facture standard et la convertir en «modèle» pour créer une nouvelle facture modèle
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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
diff --git a/htdocs/langs/fr_CA/cashdesk.lang b/htdocs/langs/fr_CA/cashdesk.lang
index 2f3da52b1f5..7b351fd210f 100644
--- a/htdocs/langs/fr_CA/cashdesk.lang
+++ b/htdocs/langs/fr_CA/cashdesk.lang
@@ -2,3 +2,5 @@
 NoVAT=Pas de TVA (TAXE) pour cette vente
 BankToPay=Compte pour le paiement
 DolibarrReceiptPrinter=Imprimante de reçu Dolibarr
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index d90041a728d..9426cca9d08 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -45,7 +45,6 @@ ConfirmDeleteSocialContribution=Êtes-vous sûr de vouloir supprimer cette charg
 ExportDataset_tax_1=Charges sociales et paiements
 CalcModeVATDebt=Mode <b>%sTPS/TVH sur débit%s</b>.
 CalcModeVATEngagement=Mode <b>%s TPS/TVH sur encaissement%s</b>.
-RulesResultDue=- Il comprend les factures, les dépenses, la TVA, les dons, qu'ils soient payés ou non. Comprend également les salaires payés. <br> - Il est basé sur la date de validation des factures et la TVA et à la date d'échéance des dépenses. Pour les salaires définis avec le module Salaire, la date de valeur du paiement est utilisée.
 RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires. <br> - Il est basé sur les dates de paiement des factures, des dépenses, de la TVA et des salaires. La date de donation pour le don.
 DepositsAreIncluded=- Les factures de versement sont incluses
 LT1ReportByCustomersES=Rapport par tiers des RE (TVA)
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index 967bf583d1c..9df16a4655b 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -59,6 +59,7 @@ ErrorSpecialCharNotAllowedForField=Les caractères spéciaux ne sont pas autoris
 ErrorNumRefModel=Une référence existe dans la base de données (%s) et n'est pas compatible avec cette règle de numérotation. Supprimez l'enregistrement ou la renommée référence pour activer ce module.
 ErrorBadMaskBadRazMonth=Erreur, mauvaise valeur de réinitialisation
 ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir plus de 3 chiffres
+ErrorSelectAtLeastOne=Error, select at least one entry.
 ErrorProdIdAlreadyExist=%s est affecté à un autre tiers
 ErrorFailedToLoadRSSFile=Impossible d'obtenir un flux RSS. Essayez d'ajouter constante MAIN_SIMPLEXMLLOAD_DEBUG si les messages d'erreur ne fournissent pas suffisamment d'informations.
 ErrorForbidden=Accès refusé. <br> Vous essayez d'accéder à une page, zone ou fonctionnalité d'un module désactivé ou sans être dans une session authentifiée ou non autorisée pour votre utilisateur.
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 212af6e5318..fdb14636cb9 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -114,6 +114,7 @@ RelatedObjects=Objets associés
 FrontOffice=Front Office
 ExportFilteredList=Export liste filtrée
 ExportList=Liste des exportations
+ExportOptions=Options d'exportation
 GroupBy=Par groupe...
 ViewFlatList=Afficher la liste forfaitaire
 RemoveString=Supprimer la chaîne '%s'
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
index e19e7944a15..ba425feb946 100644
--- a/htdocs/langs/fr_CA/other.lang
+++ b/htdocs/langs/fr_CA/other.lang
@@ -110,4 +110,3 @@ LibraryVersion=Version de la bibliothèque
 ExportableDatas=Données à l'exportation
 NoExportableData=Aucune donnée exportable (aucun module avec des données exportables chargées ou des autorisations manquantes)
 WebsiteSetup=Site de configuration du module
-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 __WEBSITEKEY__ in the path if path depends on website name.
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index 7b2d5aad08b..f92612aa8bf 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -88,7 +88,6 @@ AddElement=Lien vers l'élément
 PlannedWorkload=Charge de travail planifiée
 ProjectReferers=Articles connexes
 ProjectMustBeValidatedFirst=Le projet doit d'abord être validé
-FirstAddRessourceToAllocateTime=Affectez une ressource utilisateur à la tâche pour allouer du temps
 InputPerDay=Entrée par jour
 InputPerWeek=Entrée par semaine
 TimeAlreadyRecorded=Il s'agit du temps passé déjà enregistré pour cette tâche / jour et utilisateur %s
diff --git a/htdocs/langs/fr_CA/users.lang b/htdocs/langs/fr_CA/users.lang
index 81db7ef3370..a6633222cdc 100644
--- a/htdocs/langs/fr_CA/users.lang
+++ b/htdocs/langs/fr_CA/users.lang
@@ -7,6 +7,7 @@ ConfirmEnableUser=Êtes-vous sûr de vouloir activer l'utilisateur <b>%s</b>?
 ConfirmReinitPassword=Êtes-vous sûr de vouloir générer un nouveau mot de passe pour l'utilisateur <b>%s</b>?
 ConfirmSendNewPassword=Êtes-vous sûr de vouloir générer et envoyer un nouveau mot de passe pour l'utilisateur <b> %s</b>?
 LastUsersCreated=Derniers %s utilisateurs créés
+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)
 ConfirmCreateContact=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce contact?
 ConfirmCreateLogin=Êtes-vous sûr de vouloir créer un compte Dolibarr pour ce membre?
 ConfirmCreateThirdParty=Êtes-vous sûr de vouloir créer un tiers pour ce membre?
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 5255b2f9da5..5aefcc130d6 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -7,3 +7,5 @@ EditMenu=Menu Edition
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
 ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
+SetHereVirtualHost=<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>
+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.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index d905a9513f7..6363b8b710d 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Remarque : Votre PHP limite la taille des envois à <b>
 NoMaxSizeByPHPLimit=Aucune limite configurée dans votre serveur PHP
 MaxSizeForUploadedFiles=Taille maximum des fichiers envoyés (0 pour interdire l'envoi)
 UseCaptchaCode=Utilisation du code graphique (CAPTCHA) sur la page de connexion
-AntiVirusCommand= Chemin complet vers la commande antivirus
-AntiVirusCommandExample= Exemple pour ClamWin : c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Exemple pour ClamAv : /usr/bin/clamscan
+AntiVirusCommand=Chemin complet vers la commande antivirus
+AntiVirusCommandExample=Exemple pour ClamAv Daemon (nécessite clamav-daemon): /usr/bin/clamdscan <br> Exemple pour ClamWin (très très lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Paramètres supplémentaires sur la ligne de commande
-AntiVirusParamExample= Exemple pour ClamWin : --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exemple pour le démon ClamAv: --fdpass <br> Exemple pour ClamWin: --database = "C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuration du module Comptabilité
 UserSetup=Configuration de la gestion des utilisateurs
 MultiCurrencySetup=Configuration du module Multi-devise
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Fonction désactivée dans la démo
 FeatureAvailableOnlyOnStable=Fonction disponible uniquement sur les versions officielles stables
 BoxesDesc=Les widgets sont des composants montrant des informations que vous pouvez ajouter à vos pages pour les personnaliser. Vous pouvez choisir de les afficher ou non en sélectionnant la page cible et en cliquant sur "Activer" ou "Désactiver".
 OnlyActiveElementsAreShown=Seuls les éléments en rapport avec un <a href="%s">module actif</a> sont présentés.
-ModulesDesc=Les modules Dolibarr définissent quelles fonctionnalités sont disponibles dans le logiciel. Certains modules / applications nécessitent, après activation, d'accorder des autorisations aux utilisateurs. Cliquez sur le bouton activé/désactivé (en fin de ligne) pour activer un module/application.
+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=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet...
 ModulesDeployDesc=Si les permissions de votre système de fichier le permettent , vous pouvez utiliser cet outil pour déployer un module externe. Le module sera alors visible dans l'onglet <strong>%s</strong>.
 ModulesMarketPlaces=Rechercher un module/application externe
@@ -212,6 +212,7 @@ CompatibleUpTo=Compatible avec la version %s
 NotCompatible=Ce module n'est pas compatible avec votre version %s de Dolibarr (version min. %s - version max. %s).
 CompatibleAfterUpdate=Ce module nécessite une mise à jour de Dolibarr %s (Version min. %s - Version max. %s).
 SeeInMarkerPlace=Voir dans la boutique
+SeeSetupOfModule=Voir la configuration du module %s
 Updated=Mise à jour effectuée
 Nouveauté=Nouveauté
 AchatTelechargement=Acheter/télécharger
@@ -221,6 +222,7 @@ DoliPartnersDesc=Liste de quelques sociétés qui peuvent fournir/développer de
 WebSiteDesc=Sites fournisseurs à consulter pour trouver plus de modules (extensions)...
 DevelopYourModuleDesc=Quelques pistes pour développer votre propre module/application...
 URL=URL
+RelativeURL=URL relative
 BoxesAvailable=Widgets disponibles
 BoxesActivated=Widgets activés
 ActivateOn=Activer sur
@@ -328,7 +330,7 @@ SetupIsReadyForUse=L"installation du module est terminée. Il est cependant néc
 NotExistsDirect=Le dossier racine alternatif n'est pas défini.<br>
 InfDirAlt=Depuis les versions 3, il est possible de définir un dossier racine alternatif. Cela permet d'installer modules et thèmes additionnels dans un répertoire dédié.<br>Créer un dossier racine alternatif à Dolibarr (ex : custom).<br>
 InfDirExample=<br>Ensuite, déclarez le dans le fichier <strong>conf.php</strong><br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Si ces lignes sont commentées avec un symbole "#" ou "//", activer les en supprimant le caractère "#" ou "//".
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Vous pouvez téléverser le fichier .zip du package du module à partir d'ici:
 CurrentVersion=Version actuelle de Dolibarr
 CallUpdatePage=Aller à la page de mise à jour de la structure et des données de la base : %s.
 LastStableVersion=Dernière version stable disponible
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Laisser ce champ vide pour utiliser la valeur par défaut
 DefaultLink=Lien par défaut
 SetAsDefault=Définir par défaut
 ValueOverwrittenByUserSetup=Attention, cette valeur peut être écrasée par une valeur spécifique à la configuration de l'utilisateur (chaque utilisateur pouvant avoir sa propre URL « clicktodial »)
-ExternalModule=Module externe - Installé dans le répertoire %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Initialisation du code-barre en masse pour les tiers
 BarcodeInitForProductsOrServices=Initialisation ou purge en masse des codes-barre des produits ou services
 CurrentlyNWithoutBarCode=Actuellement, vous avez <strong>%s</strong> enregistrements sur <strong>%s</strong> %s sans code barre défini.
@@ -546,7 +549,7 @@ Module58Desc=Intégration d'un système de « ClickToDial » (Asterisk, …)
 Module59Name=Bookmark4u
 Module59Desc=Ajoute une fonction pour générer un compte Bookmark4u depuis un compte Dolibarr
 Module60Name=Autocollants
-Module60Desc=Gestion des autocollants
+Module60Desc=Gestion des pages d'autocollants
 Module70Name=Interventions
 Module70Desc=Gestion des interventions chez les tiers
 Module75Name=Notes de frais
@@ -642,7 +645,7 @@ Module50000Desc=Module permettant d'offrir une page de paiement en ligne par car
 Module50100Name=PdV SimplePOS
 Module50100Desc=Point de vente SimplePOS (caisse enregistreuse simple)
 Module50150Name=PdV TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Point de Vente TakePOS (Caisse enregistreuse à écran tactile, pour magasins, bars, restaurants, etc).
 Module50200Name=Paypal
 Module50200Desc=Module permettant d'offrir une page de paiement en ligne par carte de crédit avec PayBox. Ceci peut être utilisé par les clients pour faire des paiements de montants libre ou pour des paiements d'un objet particulier de Dolibarr (facture, commande, ...)
 Module50300Name=Stripe
@@ -881,7 +884,7 @@ Permission1251=Lancer des importations en masse dans la base (chargement de donn
 Permission1321=Exporter les factures clients, attributs et règlements
 Permission1322=Rouvrir une facture payée
 Permission1421=Exporter les commandes clients et attributs
-Permission2401=Lire les actions (événements ou tâches) liées à son compte utilisateur (si propriétaire de l’événement ou lui est assigné)
+Permission2401=Lire les actions (événements ou tâches) liées à son compte utilisateur (si propriétaire de l’événement ou simplement assigné à l'événement)
 Permission2402=Créer/modifier des actions (événements ou tâches) liées à son compte utilisateur (si propriétaire de l'événement)
 Permission2403=Supprimer des actions (événements ou tâches) liées à son compte utilisateur (si propriétaire de l'événement)
 Permission2411=Lire les actions (événements ou tâches) des autres
@@ -947,7 +950,7 @@ DictionaryCanton=Etats/Province
 DictionaryRegion=Régions
 DictionaryCountry=Pays
 DictionaryCurrency=Monnaies
-DictionaryCivility=Titres de civilité
+DictionaryCivility=Honorific titles
 DictionaryActions=Liste des types d'événements de l'agenda
 DictionarySocialContributions=Types de charges sociales ou fiscales
 DictionaryVAT=Taux de TVA ou de Taxes de Ventes
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'assoc
 VATIsUsedExampleFR=En France, cela signifie que les entreprises ou les organisations sont assujetis à la tva (réel ou normal).
 VATIsNotUsedExampleFR=En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaître la mention "TVA non applicable - art-293B du CGI" sur les factures.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Taux
 LocalTax1IsNotUsed=Non assujeti
 LocalTax1IsUsedDesc=Utilisation d'un 2ème type taxe (autre que le premier)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Le IRPF proposé par défaut lors de la création de propa
 LocalTax2IsNotUsedDescES=L'IRPF proposé par défaut est 0. Fin de règle.
 LocalTax2IsUsedExampleES=En Espagne, ce sont des professionnels autonomes et indépendants qui offrent des services, et des sociétés qui ont choisi le système fiscal du module.
 LocalTax2IsNotUsedExampleES=En Espagne, ce sont des sociétés qui ne sont pas soumises au système fiscal du module.
+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 des 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=Rapports sur les taxes locales
 CalcLocaltax1=Ventes - Achats
 CalcLocaltax1Desc=Les rapports des Taxes locales sont calculées avec la différence entre les taxes locales de ventes et les taxes locales d'achats
@@ -1018,10 +1025,11 @@ CalcLocaltax2=Achats
 CalcLocaltax2Desc=Le Rapport des Taxes locales sont le total des taxes locales d'achats
 CalcLocaltax3=Ventes
 CalcLocaltax3Desc=Le Rapports des Taxes locales sont le total des taxes locales de ventes
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Libellé qui sera utilisé si aucune traduction n'est trouvée pour ce code
 LabelOnDocuments=Libellé sur les documents
 LabelOrTranslationKey=Libellé ou clé de traduction
-ValueOfConstantKey=Value of a configuration constant
+ValueOfConstantKey=Valeur de constante de configuration
 NbOfDays=Nb. de jours
 AtEndOfMonth=En fin de mois
 CurrentNext=Current/Next
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Note de frais à approuver
 Delays_MAIN_DELAY_HOLIDAYS=Demandes de congés à approuver
 SetupDescription1=L'espace configuration permet de réaliser le paramétrage initial afin de pouvoir commencer à utiliser l'application.
 SetupDescription2=Les deux étapes obligatoires sont les deux premières entrées dans le menu de configuration, soit
-SetupDescription3=<a href="%s">%s -> %s</a><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> Ce logiciel est un ensemble de plusieurs modules/applications, tous plus ou moins indépendants. Les fonctionnalités en rapport avec vos besoins doivent être activées et configurées. De nouvelles entrées/options seront ajoutés aux menus avec l'activation d'un module.
+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é
 Audit=Audit de sécurité
@@ -1128,7 +1136,7 @@ LogEventDesc=Vous pouvez activer ici l'historique des événements d'audit de s
 AreaForAdminOnly=Les paramètres d'installation ne peuvent être remplis que par les <b>utilisateurs administrateurs</b> uniquement.
 SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement.
 SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateur. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace.
-CompanyFundationDesc=Modifiez les informations de la société/organisation. Cliquez sur le bouton "%s" en bas de la page.
+CompanyFundationDesc=Modifiez les informations de votre société/organisation. Cliquez sur le bouton "%s" en bas de page pour sauvegarder.
 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
@@ -1144,7 +1152,7 @@ TriggerAlwaysActive=Déclencheurs de ce fichier toujours actifs, quels que soien
 TriggerActiveAsModuleActive=Déclencheurs de ce fichier actifs car le module <b>%s</b> est actif.
 GeneratedPasswordDesc=Définissez ici quelle règle vous voulez utiliser pour générer les mots de passe quand vous demandez à générer un nouveau mot de passe
 DictionaryDesc=Définissez ici les données de référence. Vous pouvez compléter/modifier les données prédéfinies avec les vôtres.
-ConstDesc=Cette page vous permet d'éditer (remplacer) des paramètres non disponibles dans d'autres pages. Il s'agit principalement de paramètres réservés pour les  développeurs et dépannage avancé uniquement.
+ConstDesc=Cette page vous permet d'éditer (remplacer) des paramètres non disponibles dans d'autres pages. Il s'agit principalement de paramètres réservés pour les développeurs et dépannage avancé uniquement. <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">Consultez ici</a> la liste des options.
 MiscellaneousDesc=Définissez ici les autres paramètres en rapport avec la sécurité.
 LimitsSetup=Configuration des limites et précisions
 LimitsDesc=Vous pouvez définir ici les limites, précisions et optimisations utilisées par Dolibarr
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Règle pour la génération des mots de passe proposé
 DisableForgetPasswordLinkOnLogonPage=Cacher le lien "Mot de passe oublié" sur la page de connexion
 UsersSetup=Configuration du module utilisateurs
 UserMailRequired=Email requis pour créer un nouvel utilisateur
+UsersDocModules=Modèles de documents pour les documents générés à partir de la fiche utilisateur
+GroupsDocModules=Modèles de documents pour les documents générés à partir de la fiche d'un groupe
 ##### HRM setup #####
 HRMSetup=Configuration du module GRH
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Modèle de document de factures
 BillsPDFModulesAccordindToInvoiceType=Modèles de documents de facturation en fonction du type de facture
 PaymentsPDFModules=Modèle de document pour les règlements
 ForceInvoiceDate=Forcer la date de facturation à la date de validation (seulement de Brouillon à Impayée)
-SuggestedPaymentModesIfNotDefinedInInvoice=Mode de paiement suggéré par défaut si non défini au niveau de la facture
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Proposer paiement par virement sur le compte
 SuggestPaymentByChequeToAddress=Proposer paiement par chèque à l'ordre et adresse de
 FreeLegalTextOnInvoices=Mention complémentaire sur les factures
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Configuration des règlements fournisseurs
 PropalSetup=Configuration du module Propositions Commerciales
 ProposalsNumberingModules=Modèles de numérotation des propositions commerciales
 ProposalsPDFModules=Modèles de documents de propositions commerciales
-SuggestedPaymentModesIfNotDefinedInProposal=Mode de paiement suggéré sur le document proposition par défaut s'il n'est pas défini au niveau de la proposition
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
 WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demander pour l'entrepôt-source pour la co
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demandez le compte bancaire destination de commande fournisseur
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Configuration du module Commandes
 OrdersNumberingModules=Modèles de numérotation des commandes
 OrdersModelModule=Modèles de document des commandes
@@ -1686,9 +1697,9 @@ CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser po
 StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée
 StockDecreaseForPointOfSaleDisabledbyBatch=La décrémentation de stock depuis ce module Point de Vente n'est pas encore compatible avec la gestion des numéros de lots/série.
 CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stock lors d'une vente depuis le Point de vente. Par conséquent, un entrepôt est nécessaire.
-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)
+CashDeskForceDecreaseStockLabel=La diminution des stocks de produits soumis à numéros de lots a été forcée.
+CashDeskForceDecreaseStockDesc=Diminuez d'abord par les dates de DMD/DLUO ou DLC les plus anciennes
+CashDeskReaderKeyCodeForEnter=Code clé pour "Entrée" défini dans le lecteur de code-barres (exemple: 13)
 ##### Bookmark #####
 BookmarkSetup=Configuration du module Marque-pages
 BookmarkDesc=Ce module vous permet de gérer des liens et raccourcis. Il permet aussi d'ajouter n'importe quelle page de Dolibarr ou lien web dans le menu d'accès rapide sur la gauche.
@@ -1720,7 +1731,7 @@ MultiCompanySetup=Configuration du module Multi-société
 ##### Suppliers #####
 SuppliersSetup=Configuration du module Fournisseurs
 SuppliersCommandModel=Modèle de commande fournisseur complet 
-SuppliersCommandModelMuscadet=Modèle de commande fournisseur complet (ancienne implémentation du modèle Cornas)
+SuppliersCommandModelMuscadet=Modèle de commande fournisseur complet 
 SuppliersInvoiceModel=Modèle de facture fournisseur complet
 SuppliersInvoiceNumberingModel=Modèles de numérotation des factures fournisseur
 IfSetToYesDontForgetPermission=Si positionné sur une valeur non nulle, n'oubliez pas de donner les permissions aux groupes ou utilisateurs qui auront le droit de cette seconde approbation.
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Attention, les valeurs élevées ralent
 ModuleActivated=Le module %s est activé et ralentit l'interface
 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
 InstanceUniqueID=ID unique de l'instance
 SmallerThan=Plus petit que
 LargerThan=Plus grand que
@@ -1978,6 +1990,8 @@ NotAPublicIp=Pas une IP publique
 MakeAnonymousPing=Effectuez un ping «+1» anonyme sur le serveur de la fondation Dolibarr (une seule fois après l’installation) pour permettre à la fondation de compter le nombre d’installations de Dolibarr.
 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 'Références' correspondant à cette syntaxe
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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.
+EMailsWillHaveMessageID=Les e-mails auront une étiquette 'References' correspondant à cette syntaxe
+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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 03d1b95b879..6ad3faba02d 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -58,8 +58,8 @@ SuppliersInvoices=Factures fournisseurs
 SupplierBill=Facture fournisseur
 SupplierBills=Factures fournisseurs
 Payment=Règlement
-PaymentBack=Remboursement
-CustomerInvoicePaymentBack=Remboursement
+PaymentBack=Rembourser
+CustomerInvoicePaymentBack=Rembourser
 Payments=Règlements
 PaymentsBack=Remboursements
 paymentInInvoiceCurrency=Dans la devise des factures
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Afficher la facture de situation
 UseSituationInvoices=Autoriser les factures de situation
 UseSituationInvoicesCreditNote=Autoriser les avoirs de factures de situation
 Retainedwarranty=Retenue de garantie
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Pourcentage par défaut de la retenue de garantie
+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=A payer sur %s
 toPayOn=à payer sur %s
 RetainedWarranty=Retenue de garantie
@@ -509,11 +512,11 @@ ToMakePayment=Payer
 ToMakePaymentBack=Rembourser
 ListOfYourUnpaidInvoices=Liste des factures impayées
 NoteListOfYourUnpaidInvoices=Remarque: Cette liste ne contient que les factures des Tiers pour lesquels vous êtes le commercial affecté.
-RevenueStamp=Timbre fiscal
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Cette option est disponible uniquement lors de la création de factures depuis l'onglet "client" du tiers
 YouMustCreateInvoiceFromSupplierThird=Cette option est disponible uniquement lors de la création d'une facture depuis l'onglet "fournisseur" d'un tiers
 YouMustCreateStandardInvoiceFirstDesc=Pour créer une facture modèle, vous devez d'abord créer une facture standard brouillon et la convertir en modèle.
-PDFCrabeDescription=Modèle de facture PDF Crabe. Un modèle de facture complet (ancienne implémentation du modèle Sponge)
+PDFCrabeDescription=Modèle de facture PDF Crabe. Un modèle de facture complet 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Définir la date de fin de la ligne de service avec la date de la
 AutoFillDateToShort=Définir la date de fin
 MaxNumberOfGenerationReached=Nb maximum de gén. atteint
 BILL_DELETEInDolibarr=Facture supprimée
+BILL_SUPPLIER_DELETEInDolibarr=Facture fournisseur supprimée
diff --git a/htdocs/langs/fr_FR/blockedlog.lang b/htdocs/langs/fr_FR/blockedlog.lang
index 2588df90cee..c0619d33371 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 # précédent existe).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=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/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 6ea67258a45..fa3f3098389 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Ajouter cet article
 RestartSelling=Reprendre la vente
 SellFinished=Vente complète
 PrintTicket=Imprimer ticket
+SendTicket=Envoyer le ticket
 NoProductFound=Aucun article trouvé
 ProductFound=produit trouvé
 NoArticle=Aucun article
@@ -48,6 +49,7 @@ Footer=Bas de page
 AmountAtEndOfPeriod=Montant en fin de période (jour, mois ou année)
 TheoricalAmount=Montant théorique
 RealAmount=Montant réel
+CashFence=Cash fence
 CashFenceDone=Clôture de caisse faite pour la période
 NbOfInvoices=Nb de factures
 Paymentnumpad=Type de pavé pour entrer le paiement
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS a besoin des catégories de produits pour fonctio
 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
-TicketVatGrouped=Grouper la TVA par taux sur les tickets
-AutoPrintTickets=Imprimer automatiquement les tickets
+TicketVatGrouped=Grouper la TVA par taux sur les tickets / reçus
+AutoPrintTickets=Imprimer automatiquement les tickets / reçus
+PrintCustomerOnReceipts=Imprimer le client sur les tickets|reçus
 EnableBarOrRestaurantFeatures=Activer les fonctionnalités pour bar ou restaurant
 ConfirmDeletionOfThisPOSSale=Confirmez-vous la suppression de cette vente en cours?
 ConfirmDiscardOfThisPOSSale=Voulez-vous écarter cette vente en cours?
@@ -81,13 +84,25 @@ CustomReceipt=Reçu personnalisé
 ReceiptName=Nom du reçu
 ProductSupplements=Suppléments de produit
 SupplementCategory=Catégorie des suppléments
-ColorTheme=Color theme
+ColorTheme=Couleur du thème
 Colorful=Coloré
-HeadBar=Head Bar
-SortProductField=Field for sorting products
+HeadBar=Bandeau du haut
+SortProductField=Champ de tri des produits
 Browser=Navigateur
-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 de cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
+BrowserMethodDescription=Impression simple et facile des reçus. Seuls quelques paramètres pour configurer le reçu. Impression via le navigateur.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the 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.
+ByTerminal=Par terminal
+TakeposNumpadUsePaymentIcon=Utiliser l'icône de paiement sur le pavé numérique
+CashDeskRefNumberingModules=Module de numérotation pour le POS
+CashDeskGenericMaskCodes6 = <br>La balise <b> {TN} </b> est utilisée pour ajouter le numéro de terminal
+TakeposGroupSameProduct=Regrouper les mêmes lignes de produits
+StartAParallelSale=Lancer une nouvelle vente en parallèle
+ControlCashOpening=Popup d'ouverture de caisse à l'ouverture
+CloseCashFence=Clôturer la caisse
+CashReport=Rapport de caisse
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 9945859c16b..850f1e99263 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=La société "%s" a été supprimée de la base.
 ListOfContacts=Liste des contacts
 ListOfContactsAddresses=Liste des contacts/adresses
 ListOfThirdParties=Liste des tiers
-ShowCompany=Afficher tiers
 ShowContact=Afficher contact
 ContactsAllShort=Tous (pas de filtre)
 ContactType=Type de contact
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Prénom du commercial
 SaleRepresentativeLastname=Nom du commercial
 ErrorThirdpartiesMerge=Une erreur est survenue lors de la suppression de ce tiers. Consultez les log. La modification a été annulée.
 NewCustomerSupplierCodeProposed=Code client ou fournisseur déjà utilisé, un nouveau code est suggéré
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Type de paiement - Client
 PaymentTermsCustomer=Conditions de paiement - Client
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 8252a1cb29f..c60c79513c5 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Voir %sanalyse des paiements%s pour un calcul sur les
 SeeReportInDueDebtMode=Voir %sanalyse des factures%s pour un calcul basé sur les factures enregistrées connues même si elles ne sont pas encore comptabilisées dans le Grand Livre.
 SeeReportInBookkeepingMode=Voir le <b> %sRapport sur le Grand Livre%s </b> pour un calcul sur les <b> tables du Grand Livre</b>
 RulesAmountWithTaxIncluded=- Les montants affichés sont les montants taxe incluse
-RulesResultDue=- Il comprend les factures impayées, les dépenses, la TVA, les dons, qu'ils soient payées ou non. Il comprend également les salaires versés. <br> - Il est basé sur la date de validation des factures et de la TVA et à la date prévue pour les dépenses. Pour les salaires définis avec le module de salaire, la date de paiement de la valeur est utilisée.
+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=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires. <br> - Il est basé sur les dates de paiement des factures, les dépenses, la TVA et les salaires. La date du don pour le don.
-RulesCADue=- Il inclut les factures clients dues, qu'elles soient payées ou non.<br>- Il se base sur la date de validation de ces factures.<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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Chiffre d'affaire facturé par taux de TVA
 TurnoverCollectedbyVatrate=Chiffre d'affaires encaissé par taux de TVA
 PurchasebyVatrate=Achat par taux de TVA
 LabelToShow=Libellé court
+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
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 267364de216..6fdaed0fe48 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -59,6 +59,7 @@ 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.
 ErrorFileSizeTooLarge=La taille du fichier est trop grande.
+ErrorFieldTooLong=Le champ %s est trop long.
 ErrorSizeTooLongForIntType=Longueur de champ trop longue pour le type int (%s chiffres maximum)
 ErrorSizeTooLongForVarcharType=Longueur de champ trop longue pour le type chaine (%s caractères maximum)
 ErrorNoValueForSelectType=Les valeurs de la liste de sélection doivent être renseignées
@@ -96,7 +97,7 @@ ErrorBadMaskFailedToLocatePosOfSequence=Erreur, masque sans numéro de séquence
 ErrorBadMaskBadRazMonth=Erreur, mauvais valeur de remise à zéro
 ErrorMaxNumberReachForThisMask=Nombre maximum atteint pour ce masque
 ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir au moins 3 positions
-ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorSelectAtLeastOne=Erreur, sélectionnez au moins une entrée.
 ErrorDeleteNotPossibleLineIsConsolidated=Suppression impossible car l'enregistrement porte sur au moins une transaction bancaire rapprochée
 ErrorProdIdAlreadyExist=%s est attribué à un autre tiers
 ErrorFailedToSendPassword=Échec de l'envoi du mot de passe
@@ -117,9 +118,9 @@ ErrorLoginDoesNotExists=Le compte utilisateur identifié par <b>%s</b> n'a pu ê
 ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'email. Impossible de continuer.
 ErrorBadValueForCode=Mauvaise valeur saisie pour le code. Réessayez avec une nouvelle valeur...
 ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent être tous deux négatifs
-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 can't be negative for a given VAT rate.
-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=Le champ <strong> %s </strong> ne peut pas être négatif sur ce type de facture. Si vous devez ajouter une ligne de remise, créez d'abord la remise (à partir du champ '%s' dans la fiche du tiers) et appliquez-la à la facture.
+ErrorLinesCantBeNegativeForOneVATRate=Le total des lignes ne peut pas être négatif pour un taux de TVA donné.
+ErrorLinesCantBeNegativeOnDeposits=Les lignes ne peuvent pas être négatives dans un acompte. Si vous le faites, vous rencontrerez des problèmes lorsque vous devrez consommer l'acompte dans la facture finale.
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantité d'une ligne ne peut pas être négative dans les factures clients 
 ErrorWebServerUserHasNotPermission=Le compte d'exécution du serveur web <b>%s</b> n'a pas les permissions pour cela
 ErrorNoActivatedBarcode=Aucun type de code-barres activé
@@ -229,12 +230,13 @@ ErrorFieldRequiredForProduct=Le champ '%s' est obligatoire pour le produit %s
 ProblemIsInSetupOfTerminal=Le problème est dans la configuration du terminal %s.
 ErrorAddAtLeastOneLineFirst=Ajouter d'abord au moins une ligne
 ErrorRecordAlreadyInAccountingDeletionNotPossible=Erreur, l'enregistrement est déjà transféré dans la comptabilité, la suppression n'est pas 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 user 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 ?
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Erreur, la langue est obligatoire si vous définissez la page comme une traduction d'une autre.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Erreur, la langue de la page traduite est la même que celle-ci.
+ErrorBatchNoFoundForProductInWarehouse=Aucun lot / série trouvé pour le produit "%s" dans l'entrepôt "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Pas assez de quantité pour ce lot / série pour le produit "%s" dans l'entrepôt "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=1 seul champ pour le 'Grouper par' est possible (les autres sont supprimés)
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index af9016d25c6..9e0084ef7e4 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=PHP supporte l'extension Curl
 PHPSupportCalendar=Ce PHP supporte les extensions calendar.
 PHPSupportUTF8=Ce PHP prend en charge les fonctions UTF8.
 PHPSupportIntl=Ce PHP supporte les fonctions Intl.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Ce PHP prend en charge les fonctions %s.
 PHPMemoryOK=Votre mémoire maximum de session PHP est définie à <b>%s</b>. Ceci devrait être suffisant.
 PHPMemoryTooLow=Votre mémoire maximum de session PHP est définie à <b>%s</b> octets. Ceci est trop faible. Il est recommandé de modifier le paramètre <b>memory_limit</b> de votre fichier <b>php.ini</b> à au moins <b>%s</b> octets.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Votre version de PHP ne supporte pas l'extension Curl
 ErrorPHPDoesNotSupportCalendar=Votre installation de PHP ne supporte pas les extensions php calendar.
 ErrorPHPDoesNotSupportUTF8=Ce PHP ne prend pas en charge les fonctions UTF8. Résolvez le problème avant d'installer Dolibarr car il ne pourra pas fonctionner correctement.
 ErrorPHPDoesNotSupportIntl=Votre installation de PHP ne supporte pas les fonctions Intl.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Votre installation PHP ne prend pas en charge les fonctions %s.
 ErrorDirDoesNotExists=Le répertoire <b>%s</b> n'existe pas ou n'est pas accessible.
 ErrorGoBackAndCorrectParameters=Revenez en arrière et vérifiez / corrigez les paramètres.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=L'application essaie de se mettre à jour, mais l
 YouTryInstallDisabledByFileLock=L'application a tenté de se mettre à niveau automatiquement, mais les pages d'installation / de mise à niveau ont été désactivées pour des raisons de sécurité (grâce à l'existence d'un fichier de verrouillage <strong> install.lock </strong> dans le répertoire de documents dolibarr). <br>
 ClickHereToGoToApp=Cliquez ici pour aller sur votre application
 ClickOnLinkOrRemoveManualy=Cliquez sur le lien suivant et si vous atteignez toujours cette page, vous devez supprimer manuellement le fichier install.lock dans le répertoire documents
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/fr_FR/link.lang b/htdocs/langs/fr_FR/link.lang
index 8257300ada2..4534b8420e7 100644
--- a/htdocs/langs/fr_FR/link.lang
+++ b/htdocs/langs/fr_FR/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Le lien %s a été supprimé
 ErrorFailedToDeleteLink= Impossible de supprimer le lien '<b>%s</b>'
 ErrorFailedToUpdateLink= Impossible de modifier le lien '<b>%s</b>'
 URLToLink=URL à lier
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 178b3dd421d..59999521019 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -25,7 +25,7 @@ ShowEMailing=Afficher emailing
 ListOfEMailings=Liste des emailings
 NewMailing=Nouvel emailing
 EditMailing=Éditer emailing
-ResetMailing=Nouvel envoi
+ResetMailing=Ré-envoyer emailing
 DeleteMailing=Supprimer emailing
 DeleteAMailing=Supprimer un emailing
 PreviewMailing=Prévisualiser emailing
@@ -132,7 +132,7 @@ AddNewNotification=Activer un nouveau couple cible/évènement pour notification
 ListOfActiveNotifications=Liste des cibles/évènements actifs pour notification par emails
 ListOfNotificationsDone=Liste des notifications emails envoyées
 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 accéder à la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email 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.
 YouCanAlsoUseSupervisorKeyword=Vous pouvez également ajouter le mot-clé <strong>__SUPERVISOREMAIL__</strong> pour avoir les emails envoyés au responsable hiérarchique de l'utilisateur (ne fonctionne que si un email est défini pour ce responsable)
 NbOfTargetedContacts=Nombre courant d'emails de contacts cibles
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Pas de contact/adresses avec cette catégorie
 NoContactLinkedToThirdpartieWithCategoryFound=Pas de contact/adresses associés à un ters avec cette catégorie
 OutGoingEmailSetup=Configuration email sortant
 InGoingEmailSetup=Configuration email entrant
-OutGoingEmailSetupForEmailing=Configuration des e-mail sortant (pour les e-mails de masse)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Configuration des emails sortant
 Information=Information
 ContactsWithThirdpartyFilter=Contacts ayant pour tiers
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index d3f86678f25..611d27d7723 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Enregistrer et rester
 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 :
 NoCloneOptionsSpecified=Aucun option de clonage n'a été spécifiée.
 Of=du
@@ -352,8 +353,8 @@ PriceUTTC=P.U TTC
 Amount=Montant
 AmountInvoice=Montant facture
 AmountInvoiced=Montant facturé
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Montant facturé (TTC)
+AmountInvoicedTTC=Montant facturé (HT)
 AmountPayment=Montant paiement
 AmountHTShort=Montant HT
 AmountTTCShort=Montant TTC
@@ -829,6 +830,8 @@ Gender=Genre
 Genderman=Homme
 Genderwoman=Femme
 ViewList=Vue liste
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obligatoire
 Hello=Bonjour
 GoodBye=Au revoir
@@ -856,7 +859,7 @@ Export=Exporter
 Exports=Exports
 ExportFilteredList=Exporter liste filtrée
 ExportList=Exporter liste
-ExportOptions=Options d'exportation
+ExportOptions=Options d'export
 IncludeDocsAlreadyExported=Inclure les documents déjà exportés
 ExportOfPiecesAlreadyExportedIsEnable=L'exportation de pièces déjà exportées est activée
 ExportOfPiecesAlreadyExportedIsDisable=L'exportation des pièces déjà exportées est désactivée
@@ -884,7 +887,7 @@ WebSiteAccounts=Comptes de site web
 ExpenseReport=Note de frais
 ExpenseReports=Notes de frais
 HR=HR
-HRAndBank=HR et banque
+HRAndBank=Salarié
 AutomaticallyCalculated=Calculé automatiquement
 TitleSetToDraft=Retour à l'état de brouillon
 ConfirmSetToDraft=Etes vous sûr de vouloir revenir à l'état Brouillon ?
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Sélectionnez vos options de graphique pour construi
 Measures=Mesures
 XAxis=Axe X
 YAxis=Axe Y
+StatusOfRefMustBe=Le statut de %s doit être %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index e1a9a124f7e..022e9f0207e 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -30,11 +30,11 @@ PreviousYearOfInvoice=Année précédente de la date de facturation
 NextYearOfInvoice=Année suivante de la date de facturation
 DateNextInvoiceBeforeGen=Date de la prochaine génération (avant génération)
 DateNextInvoiceAfterGen=Date de la prochaine facture (après génération)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+GraphInBarsAreLimitedToNMeasures=Les graphiques sont limités à %s mesures en mode 'Bars'. Le mode "Lignes" a été automatiquement sélectionné à la place.
 OnlyOneFieldForXAxisIsPossible=1 seul champ est actuellement possible en tant qu'axe X. Seul le premier champ sélectionné a été choisi.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-
+AtLeastOneMeasureIsRequired=Au moins 1 champ de mesure est requis
+AtLeastOneXAxisIsRequired=Au moins 1 champ pour l'axe X est requis
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=Validation commande client
 Notify_ORDER_SENTBYMAIL=Envoi commande client par email
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envoi commande fournisseur par email
@@ -108,7 +108,7 @@ DemoFundation=Gestion des adhérents d'une association
 DemoFundation2=Gestion des adhérents et trésorerie d'une association
 DemoCompanyServiceOnly=Société ou indépendant faisant du service uniquement
 DemoCompanyShopWithCashDesk=Gestion d'un magasin avec caisse
-DemoCompanyProductAndStocks=Magasin de vente de produits avec point de vente
+DemoCompanyProductAndStocks=Magasin vendant des produits via points de vente
 DemoCompanyManufacturing=Société de fabrication de produits
 DemoCompanyAll=Société avec de multiples activités (tous les modules principaux)
 CreatedBy=Créé par %s
@@ -190,7 +190,7 @@ NumberOfSupplierProposals=Nombre de demandes de prix
 NumberOfSupplierOrders=Nombre de commandes fournisseurs
 NumberOfSupplierInvoices=Nombre de factures fournisseurs
 NumberOfContracts=Nombre de contrats
-NumberOfMos=Number of manufacturing orders
+NumberOfMos=Nombre d'ordres de fabrication
 NumberOfUnitsProposals=Quantités présentes dans les propositions commerciales
 NumberOfUnitsCustomerOrders=Quantités  présentes dans les commandes clients
 NumberOfUnitsCustomerInvoices=Quantités présentes dans les factures clients
@@ -198,7 +198,7 @@ NumberOfUnitsSupplierProposals=Quantités présentes dans les demande de prix
 NumberOfUnitsSupplierOrders=Quantités  présentes dans les commandes fournisseurs
 NumberOfUnitsSupplierInvoices=Quantités présentes dans les factures fournisseurs
 NumberOfUnitsContracts=Nombre d'unités en contrat
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
+NumberOfUnitsMos=Nombre d'unités à produire dans les ordres de fabrication
 EMailTextInterventionAddedContact=Une nouvelle intervention %s vous a été assignée
 EMailTextInterventionValidated=La fiche intervention %s vous concernant a été validée.
 EMailTextInvoiceValidated=La facture %s vous concernant a été validée.
@@ -274,13 +274,13 @@ WEBSITE_PAGEURL=URL de la page
 WEBSITE_TITLE=Titre
 WEBSITE_DESCRIPTION=Description
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Chemin relatif du média image. Vous pouvez garder ce champ vide car il est rarement utilisé (cela peut être utilisé par du contenu dynamique pour afficher un aperçu de page de type "blog_post"). Utilisez la chaine __WEBSITEKEY__ dans le chemin si le chemin dépend du nom du site web.
+WEBSITE_IMAGEDesc=Chemin relatif du média image. Vous pouvez garder ce champ vide car il est rarement utilisé (cela peut être utilisé par du contenu dynamique pour afficher un aperçu de page de type "blog_post"). Utilisez la chaîne __WEBSITE_KEY__ dans le chemin si le chemin dépend du nom du site web (for example: image/__WEBSITE_KEY__/stories/myimage.png).
 WEBSITE_KEYWORDS=Mots clés
 LinesToImport=Lignes à importer
 
 MemoryUsage=Utilisation de la mémoire
 RequestDuration=Durée de la demande
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
+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
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 02e4378f24d..9219eb2d1cd 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Cette page permet de modifier les taux de TVA définis
 MassBarcodeInit=Initialisation codes-barre
 MassBarcodeInitDesc=Cette page peut être utilisée pour initialiser un code-barre sur des objets qui ne disposent pas de code-barre défini. Vérifiez avant que l'installation du module code-barres est complète.
 ProductAccountancyBuyCode=Code comptable (achat)
+ProductAccountancyBuyIntraCode=Code comptable (achat intra-communautaire)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Code comptable (vente)
 ProductAccountancySellIntraCode=Code comptable (vente intra-communautaire)
 ProductAccountancySellExportCode=Code comptable (vente à l'export)
@@ -165,7 +167,7 @@ SuppliersPrices=Prix fournisseurs
 SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
 CustomCode=Nomenclature douanière / Code SH
 CountryOrigin=Pays d'origine
-Nature=Nature du produit (matière première / produit fini)
+Nature=Nature of product (material/finished)
 ShortLabel=Libellé court
 Unit=Unité
 p=u.
@@ -331,9 +333,9 @@ PossibleValues=Valeurs possibles
 GoOnMenuToCreateVairants=Allez sur le menu %s - %s pour ajouter les attributs de variantes (comme les couleurs, tailles, ...)
 UseProductFournDesc=Ajouter une fonctionnalité pour définir les descriptions des produits définies par les fournisseurs en plus des descriptions pour les clients
 ProductSupplierDescription=Description du fournisseur du produit
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductSupplierPackaging=Utiliser le conditionnement/emballage sur les prix fournisseur (recalculer les quantités en fonction de l'emballage défini sur le prix fournisseur lors de l'ajout / mise à jour de la ligne dans les documents fournisseurs)
+PackagingForThisProduct=Emballage
+QtyRecalculatedWithPackaging=La quantité de la ligne a été recalculée en fonction de l'emballage du fournisseur
 
 #Attributes
 VariantAttributes=Attributs de variante
@@ -367,7 +369,7 @@ UsePercentageVariations=Utiliser les pourcentages de variation
 PercentageVariation=Variation de pourcentage
 ErrorDeletingGeneratedProducts=Une erreur s'est produite lors de la suppression des variantes existante de produits
 NbOfDifferentValues=Nb de valeurs différentes
-NbProducts=Number of products
+NbProducts=Nb de produits
 ParentProduct=Produit parent
 HideChildProducts=Cacher les variantes de produits
 ShowChildProducts=Afficher les variantes de produits
@@ -380,4 +382,4 @@ ErrorProductCombinationNotFound=Variante du produit non trouvé
 ActionAvailableOnVariantProductOnly=Action disponible uniquement sur la variante du produit
 ProductsPricePerCustomer=Prix produit par clients
 ProductSupplierExtraFields=Attributs supplémentaires (Prix fournisseur)
-DeleteLinkedProduct=Delete the child product linked to the combination
+DeleteLinkedProduct=Supprimer le produit enfant lié à la combinaison
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 92a1bc069a5..21ad286ff51 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -39,8 +39,8 @@ ShowProject=Afficher projet
 ShowTask=Afficher tâche
 SetProject=Définir projet
 NoProject=Aucun projet défini ou responsable
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Nombre de projets
+NbOfTasks=Nb de tâches
 TimeSpent=Temps consommé
 TimeSpentByYou=Temps consommé par vous
 TimeSpentByUser=Temps consommé par utilisateur
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=dont je suis contact de projet
 Time=Temps
 ListOfTasks=Liste de tâches
 GoToListOfTimeConsumed=Aller à la liste des temps consommés
-GoToListOfTasks=Vue liste
-GoToGanttView=Vue Gantt
 GanttView=Vue Gantt
 ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
 ListOrdersAssociatedProject=Liste des commandes clients associées au projet
@@ -104,7 +102,7 @@ ListDonationsAssociatedProject=Liste des dons associés au projet
 ListVariousPaymentsAssociatedProject=Liste des paiements divers liés au projet
 ListSalariesAssociatedProject=Liste des paiements de salaires liés au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
-ListMOAssociatedProject=List of manufacturing orders related to the project
+ListMOAssociatedProject=Liste des ordres de fabrication liées au projet
 ListTaskTimeUserProject=Liste du temps consommé sur les tâches d'un projet
 ListTaskTimeForTask=Liste du temps consommé sur les tâches
 ActivityOnProjectToday=Activité projet aujourd'hui
@@ -164,8 +162,8 @@ OpportunityProbability=Probabilité d'opportunité
 OpportunityProbabilityShort=Prob. opp.
 OpportunityAmount=Montant opportunité
 OpportunityAmountShort=Montant opportunité
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityWeightedAmount=Montant pondéré par opportunité
+OpportunityWeightedAmountShort=Montant pondéré opp.
 OpportunityAmountAverageShort=montant moyen des opportunités
 OpportunityAmountWeigthedShort=Montant pondéré des opportunités
 WonLostExcluded=hors opportunités remportées/perdues
@@ -188,7 +186,7 @@ PlannedWorkload=Charge de travail prévue
 PlannedWorkloadShort=Charge de travail
 ProjectReferers=Objets associés
 ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
-FirstAddRessourceToAllocateTime=Affecter un utilisateur pour saisir des temps
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Saisie par jour
 InputPerWeek=Saisie par semaine
 InputPerMonth=Saisie par mois
@@ -240,6 +238,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 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
@@ -265,3 +264,4 @@ InvoiceToUse=Facture brouillon à utiliser
 NewInvoice=Nouvelle facture
 OneLinePerTask=Une ligne par tâche
 OneLinePerPeriod=Une ligne par période
+RefTaskParent=Réf. Tâche parent
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index d9e40866689..4cdb1b05cb3 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -76,7 +76,7 @@ TypeContact_propal_external_BILLING=Contact client facturation proposition
 TypeContact_propal_external_CUSTOMER=Contact client suivi proposition
 TypeContact_propal_external_SHIPPING=Contact client pour la livraison
 # Document models
-DocModelAzurDescription=Un modèle de proposition complet (ancienne implémentation du modèle Cyan)
+DocModelAzurDescription=Un modèle de proposition complet 
 DocModelCyanDescription=Un modèle de proposition complet
 DefaultModelPropalCreate=Modèle par défaut à la création
 DefaultModelPropalToBill=Modèle par défaut lors de la clôture d'une proposition commerciale (à facturer)
diff --git a/htdocs/langs/fr_FR/receiptprinter.lang b/htdocs/langs/fr_FR/receiptprinter.lang
index 23970db5ed7..8ed2664fa67 100644
--- a/htdocs/langs/fr_FR/receiptprinter.lang
+++ b/htdocs/langs/fr_FR/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Imprimante Test
 CONNECTOR_NETWORK_PRINT=Imprimante réseau
 CONNECTOR_FILE_PRINT=Imprimante locale
 CONNECTOR_WINDOWS_PRINT=Imprimante Windows local
+CONNECTOR_CUPS_PRINT=Imprimante Cups
 CONNECTOR_DUMMY_HELP=Fausse imprimante pour le test, ne fait rien
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=Nom de l'imprimante CUPS, exemple: HPRT_TP805L
 PROFILE_DEFAULT=Profil par défaut
 PROFILE_SIMPLE=Profil standard
 PROFILE_EPOSTEP=Profil Epos Tep
@@ -55,9 +57,39 @@ DOL_UNDERLINE_DISABLED=Désactiver le souligné
 DOL_BEEP=Bruit de fond
 DOL_PRINT_TEXT=Imprimer le texte
 DOL_VALUE_DATE=Date facturation
-DOL_VALUE_DATE_TIME=Invoice date and time
-DOL_VALUE_YEAR=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_VALUE_DATE_TIME=Date et heure de facturation
+DOL_VALUE_YEAR=Année de facturation
+DOL_VALUE_MONTH_LETTERS=Mois de facturation en lettres
+DOL_VALUE_MONTH=Mois de facturation
+DOL_VALUE_DAY=Jour de facturation
+DOL_VALUE_DAY_LETTERS=Jour de facturation en lettres
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Réf facture
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Numéro de TVA intracommunautaire
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index 27c220f7ec5..57b5c7e29ca 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Nom du vendeur
 CSSUrlForPaymentForm=URL feuille style css pour le formulaire de paiement
 NewStripePaymentReceived=Nouveau paiement Stripe reçu
 NewStripePaymentFailed=Nouveau paiement Stripe tenté mais en échec
+FailedToChargeCard=Échec d'encaissement de la carte
 STRIPE_TEST_SECRET_KEY=Clé secrète de test 
 STRIPE_TEST_PUBLISHABLE_KEY=Clé plublique de test
 STRIPE_TEST_WEBHOOK_KEY=Clé test des Webhooks
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Lien pour la configuration de Stripe WebHook pour app
 ToOfferALinkForLiveWebhook=Lien pour la configuration de Stripe WebHook pour appeler l'IPN (mode actif)
 PaymentWillBeRecordedForNextPeriod=Le paiement sera enregistré pour la prochaine période.
 ClickHereToTryAgain=<a href="%s">Cliquez ici pour essayer à nouveau...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 332306735cc..36c16959e50 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -70,7 +70,7 @@ 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 une client, fournisseur ou autre. <br><br>Dans les deux cas, les permissions déterminent les accès aux fonctionnalités de Dolibarr. 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.<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)
 PermissionInheritedFromAGroup=La permission est accordée car héritée d'un groupe auquel appartient l'utilisateur.
 Inherited=Hérité
 UserWillBeInternalUser=L'utilisateur créé sera un utilisateur interne (car non lié à un tiers en particulier)
@@ -110,3 +110,8 @@ UserLogged=Utilisateur connecté
 DateEmployment=Date d'embauche
 DateEmploymentEnd=Date de fin d'emploi
 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
+ValidatorIsSupervisorByDefault=Par défaut, le valideur est le responsable hiérarchique de l'utilisateur. Gardez vide pour conserver ce comportement.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 0ffa73a567c..ab903c9bc6a 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Pré-visualiser la page dans un nouvel onglet
 SetAsHomePage=Définir comme page d'accueil
 RealURL=URL réelle
 ViewWebsiteInProduction=Pré-visualiser le site web en utilisant l'URL de la page d'accueil
-SetHereVirtualHost=<u> Utilisation avec Apache/NGinx/...</u> <br> Si vous pouvez créer sur votre serveur Web (Apache, Nginx, ...) un hôte virtuel dédié avec PHP activé et un répertoire racine sur <br> <strong> %s </strong> <br> alors entrez le nom de l'hôte virtuel que vous avez créé dans les propriétés du site, ainsi l'aperçu pourra être fait en utilisant cette URL pour un accès via le serveur Web dédié plutôt que via le serveur interne Dolibarr.
+SetHereVirtualHost=<u> Utilisation avec Apache/NGinx/...</u> <br> Créez sur votre serveur Web (Apache, Nginx, ...) un hôte virtuel dédié avec PHP activé et un répertoire racine sur <br> <strong> %s </strong>
+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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Désolé, ce site est actuellement hors ligne. Me
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activer la table des comptes du site Web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activer la table pour stocker les comptes de site Web (login / pass) pour chaque site web / tiers
 YouMustDefineTheHomePage=Vous devez d'abord définir la page d'accueil par défaut
-OnlyEditionOfSourceForGrabbedContentFuture=Avertissement: La création d'une page Web en important une page Web externe est réservée à un utilisateur expérimenté. Selon la complexité de la page source, le résultat de l'importation peut différer une fois importé de l'original. De même, si la page source utilise un style CSS commun ou un code JavaScript non compatible, cela peut casser l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide d’avoir une page, mais il est recommandé de créer votre nouvelle page à partir de rien ou à partir d’un modèle de page suggéré. <br> Notez également que seule l’édition de la source HTML sera possible lorsqu’un contenu de page aura été initialisé par une capture d'une page externe (l'éditeur "en ligne" ne sera PAS disponible)
+OnlyEditionOfSourceForGrabbedContentFuture=Avertissement: La création d'une page Web en important une page Web externe est réservée aux utilisateurs expérimentés. Selon la complexité de la page source, le résultat de l'importation peut différer une fois importé de l'original. De même, si la page source utilise un style CSS en conflit ou un code JavaScript non compatible, cela peut casser l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide de créer une nouvelle page, mais il est recommandé de créer votre nouvelle page à partir de rien ou à partir d’un modèle de page suggéré. <br> Notez également que seule l’éditeur en ligne peut ne pas fonctionner correctement quand il est utilisé sur une page créée par aspiration.
 OnlyEditionOfSourceForGrabbedContent=Seule l'édition de source HTML est possible lorsque le contenu a été aspiré depuis un site externe
 GrabImagesInto=Aspirer aussi les images trouvées dans les css et la page.
 ImagesShouldBeSavedInto=Les images doivent être sauvegardées dans le répertoire
@@ -121,6 +122,9 @@ BackToHomePage=Retour à la page d'accueil...
 TranslationLinks=Liens de traduction
 YouTryToAccessToAFileThatIsNotAWebsitePage=Vous tentez d'accéder à une page qui n'est pas une page du site web
 UseTextBetween5And70Chars=Pour les bonnes pratiques de référencement, utilisez un texte de 5 à 70 caractères
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
+MainLanguage=Langage principal
+OtherLanguages=Autres langues
+UseManifest=Fournir un fichier manifest.json
+PublicAuthorAlias=Alias publique de l'auteur
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Les langues disponibles sont définies dans les propriétés du site Web
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 6f2a807d99a..854aae23e84 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=הערה: �ין גבול מוגדר בתצורת שלך PHP
 MaxSizeForUploadedFiles=הגודל המקסימלי של קבצי� ש�פשר להעלות (0 ל�סור על כל ההעל�ה)
 UseCaptchaCode=השתמש בקוד גרפי (CAPTCHA) בדף הכניסה
-AntiVirusCommand= הנתיב המל� ה�נטי וירוס הפקודה
-AntiVirusCommandExample= דוגמה ClamWin: c: \\ progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe <br> דוגמה ClamAV: / usr / bin / clamscan
+AntiVirusCommand=הנתיב המל� ה�נטי וירוס הפקודה
+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= פרמטרי� נוספי� על שורת הפקודה
-AntiVirusParamExample= דוגמה עבור ClamWin: - מסד נתוני� = &quot;C: \\ קבצי תוכניות (x86) \\ ClamWin \\ lib&quot;
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=מודול הנהלת חשבונות ההתקנה
 UserSetup=התקנה וניהול של המשתמש
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ 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.
 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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=הפעל על
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=�זורי�
 DictionaryCountry=מדינות
 DictionaryCurrency=מטבעות
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=שיעורי מע&quot;מ �ו מכירות שיעורי מס
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=כברירת מחדל IRPF המוצע הו� 0. קץ שלטון.
 LocalTax2IsUsedExampleES=בספרד, פרילנסרי� ובעלי מקצוע עצמ�יי� המספקי� שירותי� וחברות �שר בחרו במערכת המס של מודולי�.
 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 des 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
@@ -1018,6 +1025,7 @@ 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=לייבל שימוש כברירת מחדל �� ל� התרגו� ניתן למצו� �ת קוד
 LabelOnDocuments=התווית על מסמכי�
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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=ביקורת �בטחה �ירועי�
 Audit=ביקורת
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=משתמשי� מודול ההתקנה
 UserMailRequired=Email required to create a new user
+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 #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=חשבוניות ומסמכי� מודלי�
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=להכריח �ת ת�ריך החשבונית עד כה �ימות
-SuggestedPaymentModesIfNotDefinedInInvoice=תשלומי� שהציע מצב בחשבונית כברירת מחדל, �� ל� הוגדרו עבור חשבונית
+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=טקסט חופשי על חשבוניות
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=מודול הצעות מסחרי ההתקנה
 ProposalsNumberingModules=הצעה מסחרית המונה מודולי�
 ProposalsPDFModules=מסמכי ההצעה מודלי� מסחריי�
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות
 WatermarkOnDraftProposal=סימן מי� על הצעות טיוטה מסחריי� (כל �� ריק)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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=הזמנות מספור מודולי�
 OrdersModelModule=מסמכי� הזמנת דגמי�
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index f5cef2fe190..758cad0418b 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/he_IL/blockedlog.lang b/htdocs/langs/he_IL/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/he_IL/blockedlog.lang
+++ b/htdocs/langs/he_IL/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 211154918de..d1fd7b33150 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 8fe6ed3f84e..26a5eb3958e 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 6a854e6fa80..bea3663aff1 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index 637f67fbab7..42f8f5149de 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/he_IL/link.lang b/htdocs/langs/he_IL/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/he_IL/link.lang
+++ b/htdocs/langs/he_IL/link.lang
@@ -8,3 +8,4 @@ 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/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 97db492d7e8..6da35178dd2 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index b4865808ee6..caa57ce5e5a 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index f6e81db4cc1..580d977179a 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=ת�ור
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 3e5d6cac9c1..f883b0823e1 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index be41a714872..dd2e3b9d0f2 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/he_IL/receiptprinter.lang b/htdocs/langs/he_IL/receiptprinter.lang
index 3df49b9fe67..896eaa313dd 100644
--- a/htdocs/langs/he_IL/receiptprinter.lang
+++ b/htdocs/langs/he_IL/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/he_IL/stripe.lang b/htdocs/langs/he_IL/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/he_IL/stripe.lang
+++ b/htdocs/langs/he_IL/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index 990140b3232..107e604ded1 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 00393affd11..b8fe65b6f57 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Napomena: Limit nije podešen u vašoj PHP konfiguraciji
 MaxSizeForUploadedFiles=Maksimalna veli�ina datoteka za upload (0 onemogu�uje bilokakav upload)
 UseCaptchaCode=Koristi grafi�ki kod (CAPTCHA) na stranici za prijavu
-AntiVirusCommand= Puna putanja do antivirusne komande
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Puna putanja do antivirusne komande
+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= Dodatni parametri za komandnu liniju
-AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Podešavanje modula ra�unovodstva
 UserSetup=Podešavanje upravljanja korisnicima
 MultiCurrencySetup=Podešavanje više valuta
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Mogućnost onemogućena u demo verziji
 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=Prikazani su samo elementi sa  <a href="%s">omogu�enih modula</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 (at end of module line) to enable/disable a module/application.
+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=Možete pronaći više modula za download na vanjskim internet web lokacijama 
 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=Nađi vanjske aplikacije/module
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=External websites for more add-on (non-core) modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Dostupni dodaci
 BoxesActivated=Aktivirani dodaci
 ActivateOn=Aktiviraj na
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Ostavite prazno za zadane vrijednosti
 DefaultLink=Default link
 SetAsDefault=Postavi kao zadano
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=Vanjski modul - Instaliran u mapi %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Masovno postavljanje ili promjena barkodova usluga i proizvoda
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regije
 DictionaryCountry=Zemlje
 DictionaryCurrency=Valute
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Tipovi događaja agende
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Stope PDV-a ili stope prodajnih poreza
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Stopa
 LocalTax1IsNotUsed=Nemoj koristit drugi porez
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Kao zadano preporu�eni IRPF je 0. Kraj prvila.
 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 des 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=Izvještaji o lokalnim porezima
 CalcLocaltax1=Prodaja - Nabava
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Nabava
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=Prodaja
 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=Oznake korištene kao zadane ako ne postoji prijevoda za kod
 LabelOnDocuments=Oznake na dokumentima
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Revizija
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Podešavanje modula korisnka
 UserMailRequired=Email required to create a new user
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Podešavanje modula HRM
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Model dokumenata ra�una
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Forsiraj datum ra�una kao datum ovjere
-SuggestedPaymentModesIfNotDefinedInInvoice=Predloženi na�in pla�anja na ra�unu kao zadano ako nije definirano za ra�un
+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=Slobodan unos teksta na ra�unu
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=Podešavanje modula ponuda
 ProposalsNumberingModules=Modeli brojeva ponuda
 ProposalsPDFModules=Modeli dokumenta ponuda
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Slobodan unos teksta na ponudi
 WatermarkOnDraftProposal=Vodeni žig na skici ponude (ako nije prazno)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Traži odredišni bankovni ra�un ponude
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Upitaj za izvorno skladište za narudžbe
 ##### 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=Postavke upravljanja narudžbenicama
 OrdersNumberingModules=Na�in ozna�avanja narudžba
 OrdersModelModule=Model dokumenata narudžba
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 6783733932e..5631061f309 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Ulazni ra�uni
 SupplierBill=Ulazni ra�un
 SupplierBills=Ulazni ra�uni
 Payment=Plaćanja
-PaymentBack=Isplata
-CustomerInvoicePaymentBack=Isplata
+PaymentBack=Povrat
+CustomerInvoicePaymentBack=Povrat
 Payments=Plaćanja
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=u valuti ra�una
 PaidBack=Uplaćeno natrag
 DeletePayment=Izbriši plaćanje
 ConfirmDeletePayment=Sigurno želite izbrisati ovo plaćanje?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Primljene uplate
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Prikaži ra�un etape
 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
@@ -509,11 +512,11 @@ ToMakePayment=Plati
 ToMakePaymentBack=Povrat
 ListOfYourUnpaidInvoices=Popis neplaćenih ra�una
 NoteListOfYourUnpaidInvoices=Napomena: Ovaj popis sadrži samo ra�une za komitente kojima ste vi prodajni predstavnik
-RevenueStamp=Prihodovna markica
+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=Kako biste izradili novi predložak ra�una morate prvo izraditi obi�an ra�un i onda ga promijeniti u "predložak"
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Ra�un obrisan
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/hr_HR/blockedlog.lang b/htdocs/langs/hr_HR/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/hr_HR/blockedlog.lang
+++ b/htdocs/langs/hr_HR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index 200a99c3d40..efcc63b0adc 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Dodaj ovu stavku
 RestartSelling=Povratak na prodaju
 SellFinished=Sale complete
 PrintTicket=Ispis ra�una
+SendTicket=Send ticket
 NoProductFound=Stavka nije pronađena
 ProductFound=Proizvod pronađen
 NoArticle=Nema stavke
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Broj ra�una
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 691cbe562de..7606871ab5c 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Tvrtka "%s" izbrisana iz baze.
 ListOfContacts=Popis kontakata/adresa
 ListOfContactsAddresses=Popis kontakata/adresa
 ListOfThirdParties=Popis trećih osoba
-ShowCompany=Show Third Party
 ShowContact=Prikaži kontakt
 ContactsAllShort=Sve(bez filtera)
 ContactType=Vrsta kontakta
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Ime prodajnog predstavnika
 SaleRepresentativeLastname=Prezime prodajnog predstavnika
 ErrorThirdpartiesMerge=Došlo je do greške tijekom brisanja treće osobe. Molim provjerite zapis. Izmjene su povraćene.
 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=Rok plaćanja - kupac
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 897da7b6b27..ba2536a8dba 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=Prikazani iznosi su sa uklju�enim svim porezima
-RulesResultDue=- Uklju�uje nepla�ene ra�une, troškove, PDV, donacije bez obzira da li su plaćene ili ne. Također uklju�uje ispla�ene plaće.<br>- Baziran je na datumu ovjere ra�una i PDV i po datumu dospjeća troškova. Za plaće definirane sa modulom Plaća, koristi se vrijednost datuma isplate.
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Uklju�uje stvarne uplate po ra�unima, troškove, PDV i plaće. <br>- Baziran je po datumu plaćanja ra�una, troškova, PDV-a i plaćama. Datum donacje za donacije.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=Kratka oznaka
+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
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 7c474631e5d..d6fc3f95da2 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index 35ae3c62b90..763892bfb5f 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/hr_HR/link.lang b/htdocs/langs/hr_HR/link.lang
index 9e5eb0d2868..ee140b37440 100644
--- a/htdocs/langs/hr_HR/link.lang
+++ b/htdocs/langs/hr_HR/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Veza %s je obrisana
 ErrorFailedToDeleteLink= Neuspješno brisanje veze '<b>%s</b>'
 ErrorFailedToUpdateLink= Neuspješna promjena veze '<b>%s</b>'
 URLToLink=URL prema vezi
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 89ef9388cf4..6595e1154c2 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=EMailing
-EMailing=EMailing
-EMailings=EMailings
-AllEMailings=All eMailings
-MailCard=EMailing card
-MailRecipients=Recipients
+Mailing=elektroni�ka pošta
+EMailing=elektroni�ka pošta
+EMailings=elektroni�ka pošta
+AllEMailings=Sva elektroni�ka pošta
+MailCard=Kartica elektroni�ke pošte
+MailRecipients=Primatelji
 MailRecipient=Primatelj
 MailTitle=Opis
 MailFrom=Pošiljatelj
-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
+MailErrorsTo=Pogreške
+MailReply=Odgovoriti na
+MailTo=Primatelj(i)
+MailToUsers=Korisnicima
+MailCC=Kopirajte u
+MailToCCUsers=Kopirajte korisniku(cima)
+MailCCC=Predmemorirana kopija u
 MailTopic=Email topic
 MailText=Poruka
 MailFile=Attached files
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Podatak
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 59aedeecba8..cbc8e21d8c2 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 SaveAndNew=Save and new
 TestConnection=Provjera veze
 ToClone=Kloniraj
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Izaberite podatke koje želite klonirati:
 NoCloneOptionsSpecified=Podaci za kloniranje nisu izabrani.
 Of=od
@@ -829,6 +830,8 @@ Gender=Spol
 Genderman=Muško
 Genderwoman=Žensko
 ViewList=Pregled popisa
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obavezno
 Hello=Pozdrav
 GoodBye=Doviđenja!
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index 55004de52bb..3c704a81c68 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -141,7 +141,7 @@ OrderByEMail=E-pošta
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEinsteinDescription=A complete order model 
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Jednostavan model narudžbe
 PDFProformaDescription=A complete Proforma invoice template
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 6b16495c105..eafd337d32b 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Naslov
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 87fa7195895..cea95c3fd23 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=Masovni init barkoda
 MassBarcodeInitDesc=Ova stranica se može koristiti za inicijalizaciju barkoda na objektima koji nemaju definiran barkod. Provjerite prije da li su postavke barcode modula podešene.
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Zemlja porijekla
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Kratka oznaka
 Unit=Jedinica
 p=j.
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 7bff5b50088..05b5aaff31a 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=projekt s kojim sam povezan
 Time=Vrijeme
 ListOfTasks=Popis zadataka
 GoToListOfTimeConsumed=Idi na popis utrošenog vremena
-GoToListOfTasks=Prikaži kao popis
-GoToGanttView=Prikaži kao gantogram (vremenski plan)
 GanttView=Gantogram
 ListProposalsAssociatedProject=Popis komercijalnih prijedloga vezanih za projekt
 ListOrdersAssociatedProject=Popis narudžbenica vezanih za projekt
@@ -188,7 +186,7 @@ PlannedWorkload=Planirano opterećenje
 PlannedWorkloadShort=Opterećenje
 ProjectReferers=Povezane stavke
 ProjectMustBeValidatedFirst=Projekt mora biti prvo ovjeren
-FirstAddRessourceToAllocateTime=Dodjeli korisnka u zadatak za alokaciju vremena
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Unos po danu
 InputPerWeek=Unos po tjednu
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=Najnoviji %s modificirani projekti
 OtherFilteredTasks=Ostali filtrirani zadaci
 NoAssignedTasks=Nisu pronađeni zadani zadaci (dodijelite projekt / zadatke trenutnom korisniku iz gornjeg okvira za odabir da biste unijeli vrijeme u njega)
 ThirdPartyRequiredToGenerateInvoice=Treća strana mora biti definirana na projektu kako bi mogli fakturirati.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Dopusti napomene korisnika na zadatke
 AllowCommentOnProject=Dopusti napomene korisnika na projekte
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Novi ra�un
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index f9f9edf6dab..ed134477f08 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -76,7 +76,7 @@ TypeContact_propal_external_BILLING=Kontakt osoba pri kupcu za ra�un
 TypeContact_propal_external_CUSTOMER=Kontakt osoba pri kupcu za ponudu
 TypeContact_propal_external_SHIPPING=Customer contact for delivery
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelAzurDescription=A complete proposal model 
 DocModelCyanDescription=A complete proposal model
 DefaultModelPropalCreate=Izrada osnovnog modela
 DefaultModelPropalToBill=Osnovni predložak prilikom zatvaranja poslovne ponude (za naplatu)
diff --git a/htdocs/langs/hr_HR/receiptprinter.lang b/htdocs/langs/hr_HR/receiptprinter.lang
index 7c8379f37af..02eea48a645 100644
--- a/htdocs/langs/hr_HR/receiptprinter.lang
+++ b/htdocs/langs/hr_HR/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy Printer
 CONNECTOR_NETWORK_PRINT=Mrežni pisa�
 CONNECTOR_FILE_PRINT=Lokalni pisa�
 CONNECTOR_WINDOWS_PRINT=Lokalni Windows pisa�
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Lažni pisa� za test, ne radi ništa
 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=Predefinirani profil
 PROFILE_SIMPLE=Jednostavan profil
 PROFILE_EPOSTEP=EPOS TEP profil
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Broj ra�una
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/hr_HR/stripe.lang b/htdocs/langs/hr_HR/stripe.lang
index 1bb6a024d47..1aeada94d38 100644
--- a/htdocs/langs/hr_HR/stripe.lang
+++ b/htdocs/langs/hr_HR/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Naziv pružatelja
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index 4adcbad88a9..cf47e5c7710 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Dozvola odobrena jer je nasljeđeno od jedne od korisni�kih grupa.
 Inherited=Nasljeđeno
 UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije vezan za određenog komitenta)
@@ -113,3 +113,5 @@ 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
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 66882d8ee7f..d7acd018105 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Pogledaj stranicu u novom tabu
 SetAsHomePage=Postavi kao po�etnu stranicu
 RealURL=Pravi URL
 ViewWebsiteInProduction=Pogledaj web lokaciju koristeći URL naslovnice
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index e01ebc06bc2..bc4e1be3552 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Megjegyzés:  az <b> Ön </b> PHP konfigurációjában j
 NoMaxSizeByPHPLimit=Megjegyzés: A PHP konfigurációban nincs beállítva korlátozás
 MaxSizeForUploadedFiles=A feltöltött fájlok maximális mérete (0 megtiltja a feltöltést)
 UseCaptchaCode=Grafikus kód (CAPTCHA) használata a bejelentkezési oldalon
-AntiVirusCommand= A vírusirtó parancs teljes elérési útvonala
-AntiVirusCommandExample= Példa ClamWin esetére: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe <br> Példa ClamAV esetére: /usr/bin/clamscan
+AntiVirusCommand=A vírusirtó parancs teljes elérési útvonala
+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= A parancssor további paraméterei
-AntiVirusParamExample= Példa ClamWin esetére: -database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Számviteli modul beállítása
 UserSetup=Felhasználói beállítások kezelése
 MultiCurrencySetup=Több valuta beállítása
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Demó módban kikapcsolva
 FeatureAvailableOnlyOnStable=A szolgáltatás csak a hivatalos stabil verziókban érhető el
 BoxesDesc=A modulok olyan összetevők, amelyek információkat mutatnak, s hozzáadhatóak az oldalak testreszabásához. Választhat úgy, hogy megjelenik-e a modul, vagy nem, ha kiválasztja a céloldalt és kattint az 'Aktiválás' gombra, vagy a kukára kattintva tilthatja le azt.
 OnlyActiveElementsAreShown=Csak a <a href="%s"> bekapcsolt modulok</a> elemei jelennek meg.
-ModulesDesc=A modulok / alkalmazások határozzák meg, hogy mely szolgáltatások érhetők el a szoftverben. Néhány modulhoz engedély szükséges a felhasználók számára a modul aktiválása után. Kattintson a be / ki gombra (a modul sor végén) a modul / alkalmazás engedélyezéséhez / letiltásához.
+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=Az interneten további modulokat találhat...
 ModulesDeployDesc=Ha a fájlrendszer engedélyei ezt lehetővé teszik, akkor ezt az eszközt használhatja egy külső modul telepítéséhez. A modul ezután a <strong>%s</strong> fülön lesz látható.
 ModulesMarketPlaces=Külső alkalmazások / modulok keresése
@@ -212,6 +212,7 @@ CompatibleUpTo=Kompatibilis a(z) %s verzióval
 NotCompatible=Ez a modul nem tűnik kompatibilisnek a Dolibarr %s verzióval (Min %s - Max %s).
 CompatibleAfterUpdate=Ehhez a modulhoz frissíteni kell a Dolibarr %s-t (Min %s - Max %s).
 SeeInMarkerPlace=Lásd a piactéren
+SeeSetupOfModule=Lásd a %s modul beállításait
 Updated=Frissítve
 Nouveauté=Újdonság
 AchatTelechargement=Vásárlás / Letöltés
@@ -221,6 +222,7 @@ DoliPartnersDesc=Az egyedi fejlesztésű modulokat vagy funkciókat kínáló c
 WebSiteDesc=Külső webhelyek további kiegészítő (nem alapvető) modulokhoz ...
 DevelopYourModuleDesc=Néhány javaslat a saját modul fejlesztésére ...
 URL=URL elérési út
+RelativeURL=Relative URL
 BoxesAvailable=Elérhető widgetek
 BoxesActivated=Aktivált widgetek
 ActivateOn=Aktiválás
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Az alapérték használatához hagyja üresen
 DefaultLink=Alapértelmezett hivatkozás
 SetAsDefault=Beállítás alapértelmezettként
 ValueOverwrittenByUserSetup=Figyelem, ezt az értéket a felhasználó-specifikus beállítás felülírhatja (minden felhasználó beállíthatja saját clicktodial URL-jét)
-ExternalModule=Külső modul - Telepítve a(z) %s könyvtárba
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Tömeges vonalkód készítése partnereknek
 BarcodeInitForProductsOrServices=A termékek vagy szolgáltatások tömeges vonalkód-indítása vagy visszaállítása
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
@@ -947,7 +950,7 @@ DictionaryCanton=�llamok / Tartományok
 DictionaryRegion=Régiók
 DictionaryCountry=Országok
 DictionaryCurrency=Pénznemek
-DictionaryCivility=Udvarias megszólítás
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=HÉA-kulcsok vagy Értékesítés adókulcsok
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Arány
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Alapértelmezésben a javasolt IRPF 0. Vége a szabály.
 LocalTax2IsUsedExampleES=Spanyolországban, szabadúszók és független szakemberek, akik szolgáltatásokat nyújtanak és a vállalatok akik úgy döntöttek, az adórendszer a modulok.
 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 des 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
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Beszerzések
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=Eladások
 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 az alap, ha nincs fordítás megtalálható a kód
 LabelOnDocuments=Címke dokumentumok
 LabelOrTranslationKey=Címke vagy fordítási kulcs
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Könyvvizsgálat
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Ha van külső könyvelője / könyvvizsgálója, itt szerkesztheti annak adatait.
 AccountantFileNumber=Könyvelői kód
 DisplayDesc=A Dolibarr kinézetét és viselkedését befolyásoló paraméterek itt módosíthatók.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=A jelszavak létrehozására és érvényesítésére
 DisableForgetPasswordLinkOnLogonPage=Ne jelenítse meg az "Elfelejtett jelszó" linket a Bejelentkezés oldalon
 UsersSetup=Felhasználók modul beállítása
 UserMailRequired=Új felhasználó létrehozásához e-mail szükséges
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=HRM modul beállításai
 ##### Company setup #####
@@ -1282,10 +1292,10 @@ CompanyIdProfChecker=Rules for Professional IDs
 MustBeUnique=Egyedinek kell lennie?
 MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
-TechnicalServicesProvided=Technical services provided
+TechnicalServicesProvided=Technikai szolgáltatások
 #####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
+WebDavServer=A(z) %s szerver gyökér URL-je: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Az export linket <b>%s</b> formátumban elérhető a következő linkre: %s
 ##### Invoices #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Számla dokumentumok modellek
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Kényszer számla keltétől annak érvényességét
-SuggestedPaymentModesIfNotDefinedInInvoice=Javasolt fizetési mód a számlát az alap, ha nincs meg a számla
+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=Szabad szöveg a számlán
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=A kereskedelmi modul beállítási javaslatok
 ProposalsNumberingModules=Üzleti ajánlat számozási modulok
 ProposalsPDFModules=Üzleti ajánlat dokumentumok modellek
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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=Megrendelés számozási modulok
 OrdersModelModule=Rendelés dokumentumok modellek
@@ -1417,69 +1428,69 @@ LDAPTestSynchroMemberType=Test member type synchronization
 LDAPTestSearch= Test a LDAP search
 LDAPSynchroOK=A szinkronizálás sikeres teszt
 LDAPSynchroKO=Nem sikerült a szinkronizálás teszt
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Nem sikerült a szinkronizálási teszt. Ellenőrizze, hogy a szerverrel való kapcsolat megfelelően van-e konfigurálva, és lehetővé teszi-e az LDAP frissítéseket
 LDAPTCPConnectOK=TCP csatlakozni az LDAP szerver sikeres (= %s Server, Port = %s)
 LDAPTCPConnectKO=TCP csatlakozni az LDAP kiszolgáló nem (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=Csatlakozás/hitelesítés az LDAP szerverhez sikeres (Szerver = %s, Port = %s, Rendszergazda = %s, Jelszó = %s)
+LDAPBindKO=Csatlakozás/hitelesítés az LDAP szerverhez sikertelen (Szerver = %s, Port = %s, Rendszergazda = %s, Jelszó = %s)
 LDAPSetupForVersion3=LDAP-kiszolgáló konfigurálva a 3-as verzió
 LDAPSetupForVersion2=LDAP-kiszolgáló konfigurálva a 2-es verziója
 LDAPDolibarrMapping=Dolibarr Mapping
 LDAPLdapMapping=LDAP Mapping
 LDAPFieldLoginUnix=Bejelentkezés (unix)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=Példa: uid
 LDAPFilterConnection=Keresés szűrő
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFilterConnectionExample=Példa: &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Bejelentkezés (samba, ActiveDirectoryba)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Példa: samaccountname
 LDAPFieldFullname=Keresztnév
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=Példa: cn
+LDAPFieldPasswordNotCrypted=A jelszó nincs titkosítva
+LDAPFieldPasswordCrypted=A jelszó titkosítva
+LDAPFieldPasswordExample=Példa: userPassword
+LDAPFieldCommonNameExample=Példa: cn
 LDAPFieldName=Név
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=Példa: sn
 LDAPFieldFirstName=Keresztnév
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=Példa: keresztnév
 LDAPFieldMail=E-mail cím
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=Példa: mail
 LDAPFieldPhone=Szakmai telefonszám
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=Példa: telefonszám
 LDAPFieldHomePhone=Személyes telefonszám
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=Példa: otthonitelefon
 LDAPFieldMobile=Mobiltelefon
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=Példa: mobil
 LDAPFieldFax=Faxszám
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=Példa: telefaxtelefonszám
 LDAPFieldAddress=Utca
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=Példa: utca
 LDAPFieldZip=Zip
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=Példa: irányítószám
 LDAPFieldTown=Város
 LDAPFieldTownExample=Example: l
 LDAPFieldCountry=Ország
 LDAPFieldDescription=Leírás
-LDAPFieldDescriptionExample=Example: description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldDescriptionExample=Példa: leírás
+LDAPFieldNotePublic=Nyilvános jegyzet
+LDAPFieldNotePublicExample=Példa: nyilvánosjegyzet
 LDAPFieldGroupMembers= A csoport tagjai
 LDAPFieldGroupMembersExample= Example: uniqueMember
 LDAPFieldBirthdate=Születésének
 LDAPFieldCompany=Vállalat
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=Példa: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=Példa: objectsid
 LDAPFieldEndLastSubscription=Születési előfizetés vége
 LDAPFieldTitle=�llás pozíció
-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
+LDAPFieldTitleExample=Példa: cím
+LDAPFieldGroupid=Csoportazonosító
+LDAPFieldGroupidExample=Példa: gidnumber
+LDAPFieldUserid=Felhasználói azonosító
+LDAPFieldUseridExample=Példa: uidnumber
+LDAPFieldHomedirectory=Kezdő könyvtár
+LDAPFieldHomedirectoryExample=Példa: homedirectory
+LDAPFieldHomedirectoryprefix=Kezdő könyvtár előtag
 LDAPSetupNotComplete=LDAP telepítés nem teljes (go másokra fül)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nem rendszergazdai jelszót vagy biztosított. LDAP hozzáférés lesz, névtelen és csak olvasható módba.
 LDAPDescContact=Ez az oldal lehetővé teszi, hogy meghatározza az LDAP attribútumok név LDAP fa minden egyes adat található Dolibarr kapcsolatok.
@@ -1489,40 +1500,40 @@ LDAPDescMembers=Ez az oldal lehetővé teszi, hogy meghatározza az LDAP attrib
 LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
 LDAPDescValues=Példaértékek tervezték <b>OpenLDAP</b> az alábbi betöltött sémák: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Ha a thoose értékek és az OpenLDAP, módosíthatja az LDAP konfigurációs file <b>slapd.conf</b> hogy minden thoose sémák betöltve.
 ForANonAnonymousAccess=A hitelesített hozzáférés (egy írási például)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
-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).
+PerfDolibarr=Teljesítménybeállítás/optimalizálás jelentés
+YouMayFindPerfAdviceHere=Ezen az oldalon található néhány ellenőrzés vagy tanácsadás a teljesítményhez kapcsolódóan.
+NotInstalled=Nincs telepítve, így a szervert ez nem lassítja le.
+ApplicativeCache=Alkalmazható gyorsítótár
+MemcachedNotAvailable=Nem található alkalmazható gyorsítótár. A teljesítmény javításához telepítheti a Memcached gyorsítótár-kiszolgálót és egy modult, amely képes használni ezt a gyorsítótár-kiszolgálót. <br> További információ itt <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Vegye figyelembe, hogy sok webtárhely-szolgáltató nem nyújt ilyen gyorsítótár-kiszolgálót.
+MemcachedModuleAvailableButNotSetup=Található memcached modul a gyorsítótár-kiszolgálóhoz, de a modul telepítése még nem fejeződött be.
+MemcachedAvailableAndSetup=A memcached szerver használatához a memcached modul engedélyezve van.
+OPCodeCache=OPCode gyorsítótár
+NoOPCodeCacheFound=Nem található az OPCode gyorsítótár. Lehet, hogy egy másik OPCode gyorsítótárat használ, mint például az XCache-t vagy az eAccelerator-t (jó), vagy lehet, hogy nincs OPCode-gyorsítótár (nagyon rossz).
 HTTPCacheStaticResources=Statikus erőforrások (css, img, javascript) HTTP gyorsítótára
 FilesOfTypeCached=A HTTP szerver a %s típusú fájlok esetében használja a gyorsítótárat.
 FilesOfTypeNotCached=A HTTP szerver a %s típusú fájlok esetében nem használja a gyorsítótárat.
 FilesOfTypeCompressed=A HTTP szerver a %s típusú fájlokat tömöríti.
 FilesOfTypeNotCompressed=A HTTP szerver a %s típusú fájlokat nem tömöríti.
-CacheByServer=Cache by server
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServer=Gyorsítótár kiszolgálónként
+CacheByServerDesc=Például az "ExpiresByType image/gif A2592000" Apache irányelv használatával
 CacheByClient=Cache by browser
 CompressionOfResources=HTTP válaszok tömörítése
-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
+CompressionOfResourcesDesc=Például az "AddOutputFilterByType DEFLATE" Apache irányelv használatával
+TestNotPossibleWithCurrentBrowsers=A jelenlegi böngészőknél nem lehetséges ilyen automatikus észlelés
+DefaultValuesDesc=Meghatározhatja azt az alapértelmezett értéket, amelyet új rekord létrehozásakor használni kíván, és/vagy az alapértelmezett szűrőket, vagy a rendezési sorrendet a rekordok listázásakor.
+DefaultCreateForm=Alapértelmezett értékek (űrlapok használatához)
+DefaultSearchFilters=Alapértelmezett keresési szűrők
+DefaultSortOrder=Alapértelmezett rendezési sorrendek
 DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+DefaultMandatory=Kötelező űrlapmezők
 ##### Products #####
 ProductSetup=Termékek modul beállítása
 ServiceSetup=Szolgáltatások modul beállítása
 ProductServiceSetup=Termékek és szolgáltatások modulok beállítása
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+NumberOfProductShowInSelect=A kombinált kiválasztási listákban megjelenítendő termékek maximális száma (0 = nincs korlátozás)
 ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+ViewProductDescInThirdpartyLanguageAbility=A termékleírások megjelenítése a partner nyelvén
 UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
 SetDefaultBarcodeTypeProducts=Alapértelmezett típusú vonalkód használatát termékek
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index ab8c59769af..f1aaa7a59e7 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=beszállítók számlái
 Payment=Fizetés
-PaymentBack=vissza fizetési
-CustomerInvoicePaymentBack=vissza fizetési
+PaymentBack=Visszatérítés
+CustomerInvoicePaymentBack=Visszatérítés
 Payments=Kifizetések
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Visszafizetések
 DeletePayment=Fizetés törlése
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Fogadott befizetések
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Kifizetés
 ToMakePaymentBack=Visszafizetés
 ListOfYourUnpaidInvoices=Nyitott számlák listája
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Illetékbélyeg
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/hu_HU/blockedlog.lang b/htdocs/langs/hu_HU/blockedlog.lang
index 28194fd21de..8a37fe90724 100644
--- a/htdocs/langs/hu_HU/blockedlog.lang
+++ b/htdocs/langs/hu_HU/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index d2c1b57f40b..c7ca149736d 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Add hozzá ezt a cikket
 RestartSelling=Menj vissza eladni
 SellFinished=Értékesítés befejezte
 PrintTicket=Nyomtatás jegy
+SendTicket=Send ticket
 NoProductFound=Nem találtam cikket
 ProductFound=termék található
 NoArticle=Nincs cikk
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Számlák száma
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 32b0b049214..26f3995ee4c 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted="%s" cég törölve az adatbázisból.
 ListOfContacts=Névjegyek / címek
 ListOfContactsAddresses=Névjegyek / címek
 ListOfThirdParties=Partnerek listája
-ShowCompany=Mutasd a partnereket
 ShowContact=Kapcsolat mutatása
 ContactsAllShort=Minden (nincs szűrő)
 ContactType=Kapcsolat típusa
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Az értékesítési képviselő vezetékneve
 SaleRepresentativeLastname=Az értékesítési képviselő vezetékneve
 ErrorThirdpartiesMerge=Hiba történt a partner(ek) törlésekor. Kérjük, ellenőrizze a naplót. A változtatások visszavonva.
 NewCustomerSupplierCodeProposed=A vevő vagy az eladó kódja már használatban van, egy új kód javasolt
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Fizetés típusa - Ügyfél
 PaymentTermsCustomer=Fizetési feltételek - Ügyfél
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 8a8efc62c29..1843b1372a1 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=Rövid címke
+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
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 281f32104ac..f6bd16ca771 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -59,6 +59,7 @@ 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.
 ErrorFileSizeTooLarge=A fájl mérete túl nagy.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Túl nagy szám az int típushoz (maximum %s számjegy)
 ErrorSizeTooLongForVarcharType=Túl hosszú szöveg a string típushoz (%s karakter maximum)
 ErrorNoValueForSelectType=Please fill value for select list
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index da1615f437a..c9b3e5ee4e5 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Ez a PHP támogatja a Curl-t.
 PHPSupportCalendar=Ez a PHP támogatja a naptár-kiterjesztéseket.
 PHPSupportUTF8=Ez a PHP támogatja az UTF8 funkciókat.
 PHPSupportIntl=Ez a PHP támogatja a többnyelvű funkciókat.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Ez a PHP támogatja a(z) %s funkciókat.
 PHPMemoryOK=A munkamenetek maximális memóriája <b>%s</b>. Ennek elégnek kéne lennie.
 PHPMemoryTooLow=A PHP munkamenetmemóriája <b>%s</b> bájt maximumra van beállítva. Ez túl alacsony. Változtassa meg a <b>php.ini</b> fájlban a <b>memory_limit</b> paraméter értékét legalább <b>%s</b> bájtra.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=A PHP telepítése nem támogatja a Curl-t.
 ErrorPHPDoesNotSupportCalendar=A telepített PHP nem támogatja a php naptárkiterjesztéseket.
 ErrorPHPDoesNotSupportUTF8=A telepített PHP nem támogatja az UTF8 funkciókat. A Dolibarr nem működik megfelelően. A Dolibarr telepítése előtt oldja meg ezt.
 ErrorPHPDoesNotSupportIntl=A telepített PHP nem támogatja a többnyelvű funkciókat.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=A telepített PHP nem támogatja a(z) %s funkciókat.
 ErrorDirDoesNotExists=%s könyvtár nem létezik.
 ErrorGoBackAndCorrectParameters=Menjen vissza és ellenőrizze / javítsa ki a paramétereket.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Az alkalmazás megpróbált frissítést végreha
 YouTryInstallDisabledByFileLock=Az alkalmazás megpróbált frissítést végrehajtani, de a biztonságot szem előtt tartva  letiltottuk a telepítési / frissítési oldalakat (az <strong>install.lock zárolási fájl létrehozásával a dolibarr dokumentumok könyvtárában</strong>). <br>
 ClickHereToGoToApp=Kattintson ide az alkalmazás eléréséhez
 ClickOnLinkOrRemoveManualy=Kattintson a következő linkre. Ha mindig ugyanazt az oldalt látja, el kell távolítania / át kell neveznie az install.lock fájlt a dokumentumok könyvtárban.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/hu_HU/link.lang b/htdocs/langs/hu_HU/link.lang
index 32e8792ef16..4a300402b46 100644
--- a/htdocs/langs/hu_HU/link.lang
+++ b/htdocs/langs/hu_HU/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=A %s hivatkozás törölve
 ErrorFailedToDeleteLink= A '<b>%s</b>' hivakozás törlése sikertelen
 ErrorFailedToUpdateLink= A '<b>%s</b>' hivakozás frissítése sikertelen
 URLToLink=A hivatkozás címe
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 068acc39b23..748b00764b6 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Információ
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 4a57c743427..f6b07282fc3 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Mentés és maradj
 SaveAndNew=Mentés és új
 TestConnection=Kapcsolat tesztelése
 ToClone=Klónozás
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Válassza ki a klónozni kívánt adatokat:
 NoCloneOptionsSpecified=Nincs klónozandó adat meghatározva.
 Of=birtokában
@@ -829,6 +830,8 @@ Gender=Nem
 Genderman=Férfi
 Genderwoman=NÅ‘
 ViewList=Lista megtekintése
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Kötelező kitölteni
 Hello=Hello
 GoodBye=Viszontlátásra
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Válassza ki a grafikon beállításait a grafikon f
 Measures=Méretek
 XAxis=X-tengely
 YAxis=Y-tengely
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index 3e21f863216..8b1b0ac0e74 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -141,7 +141,7 @@ OrderByEMail=E-mail
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=Teljes megrendelési modell (az Eratosthene sablon régi megvalósítása)
+PDFEinsteinDescription=Teljes megrendelési modell 
 PDFEratostheneDescription=Teljes megrendelési modell
 PDFEdisonDescription=Egyszerű megrendelési sablon
 PDFProformaDescription=Teljes Proforma számlasablon
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 2c84431663c..b070f06054a 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=A grafikák „Sávok� módban %s mértékre
 OnlyOneFieldForXAxisIsPossible=Jelenleg csak 1 mező lehetséges X-tengelyként. Csak az első kiválasztott mező került kiválasztásra.
 AtLeastOneMeasureIsRequired=Legalább 1 mező szükséges a méréshez
 AtLeastOneXAxisIsRequired=Legalább 1 mező szükséges az X-tengelyhez
-
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=Az értékesítési megrendelés érvényes
 Notify_ORDER_SENTBYMAIL=Az értékesítési megrendelés postai úton elküldve
 Notify_ORDER_SUPPLIER_SENTBYMAIL=A beszerzési megrendelés e-mailben elküldve
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=Az oldal URL-je
 WEBSITE_TITLE=Cím
 WEBSITE_DESCRIPTION=Leírás
 WEBSITE_IMAGE=Kép
-WEBSITE_IMAGEDesc=A képfájl relatív útja. Ezt üresen hagyhatja, mivel ezt ritkán használják (a dinamikus tartalom felhasználhatja miniatűr megjelenítésére a blogbejegyzések listájában). Használja a __WEBSITEKEY__ az elérési útban, ha az elérési út a webhely nevétől függ.
+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=Kulcsszavak
 LinesToImport=Importálandó sorok
 
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 014a4a9fccb..c28d41d5a08 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -22,6 +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)
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Eladási árak
 SuppliersPricesOfProductsOrServices=Eladási árak (termékek vagy szolgáltatások)
 CustomCode=Vám / �ru / HS kód
 CountryOrigin=Származási ország
-Nature=A termék természete (alapanyag / késztermék)
+Nature=Nature of product (material/finished)
 ShortLabel=Rövid címke
 Unit=Egység
 p=db.
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 8376020d283..0b9ee0449c2 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Idő
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Kapcsolódó elemek
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Új számla
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/hu_HU/receiptprinter.lang b/htdocs/langs/hu_HU/receiptprinter.lang
index 3d2c4e632ab..08d8836143b 100644
--- a/htdocs/langs/hu_HU/receiptprinter.lang
+++ b/htdocs/langs/hu_HU/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Számla hiv.
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=TÅ‘ke
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/hu_HU/stripe.lang b/htdocs/langs/hu_HU/stripe.lang
index d88607e0c22..27845bc9ee2 100644
--- a/htdocs/langs/hu_HU/stripe.lang
+++ b/htdocs/langs/hu_HU/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Neve eladó
 CSSUrlForPaymentForm=CSS stíluslapot url fizetési forma
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 63cd31fa91c..084d20b5834 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -70,7 +70,7 @@ 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=A <b>belső</b> felhasználó az a felhasználó, amely része a vállalatának/szervezetének. <br>Egy <b>külső</b> felhasználó vevő, eladó vagy más. <br> <br> Mindkét esetben az engedélyek meghatározzák a felhasználó Dolibarr jogait, a külső felhasználónak más menükezelője is lehet, mint a belső felhasználónál (lásd Kezdőlap - Beállítás - Kijelző)
+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)
 PermissionInheritedFromAGroup=Engedélyek megadva mert örökölte az egyik csoporttól.
 Inherited=Örökölve
 UserWillBeInternalUser=Létrehozta felhasználó lesz egy belső felhasználó (mivel nem kapcsolódik az adott harmadik fél)
@@ -113,3 +113,5 @@ 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
 ValidatorIsSupervisorByDefault=Alapértelmezés szerint az érvényesítő a felhasználó vezetője. Hagyja üresen ha ez így van.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 27dc084c76f..4548cbdf7ed 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Az oldal megtekintése új lapon
 SetAsHomePage=Beállítás kezdőlapnak
 RealURL=Valódi URL
 ViewWebsiteInProduction=Tekintse meg a webhelyet otthoni URL-ek segítségével
-SetHereVirtualHost=<u>Használja Apache / NGinx / ...</u> <br> Ha a webkiszolgálón (Apache, Nginx, ...) létrehozhat egy dedikált virtuális gazdagépet, amelyen a PHP engedélyezve van, és egy gyökérkönyvtárat <br> <strong>%s</strong> <br> majd állítsa be a webhely tulajdonságaiban létrehozott virtuális gazdagép nevét, így az előnézetet a belső Dolibarr szerver helyett ennek a dedikált webkiszolgálónak a hozzáférésével is el lehet végezni.
+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>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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sajnáljuk, ez a webhely jelenleg offline állapo
 WEBSITE_USE_WEBSITE_ACCOUNTS=Engedélyezze a webhely account tábláját
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Engedélyezze a táblát a webhely accountok (usernév / jelszó) tárolására minden weboldalon / harmadik félnél
 YouMustDefineTheHomePage=Először meg kell határoznia az alapértelmezett Kezdőlapot
-OnlyEditionOfSourceForGrabbedContentFuture=Figyelem: A weboldal külső weboldal importálásával történő létrehozása a tapasztalt felhasználók számára van fenntartva. A forrásoldal összetettségétől függően az importálás eredménye eltérhet az eredetitől. Ha a forrásoldal is általános CSS stílusokat vagy ütköző javascriptet használ, akkor az megsemmisítheti a webhely szerkesztő megjelenését vagy funkcióit, amikor ezen az oldalon dolgozik. Ez a módszer gyorsabb módszer egy oldal létrehozására, de ajánlott az új oldal a nulláról vagy a javasolt oldalsablonból történő létrehozása. <br> Vegye figyelembe azt is, hogy a HTML forrás szerkesztése akkor lehetséges, ha az oldal tartalma inicializálva van, ha egy külső oldalról grabbeli azt (az &quot;Online&quot; szerkesztő NEM lesz elérhető)
+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=Csak a HTML forrás kiadása lehetséges, ha a tartalmat egy külső webhelyről megragadták
 GrabImagesInto=Ragadja meg a css-ben és az oldalon található képeket is.
 ImagesShouldBeSavedInto=A képeket a könyvtárba kell menteni
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=A helyes SEO gyakorlat érdekében használjon 5 és 7
 MainLanguage=FÅ‘ nyelv
 OtherLanguages=Más nyelvek
 UseManifest=Adjon meg egy manifest.json fájlt
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 8dea06a28ad..acbf3ab23a7 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Catatan: Tidak ada batas diatur dalam konfigurasi PHP Anda
 MaxSizeForUploadedFiles=Ukuran maksimal untuk file upload (0 untuk melarang pengunggahan ada)
 UseCaptchaCode=Gunakan kode grafis (CAPTCHA) pada halaman login
-AntiVirusCommand= Path lengkap ke perintah antivirus
-AntiVirusCommandExample= Contoh untuk ClamWin: c: \\ progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe <br> Contoh untuk ClamAV: / usr / bin / clamscan
+AntiVirusCommand=Path lengkap ke perintah antivirus
+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= Lebih lanjut tentang parameter baris perintah
-AntiVirusParamExample= Contoh untuk ClamWin: - database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Pengaturan modul Akuntansi
 UserSetup=Konfigurasi manajemen pengguna
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Link Standar
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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=lebih besar dari
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 4b62c14cfb1..adafb4ff710 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=semua tagihan untuk semua pemasok / supplier
 Payment=Pembayaran
-PaymentBack=Pembayaran kembali
-CustomerInvoicePaymentBack=Pembayaran kembali
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Semua pembayaran
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Dibayar kembali
 DeletePayment=Hapus pembayaran
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Semua pembayaran yang diterima
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/id_ID/blockedlog.lang b/htdocs/langs/id_ID/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/id_ID/blockedlog.lang
+++ b/htdocs/langs/id_ID/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index b040df0305d..4dcde5eda9f 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 4a2c3fa0599..a90e08ac188 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 1e81d808167..37cf0356250 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index bc6b7fc3e69..59457c8085f 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/id_ID/link.lang b/htdocs/langs/id_ID/link.lang
index 600b2d930ff..1d10ffbad6e 100644
--- a/htdocs/langs/id_ID/link.lang
+++ b/htdocs/langs/id_ID/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Tautan %s telah dihapus
 ErrorFailedToDeleteLink= gagal untuk menghapus tautan '<b>%s</b>'
 ErrorFailedToUpdateLink= Gagal untuk memperbaharui tautan '<b>%s</b>'
 URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index c02d383c4fb..195055ba334 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 3ef8d8605d4..9988de10e94 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=Tampilan daftar
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 8e8d51192cb..7cac2e06e63 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Keterangan
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 9e8aff41e86..411bb7216ed 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 0a2900a8296..d207986f87c 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Tagihan baru
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/id_ID/receiptprinter.lang b/htdocs/langs/id_ID/receiptprinter.lang
index 3df49b9fe67..896eaa313dd 100644
--- a/htdocs/langs/id_ID/receiptprinter.lang
+++ b/htdocs/langs/id_ID/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/id_ID/stripe.lang b/htdocs/langs/id_ID/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/id_ID/stripe.lang
+++ b/htdocs/langs/id_ID/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index d424b1f334e..a9498dec5ac 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 0b03d4da07f..a9a52b04b77 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Ath: Ekki eru sett lágmörk á PHP uppsetningu þína
 MaxSizeForUploadedFiles=Hámarks stærð fyrir skrár (0 til banna allir senda)
 UseCaptchaCode=Nota myndræna kóða (Kapteinn) á innskráningarsíðu
-AntiVirusCommand= Full slóð að antivirus stjórn
-AntiVirusCommandExample= Dæmi um Samloka: c: \\ Program Files (x86) \\ Samloka \\ kassi \\ clamscan.exe <br> Dæmi um Samloka: / usr / bin / clamscan
+AntiVirusCommand=Full slóð að antivirus stjórn
+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= Fleiri breytur á lína
-AntiVirusParamExample= Dæmi um Samloka: - gagnasafn = "C: \\ Program Files (x86) \\ Samloka \\ lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Bókhald mát skipulag
 UserSetup=Stjórn notanda skipulag
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Lögun fatlaður í kynningu
 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=Aðeins atriði frá <a href="%s">virkt einingar</a> eru birtar.
-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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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=Virkja á
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Svæði
 DictionaryCountry=Lönd
 DictionaryCurrency=Gjaldmiðlar
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VSK Verð
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Verð
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Sjálfgefið er fyrirhuguð IRPF er 0. Lok reglu.
 LocalTax2IsUsedExampleES=� Spáni freelancers og sjálfstæða sérfræðinga sem veita þjónustu og fyrirtæki sem hafa valið skatt kerfi eininga.
 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 des 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
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Innkaup
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=Velta
 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=Merki notaður við vanræksla, ef ekki þýðingu er að finna í kóða
 LabelOnDocuments=Merki um skjöl
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Úttekt
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Kerfi upplýsingar er ýmis tæknilegar upplýsingar sem þú færð í lesa aðeins háttur og sýnileg Aðeins kerfisstjórar.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Notendur mát skipulag
 UserMailRequired=Email required to create a new user
+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 #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Invoice skjöl módel
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Force dagsetningu reiknings staðfestingu dagsetningu
-SuggestedPaymentModesIfNotDefinedInInvoice=Leiðbeinandi greiðslur háttur á reikning við vanræksla ef ekki er skilgreind fyrir reikning
+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=Frjáls texti á reikningum
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=Auglýsing tillögur mát skipulag
 ProposalsNumberingModules=Auglýsing tillögu tala mát
 ProposalsPDFModules=Auglýsing tillögu skjöl módel
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Frjáls texti um viðskiptabanka tillögur
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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=Pantanir tala mát
 OrdersModelModule=Panta skjöl módel
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index f4e78a6e916..87fd0e67073 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=birgjum reikninga
 Payment=Greiðsla
-PaymentBack=Greiðsla til baka
-CustomerInvoicePaymentBack=Greiðsla til baka
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Greiðslur
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Eyða greiðslu
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Móttekin greiðslur
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/is_IS/blockedlog.lang b/htdocs/langs/is_IS/blockedlog.lang
index 626f5821bcf..4a0e02851e2 100644
--- a/htdocs/langs/is_IS/blockedlog.lang
+++ b/htdocs/langs/is_IS/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index 11eb12c8b02..53d67608a08 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Bæta við þessa grein
 RestartSelling=Fara aftur á að selja
 SellFinished=Sale complete
 PrintTicket=Prenta miða
+SendTicket=Send ticket
 NoProductFound=Engin grein fannst
 ProductFound=vara fannst
 NoArticle=Engin grein
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=NB af reikningum
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 8e2f1086cbe..699c424c082 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Fyrirtæki " %s " eytt úr gagnagrunninum.
 ListOfContacts=Listi yfir tengiliði
 ListOfContactsAddresses=Listi yfir tengiliði
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show samband
 ContactsAllShort=Öll (síu)
 ContactType=Hafðu tegund
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index bd1c8b64c46..82960faedfc 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 6c5f33f419e..28f89d9d044 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -59,6 +59,7 @@ 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.
 ErrorFileSizeTooLarge=Skráarstærð er of stór.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Stærð of lengi fyrir int tegund (%s tölustafir hámark)
 ErrorSizeTooLongForVarcharType=Stærð of lengi fyrir gerð band (%s stafir hámark)
 ErrorNoValueForSelectType=Please fill value for select list
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index 4d44fcfc421..9c14f4b9435 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max fundur minnið er stillt <b>á %s .</b> Þetta ætti að vera nóg.
 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.
@@ -26,6 +27,7 @@ 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=Listinn %s  er ekki til.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/is_IS/link.lang b/htdocs/langs/is_IS/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/is_IS/link.lang
+++ b/htdocs/langs/is_IS/link.lang
@@ -8,3 +8,4 @@ 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/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 23de4f9fad2..fd2e406a2e5 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 85245ac028d..271416128f0 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=Engin gögn til að afrita skilgreind.
 Of=á
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=Skoða lista
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index ebaa25e6d3d..b81f0d0f77e 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titill
 WEBSITE_DESCRIPTION=Lýsing
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 3ed2df6e56c..50494b9a623 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Uppruni land
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 883d21f7aab..7333330d5c4 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Tími
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nýr reikningur
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/is_IS/receiptprinter.lang b/htdocs/langs/is_IS/receiptprinter.lang
index 76c8635765a..6ba804469a5 100644
--- a/htdocs/langs/is_IS/receiptprinter.lang
+++ b/htdocs/langs/is_IS/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Invoice dómari
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/is_IS/stripe.lang b/htdocs/langs/is_IS/stripe.lang
index 66b0105ee29..8ba78b4df1e 100644
--- a/htdocs/langs/is_IS/stripe.lang
+++ b/htdocs/langs/is_IS/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Nafn seljanda
 CSSUrlForPaymentForm=CSS stíll lak url fyrir formi greiðslu
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index b0830affd55..3d4566f6abf 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Heimild veitt vegna þess að arfur frá einni í hópnum notanda.
 Inherited=Arf
 UserWillBeInternalUser=Búið notandi vilja vera innri notanda (vegna þess að ekki tengd við ákveðna þriðja aðila)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index 738071eb4b4..a43243bd41a 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index f924fd121c9..66b70b12ea1 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -168,10 +168,15 @@ DONATION_ACCOUNTINGACCOUNT=Conto di contabilità per registrare le donazioni
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conto contabile per registrare gli abbonamenti
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conto di contabilità predefinito per i prodotti acquistati (se non definito nella scheda prodotto)
+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=Conto di contabilità predefinito per i prodotti venduti (se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Conto contabile per impostazione predefinita per i prodotti venduti in CEE (utilizzato se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Conto contabile per impostazione predefinita per l'esportazione dei prodotti venduti fuori dalla CEE (utilizzato se non definito nella scheda prodotto)
+
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Conto di contabilità per impostazione predefinita per i servizi acquistati (utilizzato se non definito nel foglio di servizio)
+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=Conto di contabilità per impostazione predefinita per i servizi venduti (utilizzato se non definito nel foglio di servizio)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conto contabile predefinito per i servizi venduti nella CEE (solo se non definito nella scheda servizio)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Conto contabile predefinito per i servizi venduti ed esportati fuori dalla CEE (solo se non definito nella scheda servizio)
@@ -228,13 +233,15 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
 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
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
+ShowOpeningBalance=Mostra bilancio di apertura
+HideOpeningBalance=Nascondi bilancio di apertura
 
 Pcgtype=Gruppo di conto
 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.
 
-TotalVente=Total turnover before tax
+Reconcilable=Reconcilable
+
+TotalVente=Fatturato totale al lordo delle imposte
 TotalMarge=Margine totale sulle vendite
 
 DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
@@ -286,7 +293,7 @@ AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Vendite
 AccountingJournalType3=Acquisti
 AccountingJournalType4=Banca
-AccountingJournalType5=Expenses report
+AccountingJournalType5=Rimborsi spese
 AccountingJournalType8=Inventario
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=Questo giornale è già in uso
@@ -308,6 +315,7 @@ Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -324,10 +332,14 @@ OptionModeProductSell=Modalità vendita
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Modalità acquisto
+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=Resetta tutti i collegamenti per l'anno corrente
 PredefinedGroups=Gruppi predefiniti
@@ -338,6 +350,8 @@ 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
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 7c938027e80..a0a16030215 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Nota: nessun limite impostato nella configurazione PHP
 MaxSizeForUploadedFiles=Dimensione massima dei file caricati (0 per disabilitare l'upload)
 UseCaptchaCode=Utilizzare verifica captcha nella pagina di login
-AntiVirusCommand= Percorso completo programma antivirus
-AntiVirusCommandExample= Esempio per ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br> Esempio per ClamAV: / usr/bin/clamscan
+AntiVirusCommand=Percorso completo programma antivirus
+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= Più parametri sulla riga di comando
-AntiVirusParamExample= Esempio per ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Impostazioni modulo contabilità
 UserSetup=Impostazioni per la gestione utenti
 MultiCurrencySetup=Impostazioni multi-valuta
@@ -197,9 +197,9 @@ IgnoreDuplicateRecords=Ignora errori per record duplicati (INSERT IGNORE)
 AutoDetectLang=Rileva automaticamente (lingua del browser)
 FeatureDisabledInDemo=Funzione disabilitata in modalità demo
 FeatureAvailableOnlyOnStable=Feature disponibile solo nelle versioni stabili ufficiali
-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=I Widgets sono componenti che personalizzano le pagine aggiungendo delle informazioni.\nPuoi scegliere se mostrare il widget o meno cliccando 'Attiva' sulla la pagina di destinazione, o cliccando sul cestino per disattivarlo.
 OnlyActiveElementsAreShown=Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> .
-ModulesDesc=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 (at end of module line) to enable/disable a module/application.
+ModulesDesc=I moduli / applicazioni determinano quali funzionalità sono disponibili nel software. Alcuni moduli richiedono autorizzazioni da concedere agli utenti dopo l'attivazione del modulo stesso. Fare clic sul pulsante on / off <span class="small valignmiddle">%s</span> (alla fine della riga del modulo) per abilitare / disabilitare un modulo / un'applicazione.
 ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su siti web esterni...
 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=Trova app/moduli esterni...
@@ -212,6 +212,7 @@ CompatibleUpTo=Compatibile con la versione %s
 NotCompatible=Questo modulo non sembra essere compatibile con la tua versione di Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Questo modulo richiede un aggiornamento a Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
+SeeSetupOfModule=Vedi la configurazione del modulo %s
 Updated=Aggiornato
 Nouveauté=Novità
 AchatTelechargement=Aquista / Scarica
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=Siti web esterni per ulteriori moduli add-on (non essenziali)...
 DevelopYourModuleDesc=Spunti per sviluppare il tuo modulo...
 URL=Collegamento
+RelativeURL=Relative URL
 BoxesAvailable=Widget disponibili
 BoxesActivated=Widget attivi
 ActivateOn=Attiva sul
@@ -231,8 +233,8 @@ Required=Richiesto
 UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Sicurezza
 Passwords=Password
-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.
+DoNotStoreClearPassword=Non memorizzare le password in chiaro nel database (raccomandato)
+MainDbPasswordFileConfEncrypted=Password del database crittata in conf.php (raccomandato)
 InstrucToEncodePass=Per avere la password codificata sostituisci nel file <b>conf.php</b> , la linea <br><b>$dolibarr_main_db_pass="...";</b><br>con<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Per avere la password decodificata (in chiaro) sostituisci nel file<b>conf.php</b> la linea <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>con<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
@@ -248,7 +250,7 @@ OfficialMarketPlace=Market ufficiale per moduli esterni e addon
 OfficialWebHostingService=Servizi di hosting web referenziati (Hosting Cloud)
 ReferencedPreferredPartners=Preferred Partners
 OtherResources=Altre risorse
-ExternalResources=External Resources
+ExternalResources=Risorse esterne
 SocialNetworks=Social Networks
 ForDocumentationSeeWiki=La documentazione per utenti e sviluppatori e le FAQ sono disponibili sul wiki di Dolibarr: <br/>Dai un'occhiata a <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Per qualsiasi altro problema/domanda, si può utilizzare il forum di Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -279,8 +281,8 @@ MAIN_MAIL_EMAIL_FROM=Indirizzo mittente per le email automatiche (predefinito in
 MAIN_MAIL_ERRORS_TO=Indirizzo a cui inviare eventuali errori (campi 'Errors-To' nelle email inviate)
 MAIN_MAIL_AUTOCOPY_TO= Indirizzo a cui inviare in copia Ccn tutte le mail in uscita
 MAIN_DISABLE_ALL_MAILS=Disabilita l'invio delle email (a scopo di test o demo)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employee users with email into allowed recipient list
+MAIN_MAIL_FORCE_SENDTO=Invia tutte le e-mail a (anziché ai destinatari reali, a scopo di test)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggerisci l'indirizzo e-mail dei dipendenti (se definiti) nell'elenco dei destinatari predefiniti durante l'invio una nuova e-mail
 MAIN_MAIL_SENDMODE=Metodo di invio email
 MAIN_MAIL_SMTPS_ID=Username SMTP (se il server richiede l'autenticazione)
 MAIN_MAIL_SMTPS_PW=Password SMTP (se il server richiede l'autenticazione)
@@ -293,7 +295,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
 MAIN_DISABLE_ALL_SMS=Disabilita l'invio di SMS (a scopo di test o demo)
 MAIN_SMS_SENDMODE=Metodo da utilizzare per inviare SMS
 MAIN_MAIL_SMS_FROM=Numero predefinito del mittente per gli SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+MAIN_MAIL_DEFAULT_FROMTYPE=Email predefinita del mittente per l'invio manuale (email utente o email aziendale)
 UserEmail=Email utente
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Funzione non disponibile sui sistemi Linux. Viene usato il server di posta installato sul server (es. sendmail).
@@ -302,9 +304,9 @@ SubmitTranslationENUS=Se la traduzione per questa lingua non è completa o trovi
 ModuleSetup=Impostazioni modulo
 ModulesSetup=Impostazione Modulo/Applicazione
 ModuleFamilyBase=Sistema
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyCrm=Gestione delle relazioni con i clienti (CRM)
+ModuleFamilySrm=Gestione delle relazioni con i fornitori (SRM / VRM)
+ModuleFamilyProducts=Gestione dei prodotti (PM)
 ModuleFamilyHr=Gestione delle risorse umane (HR)
 ModuleFamilyProjects=Progetti/collaborazioni
 ModuleFamilyOther=Altro
@@ -312,7 +314,7 @@ ModuleFamilyTechnic=Strumenti Multi-modulo
 ModuleFamilyExperimental=Moduli sperimentali
 ModuleFamilyFinancial=Moduli finanziari (Contabilità/Cassa)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyPortal=Web sites ed altre applicazioni
 ModuleFamilyInterface=Interfacce con sistemi esterni
 MenuHandlers=Gestori menu
 MenuAdmin=Editor menu
@@ -363,7 +365,7 @@ ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanent
 MinLength=Durata minima
 LanguageFilesCachedIntoShmopSharedMemory=File Lang caricati nella memoria cache
 LanguageFile=File di Lingua
-ExamplesWithCurrentSetup=Examples with current configuration
+ExamplesWithCurrentSetup=Esempi di funzionamento secondo la configurazione attuale
 ListOfDirectories=Elenco delle directory dei modelli OpenDocument
 ListOfDirectoriesForModelGenODT=Lista di cartelle contenenti file modello in formato OpenDocument.<br><br>Inserisci qui il percorso completo delle cartelle.<br>Digitare un 'Invio' tra ciascuna cartella.<br>Per aggiungere una cartella del modulo GED, inserire qui <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>I file in quelle cartelle devono terminare con <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
@@ -381,24 +383,24 @@ ResponseTimeout=Timeout della risposta
 SmsTestMessage=Prova messaggio da __PHONEFROM__ a __PHONETO__
 ModuleMustBeEnabledFirst=Il modulo <b>%s</b> deve prima essere attivato per poter accedere a questa funzione.
 SecurityToken=Token di sicurezza
-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=Nessun gestore mittente SMS disponibile. Un gestore mittente SMS non è installato con la distribuzione predefinita perché dipendono da un fornitore esterno, ma puoi trovarne alcuni su %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFDesc=Opzioni globali per la generazione di PDF.
+PDFAddressForging=Regole per i box degli indirizzi sui documenti pdf
+HideAnyVATInformationOnPDF=Nascondi tutte le informazioni relative all'IVA sui pdf generati.
 PDFRulesForSalesTax=Regole per tasse sulla vendita/IVA
 PDFLocaltax=Regole per %s
 HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-HideDetailsOnPDF=Hide product lines details
+HideDescOnPDF=Nascondi le descrizioni dei prodotti nel pdf generato
+HideRefOnPDF=Nascondi il riferimento dei prodotti nel pdf generato
+HideDetailsOnPDF=Nascondi dettagli linee prodotti sui PDF generati
 PlaceCustomerAddressToIsoLocation=Usa la posizione predefinita francese (La Poste) per l'indirizzo del cliente
 Library=Libreria
 UrlGenerationParameters=Parametri di generazione degli indirizzi
 SecurityTokenIsUnique=Utilizzare un unico parametro securekey per ogni URL
 EnterRefToBuildUrl=Inserisci la reference per l'oggetto %s
 GetSecuredUrl=Prendi URL calcolato
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Nascondi i pulsanti per azioni non autorizzate anziché mostrare i pulsanti disabilitati
 OldVATRates=Vecchia aliquota IVA
 NewVATRates=Nuova aliquota IVA
 PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
@@ -423,7 +425,7 @@ ExtrafieldPassword=Password
 ExtrafieldRadio=Radio buttons (one choice only)
 ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
-ExtrafieldLink=Link to an object
+ExtrafieldLink=Collegamento ad un oggetto
 ComputedFormula=Campo calcolato
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Lasciare vuoto per utilizzare il valore di default
 DefaultLink=Link predefinito
 SetAsDefault=Imposta come predefinito
 ValueOverwrittenByUserSetup=Attenzione, questo valore potrebbe essere sovrascritto da un impostazione specifica dell'utente (ogni utente può settare il proprio url clicktodial)
-ExternalModule=Modulo esterno - Installato nella directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -456,7 +459,7 @@ ConfirmEraseAllCurrentBarCode=Vuoi davvero eliminare tutti i valori attuali dei
 AllBarcodeReset=All barcode values have been removed
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
 EnableFileCache=Abilita file di cache
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+ShowDetailsInPDFPageFoot=Aggiungi più dettagli nel piè di pagina, come l'indirizzo dell'azienda o i nomi dei gestori (oltre agli ID professionali, al capitale aziendale e al numero di partita IVA).
 NoDetails=No additional details in footer
 DisplayCompanyInfo=Mostra indirizzo dell'azienda
 DisplayCompanyManagers=Visualizza nomi responsabili
@@ -469,7 +472,7 @@ ModuleCompanyCodeDigitaria=Accounting code depends on third-party code. The code
 ModuleCompanyCodeCustomerDigitaria=%s seguito dal nome del cliente troncato dal numero di caratteri: %s per il codice contabile del cliente.
 ModuleCompanyCodeSupplierDigitaria=%s seguito dal nome del fornitore troncato dal numero di caratteri: %s per il codice contabile del fornitore.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
-UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
+UseDoubleApproval=Utilizzare un'approvazione in 3 passaggi quando l'importo (senza tasse) è superiore a ...
 WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
@@ -481,7 +484,7 @@ PageUrlForDefaultValues=You must enter the relative path of the page URL. If you
 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
+EnableDefaultValues=Abilita l'utilizzo di valori predefiniti personalizzati
 EnableOverwriteTranslation=Abilita queste traduzioni personalizzate
 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.
@@ -492,7 +495,7 @@ WatermarkOnDraftExpenseReports=Bozze delle note spese filigranate
 AttachMainDocByDefault=Imposta a 1 se vuoi allegare il documento principale alle email come impostazione predefinita (se applicabile)
 FilesAttachedToEmail=Allega file
 SendEmailsReminders=Invia promemoria agenda via email
-davDescription=Setup a WebDAV server
+davDescription=Configurazione di un server WebDAV
 DAVSetup=Configurazione del modulo 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.
@@ -504,163 +507,163 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 Module0Name=Utenti e gruppi
 Module0Desc=Gestione utenti/impiegati e gruppi
 Module1Name=Soggetti terzi
-Module1Desc=Companies and contacts management (customers, prospects...)
+Module1Desc=Gestione aziende e soggetti terzi (clienti, fornitori e contatti)
 Module2Name=Commerciale
 Module2Desc=Gestione commerciale
-Module10Name=Accounting (simplified)
+Module10Name=Contabilità (semplificata)
 Module10Desc=Resoconti contabili semplici (spese, ricavi) basati sul contenuto del database. Non usa tabelle di contabilità generale.
 Module20Name=Proposte
 Module20Desc=Gestione proposte commerciali
 Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module22Desc=Gestione invii di posta massiva
 Module23Name=Energia
 Module23Desc=Monitoraggio del consumo energetico
 Module25Name=Ordini Cliente
-Module25Desc=Sales order management
+Module25Desc=Gestione ordini cliente
 Module30Name=Fatture
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=Gestione delle fatture e note di accredito per i clienti. Gestione di fatture e note di accredito per fornitori
 Module40Name=Fornitori
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=Gestione fornitori e acquisti (ordini e fatture)
 Module42Name=Debug Logs
 Module42Desc=Strumenti di tracciamento (file, syslog, ...). Questi strumenti sono per scopi tecnici/correzione.
 Module49Name=Redazione
 Module49Desc=Gestione redattori
 Module50Name=Prodotti
-Module50Desc=Management of Products
+Module50Desc=Gestione prodotti
 Module51Name=Posta massiva
 Module51Desc=Modulo per la gestione dell'invio massivo di posta cartacea
 Module52Name=Magazzino
-Module52Desc=Stock management (for products only)
+Module52Desc=Gestione magazzino prodotti
 Module53Name=Servizi
 Module53Desc=Gestione servizi
 Module54Name=Contratti/Abbonamenti
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module54Desc=Gestione contratti (servizi o abbonamenti)
 Module55Name=Codici a barre
 Module55Desc=Gestione codici a barre
 Module56Name=Telefonia
 Module56Desc=Integrazione telefonia
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module57Name=Ordini addebito diretto (SEPA)
+Module57Desc=Gestione degli ordini di pagamento SEPA Direct Debit. Comprende anche la generazione di file SEPA per i paesi europei.
 Module58Name=ClickToDial
 Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk)
 Module59Name=Bookmark4u
 Module59Desc=Aggiungi la possibilità di generare account Bookmark4u da un account Dolibarr
 Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Desc=Gestione stickers
 Module70Name=Interventi
 Module70Desc=Gestione Interventi
 Module75Name=Spese di viaggio e note spese
 Module75Desc=Gestione spese di viaggio e note spese
 Module80Name=Spedizioni
-Module80Desc=Shipments and delivery note management
-Module85Name=Banche & Denaro
+Module80Desc=Gestione spedizioni e bolla di consegna
+Module85Name=Banche e cassa
 Module85Desc=Gestione di conti bancari o conti di cassa
-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=Sito esterno
+Module100Desc=Aggiungi un collegamento ad un sito Web esterno come icona del menu principale. Il sito Web sarà visualizzato in un iframe.
 Module105Name=Mailman e SPIP
 Module105Desc=Interfaccia Mailman o SPIP per il modulo membri
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=Sincronizzazione directory LDAP
 Module210Name=Postnuke
 Module210Desc=Integrazione Postnuke
 Module240Name=Esportazione dati
 Module240Desc=Strumento per esportare i dati di Dolibarr (con assistenti)
 Module250Name=Importazione dati
-Module250Desc=Tool to import data into Dolibarr (with assistants)
+Module250Desc=Strumento per importare dati in Dolibarr (con assistente)
 Module310Name=Membri
 Module310Desc=Gestione membri della fondazione
 Module320Name=Feed RSS
-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=Aggiungi un feed RSS alle pagine Dolibarr
+Module330Name=Segnalibri e scorciatoie
+Module330Desc=Crea collegamenti, sempre accessibili, alle pagine interne o esterne a cui accedi più frequentemente
+Module400Name=Progetti o Opportunità
+Module400Desc=Gestione di progetti ed opportunità. Puoi assegnare ogni elemento (fattura, ordini, proposte commerciali, interventi, ...) ad un progetto ed avere una vista trasversale dalla scheda del progetto
 Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module500Name=Tasse e spese speciali
+Module500Desc=Amministrazione delle spese speciali quali tasse, contributi sociali, dividendi e salari.
 Module510Name=Stipendi
-Module510Desc=Record and track employee payments
+Module510Desc=Gestione salari e pagamenti dei dipendenti
 Module520Name=Prestiti
 Module520Desc=Gestione dei prestiti
-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
+Module600Name=Notifiche di eventi aziendali
+Module600Desc=Inviare notifiche EMail (generate da eventi aziendali) ad utenti (impostazione definita per ogni utente) o contatti di terze parti (impostazione definita per ogni terza parte) o a email predefinite
 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=Varianti prodotto
-Module610Desc=Creation of product variants (color, size etc.)
+Module610Desc=Creazione delle varianti di prodotto (colore, taglia etc.)
 Module700Name=Donazioni
 Module700Desc=Gestione donazioni
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module770Name=Rimborso spese
+Module770Desc=Gestione delle richieste di rimborso spese (trasporti, pasti, ...)
+Module1120Name=Richieste quotazioni fornitore
+Module1120Desc=Gestione delle richieste di offerta e quotazioni verso i fornitori
 Module1200Name=Mantis
 Module1200Desc=Integrazione Mantis
 Module1520Name=Generazione dei documenti
-Module1520Desc=Mass email document generation
+Module1520Desc=Generazione di massa documenti di posta elettronica
 Module1780Name=Tag/categorie
 Module1780Desc=Crea tag / categorie (prodotti, clienti, fornitori, contatti o membri)
 Module2000Name=FCKeditor
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=Permette di usare un editor avanzato (CKEditor) per alcune aree di testo
 Module2200Name=Prezzi dinamici
-Module2200Desc=Use maths expressions for auto-generation of prices
+Module2200Desc=Utilizza espressioni matematiche per la generazione automatica dei prezzi
 Module2300Name=Processi pianificati
 Module2300Desc=Gestione delle operazioni pianificate
 Module2400Name=Eventi/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=Gestione eventi/compiti e ordine del giorno. Registra manualmente eventi nell'agenda o consenti all'applicazione di registrare eventi automaticamente a scopo di monitoraggio. Questo è il modulo principale per una buona gestione delle relazioni con clienti e fornitori. 
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2500Desc=Sistema di gestione documentale / Gestione elettronica dei contenuti. Organizzazione automatica dei documenti generati o archiviati. Condivisione con chi ne ha bisogno.
 Module2600Name=API/Web services (SOAP server)
 Module2600Desc=Attiva il server SOAP che fornisce i servizi di API
 Module2610Name=API/Web services (REST server)
 Module2610Desc=Attiva il server REST che fornisce i servizi di API
 Module2660Name=Chiamata 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.)
+Module2660Desc=Abilitare il client dei Web service Dolibarr (può essere utilizzato per inviare dati / richieste a server esterni. Attualmente sono supportati solo gli ordini di acquisto).
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=Usa il servizio online Gravatar (www.gravatar.com) per mostrare le foto degli utenti/membri. Necessita dell'accesso a Internet
 Module2800Desc=Client FTP
 Module2900Name=GeoIPMaxmind
 Module2900Desc=Localizzazione degli accessi tramite 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=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.
 Module4000Name=Risorse umane
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+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=Workflow management (automatic creation of object and/or automatic status change)
+Module6000Desc=Gestione flussi di lavoro (creazione automatica di oggetti e / o cambio di stati automatico)
 Module10000Name=Siti web
-Module10000Desc=Create websites (public) with a WYSIWYG editor. 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
+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
+Module20000Desc=Gestione delle richieste di ferie e permessi dei dipendenti aziendali
+Module39000Name=Lotti di prodotto
+Module39000Desc=Lotti, numeri seriali, gestione delle date di scadenza dei prodotti
 Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
+Module40000Desc=Usa valute alternative in prezzi e documenti
 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=Modulo per offrire una pagina di pagamento che accetti pagamenti con carte di credito o debito via PayBox. Può essere usato per tutti i pagamenti dei clienti o solo per alcune specifiche tipologie di pagamenti in Dolibarr (fatture, ordini, ...) 
 Module50100Name=Punti vendita SimplePOS
 Module50100Desc=Modulo per la creazione di un punto vendita SimplePOS (POS semplice)
 Module50150Name=Punti vendita TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Modulo Punto vendita TakePOS (touchscreen 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=Modulo per offrire una pagina di pagamento che accetti pagamenti PayPal (carte di credito/debito o credito PayPal). Può essere usato per tutti i pagamenti dei clienti o solo per alcune specifiche tipologie di pagamenti in Dolibarr (fatture, ordini, ...) 
 Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50300Desc=Offri ai clienti una pagina di pagamento online Stripe (carte di credito / debito). Questo modulo può essere usato per consentire ai tuoi clienti di effettuare pagamenti ad-hoc o pagamenti relativi a uno specifico oggetto Dolibarr (fattura, ordine ecc ...)
+Module50400Name=Contabilità (partita doppia)
+Module50400Desc=Gestione contabile (partita doppia, supporto per libri contabili principali e ausiliari). Esportazione del libro mastro in diversi altri formati per software contabili.
 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=Sondaggio, Indagine o Votazione
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module55000Desc=Modulo per creare sondaggi, indagini o feedback online (Doodle, Studs, Rdvz o simili)
 Module59000Name=Margini
 Module59000Desc=Modulo per gestire margini
 Module60000Name=Commissioni
 Module60000Desc=Modulo per gestire commissioni
 Module62000Name=Import-Export
-Module62000Desc=Add features to manage Incoterms
+Module62000Desc=Aggiunge funzioni per la gestione Incoterm
 Module63000Name=Risorse
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=Gestione risorse (stampanti, automobili, locali, ...) e loro utilizzo all'interno degli eventi
 Permission11=Vedere le fatture attive
 Permission12=Creare fatture attive
 Permission13=Annullare le fatture attive
@@ -715,10 +718,10 @@ Permission109=Eliminare spedizioni
 Permission111=Vedere i conti bancari
 Permission112=Creare/modificare/cancellare e confrontare operazioni bancarie
 Permission113=Imposta conti finanziari (crea, gestire le categorie)
-Permission114=Reconcile transactions
+Permission114=Riconciliare transazioni
 Permission115=Operazioni di esportazione ed estratti conto
 Permission116=Trasferimenti tra conti
-Permission117=Manage checks dispatching
+Permission117=Gestire il deposito di assegni
 Permission121=Vedere soggetti terzi collegati all'utente
 Permission122=Creare/modificare terzi legati all'utente
 Permission125=Eliminare terzi legati all'utente
@@ -737,7 +740,7 @@ Permission162=Crea/modifica contratti/abbonamenti
 Permission163=Attiva un servizio/sottoscrizione di un contratto
 Permission164=Disable a service/subscription of a contract
 Permission165=Elimina contratti / abbonamenti
-Permission167=Esprta contratti
+Permission167=Esportare contratti
 Permission171=Vedi viaggi e spese (propri e i suoi subordinati)
 Permission172=Crea/modifica nota spese
 Permission173=Elimina nota spese
@@ -816,7 +819,7 @@ Permission401=Vedere sconti
 Permission402=Creare/modificare sconti
 Permission403=Convalidare sconti
 Permission404=Eliminare sconti
-Permission430=Use Debug Bar
+Permission430=Usa la barra di debug
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -838,11 +841,11 @@ Permission701=Vedere donazioni
 Permission702=Creare/modificare donazioni
 Permission703=Eliminare donazioni
 Permission771=Visualizzare le note spese (tue e dei tuoi subordinati)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
+Permission772=Creare / modificare le note spese
+Permission773=Eliminare le note spese
+Permission774=Vedere tutte le note spese (anche per utenti non subordinati)
+Permission775=Approvare le note spese
+Permission776=Pagare le note spese
 Permission779=Esporta note spese
 Permission1001=Vedere magazzino
 Permission1002=Crea/modifica magazzini
@@ -870,18 +873,18 @@ Permission1188=Delete purchase orders
 Permission1190=Approve (second approval) purchase orders
 Permission1201=Ottieni il risultato di un esportazione
 Permission1202=Creare/Modificare esportazioni
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
+Permission1231=Visualizzare le fatture fornitori
+Permission1232=Creare / modificare fatture fornitore
+Permission1233=Convalidare fatture fornitore
+Permission1234=Eliminare fatture fornitore
+Permission1235=Inviare fatture fornitore tramite e-mail
 Permission1236=Export vendor invoices, attributes and payments
 Permission1237=Export purchase orders and their details
 Permission1251=Eseguire importazioni di massa di dati esterni nel database (data load)
 Permission1321=Esportare fatture attive, attributi e pagamenti
 Permission1322=Riaprire le fatture pagate
 Permission1421=Esporta Ordini Cliente e attributi
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
+Permission2401=Leggere le azioni (eventi o attività) collegate al suo account utente (se proprietario dell'evento)
 Permission2402=Creare/modificare azioni (eventi o compiti) personali
 Permission2403=Cancellare azioni (eventi o compiti) personali
 Permission2411=Vedere azioni (eventi o compiti) altrui
@@ -908,7 +911,7 @@ Permission20002=Create/modify your leave requests (your leave and those of your
 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)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20006=Amministrazione richieste di ferie/permessi  (impostazione e aggiornamento del bilancio)
 Permission20007=Approvare le richieste di ferie
 Permission23001=Leggi lavoro pianificato
 Permission23002=Crea / Aggiorna lavoro pianificato
@@ -923,7 +926,7 @@ 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)
+Permission50420=Report e report sulle esportazioni (fatturato, saldo, giornali, libro mastro)
 Permission50430=Define and close a fiscal period
 Permission50440=Manage chart of accounts, setup of accountancy
 Permission51001=Read assets
@@ -943,25 +946,25 @@ Permission63004=Collega le risorse agli eventi
 DictionaryCompanyType=Tipo di soggetto terzo
 DictionaryCompanyJuridicalType=Entità legali di terze parti
 DictionaryProspectLevel=Liv. cliente potenziale
-DictionaryCanton=States/Provinces
+DictionaryCanton=Stati / Province
 DictionaryRegion=Regioni
 DictionaryCountry=Paesi
 DictionaryCurrency=Valute
-DictionaryCivility=Title of civility
+DictionaryCivility=Titoli personali e professionali
 DictionaryActions=Tipi di azioni/eventi
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Aliquote IVA o Tasse di vendita
-DictionaryRevenueStamp=Amount of tax stamps
+DictionaryRevenueStamp=Ammontare dei valori bollati
 DictionaryPaymentConditions=Termini di Pagamento
-DictionaryPaymentModes=Payment Modes
+DictionaryPaymentModes=Tipi di pagamento
 DictionaryTypeContact=Tipi di contatti/indirizzi
 DictionaryTypeOfContainer=Website - Type of website pages/containers
 DictionaryEcotaxe=Ecotassa (WEEE)
 DictionaryPaperFormat=Formati di carta
 DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
+DictionaryFees=Note spesa - Tipi di righe delle note spesa
 DictionarySendingMethods=Metodi di spedizione
-DictionaryStaff=Number of Employees
+DictionaryStaff=Numero di dipendenti
 DictionaryAvailability=Tempi di consegna
 DictionaryOrderMethods=Metodi di ordinazione
 DictionarySource=Origine delle proposte/ordini
@@ -973,21 +976,22 @@ DictionaryUnits=Unità
 DictionaryMeasuringUnits=Unità di misura
 DictionarySocialNetworks=Social networks
 DictionaryProspectStatus=Stato cliente potenziale
-DictionaryHolidayTypes=Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryHolidayTypes=Tipi di ferie/permessi
+DictionaryOpportunityStatus=Stato opportunità per progetto/clienti potenziali
+DictionaryExpenseTaxCat=Note spesa - Categorie di trasporto
+DictionaryExpenseTaxRange=Note spesa: intervallo per categoria di trasporto
 SetupSaved=Impostazioni salvate
 SetupNotSaved=Impostazioni non salvate
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
+BackToModuleList=Torna all'elenco dei moduli
+BackToDictionaryList=Torna all'elenco dei dizionari
 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.
+VATManagement=Gestione imposte sulle vendite
+VATIsUsedDesc=Per impostazione predefinita quando si creano proposte commerciali, fatture, ordini ecc., L'aliquota IVA segue la regola standard attiva: <br> Se il venditore non è soggetto all'imposta sulle vendite, per impostazione predefinita l'imposta sulle vendite è 0. Fine della regola. <br> Se il (Paese del fornitore = Paese dell'acquirente), l'imposta sulle vendite per impostazione predefinita è uguale all'imposta sulle vendite del prodotto nel paese del fornitore. Fine della regola <br> Se il fornitore e l'acquirente sono entrambi nella Comunità Europea e le merci sono prodotti relativi al trasporto (trasporto, spedizione, compagnia aerea), l'IVA di default è 0. Questa regola dipende dal paese del fornitore - consultare il proprio commercialista. L'IVA deve essere pagata dall'acquirente all'ufficio doganale del proprio paese e non al venditore. Fine della regola <br> Se il fornitore e l'acquirente sono entrambi nella Comunità Europea e l'acquirente non è una società (con un numero di partita IVA intracomunitaria registrato), l'IVA si imposta automaticamente sull'aliquota IVA del paese del fornitore. Fine della regola <br> Se il fornitore e l'acquirente sono entrambi nella Comunità Europea e l'acquirente è una società (con una partita IVA intracomunitaria registrata), l'IVA è 0 per impostazione predefinita. Fine della regola <br> In tutti gli altri casi il valore predefinito proposto è IVA = 0. Fine della regola
+VATIsNotUsedDesc=Per impostazione predefinita, l'imposta sulle vendite proposta è 0 che può essere utilizzata per casi come associazioni, privati o piccole aziende.
 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=Tariffa
 LocalTax1IsNotUsed=Non usare seconda tassa
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Per impostazione predefinita la proposta di IRPF è 0. Fine della regola.
 LocalTax2IsUsedExampleES=In Spagna, liberi professionisti e freelance che forniscono servizi e le aziende che hanno scelto il regime fiscale modulare.
 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 des 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=Acquisti-vendite
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
@@ -1018,11 +1025,12 @@ CalcLocaltax2=Acquisti
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=Vendite
 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=Descrizione (utilizzata in tutti i documenti per cui non esiste la traduzione)
 LabelOnDocuments=Descrizione sul documento
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of a configuration constant
-NbOfDays=No. of days
+LabelOrTranslationKey=Etichetta o chiave di traduzione
+ValueOfConstantKey=Valore di una costante
+NbOfDays=Numero di giorni
 AtEndOfMonth=Alla fine del mese
 CurrentNext=Corrente/Successivo
 Offset=Scostamento
@@ -1059,23 +1067,23 @@ Skin=Tema
 DefaultSkin=Skin di default
 MaxSizeList=Lunghezza massima elenchi
 DefaultMaxSizeList=Lunghezza massima predefinita elenchi
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+DefaultMaxSizeShortList=Massima lunghezza di default per gli elenchi brevi (es in scheda cliente)
 MessageOfDay=Messaggio del giorno
 MessageLogin=Messaggio per la pagina di login
 LoginPage=Pagina di login
 BackgroundImageLogin=Immagine di sfondo
 PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra
 DefaultLanguage=Lingua predefinita (codice lingua)
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Abilita supporto multilingua
 EnableShowLogo=Abilita la visualizzazione del logo
 CompanyInfo=Società/Organizzazione
-CompanyIds=Company/Organization identities
+CompanyIds=Informazioni società/fondazione
 CompanyName=Nome
 CompanyAddress=Indirizzo
 CompanyZip=CAP
 CompanyTown=Città
 CompanyCountry=Paese
-CompanyCurrency=Principali valute
+CompanyCurrency=Valuta principale
 CompanyObject=Mission della società
 IDCountry=ID paese
 Logo=Logo
@@ -1091,26 +1099,26 @@ 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.
 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_PROJECT_TO_CLOSE=Progetto non chiuso in tempo
 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_PROPALS_TO_CLOSE=Proposta non chiusa
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposta non fatturata
 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_SUPPLIER_BILLS_TO_PAY=Fattura fornitore non pagata
 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_EXPENSEREPORTS=Note spese da approvare
 Delays_MAIN_DELAY_HOLIDAYS=Invia richieste da approvare
 SetupDescription1=Prima di iniziare ad utilizzare Dolibarr si devono definire alcuni parametri iniziali ed abilitare/configurare i moduli.
 SetupDescription2=Le 2 seguenti sezioni sono obbligatorie (le prime 2 sezioni nel menu Impostazioni):
-SetupDescription3=<a href="%s">%s -> %s</a><br>Parametri di base utilizzati per personalizzare il comportamento predefinito della tua applicazione (es: caratteristiche relative alla nazione).
-SetupDescription4=<a href="%s">%s -> %s</a><br>Questo software è una suite composta da molteplici moduli/applicazioni, tutti più o meno indipendenti. I moduli rilevanti per le tue necessità devono essere abilitati e configurati. Nuovi oggetti/opzioni vengono aggiunti ai menu quando un modulo viene attivato.
-SetupDescription5=Other Setup menu entries manage optional parameters.
+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=Altre voci di menu consentono la gestione di parametri opzionali.
 LogEvents=Eventi di audit di sicurezza
 Audit=Audit
 InfoDolibarr=Informazioni su Dolibarr
@@ -1127,11 +1135,11 @@ SecurityEventsPurged=Eventi di sicurezza eliminati
 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=I parametri di setup possono essere definiti solo da utenti di tipo <b>amministratore</b>.
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+SystemAreaForAdminOnly=Questa area è disponibile solo per gli utenti amministratori. Le autorizzazioni utente Dolibarr non possono modificare questa limitazione.
+CompanyFundationDesc=Modifica le informazioni dell'azienda / fondazione. Fai clic sul pulsante "%s" nella parte inferiore della pagina.
+AccountantDesc=Se hai un contabile / contabile esterno, puoi modificare qui le sue informazioni.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+DisplayDesc=Qui è possibile scegliere i parametri relativi all'aspetto di Dolibarr
 AvailableModules=Moduli disponibili
 ToActivateModule=Per attivare i moduli, andare nell'area <b>Impostazioni</b> (Home->Impostazioni->Moduli).
 SessionTimeOut=Timeout delle sessioni
@@ -1144,16 +1152,16 @@ TriggerAlwaysActive=I trigger in questo file sono sempre attivi, indipendentemen
 TriggerActiveAsModuleActive=I trigger in questo file sono attivi se il modulo <b>%s</b> è attivo.
 GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
 DictionaryDesc=Inserire tutti i dati di riferimento. È possibile aggiungere i propri valori a quelli di default.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting. For a full list of the parameters available <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">see here</a>.
+ConstDesc=Questa pagina consente di modificare (sovrascrivere) i parametri non disponibili in altre pagine. Questi sono parametri principalmente riservati agli sviluppatori o per la risoluzione avanzata dei problemi.
 MiscellaneousDesc=Definire qui tutti gli altri parametri relativi alla sicurezza.
 LimitsSetup=Limiti/impostazioni di precisione
-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=Da qui è possibile definire i limiti e la precisione utilizzati da Dolibarr.
+MAIN_MAX_DECIMALS_UNIT=Limite massimo di decimali per i prezzi unitari
+MAIN_MAX_DECIMALS_TOT=Limite massimo di decimali per il totale dei prezzi.
+MAIN_MAX_DECIMALS_SHOWN=Limite massimo dei decimali per i prezzi <b>visualizzati a schermo</b> (Aggiungi <b>...</b> dopo tale numero (es. "2...") se vuoi visualizzare <b>tre puntini</b> per indicare il troncamento del numero).
+MAIN_ROUNDING_RULE_TOT=Regola per l'arrotondamento (per i pochi paesi in cui l'arrotondamento non è calcolato in base 10). Per esempio, inserisci 0.05 se l'arrotondamento viene fatto a step di 0.05
 UnitPriceOfProduct=Prezzo unitario netto di un prodotto
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+TotalPriceAfterRounding=Prezzo totale (IVA esclusa / IVA inclusa) dopo l'arrotondamento
 ParameterActiveForNextInputOnly=Parametro valido esclusivamente per il prossimo inserimento
 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.
@@ -1170,15 +1178,15 @@ RestoreDesc3=Restore the database structure and data from a backup dump file int
 RestoreMySQL=Importa MySQL
 ForcedToByAModule= Questa regola è impsotata su <b>%s</b> da un modulo attivo
 PreviousDumpFiles=Existing backup files
-PreviousArchiveFiles=Existing archive files
-WeekStartOnDay=First day of the week
+PreviousArchiveFiles=Archivio files esistente
+WeekStartOnDay=Primo giorno della settimana
 RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
 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
-ShowProfIdInAddress=Show professional id with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number with addresses
+ShowProfIdInAddress=Nei documenti mostra identità professionale completa di:
+ShowVATIntaInAddress=Nascondi il numero di partita IVA intracomunitaria negli indirizzi
 TranslationUncomplete=Traduzione incompleta
 MAIN_DISABLE_METEO=Disable meteorological view
 MeteoStdMod=Standard mode
@@ -1188,31 +1196,31 @@ MeteoPercentageModEnabled=Percentage mode enabled
 MeteoUseMod=Clicca per usare %s
 TestLoginToAPI=Test login per 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
+ExternalAccess=Accesso esterno / Internet
 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
+DefineHereComplementaryAttributes=Definire gli eventuali attributi aggiuntivi / campi personalizzati che devono essere inclusi negli oggetti: %s
 ExtraFields=Campi extra
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsLines=Attributi complementari (righe)
+ExtraFieldsLinesRec=Attributi complementari (righe di template di fattura)
+ExtraFieldsSupplierOrdersLines=Attributi complementari (righe ordine)
+ExtraFieldsSupplierInvoicesLines=Attributi complementari (righe di fattura)
 ExtraFieldsThirdParties=Attributi complementari (soggetto terzo)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsContacts=Attributi complementari (contatti / indirizzo)
 ExtraFieldsMember=Attributi Complementari (membri)
 ExtraFieldsMemberType=Attributi Complementari (tipo di membro)
 ExtraFieldsCustomerInvoices=Attributi aggiuntivi (fatture)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsCustomerInvoicesRec=Attributi complementari (template di fattura)
 ExtraFieldsSupplierOrders=Attributi Complementari (ordini)
 ExtraFieldsSupplierInvoices=Attributi Complementari (fatture)
 ExtraFieldsProject=Attributi Complementari (progetti)
 ExtraFieldsProjectTask=Attributi Complementari (attività)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Attributi complementari (stipendi)
 ExtraFieldHasWrongValue=L'attributo %s ha un valore errato.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+AlphaNumOnlyLowerCharsAndNoSpace=solo caratteri alfanumerici e caratteri minuscoli senza spazio
 SendmailOptionNotComplete=Attenzione: su alcuni sistemi Linux, per poter inviare email, la configurazione di sendmail deve contenere l'opzione -ba (il parametro mail.force_extra_parameters nel file php.ini). Se alcuni destinatari non ricevono messaggi di posta elettronica, provate a modificare questo parametro con mail.force_extra_parameters =-BA).
 PathToDocuments=Percorso documenti
 PathDirectory=Percorso directory
@@ -1233,7 +1241,7 @@ TotalNumberOfActivatedModules=Applicazioni/moduli attivi: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Si in estate
-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=Nota, solo i seguenti moduli sono disponibili per gli utenti esterni (indipendentemente dalle autorizzazioni di tali utenti) e solo se le autorizzazioni sono concesse: <br>
 SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin
 ConditionIsCurrently=La condizione corrente è %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
@@ -1261,16 +1269,18 @@ SetupPerso=Secondo la tua configurazione
 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
+DisableForgetPasswordLinkOnLogonPage=Non mostrare il link "Password dimenticata?" nella pagina di accesso
 UsersSetup=Impostazioni modulo utenti
-UserMailRequired=Email required to create a new user
+UserMailRequired=È obbligatorio inserire un indirizzo email per creare un nuovo utente
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Impostazioni modulo risorse umane
 ##### Company setup #####
 CompanySetup=Impostazioni modulo aziende
-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:
+CompanyCodeChecker=Opzioni per la generazione automatica di codici cliente / fornitore
+AccountCodeManager=Opzioni per la generazione automatica di codici contabili cliente / fornitore
+NotificationsDesc=Le notifiche e-mail possono essere inviate automaticamente per alcuni eventi Dolibarr. <br> I destinatari delle notifiche possono essere definiti:
 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.
@@ -1295,19 +1305,19 @@ BillsPDFModules=Modelli fattura in pdf
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Forza la data della fattura alla data di convalida
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggerire le modalità predefinite di pagamento delle fatture, se non definite già nella fattura
+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=Testo libero sulle fatture
 WatermarkOnDraftInvoices=Bozze delle fatture filigranate (nessuna filigrana se vuoto)
 PaymentsNumberingModule=Modello per la numerazione dei documenti
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+SuppliersPayment=Pagamenti fornitori
+SupplierPaymentSetup=Impostazioni pagamenti fornitori
 ##### Proposals #####
 PropalSetup=Impostazioni proposte commerciali
 ProposalsNumberingModules=Modelli di numerazione della proposta commerciale
 ProposalsPDFModules=Modelli per pdf proposta commerciale
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Testo libero sulle proposte commerciali
 WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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=Impostazione gestione Ordini Cliente
 OrdersNumberingModules=Modelli di numerazione ordini
 OrdersModelModule=Modelli per ordini in pdf
@@ -1509,12 +1520,12 @@ CacheByClient=Cache per browser
 CompressionOfResources=Compressione delle risposte HTTP
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Con i browser attuali l'individuazione automatica non è possibile
-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)
+DefaultValuesDesc=Qui è possibile definire il valore predefinito che si desidera utilizzare durante la creazione di un nuovo record e / o i filtri predefiniti o l'ordinamento quando si elencano i record.
+DefaultCreateForm=Valori predefiniti (da utilizzare nei form)
 DefaultSearchFilters=Filtri di ricerca predefiniti
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+DefaultSortOrder=Ordinamento predefinito
+DefaultFocus=Campi con focus predefinito
+DefaultMandatory=Campi obbligatori
 ##### Products #####
 ProductSetup=Impostazioni modulo prodotti
 ServiceSetup=Impostazioni modulo servizi
@@ -1577,7 +1588,7 @@ 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
+NotificationSetup=Impostazioni modulo notifiche email
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Destinatario
 ##### Sendings #####
@@ -1603,7 +1614,7 @@ FCKeditorForUserSignature=WYSIWIG creazione/modifica della firma utente
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
 FCKeditorForTicket=Creazione / edizione WYSIWIG per i biglietti
 ##### Stock #####
-StockSetup=Stock module setup
+StockSetup=Impostazioni modulo magazzino
 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 soppresso
@@ -1650,7 +1661,7 @@ SupposedToBeInvoiceDate=Alla data della fattura
 Buy=Acquista
 Sell=Vendi
 InvoiceDateUsed=Data utilizzata per la fatturazione
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=La tua azienda è stata definita per non utilizzare l'IVA (Home - Installazione - Azienda / Organizzazione), quindi non ci sono opzioni IVA da impostare.
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Codice contabilità vendite
 AccountancyCodeBuy=Codice contabilità acquisti
@@ -1662,7 +1673,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Quale scheda si desidera aprire per impostazione predefinita quando si seleziona il menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Attiva i suoni per le notifiche
@@ -1691,7 +1702,7 @@ CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dat
 CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
 ##### Bookmark #####
 BookmarkSetup=Impostazioni modulo segnalibri
-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.
+BookmarkDesc=Questo modulo consente di gestire i segnalibri web. È possibile aggiungere collegamenti a pagine Dolibarr o a qualsiasi altro sito web esterno al menu di sinistra.
 NbOfBoomarkToShow=Numero massimo dei segnalibri da mostrare nel menu di sinistra
 ##### WebServices #####
 WebServicesSetup=Impostazioni modulo webservices
@@ -1704,8 +1715,8 @@ ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscel
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Puoi controllare e testare le API all'indirizzo
 OnlyActiveElementsAreExposed=Vengono esposti solo elementi correlati ai moduli abilitati
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiKey=Chiave per API
+WarningAPIExplorerDisabled=L'API Explorer è stato disabilitato. API Explorer non è tenuto a fornire servizi API. È uno strumento per gli sviluppatori per trovare / testare le API REST. Se hai bisogno di questo strumento, vai all'installazione del modulo API REST per attivarlo.
 ##### Bank #####
 BankSetupModule=Impostazioni modulo banca/cassa
 FreeLegalTextOnChequeReceipts=Free text on check receipts
@@ -1719,11 +1730,11 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
 MultiCompanySetup=Impostazioni modulo multiazienda
 ##### Suppliers #####
 SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of Purchase Order
+SuppliersCommandModel=Modello completo dell'ordine d'acquisto
 SuppliersCommandModelMuscadet=Complete template of Purchase Order 
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersInvoiceModel=Modello completo di fattura fornitore
+SuppliersInvoiceNumberingModel=Modello per la numerazione delle fatture fornitore
+IfSetToYesDontForgetPermission=Se impostato su un valore non nullo, non dimenticare di fornire autorizzazioni a gruppi o utenti autorizzati per la seconda approvazione
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Impostazioni modulo GeoIP Maxmind
 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
@@ -1749,7 +1760,7 @@ DeleteFiscalYear=Elimina periodo di esercizio
 ConfirmDeleteFiscalYear=Vuoi davvero cancellare questo periodo di esercizio?
 ShowFiscalYear=Mostra periodo di esercizio
 AlwaysEditable=Può essere modificato in qualsiasi momento
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
+MAIN_APPLICATION_TITLE=Forza il nome visibile dell'applicazione (avviso: l'impostazione del proprio nome qui potrebbe interrompere la funzionalità di accesso alla compilazione automatica quando si utilizza l'applicazione mobile DoliDroid)
 NbMajMin=Numero minimo di caratteri maiuscoli
 NbNumMin=Numero minimo di caratteri numerici
 NbSpeMin=Numero minimo di caratteri speciali
@@ -1764,36 +1775,36 @@ ExpenseReportsSetup=Impostazioni del modulo note spese
 TemplatePDFExpenseReports=Document templates to generate expense report document
 ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
+ExpenseReportNumberingModules=Modelli di numerazione delle note spesa
 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*
+YouMayFindNotificationsFeaturesIntoModuleNotification=È possibile trovare opzioni per le notifiche e-mail abilitando e configurando il modulo 'Notifiche di eventi lavorativi'
+ListOfNotificationsPerUser=Elenco delle notifiche automatiche per utente*
 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
+ListOfFixedNotifications=Elenco di notifiche fisse automatiche
+GoOntoUserCardToAddMore=Vai alla scheda "Notifiche" di un utente per aggiungere o rimuovere le notifiche per gli utenti
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Soglia
-BackupDumpWizard=Wizard to build the database dump file
+BackupDumpWizard=Procedura guidata per creare file di backup del database (dump)
 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)
+HighlightLinesColor=Evidenzia il colore della linea quando passa il mouse (usa 'ffffff' per nessuna evidenziazione)
+HighlightLinesChecked=Evidenzia il colore della linea quando è selezionata (usa 'ffffff' per nessuna evidenziazione)
 TextTitleColor=Colore del testo del titolo della pagina
 LinkColor=Colore dei link
 PressF5AfterChangingThis=Premi CTRL + F5 sulla tastiera o cancella la cache del browser per rendere effettiva la modifica di questo parametro
 NotSupportedByAllThemes=Funziona con il tema Eldy ma non è supportato da tutti gli altri temi
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
+BackgroundColor=Colore di sfondo
+TopMenuBackgroundColor=Colore di sfondo menù in alto
 TopMenuDisableImages=Nascondi le icone nel menu superiore
-LeftMenuBackgroundColor=Background color for Left menu
+LeftMenuBackgroundColor=Colore di sfondo menù laterale
 BackgroundTableTitleColor=Colore di sfondo della riga di intestazione
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
+BackgroundTableTitleTextColor=Colore del testo per la riga del titolo delle tabelle
+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.
@@ -1884,19 +1895,19 @@ RemoveSpecialChars=Rimuovi caratteri speciali
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter su clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicazione non consentita
-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
+GDPRContact=DPO (Data Protection Officer) o in italiano RPD (Responsabile della Protezione dei Dati)
+GDPRContactDesc=Se memorizzi dati relativi a società / cittadini europei, puoi memorizzare qui il contatto responsabile del trattamento dei dati personali/sensibili
+HelpOnTooltip=Testo di aiuto da mostrare come tooltip
+HelpOnTooltipDesc=Inserisci qui il testo o una chiave di traduzione affinché il testo sia mostrato nel tooltip quando questo campo appare in un form 
 YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
 ChartLoaded=Chart of account loaded
 SocialNetworkSetup=Setup of module Social Networks
 EnableFeatureFor=Enable features for <strong>%s</strong>
 VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+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.
 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).
+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
 EMailHost=Host of email IMAP server
 MailboxSourceDirectory=Mailbox source directory
@@ -1917,7 +1928,7 @@ RecordEvent=Record email event
 CreateLeadAndThirdParty=Crea Opportunità (e Soggetto terzo se necessario)
 CreateTicketAndThirdParty=Crea Ticket (e Soggetto terzo se necessario)
 CodeLastResult=Ultimo codice risultato
-NbOfEmailsInInbox=Number of emails in source directory
+NbOfEmailsInInbox=Numero di e-mail nella directory di origine
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
 WithDolTrackingID=Dolibarr Tracking ID found
@@ -1926,8 +1937,8 @@ FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<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=Orari di apertura
+OpeningHoursDesc=Inserisci gli orari di apertura regolare della tua azienda.
 ResourceSetup=Configuration of Resource module
 UseSearchToSelectResource=Utilizza il form di ricerca per scegliere una risorsa (invece della lista a tendina)
 DisabledResourceLinkUser=Disattiva funzionalità per collegare una risorsa agli utenti
@@ -1936,10 +1947,10 @@ EnableResourceUsedInEventCheck=Abilitare la funzione per verificare se una risor
 ConfirmUnactivation=Conferma reset del modulo
 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_OPTIMIZEFORTEXTBROWSER=Semplifica l'interfaccia per i non vedenti
 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_OPTIMIZEFORCOLORBLIND=Cambia il colore dell'interfaccia per i non vedenti
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Abilita questa opzione se sei daltonico, in alcuni casi l'interfaccia cambierà la configurazione del colore per aumentare il contrasto.
 Protanopia=Protanopia
 Deuteranopes=Deuteranopes
 Tritanopes=Tritanopes
@@ -1948,17 +1959,18 @@ DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
 RootCategoryForProductsToSell=Root category of products to sell
 RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
+DebugBar=Barra di debug
 DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
+DebugBarSetup=Impostazione barra di debug
 GeneralOptions=General Options
 LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
+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
 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
@@ -1979,5 +1991,7 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Funzione non disponibile quando la ricezione del modulo è abilitata
 EmailTemplate=Modello per le e-mail
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 380091e9351..fad1a61d848 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -17,7 +17,7 @@ CurrentAccounts=Conti correnti
 SavingAccounts=Conti di risparmio
 ErrorBankLabelAlreadyExists=Etichetta banca già esistente
 BankBalance=Saldo
-BankBalanceBefore=Saldo prima
+BankBalanceBefore=Bilancio precedente
 BankBalanceAfter=Saldo dopo
 BalanceMinimalAllowed=Saldo minimo consentito
 BalanceMinimalDesired=Saldo minimo voluto
@@ -42,7 +42,7 @@ AccountStatementShort=Est. conto
 AccountStatements=Estratti conto
 LastAccountStatements=Ultimi estratti conto
 IOMonthlyReporting=Report mensile
-BankAccountDomiciliation=Bank address
+BankAccountDomiciliation=Indirizzo banca
 BankAccountCountry=Paese del conto
 BankAccountOwner=Nome titolare
 BankAccountOwnerAddress=Indirizzo titolare
@@ -139,7 +139,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 dar includere nella ricevuta di versamento e clicca su "Crea".
+SelectChequeTransactionAndGenerate=Seleziona gli assegni da includere nella ricevuta di versamento e clicca su "Crea".
 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 20e5e69e47e..6473762dbcc 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -66,14 +66,14 @@ paymentInInvoiceCurrency=nella valuta delle fatture
 PaidBack=Rimborsato
 DeletePayment=Elimina pagamento
 ConfirmDeletePayment=Vuoi davvero cancellare questo pagamento?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+ConfirmConvertToReduc=Vuoi convertire questa %s in uno sconto assoluto?
 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 absolute discount?
+ConfirmConvertToReducSupplier=Vuoi convertire questo %s in uno sconto assoluto?
 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=Pagamenti ricevuti
 ReceivedCustomersPayments=Pagamenti ricevuti dai clienti
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=Pagamenti effettuati ai fornitori
 ReceivedCustomersPaymentsToValid=Pagamenti ricevuti dai clienti da convalidare
 PaymentsReportsForYear=Report pagamenti per %s
 PaymentsReports=Report pagamenti
@@ -106,7 +106,7 @@ AddBill=Crea fattura o nota di credito
 AddToDraftInvoices=Aggiungi alle fattture in bozza
 DeleteBill=Elimina fattura
 SearchACustomerInvoice=Cerca una fattura attiva
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Cerca una fattura fornitore
 CancelBill=Annulla una fattura
 SendRemindByMail=Inviare promemoria via email
 DoPayment=Registra pagamento
@@ -146,7 +146,7 @@ BillShortStatusClosedPaidPartially=Pagata (in parte)
 PaymentStatusToValidShort=Da convalidare
 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
+ErrorCreateBankAccount=Crea un conto bancario, quindi passa al modulo impostazione delle fatture per definire i tipi di pagamento
 ErrorBillNotFound=La fattura %s non esiste
 ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Errore, sconto già utilizzato
@@ -204,8 +204,8 @@ ConfirmSupplierPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmValidatePayment=Vuoi davvero convalidare questo pagamento? Una volta convalidato non si potranno più operare modifiche.
 ValidateBill=Convalida fattura
 UnvalidateBill=Invalida fattura
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+NumberOfBills=Numero di fatture
+NumberOfBillsByMonth=Numero di fatture per mese
 AmountOfBills=Importo delle fatture
 AmountOfBillsHT=Amount of invoices (net of tax)
 AmountOfBillsByMonthHT=Importo delle fatture per mese (al netto delle imposte)
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Mostra avanzamento lavori
 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
@@ -334,7 +337,7 @@ InvoiceDateCreation=Data di creazione fattura
 InvoiceStatus=Stato Fattura
 InvoiceNote=Nota Fattura
 InvoicePaid=Fattura pagata
-InvoicePaidCompletely=Paid completely
+InvoicePaidCompletely=Pagata completamente
 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
@@ -354,7 +357,7 @@ ConfirmRemoveDiscount=Vuoi davvero eliminare questo sconto?
 RelatedBill=Fattura correlata
 RelatedBills=Fatture correlate
 RelatedCustomerInvoices=Fatture attive correlate
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=Fatture fornitore correlate
 LatestRelatedBill=Ultima fattura correlata
 WarningBillExist=Warning, one or more invoices already exist
 MergingPDFTool=Strumento di fusione dei PDF
@@ -378,7 +381,7 @@ NextDateToExecution=Data per la prossima generazione di fattura
 NextDateToExecutionShort=Data successiva gen.
 DateLastGeneration=Data dell'ultima generazione
 DateLastGenerationShort=Data ultima gen.
-MaxPeriodNumber=Max. number of invoice generation
+MaxPeriodNumber=Numero massimo di fatture da generare
 NbOfGenerationDone=Numero di fatture generate già create
 NbOfGenerationDoneShort=Numero di generazione eseguita
 MaxGenerationReached=Numero massimo di generazioni raggiunto
@@ -441,7 +444,7 @@ PaymentTypeFAC=Fattore
 PaymentTypeShortFAC=Fattore
 BankDetails=Dati banca
 BankCode=ABI
-DeskCode=Branch code
+DeskCode=Codice filiale
 BankAccountNumber=C.C.
 BankAccountNumberKey=Checksum
 Residence=Indirizzo
@@ -477,13 +480,13 @@ UseLine=Applica
 UseDiscount=Usa lo sconto
 UseCredit=Utilizza il credito
 UseCreditNoteInInvoicePayment=Riduci l'ammontare del pagamento con la nota di credito
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=Deposito assegni
 MenuCheques=Assegni
 MenuChequesReceipts=Check receipts
 NewChequeDeposit=Nuovo acconto
 ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesArea=Area deposito assegni
+ChequeDeposits=Deposito assegni
 Cheques=Assegni
 DepositId=ID deposito
 NbCheque=Numero di assegni
@@ -509,11 +512,11 @@ ToMakePayment=Paga
 ToMakePaymentBack=Rimborsa
 ListOfYourUnpaidInvoices=Elenco fatture non pagate
 NoteListOfYourUnpaidInvoices=Nota: questo elenco contiene solo fatture che hai collegato ad un rappresentante.
-RevenueStamp=Marca da bollo
+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=Per creare un nuovo modelo bisogna prima creare una fattura normale e poi convertirla.
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Modello di fattura PDF Crabe. Un modello completo di fattura 
 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.
@@ -528,7 +531,7 @@ TypeContact_facture_external_BILLING=Contatto fatturazioni clienti
 TypeContact_facture_external_SHIPPING=Contatto spedizioni clienti
 TypeContact_facture_external_SERVICE=Contatto servizio clienti
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_BILLING=Contatto fattura fornitore
 TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
 TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 # Situation invoices
@@ -575,3 +578,4 @@ AutoFillDateTo=Imposta data di fine per la riga di servizio con la successiva da
 AutoFillDateToShort=Imposta data di fine
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Fattura cancellata
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/it_IT/blockedlog.lang b/htdocs/langs/it_IT/blockedlog.lang
index f69567e0ebf..b0cbfa4cdde 100644
--- a/htdocs/langs/it_IT/blockedlog.lang
+++ b/htdocs/langs/it_IT/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 33a3614472e..c55a5828087 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -4,7 +4,7 @@ BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
 BoxProductsAlertStock=Avvisi per le scorte di prodotti
 BoxLastProductsInContract=Ultimi %s prodotti/servizi contrattualizzati
-BoxLastSupplierBills=Latest Vendor invoices
+BoxLastSupplierBills=Ultime fatture fornitore
 BoxLastCustomerBills=Latest Customer invoices
 BoxOldestUnpaidCustomerBills=Ultime fatture attive non pagate
 BoxOldestUnpaidSupplierBills=Fatture Fornitore non pagate più vecchie
@@ -21,14 +21,14 @@ BoxFicheInter=Ultimi interventi
 BoxCurrentAccounts=Saldo conti aperti
 BoxTitleMemberNextBirthdays=Compleanni di questo mese (membri)
 BoxTitleLastRssInfos=Ultime %s notizie da %s
-BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleLastProducts=Prodotti/Servizi: ultimi %s modificati
 BoxTitleProductsAlertStock=Prodotti: allerta scorte
 BoxTitleLastSuppliers=Ultimi %s ordini fornitore
 BoxTitleLastModifiedSuppliers=Fornitori: ultimi %s modificati
 BoxTitleLastModifiedCustomers=Clienti: ultimi %s modificati
 BoxTitleLastCustomersOrProspects=Ultimi %s clienti o potenziali clienti
-BoxTitleLastCustomerBills=Ultime %s Fatture Cliente
-BoxTitleLastSupplierBills=Ultime %sFatture Fornitore
+BoxTitleLastCustomerBills=Ultime %s fatture attive modificate
+BoxTitleLastSupplierBills=Ultime %s fatture fornitore modificate
 BoxTitleLastModifiedProspects=Clienti potenziali: ultimi %s modificati
 BoxTitleLastModifiedMembers=Ultimi %s membri
 BoxTitleLastFicheInter=Ultimi %s interventi modificati
@@ -36,8 +36,8 @@ BoxTitleOldestUnpaidCustomerBills=Fatture cliente: %s non pagate più vecchie
 BoxTitleOldestUnpaidSupplierBills=Fatture fornitori: %s più vecchie non pagate
 BoxTitleCurrentAccounts=Conti aperti: bilanci
 BoxTitleSupplierOrdersAwaitingReception=Ordini dei fornitori in attesa di ricezione
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxTitleLastModifiedContacts=Contatti/indirizzi: ultimi %s modificati
+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
@@ -61,7 +61,7 @@ NoRecordedProposals=Nessuna proposta registrata
 NoRecordedInvoices=Nessuna fattura attiva registrata
 NoUnpaidCustomerBills=Nessuna fattura attiva non pagata
 NoUnpaidSupplierBills=Nessuna Fattura Fornitore non pagata
-NoModifiedSupplierBills=No recorded vendor invoices
+NoModifiedSupplierBills=Nessuna fattura fornitore registrata
 NoRecordedProducts=Nessun prodotto/servizio registrato
 NoRecordedProspects=Nessun potenziale cliente registrato
 NoContractedProducts=Nessun prodotto/servizio contrattualizzato
@@ -71,16 +71,16 @@ BoxLatestSupplierOrders=Latest purchase orders
 BoxLatestSupplierOrdersAwaitingReception=Ultimi ordini di acquisto (con una ricezione in sospeso)
 NoSupplierOrder=No recorded purchase order
 BoxCustomersInvoicesPerMonth=Fatture cliente al mese
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
+BoxSuppliersInvoicesPerMonth=Fatture fornitore per mese
 BoxCustomersOrdersPerMonth=Ordini Cliente per mese
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
-BoxProposalsPerMonth=proposte al mese
+BoxSuppliersOrdersPerMonth=Ordini fornitore per mese
+BoxProposalsPerMonth=Preventivi per mese
 NoTooLowStockProducts=Nessun prodotto sotto la soglia minima di scorte
 BoxProductDistribution=Distribuzione prodotti/servizi
 ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
+BoxTitleLastModifiedSupplierBills=Fatture fornitore: ultime %s modificate
+BoxTitleLatestModifiedSupplierOrders=Ordini fornitore: ultimi %s modificati
+BoxTitleLastModifiedCustomerBills=Fatture attive: ultime %s modificate
 BoxTitleLastModifiedCustomerOrders=Ordini: ultimi %s modificati
 BoxTitleLastModifiedPropals=Ultime %s proposte modificate
 ForCustomersInvoices=Fatture attive
@@ -89,7 +89,7 @@ ForProposals=Proposte
 LastXMonthRolling=Ultimi %s mesi
 ChooseBoxToAdd=Aggiungi widget alla dashboard
 BoxAdded=Widget aggiunto al pannello principale
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month
+BoxTitleUserBirthdaysOfMonth=Compleanni di questo mese (utenti)
 BoxLastManualEntries=Ultime registrazioni manuali in contabilità
 BoxTitleLastManualEntries=%s ultime voci del manuale
 NoRecordedManualEntries=Nessuna registrazione manuale registrata in contabilità
@@ -98,5 +98,5 @@ BoxTitleSuspenseAccount=Numero di righe non allocate
 NumberOfLinesInSuspenseAccount=Numero di riga nell'account suspense
 SuspenseAccountNotDefined=L'account Suspense non è definito
 BoxLastCustomerShipments=Ultime spedizioni cliente
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
+BoxTitleLastCustomerShipments=Ultime %s spedizioni cliente
+NoRecordedShipments=Nessuna spedizione cliente registrata
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index 97bf03f0231..9d92620b4be 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Aggiungi questo articolo
 RestartSelling=Rimetti in vendita
 SellFinished=Vendita completata
 PrintTicket=Stampa biglietto
+SendTicket=Send ticket
 NoProductFound=Nessun articolo trovato
 ProductFound=Prodotto trovato
 NoArticle=Nessun articolo
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Numero di fatture
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 87d41652b62..7663624b70c 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -10,7 +10,7 @@ modify=modifica
 Classify=Classifica
 CategoriesArea=Area tag/categorie
 ProductsCategoriesArea=Area categorie/tag prodotti/servizi
-SuppliersCategoriesArea=Vendors tags/categories area
+SuppliersCategoriesArea=Area tag/categorie fornitori
 CustomersCategoriesArea=Area tag/categorie clienti
 MembersCategoriesArea=Area tag/categorie membri
 ContactsCategoriesArea=Area tag/categorie contatti
@@ -32,7 +32,7 @@ WasAddedSuccessfully=<b> %s </b> aggiunta con successo
 ObjectAlreadyLinkedToCategory=L'elemento è già collegato a questa tag/categoria
 ProductIsInCategories=Il prodotto/servizio è collegato alle seguenti tag/categorie
 CompanyIsInCustomersCategories=Questo soggetto terzo è collegato alle seguenti tag/categorie di clienti/potenziali clienti
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
+CompanyIsInSuppliersCategories=Il soggetto terzo è collegato alle seguenti tag/categorie fornitori
 MemberIsInCategories=Il membro è collegato alle seguenti tag/categorie membri
 ContactIsInCategories=Il contatto appartiene alle seguenti tag/categorie
 ProductHasNoCategory=Questo prodotto/servizio non è collegato ad alcuna tag/categoria
@@ -48,14 +48,14 @@ ContentsNotVisibleByAllShort=Contenuti non visibili a tutti
 DeleteCategory=Elimina tag/categoria
 ConfirmDeleteCategory=Vuoi davvero eliminare questo tag/categoria?
 NoCategoriesDefined=Nessuna tag/categoria definita
-SuppliersCategoryShort=Vendors tag/category
+SuppliersCategoryShort=Tag/categoria fornitori
 CustomersCategoryShort=Tag/categoria clienti
 ProductsCategoryShort=Tag/categoria prodotti
 MembersCategoryShort=Tag/categoria membri
-SuppliersCategoriesShort=Vendors tags/categories
+SuppliersCategoriesShort=Tag/categorie fornitori
 CustomersCategoriesShort=Tag/categorie clienti
 ProspectsCategoriesShort=Tag/categorie clienti potenziali
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
+CustomersProspectsCategoriesShort=Tag/categorie clienti/clienti potenziali
 ProductsCategoriesShort=Tag/categorie prodotti
 MembersCategoriesShort=Tag/categorie membri
 ContactCategoriesShort=Tag/categorie contatti
@@ -63,13 +63,7 @@ AccountsCategoriesShort=Conti di tag/categorie
 ProjectsCategoriesShort=Tag/categoria progetti
 UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Tag / categorie di magazzino
-ThisCategoryHasNoProduct=Questa categoria non contiene alcun prodotto
-ThisCategoryHasNoSupplier=This category does not contain any vendor.
-ThisCategoryHasNoCustomer=Questa categoria non contiene alcun cliente
-ThisCategoryHasNoMember=Questa categoria non contiene alcun membro
-ThisCategoryHasNoContact=Questa categoria non contiene contatti
-ThisCategoryHasNoAccount=Non ci sono conti collegati a questa categoria
-ThisCategoryHasNoProject=Questa categoria non contiene alcun progetto.
+ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID Tag/categoria
 CatSupList=List of vendor tags/categories
 CatCusList=Lista delle tag/categorie clienti
@@ -78,7 +72,7 @@ CatMemberList=Lista delle tag/categorie membri
 CatContactList=Lista delle tag/categorie contatti
 CatSupLinks=Collegamenti tra fornitori e tag/categorie
 CatCusLinks=Collegamenti tra clienti e tag/categorie
-CatContactsLinks=Links between contacts/addresses and tags/categories
+CatContactsLinks=Collegamento fra: contatti/indirizzi e tags/categorie
 CatProdLinks=Collegamenti tra prodotti/servizi e tag/categorie
 CatProJectLinks=Collegamenti tra progetti e tag/categorie
 DeleteFromCat=Elimina dalla tag/categoria
@@ -91,5 +85,5 @@ ShowCategory=Mostra tag/categoria
 ByDefaultInList=Default nella lista
 ChooseCategory=Choose category
 StocksCategoriesArea=Area categorie magazzini
-ActionCommCategoriesArea=Events Categories Area
+ActionCommCategoriesArea=Area eventi 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 d3dbbc93a18..8f2cb848865 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -277,7 +277,7 @@ CustomerRelativeDiscountShort=Sconto relativo
 CustomerAbsoluteDiscountShort=Sconto assoluto
 CompanyHasRelativeDiscount=Il cliente ha uno sconto del <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Il cliente non ha alcuno sconto relativo impostato
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
+HasRelativeDiscountFromSupplier=Hai uno sconto predefinito di <b>%s%%</b> da questo fornitore
 HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
 CompanyHasAbsoluteDiscount=Questo cliente ha degli sconti disponibili (note di credito o anticipi) per un totale di <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Questo cliente ha uno sconto disponibile (commerciale, anticipi) per <b>%s</b>%s
@@ -325,7 +325,6 @@ CompanyDeleted=Società %s cancellata dal database.
 ListOfContacts=Elenco dei contatti
 ListOfContactsAddresses=Elenco dei contatti
 ListOfThirdParties=Elenco dei soggetti terzi
-ShowCompany=Mostra soggetto terzo
 ShowContact=Mostra contatti
 ContactsAllShort=Tutti (Nessun filtro)
 ContactType=Tipo di contatto
@@ -352,7 +351,7 @@ VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
 VATIntraManualCheck=È anche possibile controllare manualmente sul sito della Commissione Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Non è possibile effettuare il controllo. Servizio non previsto per lo stato membro ( %s).
-NorProspectNorCustomer=Not prospect, nor customer
+NorProspectNorCustomer=Né cliente, né cliente potenziale
 JuridicalStatus=Forma giuridica
 Staff=Dipendenti
 ProspectLevelShort=Cl. Pot.
@@ -400,8 +399,8 @@ 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
+PriceLevel=Livello dei prezzi
+PriceLevelLabels=Etichette livello dei prezzi
 DeliveryAddress=Indirizzo di consegna
 AddAddress=Aggiungi un indirizzo
 SupplierCategory=Categoria fornitore
@@ -447,11 +446,12 @@ SaleRepresentativeFirstname=Nome del commerciale
 SaleRepresentativeLastname=Cognome del commerciale
 ErrorThirdpartiesMerge=Si è verificato un errore durante l'eliminazione di terze parti. Si prega di controllare il registro. Le modifiche sono state ripristinate.
 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=Termini di Pagamento - Cliente
 PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
+PaymentTermsSupplier=Termine di pagamento - Fornitore
 PaymentTypeBoth=Tipo di pagamento - Cliente e fornitore
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Valuta
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index cf5d2312892..c08cfa61481 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -19,13 +19,13 @@ Income=Entrate
 Outcome=Uscite
 MenuReportInOut=Entrate/Uscite
 ReportInOut=Bilancio di entrate e uscite
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
+ReportTurnover=Fatturato
+ReportTurnoverCollected=Fatturato
 PaymentsNotLinkedToInvoice=I pagamenti non legati ad una fattura, quindi non legati ad alcun soggetto terzo
 PaymentsNotLinkedToUser=Pagamenti non legati ad alcun utente
 Profit=Utile
 AccountingResult=Risultato contabile
-BalanceBefore=Balance (before)
+BalanceBefore=Bilancio (precedente)
 Balance=Saldo
 Debit=Debito
 Credit=Credito
@@ -81,12 +81,12 @@ ContributionsToPay=Tasse/contributi da pagare
 AccountancyTreasuryArea=Billing and payment area
 NewPayment=Nuovo pagamento
 PaymentCustomerInvoice=Pagamento fattura attiva
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=pagamento fattura fornitore
 PaymentSocialContribution=Pagamento delle imposte sociali/fiscali
 PaymentVat=Pagamento IVA
 ListPayment=Elenco dei pagamenti
 ListOfCustomerPayments=Elenco dei pagamenti dei clienti
-ListOfSupplierPayments=List of vendor payments
+ListOfSupplierPayments=Elenco dei pagamenti fornitore
 DateStartPeriod=Data di inzio
 DateEndPeriod=Data di fine
 newLT1Payment=New tax 2 payment
@@ -118,8 +118,8 @@ SupplierAccountancyCodeShort=Cod. cont. fornitore
 AccountNumber=Numero di conto
 NewAccountingAccount=Nuovo conto
 Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
+TurnoverCollected=Fatturato
+SalesTurnoverMinimum=Fatturato minimo di vendita
 ByExpenseIncome=By expenses & incomes
 ByThirdParties=Per soggetti terzi
 ByUserAuthorOfInvoice=Per autore fattura
@@ -139,8 +139,8 @@ ConfirmDeleteSocialContribution=Sei sicuro di voler cancellare il pagamento di q
 ExportDataset_tax_1=Tasse/contributi e pagamenti
 CalcModeVATDebt=Modalità <b>%sIVA su contabilità d'impegno%s</b>.
 CalcModeVATEngagement=Calcola <b>%sIVA su entrate-uscite%s</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeDebt=Analisi delle fatture registrate anche se non sono ancora contabilizzate nel libro mastro.
+CalcModeEngagement=Analisi dei pagamenti registrati, anche se non ancora contabilizzati nel libro mastro.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Modalità <b>%sRE su fatture clienti - fatture fornitori%s</b>
 CalcModeLT1Debt=Modalità <b>%sRE su fatture clienti%s</b>
@@ -153,21 +153,21 @@ AnnualSummaryInputOutputMode=Bilancio di entrate e uscite, sintesi annuale
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
+SeeReportInInputOutputMode=Vedi %sanalisi dei pagamenti%s per un calcolo sui pagamenti effettivi effettuati anche se non ancora contabilizzati nel libro mastro.
+SeeReportInDueDebtMode=Vedi %sanalisi delle fatture %s per un calcolo basato sulle fatture registrate anche se non ancora contabilizzate nel libro mastro.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Gli importi indicati sono tasse incluse
-RulesResultDue=- Gli importi indicati sono tutti tasse incluse<br/>- Comprendono le fatture in sospeso, l'IVA e le spese, che siano state pagate o meno.<br/>- Si basa sulla data di convalida delle fatture e dell'IVA e sulla data di scadenza per le spese.
+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=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<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=- 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.
 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
+DepositsAreIncluded=- Sono incluse le fatture d'acconto
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
@@ -211,7 +211,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Tipo pcg
 Pcg_subtype=Sottotipo Pcg
 InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare
-ByProductsAndServices=By product and service
+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".
 LinkedOrder=Collega a ordine
@@ -219,7 +219,7 @@ Mode1=Metodo 1
 Mode2=Metodo 2
 CalculationRuleDesc=Ci sono due metodi per calcolare l'IVA totale:<br/>Metodo 1: arrotondare l'IVA per ogni riga e poi sommare.<br/>Metodo 2: sommare l'IVA di ogni riga e poi arrotondare il risultato della somma.<br/>Il risultato finale può differire di alcuni centesimi tra i due metodi. Il metodo di default è il <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.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Il report sul fatturato per prodotto non è disponibile. Questo rapporto è disponibile solo per il fatturato.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
 CalculationMode=Metodo di calcolo
 AccountancyJournal=Accounting code journal
@@ -250,8 +250,15 @@ 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
+ByVatRate=Per aliquota iva di vendita
+TurnoverbyVatrate=Fatturato per aliquota iva di vendita
+TurnoverCollectedbyVatrate=Fatturato per aliquota iva di vendita
+PurchasebyVatrate=Acquisti per aliquota iva
 LabelToShow=Etichetta breve
+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
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index 84390cc378f..78b9b6f0f1b 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -34,8 +34,8 @@ ECMDocsByProjects=Documenti collegati ai progetti
 ECMDocsByUsers=Documenti collegati agli utenti
 ECMDocsByInterventions=Documenti collegati agli interventi
 ECMDocsByExpenseReports=Documenti collegati a note spese
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to supplier proposals
+ECMDocsByHolidays=Documenti collegati alle ferie
+ECMDocsBySupplierProposals=Documenti collegati alle proposte fornitore
 ECMNoDirectoryYet=Nessuna directory creata
 ShowECMSection=Visualizza la directory
 DeleteSection=Eliminare la directory
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 778ea8e2d0d..fc4477d1495 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=File non completamente ricevuto dal server.
 ErrorNoTmpDir=La directory temporanea %s non esiste.
 ErrorUploadBlockedByAddon=Upload bloccato da un plugin di Apache/PHP
 ErrorFileSizeTooLarge=La dimensione del file è troppo grande.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Numero troppo lungo (massimo %s cifre)
 ErrorSizeTooLongForVarcharType=Stringa troppo lunga (limite di %s caratteri)
 ErrorNoValueForSelectType=Per favore immetti un valore per la lista di selezione
@@ -165,7 +166,7 @@ ErrorPriceExpression24=La variabile '%s' esiste, ma non è valorizzata
 ErrorPriceExpressionInternal=Errore interno '%s'
 ErrorPriceExpressionUnknown=Errore sconosciuto '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=I magazzini di origine e di destinazione devono essere diversi
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=Errore, tentativo di eseguire un movimento di magazzino senza informazioni lotto / seriale, sul prodotto '%s' che richiede informazioni lotto / seriale
 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=Richiesta HTTP fallita con errore '%s'
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
@@ -259,5 +261,5 @@ WarningYourLoginWasModifiedPleaseLogin=La tua login è stata modificata. Per rag
 WarningAnEntryAlreadyExistForTransKey=Esiste già una voce tradotta per la chiave di traduzione per questa lingua
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectClosed=Project is closed. You must re-open it first.
+WarningProjectClosed=Il progetto è chiuso. È necessario prima aprirlo nuovamente.
 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.
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index 89821e19cc4..4dde053c1ee 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Risorse umane
-Holidays=Leave
-CPTitreMenu=Leave
+Holidays=Ferie / Permessi
+CPTitreMenu=Ferie / Permessi
 MenuReportMonth=Estratto conto mensile
 MenuAddCP=Nuova richiesta
 NotActiveModCP=You must enable the module Leave to view this page.
@@ -25,8 +25,8 @@ UserForApprovalLogin=Login of approval user
 DescCP=Descrizione
 SendRequestCP=Inserisci richiesta di assenza
 DelayToRequestCP=Le richieste devono essere inserite almeno <b>%s giorni</b> prima dell'inizio.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+MenuConfCP=Bilancio delle ferie / permessi
+SoldeCPUser=Rimangono <b>%s</b> giorni di ferie
 ErrorEndDateCP=La data di fine deve essere posteriore alla data di inizio.
 ErrorSQLCreateCP=Si è verificato un errore SQL durante la creazione:
 ErrorIDFicheCP=Si è verificato un errore: la richiesta non esiste.
@@ -115,15 +115,15 @@ HolidaysToValidate=Convalida ferie
 HolidaysToValidateBody=Di sotto una richiesta ferie da convalidare
 HolidaysToValidateDelay=Questa richiesta avrà luogo fra meno di %s giorni
 HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
-HolidaysValidated=Richieste di assenza approvate
+HolidaysValidated=Richieste di ferie/permesso approvate
 HolidaysValidatedBody=La tua richiesta di ferie dal %s al %s è stata approvata
 HolidaysRefused=Richiesta negata
 HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
-HolidaysCanceled=Richiesta di assenza cancellata
+HolidaysCanceled=Richiesta di ferie/permesso eliminata
 HolidaysCanceledBody=La tua richiesta di ferie dal %s al %s è stata cancellata
 FollowedByACounter=<strong>1</strong>: questo tipo di ferie segue un contatore. Il contatore incrementa automaticamente o manualmente e quando una richiesta di ferie è validata. il contatore decrementa.<br><strong>0</strong>: non segue nessun contatore
 NoLeaveWithCounterDefined=Non ci sono tipi di ferie definite che devono seguire un contatore
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Vai in <strong>Home - Impostazioni - Dizionari - Tipi di ferie/permessi</strong> per impostare i diversi tipi di ferie e permessi.
 HolidaySetup=Setup of module Holiday
 HolidaysNumberingModules=Leave requests numbering models
 TemplatePDFHolidays=Template for leave requests PDF
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index ca43361cf52..659ce3b4a2d 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -16,7 +16,8 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=Questo PHP supporta le estensioni dei calendari.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
-PHPSupport=This PHP supports %s functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupport=La versione di PHP supporta la funzione %s.
 PHPMemoryOK=La memoria massima per la sessione è fissata dal PHP a <b>%s</b>. Dovrebbe essere sufficiente.
 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
@@ -26,7 +27,8 @@ ErrorPHPDoesNotSupportCurl=L'attuale installazione di PHP non supporta cURL.
 ErrorPHPDoesNotSupportCalendar=La tua installazione di PHP non supporta le estensioni del calendario php.
 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.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupport=La tua installazione di PHP non supporta le funzioni %s.
 ErrorDirDoesNotExists=La directory <b>%s</b> non esiste.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
 ErrorWrongValueForParameter=Potresti aver digitato un valore errato per il parametro <b>%s</b>.
@@ -210,10 +212,12 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
 MigrationReloadModule=Ricarica modulo %s
 MigrationResetBlockedLog=Reset del modulo BlockedLog per l'algoritmo v7
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
+ShowNotAvailableOptions=Mostra opzioni non disponibili
+HideNotAvailableOptions=Nascondi opzioni non disponibili
 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=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/it_IT/link.lang b/htdocs/langs/it_IT/link.lang
index 3c3a345c16a..5448ce32703 100644
--- a/htdocs/langs/it_IT/link.lang
+++ b/htdocs/langs/it_IT/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Il collegamento %s è stato rimosso
 ErrorFailedToDeleteLink= Impossibile rimuovere il collegamento '<b>%s</b>'
 ErrorFailedToUpdateLink= Impossibile caricare il collegamento '<b>%s</b>'
 URLToLink=Indirizzo del link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 306ba1f5a22..cb3d441981a 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -50,7 +50,7 @@ ConfirmValidMailing=Intendi veramente validare questo invio?
 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
+NbOfEMails=Numero di email
 TotalNbOfDistinctRecipients=Numero di singoli destinatari
 NoTargetYet=Nessun destinatario ancora definito (Vai alla scheda 'destinatari')
 NoRecipientEmail=No recipient email for %s
@@ -75,7 +75,7 @@ XTargetsAdded=<b>%s</b> destinatari aggiunti alla lista di invio
 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)
+OneEmailPerRecipient=Una e-mail per destinatario (per impostazione predefinita, una e-mail per record selezionato)
 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
@@ -162,9 +162,9 @@ AdvTgtCreateFilter=Crea filtro
 AdvTgtOrCreateNewFilter=Titolo del nuovo filtro
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
+OutGoingEmailSetup=Configurazione email in uscita
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=Impostazione predefinita email in uscita
 Information=Informazioni
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 8b222aac6de..b7d535794fe 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -171,9 +171,10 @@ NotValidated=Non valido
 Save=Salva
 SaveAs=Salva con nome
 SaveAndStay=Salva e rimani
-SaveAndNew=Save and new
+SaveAndNew=Salva e nuovo
 TestConnection=Test connessione
 ToClone=Clonare
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Choose data you want to clone:
 NoCloneOptionsSpecified=Dati da clonare non definiti
 Of=di
@@ -338,12 +339,12 @@ Copy=Copia
 Paste=Incolla
 Default=Predefinito
 DefaultValue=Valore predefinito
-DefaultValues=Default values/filters/sorting
+DefaultValues=Valori / filtri / ordinamenti predefiniti
 Price=Prezzo
 PriceCurrency=Prezzo (valuta)
 UnitPrice=Prezzo unitario
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
+UnitPriceHT=Prezzo unitario (netto)
+UnitPriceHTCurrency=Prezzo unitario (netto) (valuta)
 UnitPriceTTC=Prezzo unitario (lordo)
 PriceU=P.U.
 PriceUHT=P.U.(netto)
@@ -353,11 +354,11 @@ Amount=Importo
 AmountInvoice=Importo della fattura
 AmountInvoiced=Importo fatturato
 AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Importo fatturato (al netto delle imposte)
 AmountPayment=Importo del pagamento
-AmountHTShort=Amount (excl.)
+AmountHTShort=Importo (netto)
 AmountTTCShort=Importo (IVA inc.)
-AmountHT=Amount (excl. tax)
+AmountHT=Importo (al netto delle imposte)
 AmountTTC=Importo (IVA inclusa)
 AmountVAT=Importo IVA
 MulticurrencyAlreadyPaid=Already paid, original currency
@@ -372,8 +373,8 @@ AmountLT1ES=Importo RE (Spagna)
 AmountLT2ES=Importo IRPF (Spagna)
 AmountTotal=Importo totale
 AmountAverage=Importo medio
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PriceQtyMinHT=Prezzo quantità min. tasse escluse
+PriceQtyMinHTCurrency=Prezzo per quantità min. (tasse escluse) (valuta)
 Percentage=Percentuale
 Total=Totale
 SubTotal=Totale parziale
@@ -394,7 +395,7 @@ TotalLT1ES=Totale RE
 TotalLT2ES=Totale IRPF
 TotalLT1IN=Totale CGST
 TotalLT2IN=Totale SGST
-HT=Excl. tax
+HT=Al netto delle imposte
 TTC=IVA inclusa
 INCVATONLY=IVA inclusa
 INCT=Inc. tutte le tasse
@@ -432,7 +433,7 @@ Favorite=Preferito
 ShortInfo=Info.
 Ref=Rif.
 ExternalRef=Rif. esterno
-RefSupplier=Rif. venditore
+RefSupplier=Rif. fornitore
 RefPayment=Rif. pagamento
 CommercialProposalsShort=Preventivi/Proposte commerciali
 Comment=Commento
@@ -632,9 +633,9 @@ BuildDoc=Genera Doc
 Entity=Entità
 Entities=Entità
 CustomerPreview=Anteprima cliente
-SupplierPreview=Anteprima venditore
+SupplierPreview=Anteprima fornitore
 ShowCustomerPreview=Visualizza anteprima cliente
-ShowSupplierPreview=Mostra anteprima venditore
+ShowSupplierPreview=Visualizza anteprima fornitore
 RefCustomer=Rif. cliente
 Currency=Valuta
 InfoAdmin=Informazioni per gli amministratori
@@ -721,7 +722,7 @@ Notes=Note
 AddNewLine=Aggiungi una nuova riga
 AddFile=Aggiungi file
 FreeZone=Non è un prodotto/servizio predefinito
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Testo libero, tipologia:
 CloneMainAttributes=Clona oggetto con i suoi principali attributi
 ReGeneratePDF=Rigenera PDF
 PDFMerge=Unisci PDF
@@ -745,8 +746,8 @@ Result=Risultato
 ToTest=Provare
 ValidateBefore=Convalidare la scheda prima di utilizzare questa funzione
 Visibility=Visibilità
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
+Totalizable=Totalizzabile
+TotalizableDesc=Questo campo è totalizzabile nell'elenco
 Private=Privato
 Hidden=Nascosto
 Resources=Risorse
@@ -765,13 +766,13 @@ LinkTo=Collega a...
 LinkToProposal=Collega a proposta
 LinkToOrder=Collega a ordine
 LinkToInvoice=Collega a fattura attiva
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
+LinkToTemplateInvoice=Collega ad un modello di fattura
+LinkToSupplierOrder=Collega ad un ordine d'acquisto
+LinkToSupplierProposal=Collega alla proposta fornitore
+LinkToSupplierInvoice=Collega alla fattura fornitore
 LinkToContract=Collega a contratto
 LinkToIntervention=Collega a intervento
-LinkToTicket=Link to ticket
+LinkToTicket=Collega al ticket
 CreateDraft=Crea bozza
 SetToDraft=Ritorna a bozza
 ClickToEdit=Clicca per modificare
@@ -829,6 +830,8 @@ Gender=Genere
 Genderman=Uomo
 Genderwoman=Donna
 ViewList=Vista elenco
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obbligatorio
 Hello=Ciao
 GoodBye=Addio
@@ -874,7 +877,7 @@ Download=Download
 DownloadDocument=Scarica documento
 ActualizeCurrency=Aggiorna tasso di cambio
 Fiscalyear=Anno fiscale
-ModuleBuilder=Module and Application Builder
+ModuleBuilder=Generatore di moduli/applicazioni
 SetMultiCurrencyCode=Imposta valuta
 BulkActions=Azioni in blocco
 ClickToShowHelp=Clicca per mostrare l'aiuto contestuale
@@ -887,20 +890,20 @@ HR=HR
 HRAndBank=HR e Banca
 AutomaticallyCalculated=Calcolato automaticamente
 TitleSetToDraft=Torna a Bozza
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
+ConfirmSetToDraft=Sei sicuro di voler tornare allo stato di Bozza?
 ImportId=ID di importazione
 Events=Eventi
 EMailTemplates=Modelli e-mail
 FileNotShared=File non condiviso con pubblico esterno
 Project=Progetto
 Projects=Progetti
-LeadOrProject=Lead | Project
+LeadOrProject=Opportunità | Progetto
 LeadsOrProjects=Leads | Projects
 Lead=Lead
 Leads=Leads
 ListOpenLeads=List open leads
 ListOpenProjects=Lista progetti aperti
-NewLeadOrProject=New lead or project
+NewLeadOrProject=Nuova opportunità o progetto
 Rights=Autorizzazioni
 LineNb=Linea n°
 IncotermLabel=Import-Export
@@ -956,12 +959,12 @@ SearchIntoSupplierInvoices=Fatture Fornitore
 SearchIntoCustomerOrders=Ordini Cliente
 SearchIntoSupplierOrders=Ordini d'acquisto
 SearchIntoCustomerProposals=Proposte del cliente
-SearchIntoSupplierProposals=Proposta venditore
+SearchIntoSupplierProposals=Proposte fornitore
 SearchIntoInterventions=Interventi
 SearchIntoContracts=Contratti
 SearchIntoCustomerShipments=Spedizioni cliente
 SearchIntoExpenseReports=Nota spese
-SearchIntoLeaves=Leave
+SearchIntoLeaves=Ferie / Permessi
 SearchIntoTickets=Ticket
 CommentLink=Commenti
 NbComments=Numero dei commenti
@@ -997,7 +1000,7 @@ NoRecordedUsers=No users
 ToClose=Da chiudere
 ToProcess=Da lavorare
 ToApprove=To approve
-GlobalOpenedElemView=Global view
+GlobalOpenedElemView=Vista globale
 NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
 NoArticlesFoundForTheCategory=No article found for the category
 ToAcceptRefuse=Da accettare | Rifiutare
@@ -1020,5 +1023,8 @@ CustomReports=Custom reports
 StatisticsOn=Statistics on
 SelectYourGraphOptionsFirst=Select your graph options to build a graph
 Measures=Measures
-XAxis=X-Axis
-YAxis=Y-Axis
+XAxis=Asse X
+YAxis=Asse Y
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index 85c0c0f1e55..cf8f9ec36dc 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -6,7 +6,7 @@ ModuleBuilderDesc2=Path where modules are generated/edited (first directory for
 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=Nuovo modulo
-NewObjectInModulebuilder=New object
+NewObjectInModulebuilder=Nuovo oggetto
 ModuleKey=Module key
 ObjectKey=Object key
 ModuleInitialized=Modulo inizializzato
@@ -60,17 +60,17 @@ 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
+CSSFile=File CSS
+JSFile=File Javascript
 ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
 PageForLib=File for PHP library
 PageForObjLib=File for PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
+SqlFileExtraFields=File SQL per attributi complementari
 SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+SqlFileKeyExtraFields=File SQL per chiavi di attributi complementari
 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
@@ -79,15 +79,15 @@ NoTrigger=No trigger
 NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
+ListOfDictionariesEntries=Elenco voci dizionari
 ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
+SeeExamples=Vedi esempi qui
 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). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratostene 
-DisplayOnPdf=Display on PDF
+VisibleDesc=Il campo è visibile? (Esempi: 0=Mai visibile, 1=Visibile sugli elenchi e nei form di creazione/modifica/visualizzazione, 2=Visibile solo negli elenchi, 3=Visibile solo nei form di creazione/modifica/visualizzazione (no elenchi), 4=Visibile negli elenchi e solo nei form di modifica/visualizzazione (no creazione). Utilizza un valore negativo se desideri che il campo non sia visibile di default negli elenchi, ma possa essere selezionato per la visualizzazione. Puoi utilizzare anche un'espressione regolare come ad esempio: <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 : eratostene <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=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
+SearchAllDesc=Il campo è utilizzato per effettuare una ricerca dallo strumento di ricerca rapida? (Esempi: 1 o 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
@@ -129,13 +129,13 @@ UseSpecificVersion = Use a specific initial version
 ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGeneration=Desidero generare alcuni documenti da questo oggetto
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
-ShowOnCombobox=Show value into combobox
+ShowOnCombobox=Mostra il valore dentro il combobox
 KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
-NotEditable=Not editable
-ForeignKey=Foreign key
+CSSClass=Classe CSS
+NotEditable=Non modificabile
+ForeignKey=Chiave esterna
 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
diff --git a/htdocs/langs/it_IT/mrp.lang b/htdocs/langs/it_IT/mrp.lang
index 7706c41f4b8..c0185190272 100644
--- a/htdocs/langs/it_IT/mrp.lang
+++ b/htdocs/langs/it_IT/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Ordini di produzione
 MO=Ordine di produzione
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPDescription=Modulo per la gestione degli ordini di produzione (MO).
 MRPArea=MRP Area
 MrpSetupPage=Configurazione del modulo MRP
 MenuBOM=Bills of material
@@ -15,20 +15,20 @@ NewBOM=New bill of material
 ProductBOMHelp=Product to create with this BOM
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOMS document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
+MOsNumberingModules=Modelli di numerazione degli ordini di produzione (MO)
+MOsModelModule=Modello PDF ordini di produzione (MO)
 FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
+FreeLegalTextOnMOs=Testo libero sui documenti MO
+WatermarkOnDraftMOs=Filigrana sulla bozza degli ordini di produzione MO (se presente)
 ConfirmCloneBillOfMaterials=Are you sure you want to clone this bill of material ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
+ConfirmCloneMo=Vuoi davvero clonare l'ordine di produzione %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
+DeleteMo=Elimina Ordine di Produzione
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
 ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
 MenuMRP=Ordini di produzione
@@ -40,22 +40,22 @@ KeepEmptyForAsap=Vuoto significa &quot;Il più presto possibile&quot;
 EstimatedDuration=Durata stimata
 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) ?
+ConfirmCloseBom=Vuoi davvero eliminare questa Distinta Base (non sarà più possibile utilizzarla per creare nuovi ordini di produzione)
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
 StatusMOProduced=Prodotto
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
+QtyFrozen=Quantità congelata
+QuantityFrozen=Quantità congelata
 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
+WarehouseForProduction=Magazzino per la produzione
+CreateMO=Crea Ordine di Produzione
 ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
+ToProduce=Da produrre
+QtyAlreadyConsumed=Q.tà già consumate
+QtyAlreadyProduced=Q.tà già prodotte
 ConsumeOrProduce=Consume or Produce
 ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
@@ -63,7 +63,7 @@ TheProductXIsAlreadyTheProductToProduce=The product to add is already the produc
 ForAQuantityOf1=For a quantity to produce of 1
 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
+ProductionForRef=Produzione di %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
@@ -71,3 +71,5 @@ 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
diff --git a/htdocs/langs/it_IT/multicurrency.lang b/htdocs/langs/it_IT/multicurrency.lang
index 4f05cd491b6..68c8f699e00 100644
--- a/htdocs/langs/it_IT/multicurrency.lang
+++ b/htdocs/langs/it_IT/multicurrency.lang
@@ -8,7 +8,7 @@ MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency ra
 multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
 CurrencyLayerAccount=CurrencyLayer API
 CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
-multicurrency_appId=API key
+multicurrency_appId=Chiave API
 multicurrency_appCurrencySource=Currency source
 multicurrency_alternateCurrencySource=Alternate currency source
 CurrenciesUsed=Currencies used
@@ -18,3 +18,5 @@ MulticurrencyReceived=Received, original currency
 MulticurrencyRemainderToTake=Remaining amout, 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
diff --git a/htdocs/langs/it_IT/oauth.lang b/htdocs/langs/it_IT/oauth.lang
index 2a231675247..397a585074e 100644
--- a/htdocs/langs/it_IT/oauth.lang
+++ b/htdocs/langs/it_IT/oauth.lang
@@ -14,7 +14,7 @@ DeleteAccess=Click qui per eliminare il token
 UseTheFollowingUrlAsRedirectURI=Usa il seguente indirizzo come Redirect URI quando crei le credenziali sul tuo provider OAuth:
 ListOfSupportedOauthProviders=Inserisci qui le credenziali fornite dal tuo provider OAuth. Vengono visualizzati solo i provider supportati. Questa configurazione può essere usata ache dagli altri moduli che necessitano di autenticazione OAuth2.
 OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
+SeePreviousTab=Vedi la scheda precedente
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token scaduto
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index cd567d39f07..c1dbc75c639 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -20,10 +20,10 @@ SuppliersOrdersRunning=Ordini d'acquisto in corso
 CustomerOrder=Sales Order
 CustomersOrders=Ordini Cliente
 CustomersOrdersRunning=Ordini Cliente in corso
-CustomersOrdersAndOrdersLines=Sales orders and order details
+CustomersOrdersAndOrdersLines=Ordini dei clienti e righe degli ordini
 OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
+OrdersToBill=Ordini clienti spediti
+OrdersInProcess=Ordini clienti in corso
 OrdersToProcess=Ordini Cliente da trattare
 SuppliersOrdersToProcess=Ordini Fornitore da trattare
 SuppliersOrdersAwaitingReception=Ordini di acquisto in attesa di ricezione
@@ -87,7 +87,7 @@ NbOfOrders=Numero di ordini
 OrdersStatistics=Statistiche ordini
 OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Numero di ordini per mese
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=Importo ordini per mese (al netto delle imposte)
 ListOfOrders=Elenco degli ordini
 CloseOrder=Chiudi ordine
 ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
@@ -104,7 +104,7 @@ OnProcessOrders=Ordini in lavorazione
 RefOrder=Rif. ordine
 RefCustomerOrder=Rif. fornitore
 RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
+RefOrderSupplierShort=Rif. ordine forn.
 SendOrderByMail=Invia ordine via email
 ActionsOnOrder=Azioni all'ordine
 NoArticleOfTypeProduct=Non ci sono articoli definiti "prodotto" quindi non ci sono articoli da spedire
@@ -121,14 +121,14 @@ SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
 SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Altri ordini
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SALESREPFOLL=Responsabile ordini cliente
 TypeContact_commande_internal_SHIPPING=Responsabile spedizioni cliente
 TypeContact_commande_external_BILLING=Contatto fatturazione cliente
 TypeContact_commande_external_SHIPPING=Contatto spedizioni cliente
 TypeContact_commande_external_CUSTOMER=Contatto follow-up cliente
 TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Responsabile spedizioni fornitore
-TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_BILLING=Contatto fattura fornitore
 TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
 TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Costante COMMANDE_SUPPLIER_ADDON non definita
@@ -141,11 +141,12 @@ OrderByEMail=Email
 OrderByWWW=Sito
 OrderByPhone=Telefono
 # Documents models
-PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
+PDFEinsteinDescription=Un modello completo PDF di ordine cliente 
 PDFEratostheneDescription=Un modello completo per gli ordini
 PDFEdisonDescription=Un modello semplice per gli ordini
-PDFProformaDescription=A complete Proforma invoice template
+PDFProformaDescription=Un modello completo PDF di fattura Proforma
 CreateInvoiceForThisCustomer=Ordini da fatturare
+CreateInvoiceForThisSupplier=Ordini da fatturare
 NoOrdersToInvoice=Nessun ordine fatturabile
 CloseProcessedOrdersAutomatically=Classifica come "Lavorati" tutti gli ordini selezionati
 OrderCreation=Creazione di ordine
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index a1750795b26..36119e72677 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
 MessageKO=Message on the return page for a canceled payment
 ContentOfDirectoryIsNotEmpty=La directory non è vuota.
 DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
+PoweredBy=Realizzato da
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
 NextYearOfInvoice=Following year of invoice date
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -55,9 +55,9 @@ Notify_BILL_UNVALIDATE=Ricevuta cliente non convalidata
 Notify_BILL_PAYED=Customer invoice paid
 Notify_BILL_CANCEL=Fattura attiva annullata
 Notify_BILL_SENTBYMAIL=Fattura attiva inviata per 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_VALIDATE=Fattura fornitore convalidata
+Notify_BILL_SUPPLIER_PAYED=Fattura fornitore pagata
+Notify_BILL_SUPPLIER_SENTBYMAIL=Fattura fornitore inviata per mail
 Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
 Notify_CONTRACT_VALIDATE=Contratto convalidato
 Notify_FICHINTER_VALIDATE=Intervento convalidato
@@ -74,17 +74,17 @@ Notify_PROJECT_CREATE=Creazione del progetto
 Notify_TASK_CREATE=Attività creata
 Notify_TASK_MODIFY=Attività modificata
 Notify_TASK_DELETE=Attività cancellata
-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_EXPENSE_REPORT_VALIDATE=Note spese convalidate (è richiesta l'approvazione)
+Notify_EXPENSE_REPORT_APPROVE=Nota spesa approvata
+Notify_HOLIDAY_VALIDATE=Richiesta ferie/permesso convalidata (approvazione richiesta)
+Notify_HOLIDAY_APPROVE=Richiesta ferie/permesso approvata
 SeeModuleSetup=Vedi la configurazione del modulo %s
 NbOfAttachedFiles=Numero di file/documenti allegati
 TotalSizeOfAttachedFiles=Dimensione totale dei file/documenti allegati
 MaxSize=La dimensione massima è
 AttachANewFile=Allega un nuovo file/documento
 LinkedObject=Oggetto collegato
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+NbOfActiveNotifications=Numero di notifiche (num. di email da ricevere)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentContract=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
@@ -181,30 +181,30 @@ AuthenticationDoesNotAllowSendNewPassword=La modalità di autenticazione è <b>%
 EnableGDLibraryDesc=Per usare questa opzione bisogna installare o abilitare la libreria GD in PHP.
 ProfIdShortDesc=<b>Prof ID %s</b> è un dato dipendente dal paese terzo.<br/> Ad esempio, per il <b>paese %s,</b> è il <b>codice %s.</b>
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
+StatsByNumberOfUnits=Statistiche per somma della quantità di prodotti / servizi
+StatsByNumberOfEntities=Statistiche in numero di entità referenti (n. di fatture o ordini ...)
 NumberOfProposals=Numero di preventivi
-NumberOfCustomerOrders=Number of sales orders
+NumberOfCustomerOrders=Numero di ordini cliente
 NumberOfCustomerInvoices=Numero di ordini fornitore
-NumberOfSupplierProposals=Number of vendor proposals
+NumberOfSupplierProposals=Numero di proposte del fornitore
 NumberOfSupplierOrders=Numero ordini d'acquisto
 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
+NumberOfUnitsProposals=Numero di unità nei preventivi
+NumberOfUnitsCustomerOrders=Numero di unità sugli ordini cliente
+NumberOfUnitsCustomerInvoices=Numero di unità nelle fatture cliente
+NumberOfUnitsSupplierProposals=Numero di unità nelle proposte fornitori
+NumberOfUnitsSupplierOrders=Numero di unità negli ordini d'acquisto
+NumberOfUnitsSupplierInvoices=Numero di unità nelle fatture fornitore
+NumberOfUnitsContracts=Numero di unità nei contratti
 NumberOfUnitsMos=Number of units to produce in manufacturing orders
 EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
 EMailTextInterventionValidated=Intervento %s convalidato
 EMailTextInvoiceValidated=La fattura %s è stata convalidata.
 EMailTextInvoicePayed=Invoice %s has been paid.
 EMailTextProposalValidated=La proposta %s è stata convalidata.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
+EMailTextProposalClosedSigned=La proposta %s è stata chiusa e firmata.
 EMailTextOrderValidated=Order %s has been validated.
 EMailTextOrderApproved=Order %s has been approved.
 EMailTextOrderValidatedBy=Order %s has been recorded by %s.
@@ -214,7 +214,7 @@ 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.
+EMailTextHolidayValidated=La richiesta di ferie/permesso %s è stata convalidata.
 EMailTextHolidayApproved=Leave request %s has been approved.
 ImportedWithSet=Set dati importazione
 DolibarrNotification=Notifica automatica
@@ -274,11 +274,11 @@ WEBSITE_PAGEURL=Indirizzo URL della pagina
 WEBSITE_TITLE=Titolo
 WEBSITE_DESCRIPTION=Descrizione
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Parole chiave
 LinesToImport=Righe da importare
 
-MemoryUsage=Memory usage
+MemoryUsage=Utilizzo della memoria
 RequestDuration=Duration of request
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
diff --git a/htdocs/langs/it_IT/paybox.lang b/htdocs/langs/it_IT/paybox.lang
index 83b4b081dbc..3f398c374d0 100644
--- a/htdocs/langs/it_IT/paybox.lang
+++ b/htdocs/langs/it_IT/paybox.lang
@@ -20,7 +20,7 @@ AccountParameter=Dati account
 UsageParameter=Parametri d'uso
 InformationToFindParameters=Aiuto per trovare informazioni sul tuo account %s
 PAYBOX_CGI_URL_V2=URL del modulo CGI di Paybox per il pagamento
-VendorName=Nome del venditore
+VendorName=Nome del fornitore
 CSSUrlForPaymentForm=URL del foglio di stile CSS per il modulo di pagamento
 NewPayboxPaymentReceived=Nuovo pagamento Paybox ricevuto
 NewPayboxPaymentFailed=Nuovo tentativo di pagamento Paybox ma fallito
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 78c718b0c37..4d5f8b24b65 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -17,11 +17,13 @@ Create=Crea
 Reference=Riferimento
 NewProduct=Nuovo prodotto
 NewService=Nuovo servizio
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChange=Modifica di massa dell'IVA
+ProductVatMassChangeDesc=Questo strumento aggiorna l'aliquota IVA definita su <b><u>TUTTI i</u></b> prodotti e servizi!
 MassBarcodeInit=Inizializzazione di massa dei codici a barre
 MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un codice a barre di un oggetto che non ha ancora un codice a barre definito. Controlla prima che il setup del modulo Codici a barre sia completo.
 ProductAccountancyBuyCode=Codice contabile (acquisto)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Codice contabile (vendita)
 ProductAccountancySellIntraCode=Codice contabile (vendita intracomunitaria)
 ProductAccountancySellExportCode=Codice contabile (vendita per esportazione)
@@ -66,17 +68,17 @@ ProductStatusNotOnBuyShort=Obsoleto
 UpdateVAT=Aggiorna iva
 UpdateDefaultPrice=Aggiornamento prezzo predefinito
 UpdateLevelPrices=Aggiorna prezzi per ogni livello
-AppliedPricesFrom=Applied from
+AppliedPricesFrom=Valido dal
 SellingPrice=Prezzo di vendita
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=Prezzo di vendita (al netto delle imposte)
 SellingPriceTTC=Prezzo di vendita (inclusa IVA)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
+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.
 CostPriceUsage=Questo valore può essere utilizzato per il calcolo del margine.
 SoldAmount=Quantità venduta
 PurchasedAmount=Quantità acquistata
 NewPrice=Nuovo prezzo
-MinPrice=Min. sell price
+MinPrice=Prezzo minimo di vendita
 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
@@ -85,7 +87,7 @@ ErrorProductBadRefOrLabel=Il valore di riferimento o l'etichetta è sbagliato.
 ErrorProductClone=Si è verificato un problema cercando di cuplicare il prodotto o servizio
 ErrorPriceCantBeLowerThanMinPrice=Errore, il prezzo non può essere inferiore al prezzo minimo.
 Suppliers=Fornitori
-SupplierRef=Vendor SKU
+SupplierRef=Codice Fornitore (SKU)
 ShowProduct=Visualizza prodotto
 ShowService=Visualizza servizio
 ProductsAndServicesArea=Area prodotti e servizi
@@ -116,7 +118,7 @@ CategoryFilter=Filtro categoria
 ProductToAddSearch=Cerca prodotto da aggiungere
 NoMatchFound=Nessun risultato trovato
 ListOfProductsServices=Elenco prodotti/servizi
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
+ProductAssociationList=Elenco dei prodotti / servizi che sono componenti di questo prodotto / pacchetto virtuale
 ProductParentList=Elenco dei prodotti/servizi comprendenti questo prodotto
 ErrorAssociationIsFatherOfThis=Uno dei prodotti selezionati è padre dell'attuale prodotto
 DeleteProduct=Elimina un prodotto/servizio
@@ -129,11 +131,11 @@ ImportDataset_service_1=Servizi
 DeleteProductLine=Elimina linea di prodotti
 ConfirmDeleteProductLine=Vuoi davvero cancellare questa linea di prodotti?
 ProductSpecial=Prodotto speciale
-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.
+QtyMin=Min. quantità d'acquisto
+PriceQtyMin=Prezzo quantità min.
+PriceQtyMinCurrency=Prezzo per questa quantità min. (senza sconto) (valuta)
+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
 PredefinedProductsToSell=Predefined Product
@@ -165,7 +167,7 @@ SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Paese di origine
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Etichetta breve
 Unit=Unità
 p=u.
@@ -282,7 +284,7 @@ PriceMode=Modalità di prezzo
 PriceNumeric=Numero
 DefaultPrice=Prezzo predefinito
 ComposedProductIncDecStock=Aumenta e Diminuisci le scorte alla modifica del prodotto padre
-ComposedProduct=Child products
+ComposedProduct=Sottoprodotto
 MinSupplierPrice=Prezzo d'acquisto minimo
 MinCustomerPrice=Prezzo minimo di vendita
 DynamicPriceConfiguration=Configurazione dinamica dei prezzi
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 1fe3f577d6a..d59b8e7d6b5 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -39,7 +39,7 @@ ShowProject=Visualizza progetto
 ShowTask=Visualizza compito
 SetProject=Imposta progetto
 NoProject=Nessun progetto definito o assegnato
-NbOfProjects=Number of projects
+NbOfProjects=Num. di progetti
 NbOfTasks=Numero attività
 TimeSpent=Tempo lavorato
 TimeSpentByYou=Tempo impiegato da te
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Tempo
 ListOfTasks=Elenco dei compiti
 GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
-GoToListOfTasks=Vai all'elenco dei compiti
-GoToGanttView=Go to Gantt view
 GanttView=Vista Gantt
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -99,11 +97,11 @@ ListSupplierInvoicesAssociatedProject=Elenco fatture d'acquisto associate al pro
 ListContractAssociatedProject=Elenco contratti associati al progetto
 ListShippingAssociatedProject=Elenco spedizioni associate al progetto
 ListFichinterAssociatedProject=Elenco interventi associati al progetto
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
+ListExpenseReportsAssociatedProject=Elenco delle note spese associate al progetto
+ListDonationsAssociatedProject=Elenco delle donazioni associate al progetto
 ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
 ListSalariesAssociatedProject=Elenco pagamenti stipendio associati al progetto
-ListActionsAssociatedProject=List of events related to the project
+ListActionsAssociatedProject=Elenco degli eventi associati al progetto
 ListMOAssociatedProject=List of manufacturing orders related to the project
 ListTaskTimeUserProject=Tempo impiegato in compiti del progetto
 ListTaskTimeForTask=Tempo impiegato per l'attività
@@ -188,10 +186,10 @@ PlannedWorkload=Carico di lavoro previsto
 PlannedWorkloadShort=Carico di lavoro
 ProjectReferers=Elementi correlati
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
-FirstAddRessourceToAllocateTime=Assegna una risorsa per allocare tempo
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per giorno
 InputPerWeek=Input per settimana
-InputPerMonth=Input per month
+InputPerMonth=Input per mese
 InputDetail=Dettagli di input
 TimeAlreadyRecorded=Questo lasso di tempo è già stato registrato per questa attività/giorno e l'utente%s
 ProjectsWithThisUserAsContact=Progetti con questo utente come contatto
@@ -206,12 +204,12 @@ AssignTaskToUser=Assegnata attività a %s
 SelectTaskToAssign=Seleziona attività da a assegnare...
 AssignTask=Assegnare
 ProjectOverview=Panoramica
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageTasks=Utilizzare i progetti per seguire compiti e/o tempo lavorato
 ManageOpportunitiesStatus=Utilizzare i progetti per seguire clienti interessati/opportunità
-ProjectNbProjectByMonth=No. of created projects by month
-ProjectNbTaskByMonth=No. of created tasks by month
+ProjectNbProjectByMonth=Num. di progetti creati per mese
+ProjectNbTaskByMonth=Numero di attività create per mese
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
+ProjectWeightedOppAmountOfProjectsByMonth=Quantità ponderata di opportunità per mese
 ProjectOpenedProjectByOppStatus=Open project/lead by lead status
 ProjectsStatistics=Le statistiche relative a progetti/clienti interessati
 TasksStatistics=Statistiche su attività di progetto/clienti interessati
@@ -223,8 +221,8 @@ 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
+OpportunityTotalAmount=Importo totale delle opportunità
+OpportunityPonderatedAmount=Importo ponderato delle opportunità
 OpportunityPonderatedAmountDesc=Leads amount weighted with probability
 OppStatusPROSP=Potenziale
 OppStatusQUAL=Qualificazione
@@ -240,6 +238,7 @@ LatestModifiedProjects=Ultimi %s progetti modificati
 OtherFilteredTasks=Altre attività filtrate
 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=Permetti agli utenti di commentare queste attività
 AllowCommentOnProject=Permetti agli utenti di commentare questi progetti
@@ -257,11 +256,12 @@ InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on p
 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=Opportunità da seguire
 ProjectFollowTasks=Attività di progetto
-Usage=Usage
+Usage=Utilizzo
 UsageOpportunity=Utilizzo: opportunità
 UsageTasks=Uso: Compiti
 UsageBillTimeShort=Utilizzo: tempo di fatturazione
-InvoiceToUse=Draft invoice to use
+InvoiceToUse=Fattura in bozza da usare
 NewInvoice=Nuova fattura
 OneLinePerTask=Una riga per compito
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index 8f2993b417c..ee7ebc262b8 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -76,7 +76,7 @@ TypeContact_propal_external_BILLING=Contatto per la fatturazione
 TypeContact_propal_external_CUSTOMER=Responsabile per il cliente
 TypeContact_propal_external_SHIPPING=Contatto cliente per la consegna
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
+DocModelAzurDescription=A complete proposal model 
 DocModelCyanDescription=Modello di preventivo completo
 DefaultModelPropalCreate=Creazione del modello predefinito
 DefaultModelPropalToBill=Modello predefinito quando si chiude un preventivo (da fatturare)
diff --git a/htdocs/langs/it_IT/receiptprinter.lang b/htdocs/langs/it_IT/receiptprinter.lang
index 7b1a22e748d..3dd1ff848c7 100644
--- a/htdocs/langs/it_IT/receiptprinter.lang
+++ b/htdocs/langs/it_IT/receiptprinter.lang
@@ -5,7 +5,7 @@ PrinterUpdated=Stampante %s aggiornata
 PrinterDeleted=Stampante %s eliminata
 TestSentToPrinter=Stampa di prova inviata a %s
 ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
+ReceiptPrinterDesc=Configurazione stampa ricevute
 ReceiptPrinterTemplateDesc=Setup of Templates
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
 ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Stampante dummy
 CONNECTOR_NETWORK_PRINT=Stampante di rete
 CONNECTOR_FILE_PRINT=Stampante locale
 CONNECTOR_WINDOWS_PRINT=Stampante Windows locale
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Stampante di test (non stampa davvero)
 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=Profilo predefinito
 PROFILE_SIMPLE=Profilo semplice
 PROFILE_EPOSTEP=Epos Tep Profile
@@ -45,8 +47,8 @@ DOL_ACTIVATE_BUZZER=Activate buzzer
 DOL_PRINT_QRCODE=Stampa codice QR
 DOL_PRINT_LOGO=Stampa il logo della mia azienda
 DOL_PRINT_LOGO_OLD=Stampa il logo della mia azienda (vecchie stampe)
-DOL_BOLD=Bold
-DOL_BOLD_DISABLED=Disable bold
+DOL_BOLD=Grassetto
+DOL_BOLD_DISABLED=Disabilita grassetto
 DOL_DOUBLE_HEIGHT=Double height size
 DOL_DOUBLE_WIDTH=Double width size
 DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Rif. fattura
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capitale
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 90b3d73bcb1..8f3d7072a54 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -64,9 +64,9 @@ OrderDispatch=Ricezione prodotti
 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=Diminuire stock reali sulla validazione di spedizione
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+DeStockOnValidateOrder=Diminuire le scorte fisiche/reali alla convalida degli ordini cliente
+DeStockOnShipment=Diminuire le scorte fisiche/reali alla convalida della spedizione
+DeStockOnShipmentOnClosing=Diminuire le scorte fisiche/reali quando la spedizione viene chiusa.
 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
@@ -79,10 +79,10 @@ 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.
-PhysicalStock=Physical Stock
+PhysicalStock=Scorte fisiche
 RealStock=Scorte reali
-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=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
 VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id magazzino
@@ -104,7 +104,7 @@ ThisWarehouseIsPersonalStock=Questo magazzino rappresenta la riserva personale d
 SelectWarehouseForStockDecrease=Scegli magazzino da utilizzare per la riduzione delle scorte
 SelectWarehouseForStockIncrease=Scegli magazzino da utilizzare per l'aumento delle scorte
 NoStockAction=Nessuna azione su queste scorte
-DesiredStock=Desired Stock
+DesiredStock=Scorte ottimali desiderate
 DesiredStockDesc=Questa quantità sarà il valore utilizzato per rifornire il magazzino mediante la funzione di rifornimento.
 StockToBuy=Da ordinare
 Replenishment=Rifornimento
@@ -112,17 +112,17 @@ ReplenishmentOrders=Ordini di rifornimento
 VirtualDiffersFromPhysical=In relazione alle opzioni di incremento/riduzione, le scorte fisiche e quelle virtuali (fisiche - ordini clienti + ordini fornitori) potrebbero differire
 UseVirtualStockByDefault=Utilizza scorte virtuali come default, invece delle scorte fisiche, per la funzione di rifornimento
 UseVirtualStock=Usa scorte virtuale
-UsePhysicalStock=Usa giacenza fisica
+UsePhysicalStock=Usa scorte fisiche
 CurentSelectionMode=Modalità di selezione corrente
 CurentlyUsingVirtualStock=Giacenza virtuale
-CurentlyUsingPhysicalStock=Giacenza fisica
+CurentlyUsingPhysicalStock=Scorte fisiche
 RuleForStockReplenishment=Regola per il rifornimento delle scorte
 SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Solo avvisi
 WarehouseForStockDecrease=Il magazzino <b>%s</b> sarà usato per la diminuzione delle scorte
 WarehouseForStockIncrease=Il magazzino <b>%s</b> sarà usato per l'aumento delle scorte
 ForThisWarehouse=Per questo magazzino
-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.
+ReplenishmentStatusDesc=Questa è una lista di tutti i prodotti con una giacenza inferiore a quella desiderata (o inferiore al valore di allarme se la casella "solo allarme" è selezionata). Utilizzando la casella di controllo, è possibile creare ordini fornitori per colmare la differenza.
 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=Rifornimento
 NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s)
@@ -152,7 +152,7 @@ NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase orde
 ThisSerialAlreadyExistWithDifferentDate=Questo lotto/numero seriale (<strong>%s</strong>) esiste già con una differente data di scadenza o di validità (trovata <strong>%s</strong>, inserita <strong>%s</strong> )
 OpenAll=Aperto per tutte le azioni
 OpenInternal=Aperto per le azioni interne
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+UseDispatchStatus=Utilizzare uno stato di spedizione (approvato / rifiutato) per le righe di prodotti alla ricezione dell'ordine di acquisto
 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
@@ -160,9 +160,9 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
+NewInventory=Nuovo inventario
 inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
+inventoryCreatePermission=Crea nuovo inventario
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
diff --git a/htdocs/langs/it_IT/stripe.lang b/htdocs/langs/it_IT/stripe.lang
index 2e4972ccef1..dcad56604c6 100644
--- a/htdocs/langs/it_IT/stripe.lang
+++ b/htdocs/langs/it_IT/stripe.lang
@@ -1,6 +1,6 @@
 # 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, ...)
+StripeDesc=Offri ai clienti una pagina di pagamento online Stripe per pagamenti con carte di credito / debito tramite <a href="http://www.stripe.com" target="_blank">Stripe</a> . Questo modulo può essere usato per consentire ai tuoi clienti di effettuare pagamenti ad-hoc o per pagamenti relativi a un particolare oggetto Dolibarr (fattura, ordine, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Puoi utilizzare i seguenti indirizzi per permettere ai clienti di effettuare pagamenti su Dolibarr
 PaymentForm=Forma di pagamento
@@ -30,8 +30,9 @@ InformationToFindParameters=Aiuto per trovare informazioni sul tuo account %s
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
 VendorName=Nome del venditore
 CSSUrlForPaymentForm=URL del foglio di stile CSS per il modulo di pagamento
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
+NewStripePaymentReceived=Nuovo pagamento Stripe ricevuto
+NewStripePaymentFailed=Nuovo pagamento Stripe provato ma non riuscito
+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
@@ -40,7 +41,7 @@ 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
+StripeImportPayment=Importa pagamenti Stripe
 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_...)
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
index 31568557d34..6ef46f45959 100644
--- a/htdocs/langs/it_IT/supplier_proposal.lang
+++ b/htdocs/langs/it_IT/supplier_proposal.lang
@@ -9,10 +9,10 @@ DraftRequests=Quotazioni in bozza
 SupplierProposalsDraft=Bozza di proposta fornitore
 LastModifiedRequests=Ultime %s richieste di quotazione modificate
 RequestsOpened=Apri richieste di quotazione
-SupplierProposalArea=Area proposte fornitore
+SupplierProposalArea=Area quotazioni fornitori
 SupplierProposalShort=Proposta fornitore
-SupplierProposals=Proposta venditore
-SupplierProposalsShort=Proposta venditore
+SupplierProposals=Proposte fornitore
+SupplierProposalsShort=Proposte fornitore
 NewAskPrice=Nuova richiesta quotazione
 ShowSupplierProposal=Mostra le richieste di quotazione
 AddSupplierProposal=Inserisci richiesta di quotazione
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 4f7a8280b1f..deeb5548651 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -19,7 +19,7 @@ ReferenceSupplierIsAlreadyAssociatedWithAProduct=Questo referenza del fornitore
 NoRecordedSuppliers=Nessun fornitore registrato
 SupplierPayment=Pagamento fornitore
 SuppliersArea=Area fornitore
-RefSupplierShort=Rif. fornitura
+RefSupplierShort=Rif. fornitore
 Availability=Disponibilità
 ExportDataset_fournisseur_1=Fatture fornitore e dettagli
 ExportDataset_fournisseur_2=Fatture fornitore e pagamenti
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index 20f6650f9cc..18141535770 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -21,7 +21,7 @@
 Module56000Name=Ticket
 Module56000Desc=Sistema di ticket per la gestione di problemi o richieste
 
-Permission56001=See tickets
+Permission56001=Visualizza tickets
 Permission56002=Modify tickets
 Permission56003=Delete tickets
 Permission56004=Manage tickets
@@ -36,7 +36,7 @@ TicketTypeShortBUGHARD=Dysfonctionnement matériel
 TicketTypeShortCOM=Commercial question
 
 TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
+TicketTypeShortISSUE=Issue, bug o problemi
 TicketTypeShortREQUEST=Change or enhancement request
 TicketTypeShortPROJET=Progetto
 TicketTypeShortOTHER=Altro
@@ -64,7 +64,7 @@ NotRead=Non letto
 Read=Da leggere
 Assigned=Assegnato
 InProgress=Avviato
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=In attesa di informazioni
 Answered=Answered
 Waiting=In attesa
 Closed=Chiuso
@@ -90,7 +90,7 @@ TicketParamModule=Module variable setup
 TicketParamMail=Email setup
 TicketEmailNotificationFrom=Notification email from
 TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
+TicketEmailNotificationTo=Notifiche via email a
 TicketEmailNotificationToHelp=Invia email di notifica a questo indirizzo
 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.
@@ -133,7 +133,7 @@ TicketsDisableCustomerEmail=Always disable emails when a ticket is created from
 #
 # Index & list page
 #
-TicketsIndex=Ticket (Home)
+TicketsIndex=Area Tickets
 TicketList=List of tickets
 TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
 NoTicketsFound=No ticket found
@@ -280,7 +280,7 @@ TicketPublicInterfaceForbidden=The public interface for the tickets was not enab
 ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
 OldUser=Old user
 NewUser=Nuovo utente
-NumberOfTicketsByMonth=Number of tickets per month
+NumberOfTicketsByMonth=Numero di ticket per mese
 NbOfTickets=Number of tickets
 # notifications
 TicketNotificationEmailSubject=Ticket %s updated
diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang
index f8ba60ce433..d328b22677d 100644
--- a/htdocs/langs/it_IT/trips.lang
+++ b/htdocs/langs/it_IT/trips.lang
@@ -10,9 +10,9 @@ ListOfFees=Elenco delle tariffe
 TypeFees=Tipi di imposte
 ShowTrip=Mostra note spese
 NewTrip=Nuova nota spese
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
+LastExpenseReports=Ultime %s note spese
+AllExpenseReports=Tutte le note spese
+CompanyVisited=Azienda / organizzazione visitata
 FeesKilometersOrAmout=Tariffa kilometrica o importo
 DeleteTrip=Elimina nota spese
 ConfirmDeleteTrip=Vuoi davvero eliminare questa nota spese?
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index 04ccb76704e..a0dd542b471 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Password cambiata a: %s
 SubjectNewPassword=La tua nuova password per %s
 GroupRights=Autorizzazioni del gruppo
 UserRights=Autorizzazioni utente
-UserGUISetup=User Display Setup
+UserGUISetup=Impostazioni grafiche 
 DisableUser=Disattiva
 DisableAUser=Disattiva un utente
 DeleteUser=Elimina
@@ -34,7 +34,7 @@ ListOfUsers=Elenco utenti
 SuperAdministrator=Superadmin
 SuperAdministratorDesc=Con tutti i diritti di amministrazione
 AdministratorDesc=Amministratore
-DefaultRights=Default Permissions
+DefaultRights=Autorizzazioni predefinite
 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=Utenti Dolibarr
 LastName=Cognome
@@ -70,7 +70,7 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Utente di dominio %s
 Reactivate=Riattiva
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-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.<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.<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)
 PermissionInheritedFromAGroup=Autorizzazioni ereditate dall'appartenenza al gruppo.
 Inherited=Ereditato
 UserWillBeInternalUser=L'utente sarà un utente interno (in quanto non collegato a un soggetto terzo)
@@ -113,3 +113,5 @@ CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Forza validatore rapporto spese
 ForceUserHolidayValidator=Convalida richiesta di congedo forzato
 ValidatorIsSupervisorByDefault=Per impostazione predefinita, il validatore è il supervisore dell'utente. Mantieni vuoto per mantenere questo comportamento.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index cf4ac858e55..f411690e00c 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Visualizza pagina in una nuova scheda
 SetAsHomePage=Imposta come homepage
 RealURL=Indirizzo URL vero
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -76,7 +77,7 @@ BlogPost=Articoli sul blog
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListOfThirdParty=Back to list for Third Party
+BackToListOfThirdParty=Torna all'elenco per terze parti
 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)
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -121,6 +122,9 @@ BackToHomePage=Torna alla home page ...
 TranslationLinks=Link alla traduzione
 YouTryToAccessToAFileThatIsNotAWebsitePage=Stai tentando di accedere ad una pagina che non è pesente
 UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
+MainLanguage=Lingua principale
 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
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 425e8bec807..0ffb092fea4 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=注：制����使��PHP�設定�設定�れ����ん
 MaxSizeForUploadedFiles=アップロードファイル�最大サイズ（0�任��アップロードを許����よ��）
 UseCaptchaCode=ログインページ��グラフィカルコード（CAPTCHA）を使用��
-AntiVirusCommand= アン�ウイルス�コマンド��フルパス
-AntiVirusCommandExample= ClamWin�例：C：\\ PROGRA〜1 \\ ClamWin�\\ BIN \\ clamscan.exe <br> ClamAV用例：�/ usr / bin / clamscan
+AntiVirusCommand=アン�ウイルス�コマンド��フルパス
+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= コマンドライン�複数�パラメータ
-AntiVirusParamExample= ClamWin����例： - データベース= &quot;�C：\\ Program Files（x86）を\\ ClamWin�\\ lib�&quot;
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=会計モジュール�セットアップ
 UserSetup=ユーザー�管�設定
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ 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.
 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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=�アクティブ�
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=地域
 DictionaryCountry=国
 DictionaryCurrency=通貨
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VATレート���販売税率
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=率
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=デフォルト����案�れ�IRPF�0��。ルール�終�り。
 LocalTax2IsUsedExampleES=スペイン���フリーランサー�サービスモジュール�税制を�択���業��供�る独立��専門家。
 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 des 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
@@ -1018,6 +1025,7 @@ CalcLocaltax2=購入
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=販売
 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=��翻訳�コード�見��ら��場��デフォルト�使用�れるラベル
 LabelOnDocuments=ドキュメント�ラベル
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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=セキュリティ監査イベント
 Audit=監査
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=ユーザーモジュール�セットアップ
 UserMailRequired=Email required to create a new user
+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 #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=請求書ドキュメントモデル
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=検証日�請求書�日付を強制的�
-SuggestedPaymentModesIfNotDefinedInInvoice=請求書����定義�れ����場��デフォルト��請求書上�示唆決済モード
+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=請求書�フリーテキスト
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=商業的��案�モジュール�セットアップ
 ProposalsNumberingModules=商業的��案番�モジュール
 ProposalsPDFModules=商業的��案文書�モデル
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=商業的��案�フリーテキスト
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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=モジュール�番��注
 OrdersModelModule=注文書�モデル
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 1b81a9dba8f..6983da51ab6 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=仕入先�請求書
 Payment=支払�
-PaymentBack=戻��支払�
-CustomerInvoicePaymentBack=戻��支払�
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=支払�
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=支払�を削除���。
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=�����支払�
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/ja_JP/blockedlog.lang b/htdocs/langs/ja_JP/blockedlog.lang
index 3b14b0761a3..8410e1d5419 100644
--- a/htdocs/langs/ja_JP/blockedlog.lang
+++ b/htdocs/langs/ja_JP/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index 8fb2af438ff..53905618d23 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=��記事を追加���。
 RestartSelling=販売�戻る
 SellFinished=販売完了
 PrintTicket=�刷�ケット
+SendTicket=Send ticket
 NoProductFound=記事見��り��ん
 ProductFound=製��見��り���
 NoArticle=���記事��ん
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=請求書�Nb
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 37ddfe69630..5779051f34f 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=データベース�ら削除�れ�会社 &quot;%s&quot;。
 ListOfContacts=連絡先/アドレス�リスト
 ListOfContactsAddresses=連絡先/アドレス�リスト
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=連絡先を表示�る
 ContactsAllShort=���（フィルタ��）
 ContactType=コンタクトタイプ
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 10ad16add2d..863b691b5b1 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index e75a5699366..fe936f0de87 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=ファイル�サー�ー�完全���������
 ErrorNoTmpDir=一時的�directy�%s�存在���ん。
 ErrorUploadBlockedByAddon=PHP / Apacheプラグイン�よ��ブロック�れ�アップロード���。
 ErrorFileSizeTooLarge=ファイルサイズ�大�����。
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=（%s��最大値）int型�対��長��るサイズ
 ErrorSizeTooLongForVarcharType=文字列型（%s文字最大）長��るサイズ
 ErrorNoValueForSelectType=Please fill value for select list
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index e9edfac1a37..530e00adb78 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=����PHP�最大�セッションメモリ�<b>%s</b>�設定�れ����。�れ��分�����。
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=�使��PHPインストール�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=ディレクトリ�%s�存在���ん。
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ja_JP/link.lang b/htdocs/langs/ja_JP/link.lang
index 51c5d766fc4..ede779683da 100644
--- a/htdocs/langs/ja_JP/link.lang
+++ b/htdocs/langs/ja_JP/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=リンク %s �削除�れ���
 ErrorFailedToDeleteLink= リンク '<b>%s</b>' を削除����ん���
 ErrorFailedToUpdateLink= リンク '<b>%s</b>' を更新����ん���
 URLToLink=リンク� URL
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 4c1dd54d0d4..cdd1d8e1eeb 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 7dc914b5354..571c9f75ab4 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=定義�れ��るクローンを作��るデータ��り��ん。
 Of=�
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=リストビュー
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -971,7 +974,7 @@ CommentDeleted=Comment deleted
 Everybody=皆
 PayedBy=Paid by
 PayedTo=Paid to
-Monthly=Monthly
+Monthly=毎月
 Quarterly=Quarterly
 Annual=Annual
 Local=Local
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 27b1ffe543e..bed40f08556 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=タイトル
 WEBSITE_DESCRIPTION=説明
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index b2546e37351..61a31695f3a 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=原産国
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=ユニット
 p=u.
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index f0f0a7e387f..06c0202207e 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=時間
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=新��請求書
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/ja_JP/receiptprinter.lang b/htdocs/langs/ja_JP/receiptprinter.lang
index c738f5e89d5..673850ca62f 100644
--- a/htdocs/langs/ja_JP/receiptprinter.lang
+++ b/htdocs/langs/ja_JP/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=資本
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 36061a632a1..90be83666f7 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -32,6 +32,7 @@ VendorName=ベンダー���
 CSSUrlForPaymentForm=支払�フォーム�CSSスタイルシート�URL
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index 2666d4032c8..daa3de23f77 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=ユーザー�グループ���れ��ら継承�れ����許��付与�れ��。
 Inherited=継承�れ�
 UserWillBeInternalUser=（特定�第三者�リンク�れ������）作���ユーザー��内部ユーザー��り��
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index fc034117da4..d0c17d5ab4d 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=ホームページ�設定�る
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 2f36c876c1a..0205f246b0c 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 6d7c61784f7..8c22ce0159a 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/ka_GE/blockedlog.lang b/htdocs/langs/ka_GE/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/ka_GE/blockedlog.lang
+++ b/htdocs/langs/ka_GE/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 7ddbc71f3e9..f9f00015840 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index c569a48c84a..f8b3d0354e2 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 1de030a1905..6cd046c5607 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ka_GE/link.lang b/htdocs/langs/ka_GE/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/ka_GE/link.lang
+++ b/htdocs/langs/ka_GE/link.lang
@@ -8,3 +8,4 @@ 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/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 8b92cef3103..7b3bfd3852a 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 686f3ac1849..2082506c405 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 00259d976bc..ba85f51e739 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index d8a3192551f..a31243a07b6 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 94e440f9ab9..cdc0e6b3c95 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/ka_GE/receiptprinter.lang b/htdocs/langs/ka_GE/receiptprinter.lang
index 3df49b9fe67..896eaa313dd 100644
--- a/htdocs/langs/ka_GE/receiptprinter.lang
+++ b/htdocs/langs/ka_GE/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ka_GE/stripe.lang b/htdocs/langs/ka_GE/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/ka_GE/stripe.lang
+++ b/htdocs/langs/ka_GE/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index 43fa5342da3..aea4e7676e4 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/km_KH/blockedlog.lang b/htdocs/langs/km_KH/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/km_KH/blockedlog.lang
+++ b/htdocs/langs/km_KH/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index d597668081d..e35d169066d 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index a58d8721b90..99ac4fe564d 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index fa99a0c04f2..634599d74e4 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/kn_IN/blockedlog.lang b/htdocs/langs/kn_IN/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/kn_IN/blockedlog.lang
+++ b/htdocs/langs/kn_IN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index 62081b8ef1a..0b220155882 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 0affa46d9a7..a327eeb7562 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted="%s" ಸಂಸ�ಥೆಯನ�ನ� ಡೇಟಾಬೇಸ�-
 ListOfContacts=ಸಂಪರ�ಕಗಳ / ವಿಳಾಸಗಳ ಪಟ�ಟಿ
 ListOfContactsAddresses=ಸಂಪರ�ಕಗಳ / ವಿಳಾಸಗಳ ಪಟ�ಟಿ
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=ಸಂಪರ�ಕವನ�ನ� ತೋರಿಸಿ
 ContactsAllShort=ಎಲ�ಲಾ (ಸೋಸಿಲ�ಲದ)
 ContactType=ಸಂಪರ�ಕದ ಮಾದರಿ
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 1de030a1905..6cd046c5607 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/kn_IN/install.lang
+++ b/htdocs/langs/kn_IN/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/kn_IN/link.lang b/htdocs/langs/kn_IN/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/kn_IN/link.lang
+++ b/htdocs/langs/kn_IN/link.lang
@@ -8,3 +8,4 @@ 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/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 8b92cef3103..7b3bfd3852a 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index ebb3f3e0ccc..1bc3ff31efb 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 90f8adbf270..4f4d283f203 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index c5321165f68..cea4640f10b 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 94e440f9ab9..cdc0e6b3c95 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/kn_IN/receiptprinter.lang b/htdocs/langs/kn_IN/receiptprinter.lang
index 3df49b9fe67..ac21f079a24 100644
--- a/htdocs/langs/kn_IN/receiptprinter.lang
+++ b/htdocs/langs/kn_IN/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=ರಾಜಧಾನಿ
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/kn_IN/stripe.lang b/htdocs/langs/kn_IN/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/kn_IN/stripe.lang
+++ b/htdocs/langs/kn_IN/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index bb9041b3ef0..535d745855e 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 1e621b02c71..6ae752012ad 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=PHP 설정�서 한�가 설정�어 있지 않습니다. 
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=율
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 1389aa363a0..a00d26ae67d 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/ko_KR/blockedlog.lang b/htdocs/langs/ko_KR/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/ko_KR/blockedlog.lang
+++ b/htdocs/langs/ko_KR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 511362e9858..503a4395ecf 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 5cb68afba05..85c206ffc06 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=회사 "%s"� (가) ��터베�스�서 삭제�었습니
 ListOfContacts=연�처 / 주소 목�
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=연�처 표시
 ContactsAllShort=모� (필터 없�)
 ContactType=연�처 유형
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=�업 담당�� �름
 SaleRepresentativeLastname=�업 대표� 성
 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
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 9e8160c0704..025d45b7e1e 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
index 20cdefbe16d..34634c92c71 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ko_KR/link.lang b/htdocs/langs/ko_KR/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/ko_KR/link.lang
+++ b/htdocs/langs/ko_KR/link.lang
@@ -8,3 +8,4 @@ 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/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index afe98d7ed4b..fb9f072a3a9 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 986c5c916be..76bd10ca370 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=복제 할 ��터가 없습니다.
 Of=�
@@ -829,6 +830,8 @@ Gender=성별
 Genderman=남�
 Genderwoman=여�
 ViewList=목� 보기
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=필수
 Hello=안녕하세요
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 24e4152e9ad..d934e284774 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=표제
 WEBSITE_DESCRIPTION=기술
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index ad79ba5ae2b..e7309818946 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index e5105fe3c87..1c20f4ddeb2 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=관련 항목
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/ko_KR/receiptprinter.lang b/htdocs/langs/ko_KR/receiptprinter.lang
index 3df49b9fe67..49abd29dafe 100644
--- a/htdocs/langs/ko_KR/receiptprinter.lang
+++ b/htdocs/langs/ko_KR/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=�본
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ko_KR/stripe.lang b/htdocs/langs/ko_KR/stripe.lang
index 6add4873669..5b2b5f98857 100644
--- a/htdocs/langs/ko_KR/stripe.lang
+++ b/htdocs/langs/ko_KR/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index f4dcb5f7033..5fdb9913777 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index 25eaff691b1..e206a0172b2 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 73c0b921f6f..e5ec3641e2e 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 6d7c61784f7..8c22ce0159a 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/lo_LA/blockedlog.lang b/htdocs/langs/lo_LA/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/lo_LA/blockedlog.lang
+++ b/htdocs/langs/lo_LA/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 7ddbc71f3e9..f9f00015840 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index baead90af58..f9972f0f228 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index c5e026448e8..b4eb327c94d 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/lo_LA/link.lang b/htdocs/langs/lo_LA/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/lo_LA/link.lang
+++ b/htdocs/langs/lo_LA/link.lang
@@ -8,3 +8,4 @@ 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/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 8b92cef3103..7b3bfd3852a 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 84d0e2276d8..f8dfd03a55c 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index ccef8b33fa1..7141983af57 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index d88c27272d9..a34414a263d 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 67d0d2f744e..494e4317bf2 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/lo_LA/receiptprinter.lang b/htdocs/langs/lo_LA/receiptprinter.lang
index 3df49b9fe67..896eaa313dd 100644
--- a/htdocs/langs/lo_LA/receiptprinter.lang
+++ b/htdocs/langs/lo_LA/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/lo_LA/stripe.lang b/htdocs/langs/lo_LA/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/lo_LA/stripe.lang
+++ b/htdocs/langs/lo_LA/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index 78fc1a3486d..b6bd125449d 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 5235e157377..bd85f3830b6 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=PHP konfiguracijoje ribos nepritaikytos
 MaxSizeForUploadedFiles=Didžiausias įkeliamo failo dydis (0 - uždrausti betkokius įkėlimus)
 UseCaptchaCode=Prisijungimo puslapyje naudoti grafinį kodą (CAPTCHA)
-AntiVirusCommand= Pilnas maršrutas iki antivirusinės programos komandos
-AntiVirusCommandExample= ClamWin pavyzdys: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>ClamAv pavyzdys: /usr/bin/clamscan
+AntiVirusCommand=Pilnas maršrutas iki antivirusinės programos komandos
+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= Daugiau parametrų komandinėje eilutėje
-AntiVirusParamExample= ClamWin pavyzdys: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Apskaitos modulio nustatymai
 UserSetup=Vartotojo valdymo nustatymai
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funkcija išjungta demo versijoje
 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=Rodomi tik elementai iš <a href="%s">leidžiami moduliai</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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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=Aktyvavimą įjungti
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Palikti tuš�ią norint naudoti reikšmę pagal nutylėji
 DefaultLink=Nustatytoji nuoroda
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Įspėjimas, ši reikšmė gali būti perrašyta pagal vartotojo specifines nuostatas (kiekvienas vartotojas gali nustatyti savo clicktodial URL)
-ExternalModule=Išorinis modulis - Įdiegtas kataloge %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Masiniss brūkšninių kodų paleidimas arba atstatymas produktams ar paslaugoms
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regionai
 DictionaryCountry=Å alys
 DictionaryCurrency=Valiutos
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=PVM tarifai ar Pardavimo mokes�io tarifai
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Norma
 LocalTax1IsNotUsed=Nenaudokite antro mokes�io
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Pagal nutylėjimą siūloma IRPF yra 0. Taisyklės pabaiga.
 LocalTax2IsUsedExampleES=Ispanijoje, laisvai samdomi ir nepriklausomi specialistai, kurie teikia paslaugas ir įmonės, kurios pasirinko modulių mokes�ių sistemą.
 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 des 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=Ataskaitos apie vietinius mokes�ius
 CalcLocaltax1=Pardavimai - Pirkimai
 CalcLocaltax1Desc=Vietinių mokes�ių ataskaitos apskai�iuojamas kaip skirtumas tarp pardavimo vietinių mokes�ių ir pirkimo vietinių mokes�ių
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Pirkimai
 CalcLocaltax2Desc=Vietinių mokes�ių ataskaitos yra pirkimo vietinių mokes�ių suma iš viso
 CalcLocaltax3=Pardavimai
 CalcLocaltax3Desc=Vietinių mokes�ių ataskaitos yra pardavimo vietinių mokes�ių suma iš viso
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=EtiketÄ— naudojamas pagal nutylÄ—jimÄ…, jei kodui nerandamas vertimas
 LabelOnDocuments=Dokumentų etiketė
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Auditas
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemos informacija yra įvairi techninė informacija, kurią gausite tik skaitymo režimu, ir bus matoma tik sistemos administratoriams.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Vartotojų modulio nuostatos
 UserMailRequired=Email required to create a new user
+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 #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Sąskaitų-faktūrų dokumentų moduliai
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Sąskaitos-faktūros data įsigalioja patvirtinimo datą
-SuggestedPaymentModesIfNotDefinedInInvoice=Siūlomas mokėjimų režimas sąskaitoje-faktūroje pagal nutylėjimą, jei pa�ioje sąskaitoje nėra apibrėžta kitaip
+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=Laisvos formos tekstas sąskaitoje-faktūroje
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=Komercinių pasiūlymų modulio nuostatos
 ProposalsNumberingModules=Komercinių pasiūlymų numeracijos modeliai
 ProposalsPDFModules=Komercinio pasiūlymo dokumentų modeliai
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Laisvas tekstas komerciniame pasiūlyme
 WatermarkOnDraftProposal=Vandens ženklas komercinių pasiūlymų projekte (nėra, jei lapas tuš�ias)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Klausti pasiūlyme esan�ios banko sąskaitos paskirties
@@ -1322,6 +1332,7 @@ 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=Užsakymų numeracijos modeliai
 OrdersModelModule=Užsakymo dokumentų modeliai
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 484eff26861..89e47957999 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=tiekėjų sąskaitos-faktūros
 Payment=MokÄ—jimas
-PaymentBack=Mokėjimas atgal (grąžinimas)
-CustomerInvoicePaymentBack=Mokėjimas atgal (grąžinimas)
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=MokÄ—jimai
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Sumokėta atgal (grąžinta)
 DeletePayment=IÅ¡trinti mokÄ—jimÄ…
 ConfirmDeletePayment=Ar tikrai norite ištrinti šį mokėjimą?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Gauti mokÄ—jimai
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=MokÄ—ti
 ToMakePaymentBack=Grąžinti
 ListOfYourUnpaidInvoices=Sąrašas neapmokėtų sąskaitų-faktūrų
 NoteListOfYourUnpaidInvoices=Pastaba: Šis sąrašas rodo tik sąskaitas tre�iosioms šalims, su kuriom Jūs susijęs kaip prekybos atstovas.
-RevenueStamp=Įplaukų rūšis
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Nustatykite paslaugų eilutės pabaigos datą su kita sąskaitos
 AutoFillDateToShort=Nustatykite pabaigos datÄ…
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Invoice deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/lt_LT/blockedlog.lang b/htdocs/langs/lt_LT/blockedlog.lang
index a24007b6783..0bb5b261bc1 100644
--- a/htdocs/langs/lt_LT/blockedlog.lang
+++ b/htdocs/langs/lt_LT/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index 09f43efab79..c78fbe486a8 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=PridÄ—ti Å¡iÄ… prekÄ™
 RestartSelling=Eiti atgal į pardavimą
 SellFinished=Pardavimas baigtas
 PrintTicket=Spausdinti užsakymą
+SendTicket=Send ticket
 NoProductFound=PrekÄ— nerasta
 ProductFound=Produktas rastas
 NoArticle=NÄ—ra prekÄ—s
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Sąskaitų-faktūrų skai�ius
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 0a2959a9409..15368db9c20 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Įmonė "%s" ištrinta iš duomenų bazės.
 ListOfContacts=Kontaktų/adresų sąrašas
 ListOfContactsAddresses=Kontaktų/adresų sąrašas
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Rodyti kontaktus
 ContactsAllShort=Visi (nÄ—ra filtro)
 ContactType=Kontakto tipas
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 96ffced295c..d645b4e329e 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Sumos rodomos su įtrauktais mokes�iais
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index ac450e42bec..f1e9b03723b 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Failas pilnai negautas serveryje.
 ErrorNoTmpDir=Laikinas aplankas %s neegzistuoja.
 ErrorUploadBlockedByAddon=Įkėlimas užblokuotas PHP/Apache įskiepio.
 ErrorFileSizeTooLarge=Failo dydis yra per didelis.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Per didelis vidiniam tipui (maksimalus skaitmenų kiekis %s)
 ErrorSizeTooLongForVarcharType=Per didelis eilutės tipui (maksimalus simbolių skai�ius %s)
 ErrorNoValueForSelectType=Prašome užpildyti reikšmę pasirinkitam sąrašui
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index 5ad9f6bfb01..aee5facec48 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Jūsų PHP maksimali sesijos atmintis yra nustatyta į <b>%s</b>. To turėtų būti pakankamai.
 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.
@@ -26,6 +27,7 @@ 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=Katalogas %s neegzistuoja.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/lt_LT/link.lang b/htdocs/langs/lt_LT/link.lang
index b798330c3e2..c9e19c70173 100644
--- a/htdocs/langs/lt_LT/link.lang
+++ b/htdocs/langs/lt_LT/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=The link %s has been removed
 ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
 ErrorFailedToUpdateLink= NesÄ—kmingas sÄ…sajos '<b>%s</b>' atnaujinimas
 URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 87a8dea5bab..ac1348c61ed 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 558131a942e..a102b3af53d 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=Nėra apibrėžtų duomenų klonavimui.
 Of=iš
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Vyras
 Genderwoman=Moteris
 ViewList=Sąrašo vaizdas
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Sveiki !
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 7a2750bca0b..eb5f8859117 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Pavadinimas
 WEBSITE_DESCRIPTION=Aprašymas
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 1fb2dbf4c7c..1a0255b9370 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=Masinė brūkšninio kodo inicializacija
 MassBarcodeInitDesc=Šis puslapis gali būti naudojamas inicijuoti brūkšninį kodą ant objektų, kurie neturi apibrėžto brūkšninio kodo. Patikrinti, ar modulio brūkšninio kodo nustatymai pilni.
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=KilmÄ—s Å¡alis
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Vienetas
 p=u.
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 34c35aeaf26..088db490d25 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Laikas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planuojamas darbo krūvis
 PlannedWorkloadShort=Darbo krūvis
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projektas turi būti pirmiausia patvirtintas
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Įves�ių per dieną
 InputPerWeek=Įves�ių per savaitę
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nauja sąskaita-faktūra
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/lt_LT/receiptprinter.lang b/htdocs/langs/lt_LT/receiptprinter.lang
index 5b050642681..23e9083da13 100644
--- a/htdocs/langs/lt_LT/receiptprinter.lang
+++ b/htdocs/langs/lt_LT/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Sąskaitos-faktūros nuoroda
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapitalas
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/lt_LT/stripe.lang b/htdocs/langs/lt_LT/stripe.lang
index e5888b8ede4..4efacc34103 100644
--- a/htdocs/langs/lt_LT/stripe.lang
+++ b/htdocs/langs/lt_LT/stripe.lang
@@ -32,6 +32,7 @@ VendorName=ParavÄ—jo vardas
 CSSUrlForPaymentForm=CSS stiliaus lapo URL mokÄ—jimo formai
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index c82858ffed6..9bafc72c0b5 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Leidimas suteiktas, nes paveldėtas iš vieno grupės vartotojų
 Inherited=PaveldÄ—tas
 UserWillBeInternalUser=Sukurtas vartotojas bus vidinis vartotojas (nes nėra susietas su konkre�ia tre�iąja šalimi)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 41607804802..7b50688fee0 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index d9ca5d4a47d..9ebc336d896 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Piezīme: <b>jūsu</b> PHP konfigur�cija pašlaik ierob
 NoMaxSizeByPHPLimit=Piezīme: Nav limits tiek noteikts jūsu PHP konfigur�cij�
 MaxSizeForUploadedFiles=Maksim�lais augšupiel�dējamo failu izmērs (0 nepieļaut failu augšupiel�di)
 UseCaptchaCode=Izmantot grafisko kodu (CAPTCHA) pieteikšan�s lap�
-AntiVirusCommand= Pilns ceļš antivīrusa komandai
-AntiVirusCommandExample= Piemēram ClamWin: C:\\PROGRA~1\\ClamWin\\bin\\clamscan.exe<br> Piemēram ClamAV: /usr/bin/clamscan
+AntiVirusCommand=Pilns ceļš antivīrusa komandai
+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= Papildus komandrindas parametri
-AntiVirusParamExample= Piemērs ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Uzskaites moduļa iestatīšana
 UserSetup=Lietot�ju p�rvaldības iestatīšana
 MultiCurrencySetup=Daudzvalūtu iestatījumi
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Iespēja bloķēta demo versij�
 FeatureAvailableOnlyOnStable=Funkcija ir pieejama tikai ofici�laj� stabil� versij�
 BoxesDesc=Logrīki ir sast�vdaļas, kas par�da inform�ciju, kuru varat pievienot, lai personalizētu dažas lapas. Varat izvēlēties starp widget par�dīšanu, izvēloties mērķa lapu un noklikšķinot uz Aktivizēt, vai noklikšķinot uz atkritnes, lai to atspējotu.
 OnlyActiveElementsAreShown=Tikai elementi no <a href="%s">iespējotiem moduļiem</a> tiek r�dīti.
-ModulesDesc=Moduļi / lietojumprogrammas nosaka, k�das funkcijas ir pieejamas programmatūr�. Daži moduļi pieprasa atļauju lietot�jiem pēc moduļa aktivizēšanas. Noklikšķiniet uz ieslēgšanas / izslēgšanas pogas (moduļa beig�s), lai iespējotu / atspējotu moduli / programmu.
+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=Jūs varat atrast vair�k moduļu, lai lejupiel�dētu �rēj�s tīmekļa vietnēs internet� ...
 ModulesDeployDesc=Ja atļaujas jūsu failu sistēm� to atļauj, varat izmantot šo rīku, lai izvietotu �rēju moduli. Tad modulis būs redzams cilnē <strong> %s </strong>.
 ModulesMarketPlaces=Atrastt �rējo lietotni / moduļus
@@ -212,6 +212,7 @@ CompatibleUpTo=Savietojams ar versiju %s
 NotCompatible=Šis modulis, šķiet, nav savietojams ar jūsu Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Šis modulis prasa atjaunin�t Dolibarr %s (Min %s - Maks %s).
 SeeInMarkerPlace=Skatiet Marketplace
+SeeSetupOfModule=See setup of module %s
 Updated=Atjaunots
 Nouveauté=Jaunums
 AchatTelechargement=Pirkt / lejupiel�dēt
@@ -221,6 +222,7 @@ DoliPartnersDesc=Uzņēmumi, kas pied�v� piel�gotus izstr�d�tus moduļus va
 WebSiteDesc=Ārēj�s vietnes vair�kiem papildin�jumiem (bez kodols) moduļiem ...
 DevelopYourModuleDesc=Daži risin�jumi, lai izstr�d�tu savu moduli ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Pieejamie logrīki
 BoxesActivated=Logrīki aktivizēti
 ActivateOn=Aktivizēt
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Saglab�jiet tukšu, lai izmantotu noklusēto vērtību
 DefaultLink=Noklusējuma saite
 SetAsDefault=Iestatīt k� noklusējumu
 ValueOverwrittenByUserSetup=Uzmanību, šī vērtība var p�rrakstīt ar lietot�ja konkrētu uzst�dīšanu (katrs lietot�js var iestatīt savu klikšķini lai zvanītu URL)
-ExternalModule=Ārējais modulis - Instalēts direktorij� %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Masveida svītru kodu veidošana trešaj�m person�m
 BarcodeInitForProductsOrServices=Masveida svītrkodu veidošana produktu vai pakalpojumu atiestatīšana
 CurrentlyNWithoutBarCode=Pašlaik jums ir <strong>%s</strong> ierakstu <strong>%s</strong> %s bez definēta svītrukoda.
@@ -947,7 +950,7 @@ DictionaryCanton=Valstis/provinces
 DictionaryRegion=Reģions
 DictionaryCountry=Valstis
 DictionaryCurrency=Valūtas
-DictionaryCivility=Pilsonības nosaukums
+DictionaryCivility=Honorific titles
 DictionaryActions=Darba k�rtības pas�kumu veidi
 DictionarySocialContributions=Soci�lo vai nodokļu nodokļu veidi
 DictionaryVAT=PVN likmes vai p�rdošanas procentu likmes
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Pēc noklusējuma pied�v�tais p�rdošanas nodoklis ir 0, ko
 VATIsUsedExampleFR=Francij� tas nozīmē uzņēmumus vai organiz�cijas, kur�m ir re�la fisk�l� sistēma (vienk�ršota re�la vai re�la). Sistēma, kur� izmanto PVN.
 VATIsNotUsedExampleFR=Francij� tas nozīmē asoci�cijas, kas nav deklarētas par tirdzniecības nodokli, vai uzņēmumi, organiz�cijas vai brīv�s profesijas, kas izvēlējuš�s mikrouzņēmumu fisk�lo sistēmu (p�rdošanas nodoklis franšīzē) un samaks�juši franšīzes p�rdošanas nodokli bez p�rdošanas nodokļa deklar�cijas. Ar šo izvēli rēķinos būs redzama atsauce "Nav piemērojams p�rdošanas nodoklis - CGI 293.B pants".
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Likme
 LocalTax1IsNotUsed=Nelietot otru nodokli
 LocalTax1IsUsedDesc=Izmantojiet otra veida nodokļus (izņemot pirmo)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=IRPF likme pēc noklusējuma, veidojot izredzes, rēķinus
 LocalTax2IsNotUsedDescES=Pēc noklusējuma ierosin�t� IRPF ir 0. Beigas varu.
 LocalTax2IsUsedExampleES=Sp�nij�, �rštata un neatkarīgi profesion�ļi, kas sniedz pakalpojumus un uzņēmumiem, kuri ir izvēlējušies nodokļu sistēmu moduļus.
 LocalTax2IsNotUsedExampleES=Sp�nij� šie uzņēmumi nav pakļauti moduļu nodokļu sistēmai.
+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 des 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=Ziņojumi par vietējiem nodokļiem
 CalcLocaltax1=P�rdošana - pirkumi
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Pirkumi
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=P�rdošanas
 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 izmantots pēc noklusējuma, ja nav tulkojuma var atrast kodu
 LabelOnDocuments=Dokumentu marÄ·Ä“jums
 LabelOrTranslationKey=Uzlīme vai tulkošanas taustiņš
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Izdevumu p�rskats kurš j�apstiprina
 Delays_MAIN_DELAY_HOLIDAYS=Atst�jiet lūgumus apstiprin�t
 SetupDescription1=Pirms s�kat lietot Dolibarr, j�nosaka daži s�kotnējie parametri un moduļi ir iespējoti / konfigurēti.
 SetupDescription2=Šīs divas sadaļas ir oblig�tas (divi pirmie ieraksti iestatīšanas izvēlnē):
-SetupDescription3= <a href="%s"> %s -> %s </a> <br> Pamata parametri, ko izmanto, lai piel�gotu lietojumprogrammas noklusējuma uzvedību (piem., Valstij raksturīg�s funkcijas).
-SetupDescription4= <a href="%s"> %s -> %s </a> <br> Šī programmatūra ir daudzu moduļu / programmu komplekts, kas ir vair�k vai maz�k neatkarīgi. Moduļiem, kas atbilst jūsu vajadzīb�m, j�būt iespējotiem un konfigurētiem. Jaunie vienumi / opcijas tiek pievienotas izvēlnēm, aktivizējot moduli.
+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=Citi iestatījumu izvēlnes ieraksti p�rvalda izvēles parametrus.
 LogEvents=Drošības audita notikumi
 Audit=Audits
@@ -1128,7 +1136,7 @@ LogEventDesc=Iespējot konkrētu drošības notikumu reģistrēšanu. Administra
 AreaForAdminOnly=Iestatīšanas parametrus var iestatīt tikai <b> administratora lietot�ji </b>.
 SystemInfoDesc=Sistēmas inform�cija ir daž�di tehnisk� inform�cija jums tikai lasīšanas režīm� un redzama tikai administratoriem.
 SystemAreaForAdminOnly=Šī sadaļa ir pieejama tikai administratora lietot�jiem. Dolibarr lietot�ja atļaujas nevar mainīt šo ierobežojumu.
-CompanyFundationDesc=Rediģējiet uzņēmuma / vienības inform�ciju. Lapas apakš� noklikšķiniet uz pogas &quot;%s&quot;.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Ja jums ir �rējais gr�matvedis / gr�matvedis, varat rediģēt šeit savu inform�ciju.
 AccountantFileNumber=Gr�matveža kods
 DisplayDesc=Šeit var mainīt parametrus, kas ietekmē Dolibarr izskatu un uzvedību.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Noteikumi paroļu ģenerēšanai un apstiprin�šanai
 DisableForgetPasswordLinkOnLogonPage=Ner�dīt saiti "Aizmirsta parole" pieteikšan�s lap�
 UsersSetup=Lietot�ju moduļa uzst�dīšana
 UserMailRequired=Lai izveidotu jaunu lietot�ju, nepieciešams e-pasts
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=HRM moduļa iestatīšana
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Rēķina dokumentu modeļi
 BillsPDFModulesAccordindToInvoiceType=Rēķinu dokumentu modeļi atbilstoši rēķina veidam
 PaymentsPDFModules=Maks�jumu dokumentu paraugi
 ForceInvoiceDate=Force rēķina datumu apstiprin�šanas datuma
-SuggestedPaymentModesIfNotDefinedInInvoice=Ieteicamie maks�jumi režīm� rēķin� pēc noklusējuma, ja nav definēts rēķins
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Iesakiet norēķinu ar norēķinu kontu
 SuggestPaymentByChequeToAddress=Ieteikt maks�jumu ar �eku uz
 FreeLegalTextOnInvoices=Brīvs teksts uz rēķiniem
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=P�rdevēja maks�jumu iestatīšana
 PropalSetup=Commercial priekšlikumi modulis uzst�dīšana
 ProposalsNumberingModules=Komerci�lie priekšlikumu numer�cijas modeļi
 ProposalsPDFModules=Komerci�lie priekšlikumu dokumentu modeļi
-SuggestedPaymentModesIfNotDefinedInProposal=Ieteicamais maks�juma režīms pēc pied�v�juma pēc noklusējuma, ja tas nav definēts priekšlikumam
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Brīvais teksts komerci�lajos priekšlikumos
 WatermarkOnDraftProposal=Ūdenszīme projektu komerci�lo priekšlikumu (none ja tukšs)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pieprasīt noliktavas avotu pasūtīšanai
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pieprasiet bankas konta galamērķi pirkuma pasūtījum�
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=P�rdošanas pasūtījumu p�rvaldības iestatīšana
 OrdersNumberingModules=Pasūtījumu numer�cijas modeļi
 OrdersModelModule=Pasūtīt dokumenti modeļi
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Brīdin�jums, augst�kas vērtības pa
 ModuleActivated=Modulis %s ir aktivizēts un palēnina saskarni
 EXPORTS_SHARE_MODELS=Eksporta modeļi ir kopīgi ar visiem
 ExportSetup=Moduļa Eksportēšana iestatīšana
+ImportSetup=Setup of module Import
 InstanceUniqueID=Unik�ls gadījuma ID
 SmallerThan=Maz�ks nek�
 LargerThan=Liel�ks nek�
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=Ja vēlaties, lai jūsu PDF fail� k�ds teksta nosaukums tiktu dublēts 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, vienu (tikai dažas PDF veidnes to atbalsta). Vien� PDF form�t� atst�jiet tukšumu 1 valod�.
+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=Š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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 3e9b4eec377..677a2029051 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -59,16 +59,16 @@ SupplierBill=Pieg�d�t�ja rēķins
 SupplierBills=pieg�d�t�ju rēķini
 Payment=Maks�jums
 PaymentBack=Atmaksa
-CustomerInvoicePaymentBack=Maks�jumu atpakaļ
+CustomerInvoicePaymentBack=Atmaksa
 Payments=Maks�jumi
 PaymentsBack=Atmaksas
 paymentInInvoiceCurrency=rēķinu valūt�
 PaidBack=Atmaks�ts atpakaļ
 DeletePayment=Izdzēst maks�jumu
 ConfirmDeletePayment=Vai tieš�m vēlaties dzēst šo maks�jumu?
-ConfirmConvertToReduc=Vai vēlaties konvertēt šo %s par absolūto atlaidi?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=Summa tiks saglab�ta starp vis�m atlaidēm un to var izmantot k� atlaidi pašreizējam vai n�kotnes rēķinam par šo klientu.
-ConfirmConvertToReducSupplier=Vai vēlaties konvertēt šo %s par absolūto atlaidi?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=Summa tiks saglab�ta starp vis�m atlaidēm un to var izmantot k� atlaidi pašreizējam vai n�kamajam rēķinam par šo p�rdevēju.
 SupplierPayments=P�rdevēja maks�jumi
 ReceivedPayments=Saņemtie maks�jumi
@@ -219,7 +219,10 @@ ShowInvoiceSituation=R�dīt situ�ciju rēķinu
 UseSituationInvoices=Atļaut rēķinu par situ�ciju
 UseSituationInvoicesCreditNote=Atļaut situ�cijas rēķina kredītvēstuli
 Retainedwarranty=Saglab�ta garantija
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Saglab�tais garantijas noklusējuma procents
+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=Maks�t %s
 toPayOn=maks�t pa t�lruni %s
 RetainedWarranty=Saglab�t� garantija
@@ -509,11 +512,11 @@ ToMakePayment=Maks�t
 ToMakePaymentBack=Atmaks�t
 ListOfYourUnpaidInvoices=Saraksts ar neapmaks�tiem rēķiniem
 NoteListOfYourUnpaidInvoices=Piezīme: Šis saraksts satur tikai rēķinus par trešo pušu Jums ir saistīti ar k� p�rdošanas p�rst�vis.
-RevenueStamp=Ieņēmumu zīmogs
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Šī opcija ir pieejama tikai tad, ja izveidojat rēķinu no treš�s personas cilnes "Klients"
 YouMustCreateInvoiceFromSupplierThird=Šī opcija ir pieejama tikai tad, ja izveidojat rēķinu no treš�s puses cilnes „P�rdevējs�
 YouMustCreateStandardInvoiceFirstDesc=Vispirms vispirms j�izveido standarta rēķins un j�p�rveido tas par "veidni", lai izveidotu jaunu veidnes rēķinu
-PDFCrabeDescription=Rēķina PDF veidne Krabis. Pilna rēķina veidne (vec� Sponge veidnes ieviešana)
+PDFCrabeDescription=Rēķina PDF veidne Krabis. Pilna rēķina veidne 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Iestatīt pakalpojuma līnijas beigu datumu ar n�kamo rēķina d
 AutoFillDateToShort=Iestatīt beigu datumu
 MaxNumberOfGenerationReached=Maksim�lais gen. sasniedza
 BILL_DELETEInDolibarr=Rēķins dzēsts
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/lv_LV/blockedlog.lang b/htdocs/langs/lv_LV/blockedlog.lang
index c4b286ab723..237dac224bc 100644
--- a/htdocs/langs/lv_LV/blockedlog.lang
+++ b/htdocs/langs/lv_LV/blockedlog.lang
@@ -5,10 +5,10 @@ Fingerprints=Arhivēti notikumi un pirkstu nospiedumi
 FingerprintsDesc=Šis ir rīks, lai p�rlūkotu vai izvelētu nemainīgus žurn�lus. Nemain�mie žurn�li tiek ģenerēti un lok�li arhivēti īpašaj� tabul�, re�llaik�, kad ieraksta biznesa notikumu. Varat izmantot šo rīku, lai eksportētu šo arhīvu un saglab�tu to �rējam atbalstam (dažas valstis, piemēram, Francija, lūdz jums to darīt katru gadu). Ņemiet vēr�, ka šī žurn�la tīrīšana nav funkcija, un visas izmaiņas, kas tika mēģin�t izdarīt tieši šaj� žurn�l� (piemēram, hacker), tiek ziņotas ar nederīgu pirkstu nospiedumu. Ja jums patieš�m ir j�iztīra šī tabula, jo izmantoj�t savu pieteikumu demonstr�cijas / p�rbaudes nolūkam un vēlaties tīrīt savus datus, lai s�ktu savu produkciju, varat lūgt savam t�l�kp�rdevējam vai integratoram atjaunot datu b�zi (visas jūsu dati tiks noņemti).
 CompanyInitialKey=Uzņēmuma s�kotnēj� atslēga (ģeēzijas bloks)
 BrowseBlockedLog=Nep�rveidojami žurn�li
-ShowAllFingerPrintsMightBeTooLong=R�dīt visus arhivētos žurn�lus (var būt garš)
+ShowAllFingerPrintsMightBeTooLong=R�dīt visus arhivētos žurn�lus (var būt daudz)
 ShowAllFingerPrintsErrorsMightBeTooLong=R�dīt visus nederīgos arhīva žurn�lus (var būt garš)
 DownloadBlockChain=Lejupiel�dējiet pirkstu nospiedumus
-KoCheckFingerprintValidity=Arhivēts žurn�la ieraksts nav derīgs. Tas nozīmē, ka k�ds (hakeris?) Pēc tam, kad tas tika ierakstīts, ir mainījis dažus datus, vai arī ir izdzēsis iepriekšējo arhivēto ierakstu (p�rbaudiet, vai līnija ir ar iepriekšējo #).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Arhivēts žurn�la ieraksts ir derīgs. Dati par šo līniju netika mainīti un ieraksts seko iepriekšējam.
 OkCheckFingerprintValidityButChainIsKo=Arhivētais žurn�ls šķiet derīgs salīdzin�jum� ar iepriekšējo, bet ķēde agr�k tika boj�ta.
 AddedByAuthority=Uzglab�ti t�lvadības iest�dē
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index fa71099764a..690e8e84d6f 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Pievienot Å¡o preci
 RestartSelling=Iet atpakaļ uz p�rdošanu
 SellFinished=P�rdošana pabeigta
 PrintTicket=Druk�t biļeti
+SendTicket=Send ticket
 NoProductFound=Raksts nav atrasts
 ProductFound=Produkts atrasts
 NoArticle=Nav pre�u
@@ -48,6 +49,7 @@ Footer=K�jene
 AmountAtEndOfPeriod=Summa perioda beig�s (diena, mēnesis vai gads)
 TheoricalAmount=Teorētisk� summa
 RealAmount=Re�l� summa
+CashFence=Cash fence
 CashFenceDone=Naudas žogs veikts par periodu
 NbOfInvoices=RÄ“Ä·inu skaits
 Paymentnumpad=Padeves veids maks�juma ievadīšanai
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS ir nepieciešama produktu kategorija
 OrderNotes=Pasūtījuma piezīmes
 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
-AutoPrintTickets=Autom�tiski druk�t biļetes
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Iespējot b�ra vai restor�na funkcijas
 ConfirmDeletionOfThisPOSSale=Vai jūsu apstiprin�jums ir šīs pašreizēj�s p�rdošanas dzēšana?
 ConfirmDiscardOfThisPOSSale=Vai vēlaties atmest šo pašreizējo izp�rdošanu?
@@ -87,7 +90,19 @@ HeadBar=Galvene
 SortProductField=Lauks produktu šķirošanai
 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.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Drukas metode
 ReceiptPrinterMethodDescription=Jaudīga metode ar daudziem parametriem. Pilnīb� piel�gojams ar veidnēm. Nevar izdruk�t no m�koņa.
 ByTerminal=Ar termin�li
+TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 9d1a5d84bce..5f304f004e7 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Komp�nija "%s" dzēsta no datub�zes.
 ListOfContacts=Kontaktu / adrešu saraksts
 ListOfContactsAddresses=Kontaktu/adrešu saraksts
 ListOfThirdParties=Trešo personu saraksts
-ShowCompany=R�dīt trešo personu
 ShowContact=R�dīt kontaktu
 ContactsAllShort=Visi (Bez filtra)
 ContactType=Kontakta veids
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Tirdzniecības p�rst�vja v�rds
 SaleRepresentativeLastname=Tirdzniecības p�rst�vja uzv�rds
 ErrorThirdpartiesMerge=Pašalot treš�s puses, rad�s kļūda. Lūdzu, p�rbaudiet žurn�lu. Izmaiņas ir atgrieztas.
 NewCustomerSupplierCodeProposed=Klienta vai p�rdevēja kods jau ir izmantots, tiek pied�v�ts jauns kods
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Maks�juma veids - Klients
 PaymentTermsCustomer=Maks�juma noteikumi - Klients
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index fd3f7210d76..7df0adea9f6 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Skatīt %s maks�jumu analīzi %s, lai aprēķin�tu
 SeeReportInDueDebtMode=Skatīt %srēķinu analīzi %s, lai aprēķiniem izmantotu zin�mos reģistrētos rēķinus, pat ja tie vēl nav uzskaitīti Virsgr�mat�.
 SeeReportInBookkeepingMode=Lai skatītu <b> Gr�matvedības gr�matvedības tabulu </ b>, skatiet <b> %sBookBooking report%s </ b>
 RulesAmountWithTaxIncluded=- Uzr�dītas summas ir ar visiem ieskaitot nodokļus
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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=- Tas ietver klienta rēķinus par to, vai tie ir samaks�ti vai nē. <br> - Tas ir balstīts uz šo rēķinu apstiprin�šanas datumu. <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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Tas ietver jūsu Ledger ierakstu ar gr�matvedības kontiem, kuriem ir grupa "IZDEVUMS" vai "IENĀKUMS"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Apgrozījums, par kuru tiek aprēķin�ta p�rdošanas nodokļ
 TurnoverCollectedbyVatrate=Apgrozījums, kas iegūts, p�rdodot nodokli
 PurchasebyVatrate=Ieg�de pēc p�rdošanas nodokļa likmes
 LabelToShow=Īsais nosaukums
+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
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index e60b9218837..91d0f6444b2 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Serveris failu nav saņemis pilnīgi.
 ErrorNoTmpDir=Pagaidu direktorija %s neeksistē.
 ErrorUploadBlockedByAddon=Augšupiel�de bloķēja ar PHP/Apache spraudni.
 ErrorFileSizeTooLarge=Faila izmērs ir p�r�k liels.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Izmērs ir p�r�k garš int tipam (%s cipari maksimums)
 ErrorSizeTooLongForVarcharType=Izmērs ir p�r�k garš (%s simboli maksimums)
 ErrorNoValueForSelectType=Lūdzu izvēlieties vērtību no saraksta
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Kļūda, tulkot�s lapas valoda
 ErrorBatchNoFoundForProductInWarehouse=Noliktav� "%s" nav atrasta partija / sērija produktam "%s".
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Šai partijai/sērijai nav pietiekams daudzums produkta "%s" noliktav� "%s".
 ErrorOnlyOneFieldForGroupByIsPossible=“Grupēt pēc� ir iespējams tikai 1 lauks (citi tiek atmesti)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augst�ks nek� PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 4d25eef8309..13f5ab1e7fc 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Å is PHP atbalsta Curl.
 PHPSupportCalendar=Šis PHP atbalsta kalend�ru paplašin�jumus.
 PHPSupportUTF8=Å is PHP atbalsta UTF8 funkcijas.
 PHPSupportIntl=Å Ä« PHP atbalsta Intl funkcijas.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Å is PHP atbalsta %s funkcijas.
 PHPMemoryOK=Jūsu PHP maksim�l� sesijas atmiņa ir iestatīts uz <b>%s.</b> Tas ir pietiekami.
 PHPMemoryTooLow=Jūsu PHP max sesijas atmiņa ir iestatīta uz <b>%s</b> baitiem. Tas ir p�r�k zems. Mainiet <b>php.ini</b>, lai iestatītu <b>memory_limit</b> parametru vismaz <b> %s </b> baitiem.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Jūsu PHP instal�cija neatbalsta Curl.
 ErrorPHPDoesNotSupportCalendar=Jūsu PHP instal�cija neatbalsta php kalend�ra paplašin�jumus.
 ErrorPHPDoesNotSupportUTF8=Jūsu PHP instal�cija neatbalsta UTF8 funkcijas. Dolibarr nevar darboties pareizi. Atrisiniet to pirms Dolibarr instalēšanas.
 ErrorPHPDoesNotSupportIntl=Jūsu PHP instal�cija neatbalsta Intl funkcijas.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Jūsu PHP instal�cija neatbalsta %s funkcijas.
 ErrorDirDoesNotExists=Katalogs %s neeksistē.
 ErrorGoBackAndCorrectParameters=Atgriezieties un p�rbaudiet/labojiet parametrus.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Pieteikums mēģin�ja pašupjaunin�t, bet insta
 YouTryInstallDisabledByFileLock=Lietojumprogramma mēģin�ja pašatjaunin�ties, bet instalēšanas/atjaunin�šanas lapas tika bloķētas drošībai (ar bloķēšanas failu <strong>install.lock</strong> Dolibarr dokumentu direktorij�). <br>
 ClickHereToGoToApp=Noklikšķiniet šeit, lai p�rietu uz savu pieteikumu
 ClickOnLinkOrRemoveManualy=Noklikšķiniet uz šīs saites. Ja jūs vienmēr redzat šo pašu lapu, dokumenta direktorij� ir j�izņem / j�nomaina faila instal.lock.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/lv_LV/link.lang b/htdocs/langs/lv_LV/link.lang
index 2f249ac15cf..e649eb2874b 100644
--- a/htdocs/langs/lv_LV/link.lang
+++ b/htdocs/langs/lv_LV/link.lang
@@ -7,4 +7,5 @@ ErrorFileNotLinked=Failu nevar salinkot
 LinkRemoved=Saite %s tika dzēsta
 ErrorFailedToDeleteLink= Kļūda dzēšot saiti '<b>%s</b>'
 ErrorFailedToUpdateLink= Kļūda atjaunojot saiti '<b>%s</b>'
-URLToLink=URL to link
+URLToLink=Saites uz URL
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 0155c024f92..f9c3b411857 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -18,7 +18,7 @@ MailCCC=Kešatmiņas kopija
 MailTopic=E-pasta tēma
 MailText=Ziņa
 MailFile=Pievienotie faili
-MailMessage=E-pasta Ä·ermenis
+MailMessage=E-pasta saturs
 SubjectNotIn=Nav priekšmet�
 BodyNotIn=Nav ķermenī
 ShowEMailing=R�dīt e-pastus
@@ -97,7 +97,7 @@ SendingFromWebInterfaceIsNotAllowed=Sūtīšana no tīmekļa saskarnes nav atļa
 LineInFile=Līnija %s fail�
 RecipientSelectionModules=Definētie pieprasījumi saņēmēja izvēles
 MailSelectedRecipients=Atlasītie saņēmēji
-MailingArea=Emailings platība
+MailingArea=E-pastu nosūtīšanas sadaļa
 LastMailings=Jaun�kie %s e-pasta ziņojumi
 TargetsStatistics=MÄ“rÄ·u statistika
 NbOfCompaniesContacts=Unik�lie kontakti/adreses
@@ -116,10 +116,10 @@ NbOfEMailingsReceived=Masu emailings saņemti
 NbOfEMailingsSend=Masveida e-pasts izsūtīts
 IdRecord=Ieraksta ID
 DeliveryReceipt=Delivery Ack.
-YouCanUseCommaSeparatorForSeveralRecipients=Jūs varat izmantot <b>komatu</b> atdalīt�ju, lai nor�dītu vair�kus adres�tus.
+YouCanUseCommaSeparatorForSeveralRecipients=Jūs varat izmantot <b>komatu</b> k� atdalīt�ju, lai nor�dītu vair�kus adres�tus.
 TagCheckMail=Izsekot pasta atvēršanu
 TagUnsubscribe=Atrakstīšan�s saite
-TagSignature=Nosūtīt�ja lietot�ja paraksts
+TagSignature=Nosūtīt�ja paraksts
 EMailRecipient=Adres�ta e-pasts
 TagMailtoEmail=Saņēmēja e-pasta adrese (ieskaitot html "mailto:" saiti)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Nav kontaktpersonas / adreses ar atrastu kategoriju
 NoContactLinkedToThirdpartieWithCategoryFound=Nav kontaktpersonas / adreses ar atrastu kategoriju
 OutGoingEmailSetup=Izejoš� e-pasta iestatīšana
 InGoingEmailSetup=Ien�koš� e-pasta iestatīšana
-OutGoingEmailSetupForEmailing=Izejoš� e-pasta iestatīšana (masveida e-pasta sūtīšanai)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Noklusējuma izejoš� e-pasta iestatīšana
 Information=Inform�cija
 ContactsWithThirdpartyFilter=Kontakti ar treš�s puses filtru
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index b9c4d8fdbcf..ddd5125278a 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Saglab�jiet un palieciet
 SaveAndNew=Saglab�t un jaunu
 TestConnection=Savienojuma p�rbaude
 ToClone=Klonēt
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Izvēlieties datus, kurus vēlaties klonēt:
 NoCloneOptionsSpecified=Nav datu klons noteikts.
 Of=no
@@ -829,6 +830,8 @@ Gender=Dzimums
 Genderman=VÄ«rietis
 Genderwoman=Sieviete
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Labdien
 GoodBye=Uz redzēšanos
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Izvēlieties diagrammas opcijas, lai izveidotu diagr
 Measures=Pas�kumi
 XAxis=X ass
 YAxis=Y ass
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 06afd8afee1..9c6ca231797 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -141,7 +141,7 @@ OrderByEMail=E-pasts
 OrderByWWW=Online
 OrderByPhone=Telefons
 # Documents models
-PDFEinsteinDescription=Pilns pasūtījuma modelis (Eratosthene veidnes vec� ieviešana)
+PDFEinsteinDescription=Pilns pasūtījuma modelis 
 PDFEratostheneDescription=Pilns pasūtījuma modelis
 PDFEdisonDescription=Vienk�ršs pasūtīt modeli
 PDFProformaDescription=Pilnīga Proforma rēķina veidne
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index b66f727ad00..53968217348 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grafika ir ierobežota ar %s mērījumiem rež
 OnlyOneFieldForXAxisIsPossible=Šobrīd k� X ass ir iespējams tikai 1 lauks. Ir atlasīts tikai pirmais atlasītais lauks.
 AtLeastOneMeasureIsRequired=Nepieciešams vismaz 1 lauks mērīšanai
 AtLeastOneXAxisIsRequired=X-asij ir nepieciešams vismaz 1 lauks
-
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=P�rdošanas pasūtījums apstiprin�ts
 Notify_ORDER_SENTBYMAIL=P�rdošanas pasūtījums nosūtīts pa pastu
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Pirkuma pasūtījums, kas nosūtīts pa e-pastu
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=Lapas URL
 WEBSITE_TITLE=Virsraksts
 WEBSITE_DESCRIPTION=Apraksts
 WEBSITE_IMAGE=Attēls
-WEBSITE_IMAGEDesc=Attēlu nesēja relatīvais ceļš. Varat to atst�t tukšu, jo tas tiek reti izmantots (dinamiskais saturs to var izmantot, lai par�dītu sīktēlu emu�ru ziņu sarakst�). Ceļ� izmantojiet __WEBSITEKEY__, ja ceļš ir atkarīgs no vietnes nosaukuma.
+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=Atslēgas v�rdi
 LinesToImport=Importējam�s līnijas
 
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index d7f71d183c1..ee734ef9376 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Šis rīks atjaunina PVN likmi, kas noteikta <b><u>ALL<
 MassBarcodeInit=Masveida svītru kodu izveidošana
 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=Gr�matvedības kods (ieg�de)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Gr�matvedības kods (tirdzniecība)
 ProductAccountancySellIntraCode=Gr�matvedības kods (p�rdošana Kopienas iekšienē)
 ProductAccountancySellExportCode=Gr�matvedības kods (p�rdošanas eksports)
@@ -165,7 +167,7 @@ SuppliersPrices=P�rdevēja cenas
 SuppliersPricesOfProductsOrServices=P�rdevēja cenas (produktiem vai pakalpojumiem)
 CustomCode=Muita / Prece / HS kods
 CountryOrigin=Izcelsmes valsts
-Nature=Izstr�d�juma veids (materi�ls/gatavs)
+Nature=Nature of product (material/finished)
 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 e1dde57cbc3..75fbe01f961 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=kuru esmu piesaistījis projektam
 Time=Laiks
 ListOfTasks=Uzdevumu saraksts
 GoToListOfTimeConsumed=P�riet uz patērēt� laika sarakstu
-GoToListOfTasks=R�dīt k� sarakstu
-GoToGanttView=par�dīt k� Gants
 GanttView=Ganta skats
 ListProposalsAssociatedProject=Ar projektu saistīto komerci�lo priekšlikumu saraksts
 ListOrdersAssociatedProject=Ar projektu saistīto p�rdošanas pasūtījumu saraksts
@@ -188,7 +186,7 @@ PlannedWorkload=Pl�notais darba apjoms
 PlannedWorkloadShort=Darba slodze
 ProjectReferers=Saistīt�s vienības
 ProjectMustBeValidatedFirst=Projektu vispirms j�p�rbauda
-FirstAddRessourceToAllocateTime=Piešķiriet lietot�jam resursus, lai piešķirtu laiku
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Ievades dien�
 InputPerWeek=Ievades nedēļ�
 InputPerMonth=Ievade mēnesī
@@ -240,6 +238,7 @@ LatestModifiedProjects=Jaun�kie %s labotie projekti
 OtherFilteredTasks=Citi filtrētie uzdevumi
 NoAssignedTasks=Nek�di piešķirtie uzdevumi nav atrasti (piešķiriet projektu / uzdevumus pašreizējam lietot�jam no augšēj� atlases lodziņa, lai ievadītu laiku taj�)
 ThirdPartyRequiredToGenerateInvoice=Lai varētu to izrēķin�t, projekt� ir j�definē treš� persona.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Atļaut lietot�ju koment�rus par uzdevumiem
 AllowCommentOnProject=Atļaut lietot�jam komentēt projektus
@@ -265,3 +264,4 @@ InvoiceToUse=Izmantojamais rēķina projekts
 NewInvoice=Jauns rēķins
 OneLinePerTask=Viena rinda katram uzdevumam
 OneLinePerPeriod=Viena rindiņa vienam periodam
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/lv_LV/receiptprinter.lang b/htdocs/langs/lv_LV/receiptprinter.lang
index 86c55dc6292..cea2b075d45 100644
--- a/htdocs/langs/lv_LV/receiptprinter.lang
+++ b/htdocs/langs/lv_LV/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Viltots printeris
 CONNECTOR_NETWORK_PRINT=TÄ«kla printeris
 CONNECTOR_FILE_PRINT=Lok�lais printeris
 CONNECTOR_WINDOWS_PRINT=Lok�lais Windows printeris
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Viltus printeris testiem, nedara neko
 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=Noklusētais profils
 PROFILE_SIMPLE=Vien�ršais profils
 PROFILE_EPOSTEP=Epos Tep Profile
@@ -61,3 +63,33 @@ DOL_VALUE_MONTH_LETTERS=Rēķina mēnesis vēstulēs
 DOL_VALUE_MONTH=Rēķina mēnesis
 DOL_VALUE_DAY=RÄ“Ä·ina diena
 DOL_VALUE_DAY_LETTERS=Rēķina diena vēstulēs
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=RÄ“Ä·ina 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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapit�ls
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/lv_LV/stripe.lang b/htdocs/langs/lv_LV/stripe.lang
index f9d235eba7d..36d4116396d 100644
--- a/htdocs/langs/lv_LV/stripe.lang
+++ b/htdocs/langs/lv_LV/stripe.lang
@@ -32,6 +32,7 @@ VendorName=P�rdevēja nosaukums
 CSSUrlForPaymentForm=CSS stila lapas url maks�juma formu
 NewStripePaymentReceived=Saņemta jauna josla maks�jums
 NewStripePaymentFailed=New Stripe maks�jums tika izmēģin�ts, bet neizdev�s
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Slepena testa atslēga
 STRIPE_TEST_PUBLISHABLE_KEY=Publicējamais testa taustiņš
 STRIPE_TEST_WEBHOOK_KEY=Webhooka testa atslēga
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Saite uz iestatījumu Stripe WebHook, lai izsauktu IP
 ToOfferALinkForLiveWebhook=Saite uz iestatījumu Stripe WebHook, lai izsauktu IPN (tiešraides režīms)
 PaymentWillBeRecordedForNextPeriod=Maks�jums tiks reģistrēts par n�kamo periodu.
 ClickHereToTryAgain=<a href="%s">Noklikšķiniet šeit, lai mēģin�tu vēlreiz ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Sakar� ar stingriem klientu autentifik�cijas noteikumiem, karte j�izveido no Stripe biroja. Jūs varat noklikšķin�t šeit, lai ieslēgtu Stripe klientu ierakstu: %s
+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/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 84e74c12322..7f18b0e8a20 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -70,7 +70,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 ir daļa no jūsu uzņēmuma / organiz�cijas. <br> <b> Ārējais </b> lietot�js ir klients, p�rdevējs vai cits. <br> <br> abos gadījumos atļaujas definē tiesības uz Dolibarr, arī �rējam lietot�jam var būt atšķirīgs izvēlņu p�rvaldnieks nek� iekšējais lietot�js (sk. M�jas - iestatīšana - displejs)
+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)
 PermissionInheritedFromAGroup=Atļauja piešķirta, jo mantojis no viena lietot�ja grupai.
 Inherited=Iedzimta
 UserWillBeInternalUser=Izveidots lietot�js būs iekšēj� lietot�ja (jo nav saistīta ar konkrētu trešajai personai)
@@ -110,3 +110,8 @@ UserLogged=Lietot�js pieteicies
 DateEmployment=Nodarbin�tības s�kuma datums
 DateEmploymentEnd=Nodarbin�tības beigu datums
 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
+ValidatorIsSupervisorByDefault=Pēc noklusējuma validēt�js ir lietot�ja uzraugs. Lai saglab�tu šo uzvedību, atst�jiet tukšu.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 929fe13f660..844b54e8c18 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Skatīt lapu jaun� cilnē
 SetAsHomePage=Iestatīt k� m�jas lapu
 RealURL=Re�ls URL
 ViewWebsiteInProduction=Apskatīt vietni, izmantojot m�jas URL
-SetHereVirtualHost=<u> Lietošana ar Apache / NGinx / ... </u> <br> Ja jūs sav� tīmekļa serverī (Apache, Nginx, ...) varat izveidot īpašu virtu�lo resursdatoru ar iespējotu PHP un saknes direktoriju <br> <strong> %s </strong> <br> pēc tam iestatiet virtu�l� uzņēmēja nosaukumu, kuru esat izveidojis tīmekļa vietnes īpašīb�s, t�pēc priekšskatījumu var izdarīt arī, izmantojot šo īpašo tīmekļa servera piekļuvi vietēj� Dolibarr viet� serveri.
+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> 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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Diemžēl šī vietne pašlaik nav pieejama. Lūd
 WEBSITE_USE_WEBSITE_ACCOUNTS=Iespējot tīmekļa vietnes kontu tabulu
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ļauj tabulai saglab�t tīmekļa vietņu kontus (pieteikšan�s / caurlaide) katrai vietnei / trešajai pusei
 YouMustDefineTheHomePage=Vispirms ir j�definē noklusējuma s�kumlapa
-OnlyEditionOfSourceForGrabbedContentFuture=Brīdin�jums: Web lapas izveide, importējot �rēju tīmekļa lapu, ir paredzēta pieredzējušiem lietot�jiem. Atkarīb� no avota lapas sarežģītības importa rezult�ts var atšķirties no oriģin�la. Arī tad, ja avota lapa izmanto kopējus CSS stilus vai konfliktējošu javascript, tas, ja str�d�jat šaj� lap�, var izjaukt tīmekļa vietnes redaktora izskatu vai funkcijas. Šī metode ir �tr�ks veids, k� izveidot lapu, bet ir ieteicams izveidot jaunu lapu no nulles vai no ieteicam�s lapas veidnes. no �rēj�s lapas ("Online" redaktors NAV pieejams)
+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=Tikai HTML avota izdevums ir pieejams, ja saturs tiek satverts no �rējas vietnes
 GrabImagesInto=Grab arī attēlus, kas atrodami CSS un lap�.
 ImagesShouldBeSavedInto=Attēli j�uzglab� mapē
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=Lai iegūtu labu SEO praksi, izmantojiet tekstu no 5 l
 MainLanguage=Galven� valoda
 OtherLanguages=Citas valodas
 UseManifest=Nor�diet failu manifest.json
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 053ff8484b3..f5d4aafd77e 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 3c1e29b2920..d8c64f369c9 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/mk_MK/blockedlog.lang b/htdocs/langs/mk_MK/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/mk_MK/blockedlog.lang
+++ b/htdocs/langs/mk_MK/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 7ddbc71f3e9..f9f00015840 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index e9b3002b886..2d140b0d23f 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 1de030a1905..6cd046c5607 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
index d56298cab0e..40f452de628 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/mk_MK/link.lang b/htdocs/langs/mk_MK/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/mk_MK/link.lang
+++ b/htdocs/langs/mk_MK/link.lang
@@ -8,3 +8,4 @@ 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/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 8b92cef3103..6708fce5b2c 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -33,7 +33,7 @@ CreateMailing=Create emailing
 TestMailing=Test email
 ValidMailing=Valid emailing
 MailingStatusDraft=Draft
-MailingStatusValidated=Validated
+MailingStatusValidated=Валидирано
 MailingStatusSent=Sent
 MailingStatusSentPartialy=Sent partially
 MailingStatusSentCompletely=Sent completely
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 97be38cfce4..d4e5709f606 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 00259d976bc..ba85f51e739 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 79c3351caf9..8cf00847a11 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 94e440f9ab9..cdc0e6b3c95 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/mk_MK/receiptprinter.lang b/htdocs/langs/mk_MK/receiptprinter.lang
index 3df49b9fe67..82387cf5703 100644
--- a/htdocs/langs/mk_MK/receiptprinter.lang
+++ b/htdocs/langs/mk_MK/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/mk_MK/stripe.lang b/htdocs/langs/mk_MK/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/mk_MK/stripe.lang
+++ b/htdocs/langs/mk_MK/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index 43fa5342da3..aea4e7676e4 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 2f36c876c1a..0205f246b0c 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index 6d7c61784f7..8c22ce0159a 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/mn_MN/blockedlog.lang b/htdocs/langs/mn_MN/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/mn_MN/blockedlog.lang
+++ b/htdocs/langs/mn_MN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 7ddbc71f3e9..f9f00015840 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index c569a48c84a..f8b3d0354e2 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 1de030a1905..6cd046c5607 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/mn_MN/install.lang b/htdocs/langs/mn_MN/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/mn_MN/install.lang
+++ b/htdocs/langs/mn_MN/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/mn_MN/link.lang b/htdocs/langs/mn_MN/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/mn_MN/link.lang
+++ b/htdocs/langs/mn_MN/link.lang
@@ -8,3 +8,4 @@ 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/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index 8b92cef3103..7b3bfd3852a 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 0681c294748..9cf03c8bfdb 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 00259d976bc..ba85f51e739 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index d8a3192551f..a31243a07b6 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index 94e440f9ab9..cdc0e6b3c95 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/mn_MN/receiptprinter.lang b/htdocs/langs/mn_MN/receiptprinter.lang
index 3df49b9fe67..896eaa313dd 100644
--- a/htdocs/langs/mn_MN/receiptprinter.lang
+++ b/htdocs/langs/mn_MN/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/mn_MN/stripe.lang b/htdocs/langs/mn_MN/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/mn_MN/stripe.lang
+++ b/htdocs/langs/mn_MN/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
index 43fa5342da3..aea4e7676e4 100644
--- a/htdocs/langs/mn_MN/users.lang
+++ b/htdocs/langs/mn_MN/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 07a50a0c31f..dd75edd09bf 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Merk: <b> din </b> PHP-konfigurasjon begrenser for øyeb
 NoMaxSizeByPHPLimit=Merk: Det er ikke satt noen begrensninger i din PHP-konfigurasjon på denne serveren
 MaxSizeForUploadedFiles=Maksimal filstørrelse for opplasting av filer (0 for å ikke tillate opplasting)
 UseCaptchaCode=Bruk Capthca på innloggingsside
-AntiVirusCommand= Full sti til antivirus kommandoen
-AntiVirusCommandExample= Eksempel på ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe <br> Eksempel på ClamAV: /usr/bin/clamscan
+AntiVirusCommand=Full sti til antivirus kommandoen
+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= Flere parametre på kommandolinjen
-AntiVirusParamExample= Eksempel på ClamWin: - database = "C:\\Program Files (x86)\\ClamWin\\ lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Oppsett av regnskapsmodul
 UserSetup=Oppsett av brukere
 MultiCurrencySetup=Oppsett av fler-valuta
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funksjonen er slått av i demo
 FeatureAvailableOnlyOnStable=Egenskapen er kun tilgjengelig på offisielle, stabile versjoner
 BoxesDesc=Widgets er komponenter som viser litt informasjon du kan legge til for å tilpasse noen sider. Du kan velge mellom å vise widgeten eller ikke ved å velge målside og klikke på "Aktiver", eller ved å klikke på papirkurven for å deaktivere den.
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
-ModulesDesc=Modulene/programmene bestemmer hvilke funksjoner som er tilgjengelige i programvaren. Noen moduler krever at brukere får tillatelser etter at modulen er aktivert. Klikk på på/av-knappen (på slutten av modullinjen) for å aktivere/deaktivere en modul/applikasjon.
+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=Du kan finne flere moduler for nedlasting på eksterne nettsteder.
 ModulesDeployDesc=Hvis tillatelser for filsystemet tillater det, kan du bruke dette verktøyet til å distribuere en ekstern modul. Modulen vil da være synlig under fanen <strong>%s</strong>.
 ModulesMarketPlaces=Finn eksterne apper/moduler
@@ -212,6 +212,7 @@ CompatibleUpTo=Kompatibel med versjon %s
 NotCompatible=Denne modulenser ikke ut til å være kompatibel med Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Denne modulen krever en oppdatering av Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Se på Markedsplass
+SeeSetupOfModule=Se oppsett av modul %s
 Updated=Oppdatert
 Nouveauté=Nyhet
 AchatTelechargement=Kjøp/Last ned
@@ -221,6 +222,7 @@ DoliPartnersDesc=Liste over selskaper som tilbyr spesialutviklede moduler eller
 WebSiteDesc=Eksterne nettsteder for flere tilleggs- (ikke-kjerne) moduler ...
 DevelopYourModuleDesc=Noen løsninger for å utvikle din egen modul...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Tilgjengelige widgeter
 BoxesActivated=Aktiverte widgeter
 ActivateOn=Aktivert på
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Hold tomt for å bruke standardverdien
 DefaultLink=Standard kobling
 SetAsDefault=Sett som standard
 ValueOverwrittenByUserSetup=Advarsel, denne verdien kan bli overskrevet av brukerspesifikke oppsett (hver bruker kan sette sitt eget clicktodial url)
-ExternalModule=Ekstern modul - Installert i katalog %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Masseinitiering av strekkoder for tredjeparter
 BarcodeInitForProductsOrServices=Masseinitiering eller sletting av strekkoder for varer og tjenester
 CurrentlyNWithoutBarCode=For øyeblikket har du <strong>%s</strong> poster på <strong>%s</strong> %s uten strekkode.
@@ -947,7 +950,7 @@ DictionaryCanton=Stater/provinser
 DictionaryRegion=Region
 DictionaryCountry=Land
 DictionaryCurrency=Valutaer
-DictionaryCivility=Tittel
+DictionaryCivility=Honorific titles
 DictionaryActions=Typer agendahendelser
 DictionarySocialContributions=Typer av sosiale avgifter og skatter
 DictionaryVAT=MVA satser
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Foreslått MVA er som standard 0. Den kan brukes mot foreninger
 VATIsUsedExampleFR=I Frankrike betyr det at bedrifter eller organisasjoner har et reelt finanssystem (forenklet reell eller normal reell). Et system hvor MVA er erklært.
 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=Ikke bruk andre skatter
 LocalTax1IsUsedDesc=Bruk en annen type skatt (annet enn den første)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Standard RE-sats når du oppretter prospekter, fakturaer,
 LocalTax2IsNotUsedDescES=Som standard er den foreslåtte IRPF er 0. Slutt på regelen.
 LocalTax2IsUsedExampleES=I Spania, for frilansere og selvstendige som leverer tjenester, og bedrifter som har valgt moduler for skattesystem.
 LocalTax2IsNotUsedExampleES=I Spania er de bedrifter som ikke er ikke skattepliktige
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des 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=Rapport over lokale avgifter 
 CalcLocaltax1=Salg - Innkjøp
 CalcLocaltax1Desc=Lokale skatter-rapporter kalkuleres med forskjellen mellom kjøp og salg
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Innkjøp
 CalcLocaltax2Desc=Lokale skatter-rapportene viser totalt kjøp
 CalcLocaltax3=Salg
 CalcLocaltax3Desc=Lokale skatter-rapportene viser totalt salg
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan bli funnet for kode
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Etikett eller oversettelsessnøkkel
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Utgiftsrapporter for godkjenning
 Delays_MAIN_DELAY_HOLIDAYS=Legg igjen forespørsler for godkjenning
 SetupDescription1=Før du begynner å bruke Dolibarr, må noen innledende parametere defineres og moduler aktiveres/konfigureres.
 SetupDescription2=Følgende to seksjoner er obligatoriske (de to første oppføringene i oppsettmenyen):
-SetupDescription3= <a href="%s"> %s -> %s </a> <br> Grunnparametere som brukes til å tilpasse standardoppførelsen til applikasjonen din (for eksempel landrelaterte funksjoner).
-SetupDescription4= <a href="%s"> %s -> %s </a> <br> Denne programvaren er en serie av mange moduler/applikasjoner, alle mer eller mindre uavhengige. Modulene som er relevante for dine behov, må aktiveres og konfigureres. Nye elementer/alternativer legges til menyer ved aktivering av en modul.
+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=Annet oppsett menyoppføringer styrer valgfrie parametere.
 LogEvents=Hendelser relatert til sikkerhet
 Audit=Revisjon
@@ -1128,7 +1136,7 @@ LogEventDesc=Aktiver logging av bestemte sikkerhetshendelser. Administratorer n
 AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er kun tilgjengelig for administratorbrukere. Dolibarr brukerrettigheter kan ikke endre denne begrensningen.
-CompanyFundationDesc=Rediger informasjonen til selskapet/enheten. Klikk på knappen "%s" nederst på siden.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Hvis du har en ekstern revisor/regnskapsholder, kan du endre dennes informasjon her.
 AccountantFileNumber=Regnskapsførerkode
 DisplayDesc=Parametre som påvirker utseende og oppførsel av Dolibarr kan endres her.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Regler for å generere og validere passord
 DisableForgetPasswordLinkOnLogonPage=Ikke vis koblingen "Glemt passord" på innloggingssiden
 UsersSetup=Oppsett av brukermodulen
 UserMailRequired=E-postadresse kreves for å opprette en ny bruker
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Dokumentmaler for dokumenter generert fra en gruppeoppføring
 ##### HRM setup #####
 HRMSetup=Oppsett av HRM-modul
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Fakturamaler
 BillsPDFModulesAccordindToInvoiceType=Faktura-dokumentmodeller etter fakturatype
 PaymentsPDFModules=Betalingsdokumentmodeller
 ForceInvoiceDate=Tving fakturadato til godkjenningsdato
-SuggestedPaymentModesIfNotDefinedInInvoice=Foreslått betalingsmåte på fakturaer når annet ikke er angitt
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Foreslå betaling trukket fra konto
 SuggestPaymentByChequeToAddress=Foreslå betaling med sjekk til
 FreeLegalTextOnInvoices=Fritekst på fakturaer
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Oppsett av leverandørbetaling
 PropalSetup=Oppsett av modulen Tilbud
 ProposalsNumberingModules=Nummereringsmodul for tilbud
 ProposalsPDFModules=Tilbudsmaler
-SuggestedPaymentModesIfNotDefinedInProposal=Foreslått standard betalingsmodus på tilbud, hvis valg ikke er gjort
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Fritekst på tilbud
 WatermarkOnDraftProposal=Vannmerke på tilbudskladder (ingen hvis tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto for tilbudet
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Spør om Lagerkilde for ordre
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Be om bankkonto destinasjon for innkjøpsordre
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Salgsordreoppsett
 OrdersNumberingModules=Nummereringsmodul for ordre
 OrdersModelModule=Ordremaler
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Advarsel, høyere verdier reduserer res
 ModuleActivated=Modul %s er aktivert og bremser grensesnittet
 EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
 ExportSetup=Oppsett av modul Eksport
+ImportSetup=Setup of module Import
 InstanceUniqueID=Unik ID for forekomsten
 SmallerThan=Mindre enn
 LargerThan=Større enn
@@ -1979,5 +1991,7 @@ MakeAnonymousPing=Utfør et anonymt Ping '+1' til Dolibarr foundation-serveren (
 FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
 EmailTemplate=Mal for e-post
 EMailsWillHaveMessageID=E-postmeldinger vil være merket 'Referanser' som samsvarer med denne syntaksen
-PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil ha en teksttittel i PDF-en din på to forskjellige språk i samme genererte PDF, må du angi andrespråket her. Det som er valgt når du genererer PDF, og dette (bare få PDF-maler støtter dette). Hold tomt for kun ett språk per PDF.
+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=Skriv inn koden til et FontAwesome-ikon. Hvis du ikke vet hva som er FontAwesome, kan du bruke den generelle verdien fa-adresseboken.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index b4d0757bc79..9b288bf1ffa 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Leverandørfakturaer
 SupplierBill=Leverandørfaktura
 SupplierBills=Leverandørfakturaer
 Payment=Betaling
-PaymentBack=Tilbakebetaling
-CustomerInvoicePaymentBack=Tilbakebetalinger
+PaymentBack=Refusjon
+CustomerInvoicePaymentBack=Refusjon
 Payments=Betalinger
 PaymentsBack=Refusjoner
 paymentInInvoiceCurrency=i faktura-valuta
 PaidBack=Tilbakebetalt
 DeletePayment=Slett betaling
 ConfirmDeletePayment=Er du sikker på at du vil slette denne betalingen?
-ConfirmConvertToReduc=Vil du konvertere denne %s til en absolutt rabatt?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=Beløpet vil bli lagret blant alle rabatter og kan brukes som en rabatt for en nåværende eller fremtidig faktura for denne kunden.
-ConfirmConvertToReducSupplier=Vil du konvertere denne %s til en absolutt rabatt?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=Beløpet vil bli lagret blant alle rabatter og kan brukes som en rabatt for en nåværende eller en fremtidig faktura for denne leverandøren.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Mottatte betalinger
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Vis delfaktura
 UseSituationInvoices=Tillat delfaktura
 UseSituationInvoicesCreditNote=Tillat delfaktura kreditnota
 Retainedwarranty=Tilbakehold
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Tilbakehold standardprosent
+RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
+RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
 ToPayOn=Å betale på %s
 toPayOn=å betale på %s
 RetainedWarranty=Tilbakehold
@@ -509,11 +512,11 @@ ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
 NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjeparter du er koblet til som salgsrepresentant.
-RevenueStamp=Stempelmerke
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "kunde" under tredjepart
 YouMustCreateInvoiceFromSupplierThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "leverandør" under tredjepart
 YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og så konvertere den til "mal" for å lage en ny fakturamal
-PDFCrabeDescription=PDF-fakturamal Crabe. En komplett fakturamal (gammel implementering av Sponge-mal)
+PDFCrabeDescription=PDF-fakturamal Crabe. En komplett fakturamal 
 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.
@@ -575,3 +578,4 @@ AutoFillDateTo=Angi sluttdato for tjenestelinje med neste faktura dato
 AutoFillDateToShort=Angi sluttdato
 MaxNumberOfGenerationReached=Maks ant. genereringer nådd
 BILL_DELETEInDolibarr=Faktura slettet
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/nb_NO/blockedlog.lang b/htdocs/langs/nb_NO/blockedlog.lang
index abac55b8269..1f7280e6ab8 100644
--- a/htdocs/langs/nb_NO/blockedlog.lang
+++ b/htdocs/langs/nb_NO/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Uforanderlige logger
 ShowAllFingerPrintsMightBeTooLong=Vis alle arkiverte logger (kan være lang)
 ShowAllFingerPrintsErrorsMightBeTooLong=Vis alle ikke-gyldige arkivlogger (kan være lang)
 DownloadBlockChain=Last ned fingeravtrykk
-KoCheckFingerprintValidity=Arkivert logg er ikke gyldig. Det betyr at noen (en hacker?) har endret noen data i den arkiverte loggen etter at den ble registrert, eller har slettet den forrige arkiverte posten (sjekk at linjen med tidligere # eksisterer).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Arkivert logg er gyldig. Det betyr at ingen data på denne linjen ble endret og posten følger den forrige.
 OkCheckFingerprintValidityButChainIsKo=Arkivert logg ser ut til å være gyldig i forhold til den forrige, men kjeden var ødelagt tidligere.
 AddedByAuthority=Lagret hos ekstern myndighet
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 4c8f57ff9c3..de444112b59 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Legg til denne artikkelen
 RestartSelling=Gå tilbake på salg
 SellFinished=Salg fullført
 PrintTicket=Skriv kvittering
+SendTicket=Send ticket
 NoProductFound=Ingen artikler funnet
 ProductFound=vare funnet
 NoArticle=Ingen artikkel
@@ -48,6 +49,7 @@ Footer=Bunntekst
 AmountAtEndOfPeriod=Beløp ved periodens slutt (dag, måned eller år)
 TheoricalAmount=Teoretisk beløp
 RealAmount=Virkelig beløp
+CashFence=Cash fence
 CashFenceDone=Kontantoppgjør ferdig for perioden
 NbOfInvoices=Ant. fakturaer
 Paymentnumpad=Tastaturtype for å legge inn betaling
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS trenger varekategorier for å fungere
 OrderNotes=Ordrenotater
 CashDeskBankAccountFor=Standardkonto for bruk for betalinger i
 NoPaimementModesDefined=Ingen betalingsmodus definert i TakePOS-konfigurasjonen
-TicketVatGrouped=Grupper MVA etter sats i kvitteringer
-AutoPrintTickets=Skriv ut kvitteringer automatisk
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Aktiver funksjoner for Bar eller Restaurant
 ConfirmDeletionOfThisPOSSale=Bekrefter du slettingen av pågående salg?
 ConfirmDiscardOfThisPOSSale=Ønsker du å forkaste dette nåværende salget?
@@ -87,7 +90,19 @@ HeadBar=Toppmeny
 SortProductField=Felt for sortering av produkter
 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.
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
 PrintMethod=Utskriftsmetode
 ReceiptPrinterMethodDescription=Metode med mange parametere. Full tilpassbar med maler. Kan ikke skrive ut fra skyen.
 ByTerminal=Med terminal
+TakeposNumpadUsePaymentIcon=Bruk betalingsikonet på numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start et nytt parallellsalg
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 5f0f0675601..319030bfc9e 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Firma "%s" er slettet fra databasen.
 ListOfContacts=Oversikt over kontaktpersoner
 ListOfContactsAddresses=Oversikt over kontaktpersoner
 ListOfThirdParties=Liste over tredjeparter
-ShowCompany=Vis tredjepart
 ShowContact=Vis kontaktperson
 ContactsAllShort=Alle (ingen filter)
 ContactType=Kontaktperson type
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Selgers fornavn
 SaleRepresentativeLastname=Selgers etternavn
 ErrorThirdpartiesMerge=Det oppsto en feil ved sletting av tredjepart. Vennligst sjekk loggen. Endringer er blitt tilbakestilt.
 NewCustomerSupplierCodeProposed=Kunde eller leverandørkode er allerede brukt, en ny kode blir foreslått
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Betalingstype - Kunde
 PaymentTermsCustomer=Betalingsbetingelser - Kunde
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index f59c7921d87..0268b80d861 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Se %sanalyse av betalinger%s for en beregning av fakt
 SeeReportInDueDebtMode=Se %sanalyse av fakturaer%s for en beregning basert på kjente registrerte fakturaer, selv om de ennå ikke er regnskapsført i hovedboken.
 SeeReportInBookkeepingMode=Se <b> %sRegnskapsrapport%s </b> for en beregning på <b> Hovedbokstabell </b>
 RulesAmountWithTaxIncluded=- Viste beløp er inkludert alle avgifter
-RulesResultDue=- Inkluderer utestående fakturaer, utgifter, MVA og donasjoner, enten de er betalt eller ikke. Inkluderer også utbetalt lønn.<br> - Basert på valideringsdato for fakturaer og MVA og på forfallsdato for utgifter. For lønn definert med Lønn-modulen, benyttes utbetalingstidspunktet.
+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=- Inkluderer betalinger gjort mot fakturaer, utgifter, MVA og lønn. <br> Basert på betalingsdato. Donasjonsdato for donasjoner
-RulesCADue=- Inkluderer kundens forfalte fakturaer, enten de er betalt eller ikke.<br> Basert på valideringsdatoen til disse fakturaene.<br>
+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=- Inkluderer alle betalinger av fakturaer mottatt fra klienter. <br> - Er basert på betalingsdatoen for disse fakturaene <br>
 RulesCATotalSaleJournal=Den inkluderer alle kredittlinjer fra salgsjournalen.
 RulesAmountOnInOutBookkeepingRecord=Inkluderer poster i hovedboken med regnskapskontoer som har gruppen "UTGIFTER" eller "INNTEKT"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Omsetning fakturert etter MVA-sats
 TurnoverCollectedbyVatrate=Omsetning etter MVA-sats
 PurchasebyVatrate=Innkjøp etter MVA-sats
 LabelToShow=Kort etikett
+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
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 6dba399c656..8ec753e1705 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Filen ble ikke fullstendig mottatt av server.
 ErrorNoTmpDir=Midlertidig mappe %s finnes ikke.
 ErrorUploadBlockedByAddon=Opplastning blokkert av en PHP/Apache plugin.
 ErrorFileSizeTooLarge=Filstørrelsen er for stor.
+ErrorFieldTooLong=Felt %s er for langt.
 ErrorSizeTooLongForIntType=Størrelse for lang for int-type (%s sifre maksimum)
 ErrorSizeTooLongForVarcharType=Størrelse for lang for streng-type (%s tegn maksimum)
 ErrorNoValueForSelectType=Sett inn verdi for å velge liste
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Feil, språket på oversatt side
 ErrorBatchNoFoundForProductInWarehouse=Ingen partier/serier funnet for produktet "%s" i lageret "%s".
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Ikke nok mengde for dette partiet/serien for produktet "%s" i lageret "%s".
 ErrorOnlyOneFieldForGroupByIsPossible=Bare ett felt for 'Grupper etter' er mulig (andre blir forkastet)
-ErrorTooManyDifferentValueForSelectedGroupBy=Fant for mange forskjellige verdier (mer enn <b> %s </b>) for feltet '<b> %s </b>', så vi kan ikke bruke det som grafikk. Feltet 'Grupper etter' er fjernet. Kan det være du ønsket å bruke den som X-akse?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index 70b583c7caa..33d72b19f03 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Denne PHP støtter Curl.
 PHPSupportCalendar=Denne PHP støtter kalenderutvidelser.
 PHPSupportUTF8=Denne PHP støtter UTF8 funksjoner.
 PHPSupportIntl=Dette PHP støtter Intl funksjoner.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Denne PHP støtter %s-funksjoner.
 PHPMemoryOK=Din PHP økt-minne er satt til maks.<b>%s</b> bytes. Dette bør være nok.
 PHPMemoryTooLow=Din PHP max økter-minnet er satt til <b>%s</b> bytes. Dette er for lavt. Endre <b>php.ini</b> å sette <b>memory_limit</b> parameter til minst <b>%s</b> byte.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Din PHP-installasjon støtter ikke Curl.
 ErrorPHPDoesNotSupportCalendar=PHP-installasjonen din støtter ikke php-kalenderutvidelser.
 ErrorPHPDoesNotSupportUTF8=Din PHP installasjon har ikke støtte for UTF8-funksjoner. Dolibarr vil ikke fungere riktig. Løs dette før du installerer Dolibarr.
 ErrorPHPDoesNotSupportIntl=PHP-installasjonen støtter ikke Intl-funksjoner.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=PHP-installasjonen din støtter ikke %s-funksjoner.
 ErrorDirDoesNotExists=Mappen %s finnes ikke.
 ErrorGoBackAndCorrectParameters=Gå tilbake og sjekk/korrigér parametrene.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Programmet prøvde å oppgradere selv, men instal
 YouTryInstallDisabledByFileLock=Programmet prøvde å oppgradere selv, men installerings- / oppgraderingssidene er deaktivert for sikkerhet (ved eksistensen av en låsfil <strong> install.lock </strong> i dolibarr-dokumenter katalogen). <br>
 ClickHereToGoToApp=Klikk her for å gå til din applikasjon
 ClickOnLinkOrRemoveManualy=Klikk på følgende lenke. Hvis du alltid ser denne samme siden, må du fjerne/endre navn på filen install.lock i dokumentmappen.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/nb_NO/link.lang b/htdocs/langs/nb_NO/link.lang
index 3719cf4a7dc..d8f4d669605 100644
--- a/htdocs/langs/nb_NO/link.lang
+++ b/htdocs/langs/nb_NO/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Koblingen til %s ble fjernet
 ErrorFailedToDeleteLink= Klarte ikke å fjerne kobling'<b>%s</b>'
 ErrorFailedToUpdateLink= Klarte ikke å oppdatere koblingen til '<b>%s</b>'
 URLToLink=URL til link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 3c29bd69e86..415ecec5f1a 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Ingen kontakter/adresser med kategori funnet
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakter/adresser med kategori funnet
 OutGoingEmailSetup=Oppsett for utgående epost
 InGoingEmailSetup=Oppsett for innkommende epost
-OutGoingEmailSetupForEmailing=Oppsett av utgående e-post (for masse-e-post)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Standard utgående e-postoppsett
 Information=Informasjon
 ContactsWithThirdpartyFilter=Kontakter med tredjepartsfilter
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 7896ac6e5fc..b90db6eb455 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Lagre og bli
 SaveAndNew=Lagre og ny
 TestConnection=Test tilkobling
 ToClone=Klon
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Velg hvilke data du vil klone:
 NoCloneOptionsSpecified=Det er ikke valgt noen data å klone.
 Of=av
@@ -829,6 +830,8 @@ Gender=Kjønn
 Genderman=Mann
 Genderwoman=Kvinne
 ViewList=Listevisning
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obligatorisk
 Hello=Hei
 GoodBye=Farvel
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Velg alternativer for å lage en graf
 Measures=MÃ¥linger
 XAxis=X-akse
 YAxis=Y-akse
+StatusOfRefMustBe=Status for %s må være %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 444b6345cbd..4c894695c78 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grafikk er begrenset til %s-mål i 'Barer' -mod
 OnlyOneFieldForXAxisIsPossible=Bare ett felt er for øyeblikket mulig som X-Akse. Bare det første valgte feltet er valgt.
 AtLeastOneMeasureIsRequired=Det kreves minst ett felt for mål
 AtLeastOneXAxisIsRequired=Minst ett felt for X-akse er påkrevd
-
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=Salgsordre validert
 Notify_ORDER_SENTBYMAIL=Salgsordre sendt via epost
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Innkjøpsordre sendt via e-post
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=Side-URL
 WEBSITE_TITLE=Tittel
 WEBSITE_DESCRIPTION=Beskrivelse
 WEBSITE_IMAGE=Bilde
-WEBSITE_IMAGEDesc=Relativ bane for bildemediet. Du kan holde dette tomt da dette sjelden blir brukt (det kan brukes av dynamisk innhold for å vise et miniatyrbilde i en liste over blogginnlegg). Bruk __WEBSITEKEY__ i banen hvis banen avhenger av nettstedets navn.
+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=Nøkkelord
 LinesToImport=Linjer å importere
 
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index e0280204dba..ec59a80ddcc 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Dette verktøyet oppdaterer MVA-verdien som er definert
 MassBarcodeInit=Masse strekkode-endring
 MassBarcodeInitDesc=Denne siden kan brukes til å lage strekkoder for objekter som ikke har dette. Kontroller at oppsett av modulen Strekkoder er fullført.
 ProductAccountancyBuyCode=Regnskapskode (kjøp)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Regnskapskode (salg)
 ProductAccountancySellIntraCode=Regnskapskode (salg intra-community)
 ProductAccountancySellExportCode=Regnskapskode (salgseksport)
@@ -165,7 +167,7 @@ SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
 CustomCode=Toll / vare / HS-kode
 CountryOrigin=Opprinnelsesland
-Nature=Varens art (materiale/ferdig)
+Nature=Nature of product (material/finished)
 ShortLabel=Kort etikett
 Unit=Enhet
 p= stk
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 07be0df9725..d514c0df475 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=som jeg er knyttet til prosjektet
 Time=Tid
 ListOfTasks=Oppgaveliste
 GoToListOfTimeConsumed=GÃ¥ til liste for tidsbruk
-GoToListOfTasks=Vis som liste
-GoToGanttView=vis som Gantt
 GanttView=Gantt visning
 ListProposalsAssociatedProject=Liste over tilbud knyttet til prosjektet
 ListOrdersAssociatedProject=Liste over salgsordre knyttet til prosjektet
@@ -188,7 +186,7 @@ PlannedWorkload=Planlagt arbeidsmengde
 PlannedWorkloadShort=Arbeidsmengde
 ProjectReferers=Relaterte elementer
 ProjectMustBeValidatedFirst=Prosjektet må valideres først
-FirstAddRessourceToAllocateTime=Tilknytt brukerressurs til oppgave for å tildele tid
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Tidsbruk pr. dag
 InputPerWeek=Tidsbruk pr. uke
 InputPerMonth=Forbruk pr. måned
@@ -240,6 +238,7 @@ LatestModifiedProjects=Siste %s endrede prosjekter
 OtherFilteredTasks=Andre filtrerte oppgaver
 NoAssignedTasks=Ingen tildelte oppgaver funnet (tilordne prosjekt/oppgaver til den nåværende brukeren fra den øverste valgboksen for å legge inn tid på den)
 ThirdPartyRequiredToGenerateInvoice=En tredjepart må defineres på prosjektet for å kunne fakturere det.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Tillat brukerkommentarer på oppgaver
 AllowCommentOnProject=Tillat brukerkommentarer på prosjekter
@@ -265,3 +264,4 @@ InvoiceToUse=Fakturamal som skal brukes
 NewInvoice=Ny faktura
 OneLinePerTask=Én linje per oppgave
 OneLinePerPeriod=Én linje per periode
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/nb_NO/receiptprinter.lang b/htdocs/langs/nb_NO/receiptprinter.lang
index c908ba6387a..8a3ea66f89a 100644
--- a/htdocs/langs/nb_NO/receiptprinter.lang
+++ b/htdocs/langs/nb_NO/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummyskriver
 CONNECTOR_NETWORK_PRINT=Nettverksskriver
 CONNECTOR_FILE_PRINT=Lokal skriver
 CONNECTOR_WINDOWS_PRINT=Lokal Windowsskriver
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Dummyskriver for test. Gjør ingenting
 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=Standardprofil
 PROFILE_SIMPLE=Enkel profil
 PROFILE_EPOSTEP=Epos Tep-profil
@@ -61,3 +63,33 @@ DOL_VALUE_MONTH_LETTERS=Fakturamåned med bokstaver
 DOL_VALUE_MONTH=Fakturamåned
 DOL_VALUE_DAY=Fakturadag
 DOL_VALUE_DAY_LETTERS=Fakturadag med bokstaver
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Fakturareferanse
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intracommunity number of VAT (ikke i Norge)
+DOL_VALUE_MYSOC_CAPITAL=Kapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
index bef1913f7ca..b4e05cb5e8a 100644
--- a/htdocs/langs/nb_NO/stripe.lang
+++ b/htdocs/langs/nb_NO/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Navn på leverandøren
 CSSUrlForPaymentForm=URL til CSS-stilark for betalingsskjema
 NewStripePaymentReceived=Ny Stripe betaling mottatt
 NewStripePaymentFailed=Ny Stripe betaling prøvd men mislyktes
+FailedToChargeCard=Kunne ikke lade kortet
 STRIPE_TEST_SECRET_KEY=Hemmelig testnøkkel
 STRIPE_TEST_PUBLISHABLE_KEY=Publiserbar testnøkkel
 STRIPE_TEST_WEBHOOK_KEY=Webhook testnøkkel
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link til oppsett av Stripe WebHook for oppkall av IPN
 ToOfferALinkForLiveWebhook=Link til oppsett av Stripe WebHook for oppkall av IPN (live-modus)
 PaymentWillBeRecordedForNextPeriod=Betalingen blir registrert for neste periode.
 ClickHereToTryAgain=<a href="%s">Klikk her for å prøve igjen ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=På grunn av sterke regler for autentisering av kunder, må opprettelse av et kort gjøres fra Stripe backoffice. Du kan klikke her for å slå på Stripe kundeoppføring: %s
+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/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 5ebfbaf8511..9afc41913f8 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Passordet er endret til : %s
 SubjectNewPassword=Ditt nye passord til %s
 GroupRights=Grupperettigheter
 UserRights=Brukerrettigheter
-UserGUISetup=User Display Setup
+UserGUISetup=Brukerens visningsoppsett
 DisableUser=Deaktiver
 DisableAUser=Deaktiver en bruker
 DeleteUser=Slett
@@ -34,8 +34,8 @@ ListOfUsers=Brukeroversikt
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Administrator med alle rettigheter
 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=Standard tillatelser
+DefaultRightsDesc=Her defineres <u> standard </u> tillatelser som automatisk tildeles en <u> ny </u> bruker (for å endre tillatelser for eksisterende brukere, gå til brukerkortet).
 DolibarrUsers=Dolibarrbrukere
 LastName=Etternavn
 FirstName=Fornavn
@@ -66,11 +66,11 @@ CreateDolibarrThirdParty=Lag en tredjepart
 LoginAccountDisableInDolibarr=Kontoen er deaktivert i Dolibarr.
 UsePersonalValue=Bruk personlig verdi
 InternalUser=Intern bruker
-ExportDataset_user_1=Users and their properties
+ExportDataset_user_1=Brukere og deres egenskaper
 DomainUser=Domenebruker %s
 Reactivate=Reaktiver
-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.<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=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=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)
 PermissionInheritedFromAGroup=Rettigheter innvilget fordi de er arvet av en brukegruppe.
 Inherited=Arvet
 UserWillBeInternalUser=Opprettet bruker vil være en intern bruker (fordi ikke knyttet til en bestemt tredjepart)
@@ -92,8 +92,8 @@ LoginToCreate=Brukernavn å opprette
 NameToCreate=Navn på tredjepart til å lage
 YourRole=Dine roller
 YourQuotaOfUsersIsReached=Din kvote på aktive brukere er nådd!
-NbOfUsers=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Antall brukere
+NbOfPermissions=Antall tillatelser
 DontDowngradeSuperAdmin=Bare en superadmin kan nedgradere en superadmin
 HierarchicalResponsible=Veileder
 HierarchicView=Hierarkisk visning
@@ -107,6 +107,11 @@ DisabledInMonoUserMode=Deaktivert i vedlikeholds-modus
 UserAccountancyCode=Bruker regnskapskode
 UserLogoff=Brukerutlogging
 UserLogged=Bruker innlogget
-DateEmployment=Employment Start Date
-DateEmploymentEnd=Employment End Date
-CantDisableYourself=You can't disable your own user record
+DateEmployment=Ansettelse startdato
+DateEmploymentEnd=Ansettelse sluttdato
+CantDisableYourself=Du kan ikke deaktivere din egen brukeroppføring
+ForceUserExpenseValidator=Tvunget utgiftsrapport-validator
+ForceUserHolidayValidator=Tvunget friforespørsel-validator
+ValidatorIsSupervisorByDefault=Som standard er validatoren veileder for brukeren. Hold tom for å beholde denne oppførselen.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 173ee33b996..df149546c37 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Vis side i ny fane
 SetAsHomePage=Sett som startside
 RealURL=Virkelig URL
 ViewWebsiteInProduction=Vis webside ved hjelp av  hjemme-URL
-SetHereVirtualHost= <u> Bruk med Apache/NGinx/... </u> <br> Hvis du kan opprette, på webserveren din (Apache, Nginx, ...), en dedikert Virtuell Vert med PHP-aktivert og en Root-katalog på <br> <strong> %s </strong> <br> deretter satt navnet på den virtuelle verten du har opprettet i egenskapene til nettstedet, slik at forhåndsvisningen kan gjøres også ved hjelp av denne dedikerte webservertilgangen i stedet for den interne Dolibarr-serveren.
+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=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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Beklager, dette nettstedet er for øyeblikket off
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver nettstedkontotabellen
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiver tabellen for å lagre nettstedkontoer (innlogging/pass) for hvert nettsted/tredjepart
 YouMustDefineTheHomePage=Du må først definere standard startside
-OnlyEditionOfSourceForGrabbedContentFuture=Advarsel: Å opprette en nettside ved å importere en ekstern nettside er for erfarne brukere. Avhengig av kompleksiteten til kildesiden, kan resultatet av importen avvike fra originalen. Også hvis kildesiden bruker vanlige CSS-stiler eller motstridende javascript, kan det ødelegge utseendet eller funksjonene til nettsideeditoren når du arbeider på denne siden. Denne metoden er en raskere måte å opprette en side på, men det anbefales å lage din nye side fra grunnen av eller fra en foreslått sidemal. <br> Vær også oppmerksom på at endringer i HTML-kilden vil være mulig når sideinnholdet er initialisert ved å ta det fra en ekstern side ("Online" editor vil IKKE være tilgjengelig)
+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=Kun HTML-kilde er mulig når innholdet ble tatt fra et eksternt nettsted
 GrabImagesInto=Hent bilder som er funnet i css og side også.
 ImagesShouldBeSavedInto=Bilder bør lagres i katalogen
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For god SEO-praksis, bruk en tekst mellom 5 og 70 tegn
 MainLanguage=Hovedspråk
 OtherLanguages=Andre språk
 UseManifest=Oppgi en manifest.json-fil
+PublicAuthorAlias=Public author alias
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
+ReplacementDoneInXPages=Replacement done in %s pages or containers
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 8de85c22445..527f9da1546 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -60,7 +60,6 @@ ExportStructure=Struktuur
 NameColumn=Kollomennaam
 FeatureAvailableOnlyOnStable=Functie alleen beschikbaar op officiële stabiele versies
 BoxesDesc=Widgets zijn componenten die informatie tonen die u kunt toevoegen om sommige pagina's te personaliseren. U kunt kiezen tussen het weergeven van de widget of niet door de doelpagina te selecteren en op 'Activeren' te klikken, of door op de prullenbak te klikken om deze uit te schakelen.
-ModulesDesc=De modules / applicaties bepalen welke functies beschikbaar zijn in de software. Sommige modules vereisen dat machtigingen worden verleend aan gebruikers na het activeren van de module. Klik op de aan / uitknop (aan het einde van de moduleregel) om een module / toepassing in of uit te schakelen.
 ModulesMarketPlaceDesc=Je kan meer modules vinden door te zoeken op andere externe websites, waar je ze kan downloaden
 ModulesMarketPlaces=Zoek externe app / modules
 ModulesDevelopYourModule=Ontwikkel je eigen app / modules
@@ -118,6 +117,7 @@ SetupIsReadyForUse=Module-implementatie is voltooid. U moet de module in uw toep
 NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd voor een bestaande map. <br>
 InfDirAlt=Sinds versie 3 is het mogelijk om een alternatieve rootmap te definiëren. Hiermee kunt u in een speciale map plug-ins en aangepaste sjablonen opslaan. <br> Maak gewoon een map aan in de root van Dolibarr (bv: aangepast). <br>
 InfDirExample=<br> <strong>Verklaar</strong> het dan in het bestand <strong>conf.php</strong> <br> $ Dolibarr_main_url_root_alt='/custom' <br> $ Dolibarr_main_document_root_alt='/pad/of/Dolibarr/htdocs/custom' <br> Als deze regels worden becommentarieerd met "#", schakelt u ze gewoon uit door het teken "#" te verwijderen.
+YouCanSubmitFile=You can upload the .zip file of module package from here:
 LastStableVersion=Nieuwste stabiele versie
 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>
@@ -161,6 +161,7 @@ ModuleCompanyCodePanicum=Retourneer een lege boekhoudcode.
 Module40Name=Verkoper
 Module1780Name=Labels/Categorien
 Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Permission1004=Bekijk voorraadmutaties
 Permission1005=Creëren / wijzigen voorraadmutaties
 ValueOfConstantKey=Value of a configuration constant
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index 342d138fb72..f6ea88ac2fd 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -4,6 +4,10 @@ BillsCustomer=Klantfactuur
 BillsCustomersUnpaid=Onbetaalde klantfacturen
 BillsCustomersUnpaidForCompany=Onbetaalde afnemersfacturen voor %s
 DisabledBecauseNotErasable=Niet mogelijk omdat het niet kan worden gewist
+PaymentBack=Teruggave
+CustomerInvoicePaymentBack=Teruggave
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 CreateCreditNote=Aanmaak krediet nota
 DoPayment=Doe een betaling
 DoPaymentBack=Doe een terugbetaling
@@ -35,6 +39,7 @@ PaymentTypeTRA=Bank cheque
 ChequeMaker=Cheque / Transfer uitvoerder
 DepositId=Id storting
 ShowUnpaidAll=Bekijk alle onbetaalde facturen
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 TypeContact_facture_external_BILLING=Klant contact
 NotLastInCycle=Deze factuur is niet de laatste in de rij en mag niet worden aangepast.
 PDFCrevetteSituationInvoiceLineDecompte=Situatie factuur - AANTAL
diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
index c811b8fa19c..26787bfc20f 100644
--- a/htdocs/langs/nl_BE/compta.lang
+++ b/htdocs/langs/nl_BE/compta.lang
@@ -24,7 +24,6 @@ ConfirmDeleteSocialContribution=Bent u zeker dat u deze sociale bijdrage/belasti
 ExportDataset_tax_1=sociale bijdragen/belastingen en betalingen
 CalcModeLT1Debt=Modus <b>%sRE op afnemersfacturen%s</b>
 CalcModeLT1Rec=Modus <b>%sRE op leveranciersfacturen%s</b>
-RulesResultDue=- Dit omvat openstaande facturen, uitgaven, BTW, donaties, zowel betaald als niet. Dit omvat eveneens betaalde lonen.<br>- Dit is gebaseerd op de validatiedatum van facturen, BTW en de vervaldatum voor uitgaven. Voor lonen die gedefinieerd zijn in de Salaris-module is de datum van betaling gebruikt.
 RulesResultInOut=- Dit omvat alle betalingen van facturen, uitgaven, BTW en lonen. <br>- Dit is gebaseerd op de betalingsdata van de facturen, uitgaven, BTW en lonen. De donatiedatum voor donaties.
 PurchasesJournal=Inkoopdagboek
 DescPurchasesJournal=Inkoopdagboek
diff --git a/htdocs/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang
index 5bdc98b4c0b..1ffbb0bb385 100644
--- a/htdocs/langs/nl_BE/other.lang
+++ b/htdocs/langs/nl_BE/other.lang
@@ -3,5 +3,4 @@ Notify_COMPANY_CREATE=Third party aangemaakt
 FileIsTooBig=Bestanden zijn te groot
 WebsiteSetup=Setup van de module website
 WEBSITE_PAGEURL=URL van de pagina
-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 __WEBSITEKEY__ in the path if path depends on website name.
 WEBSITE_KEYWORDS=Trefwoorden
diff --git a/htdocs/langs/nl_BE/users.lang b/htdocs/langs/nl_BE/users.lang
index 83e85755523..161657b3cc9 100644
--- a/htdocs/langs/nl_BE/users.lang
+++ b/htdocs/langs/nl_BE/users.lang
@@ -12,7 +12,6 @@ LastGroupsCreated=Nieuwste %s groepen gemaakt
 LastUsersCreated=Laatste %s gemaakte gebruikers
 CreateDolibarrThirdParty=Maak Derden
 CreateInternalUserDesc=Met dit formulier kunt u een interne gebruiker in uw bedrijf / organisatie maken. Om een externe gebruiker (klant, leverancier enz.) Aan te maken, gebruikt u de knop 'Maak Dolibarr Gebruiker aan' van de contactkaart van die partij.
-InternalExternalDesc=Een <b>interne</b> gebruiker is een gebruiker die deel uitmaakt van uw bedrijf / organisatie. <br> Een <b>externe</b> gebruiker is een klant, verkoper of andere. <br><br> In beide gevallen definieert machtiging rechten op Dolibarr, ook kan de externe gebruiker een ander menu-manager hebben dan de interne gebruiker (zie Home - Setup - Display)
 ConfirmCreateContact=Weet u zeker dat u een Dolibarr account wilt maken voor deze contactpersoon?
 ConfirmCreateThirdParty=Weet u zeker dat u een 'derde' wilt maken voor dit lid?
 NbOfPermissions=Aantal toestemmingen
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 7875a74a1c2..b83e9d0cf25 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Opmerking: <b>uw</b> PHP-configuratie beperkt momenteel
 NoMaxSizeByPHPLimit=Opmerking: Geen limiet ingesteld in uw PHP instellingen
 MaxSizeForUploadedFiles=Maximale grootte voor geüploade bestanden (0 om uploaden niet toe te staan)
 UseCaptchaCode=Gebruik een grafische code (CAPTCHA) op de aanmeldingspagina (SPAM preventie)
-AntiVirusCommand= Het volledige pad naar het antiviruscommando
-AntiVirusCommandExample= Voorbeeld voor ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Voorbeeld voor ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Het volledige pad naar het antiviruscommando
+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= Aanvullende parameters op de opdrachtregel
-AntiVirusParamExample= Voorbeeld voor ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Instellingen van de boekhoudkundige module
 UserSetup=Gebruikersbeheer instellingen
 MultiCurrencySetup=Setup meerdere valuta's
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Functionaliteit uitgeschakeld in de demonstratie
 FeatureAvailableOnlyOnStable=Functie alleen beschikbaar bij officiële stabiele versies
 BoxesDesc=Widgets zijn componenten die informatie tonen die u kunt toevoegen om sommige pagina's te personaliseren. U kunt kiezen of u de widget wilt weergeven of niet door de doelpagina te selecteren en op 'Activeren' te klikken of door op de prullenbak te klikken om deze uit te schakelen.
 OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond.
-ModulesDesc=De modules / applicaties bepalen welke functies beschikbaar zijn in de software. Sommige modules vereisen dat machtigingen worden verleend aan gebruikers na het activeren van de module. Klik op de aan / uit knop (aan het einde van de module lijn) aan / uit te schakelen een module / applicatie.
+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=U kunt meer modules downloaden van externe websites op het internet...
 ModulesDeployDesc=Als machtigingen op uw bestandssysteem dit toestaan, kunt u dit hulpprogramma gebruiken om een externe module te implementeren. De module is dan zichtbaar op het tabblad <strong>%s</strong> .
 ModulesMarketPlaces=Vind externe apps of modules
@@ -212,6 +212,7 @@ CompatibleUpTo=Compatibel met versie %s
 NotCompatible=Deze module lijkt niet compatibel met uw Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Deze module vereist een update van uw Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Zie op de Marktplaats
+SeeSetupOfModule=See setup of module %s
 Updated=Bijgewerkt
 Nouveauté=Nieuwigheid
 AchatTelechargement=Kopen/Downloaden
@@ -221,6 +222,7 @@ DoliPartnersDesc=Lijst van bedrijven die op maat ontwikkelde modules of functies
 WebSiteDesc=Externe websites voor meer add-on (niet-core) modules ...
 DevelopYourModuleDesc=Enkele oplossingen om uw eigen module te ontwikkelen ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Beschikbare widgets
 BoxesActivated=Widgets geactiveerd
 ActivateOn=Activeren op
@@ -328,7 +330,7 @@ SetupIsReadyForUse=Module-implementatie is voltooid. U moet de module in uw toep
 NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd in een bestaande map.<br>
 InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren.  Dit stelt je in staat om op dezelfde plaats zowel plug-ins als eigen templates te bewaren. <br>Maak gewoon een directory op het niveau van de root van Dolibarr (bv met de naam: aanpassing).<br>
 InfDirExample=<br>Leg dit vast in het bestand <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Als deze lijnen zijn inactief gemaakt met een "#" teken, verwijder dit teken dan om ze te activeren.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=U kunt het .zip-bestand van het modulepakket vanaf hier uploaden:
 CurrentVersion=Huidige versie van Dolibarr
 CallUpdatePage=Blader naar de pagina die de databasestructuur en gegevens bijwerkt: %s.
 LastStableVersion=Laatste stabiele versie
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Laat leeg om standaardwaarde te gebruiken
 DefaultLink=Standaard link
 SetAsDefault=Gebruik standaard
 ValueOverwrittenByUserSetup=Waarschuwing, deze waarde kan worden overschreven door de gebruiker specifieke setup (elke gebruiker kan zijn eigen ClickToDial url ingestellen)
-ExternalModule=Externe module - geïnstalleerd in map %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Massa streepjescode initialisatie relaties
 BarcodeInitForProductsOrServices=Mass barcode init of reset voor producten of diensten
 CurrentlyNWithoutBarCode=Momenteel hebt u een <strong>%s</strong> record op <strong>%s</strong>%s zonder gedefinieerde streepjescode.
@@ -642,7 +645,7 @@ Module50000Desc=Bied klanten een PayBox online betaalpagina (credit / debit card
 Module50100Name=POS SimplePOS
 Module50100Desc=Point of Sale-module SimplePOS (eenvoudige POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Point of Sale module TakePOS (touchscreen POS, voor winkels, bars of restaurants).
 Module50200Name=Paypal
 Module50200Desc=Bied klanten een PayPal-online betaalpagina (PayPal-account of credit- / debetkaarten). Dit kan worden gebruikt om uw klanten toe te staan ad-hocbetalingen te doen of betalingen gerelateerd aan een specifiek Dolibarr-object (factuur, bestelling, enz ...)
 Module50300Name=Stripe
@@ -947,7 +950,7 @@ DictionaryCanton=Staten / Provincies
 DictionaryRegion=Regio
 DictionaryCountry=Landen
 DictionaryCurrency=Valuta
-DictionaryCivility=Titel van de beleefdheid
+DictionaryCivility=Honorific titles
 DictionaryActions=Agenda evenementen
 DictionarySocialContributions=Soorten sociale of fiscale belastingen
 DictionaryVAT=BTW-tarieven of Verkoop Tax tarieven
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Standaard is de voorgestelde BTW 0. Dit kan gebruikt worden in
 VATIsUsedExampleFR=In Frankrijk betekent dit dat bedrijven of organisaties een echt fiscaal systeem hebben (Vereenvoudigd echt of normaal echt). Een systeem waarin btw wordt aangegeven.
 VATIsNotUsedExampleFR=In Frankrijk betekent dit verenigingen die niet-omzetbelasting zijn aangegeven of bedrijven, organisaties of vrije beroepen die hebben gekozen voor het micro-onderneming fiscale systeem (omzetbelasting in franchise) en een franchise omzetbelasting hebben betaald zonder aangifte omzetbelasting. Bij deze keuze wordt de verwijzing "Niet van toepassing omzetbelasting - art-293B van CGI" op facturen weergegeven.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Tarief
 LocalTax1IsNotUsed=Gebruik geen tweede belasting
 LocalTax1IsUsedDesc=Gebruik een tweede type belasting (anders dan de eerste)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Het IRPF-tarief standaard bij het maken van prospects, fac
 LocalTax2IsNotUsedDescES=Standaard is de voorgestelde IRPF 0. Einde van de regel.
 LocalTax2IsUsedExampleES=In Spanje, freelancers en onafhankelijke professionals die diensten aanbieden alsmede bedrijven die voor het belastingsysteem van modules hebben gekozen.
 LocalTax2IsNotUsedExampleES=In Spanje zijn het bedrijven die niet onderworpen zijn aan het belastingstelsel van 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 des 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=Rapporten over lokale belastingen
 CalcLocaltax1=Verkopen - Aankopen
 CalcLocaltax1Desc=Lokale belastings rapporten worden berekend met het verschil tussen verkopen en aankopen
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Aankopen
 CalcLocaltax2Desc=Lokale Belastingen rapporten zijn het totaal van balastingen aankopen
 CalcLocaltax3=Verkopen
 CalcLocaltax3Desc=Lokale Belastingen rapporten zijn het totaal van belastingen verkoop
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan worden gevonden voor de code
 LabelOnDocuments=Etiket op documenten
 LabelOrTranslationKey=Label- of vertaalsleutel
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Onkostendeclaratie ter goedkeuring
 Delays_MAIN_DELAY_HOLIDAYS=Verzoek voor goedkeuring
 SetupDescription1=Voordat u Dolibarr begint te gebruiken, moeten enkele beginparameters worden gedefinieerd en modules ingeschakeld / geconfigureerd.
 SetupDescription2=De volgende twee secties zijn verplicht (de twee eerste vermeldingen in het Setup-menu):
-SetupDescription3=<a href="%s">%s -> %s</a> <br> Basisparameters die worden gebruikt om het standaardgedrag van uw toepassing aan te passen (bijvoorbeeld voor landgerelateerde functies).
-SetupDescription4=<a href="%s">%s -&gt; %s</a> <br> Deze software is een pakket van vele modules / applicaties, allemaal min of meer onafhankelijk. De modules die relevant zijn voor uw behoeften, moeten worden ingeschakeld en geconfigureerd. Nieuwe items / opties worden toegevoegd aan menu&#39;s met de activering van een module.
+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=Andere items in het Setup-menu beheren optionele parameters.
 LogEvents=Veiligheidsauditgebeurtenissen
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Schakel logboekregistratie in voor specifieke beveiligingsgebeurten
 AreaForAdminOnly=Setup functies kunnen alleen door <b>Administrator gebruikers</b> worden ingesteld
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
 SystemAreaForAdminOnly=Dit gebied is alleen beschikbaar voor beheerders. Gebruikersrechten van Dolibarr kunnen deze beperking niet wijzigen.
-CompanyFundationDesc=Bewerk de informatie van het bedrijf / de entiteit. Klik op de knop &quot;%s&quot; onderaan de pagina.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Als u een externe accountant / boekhouder hebt, kunt u hier de informatie bewerken.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters die het uiterlijk en gedrag van Dolibarr beïnvloeden, kunnen hier worden gewijzigd.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Regels om wachtwoorden te genereren en te valideren
 DisableForgetPasswordLinkOnLogonPage=De link &quot;Wachtwoord vergeten&quot; niet weergeven op de aanmeldingspagina
 UsersSetup=Gebruikersmoduleinstellingen
 UserMailRequired=E-mail vereist om een nieuwe gebruiker te maken
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Instellingen HRM module
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Factuur documentsjablonen
 BillsPDFModulesAccordindToInvoiceType=Factuur documenteert modellen volgens factuurtype
 PaymentsPDFModules=Modellen betaal documenten
 ForceInvoiceDate=Forceer factuurdatum naar validatiedatum
-SuggestedPaymentModesIfNotDefinedInInvoice=Voorgestelde betaalwijze standaard op de factuur, indien niet ingesteld voor de betreffende factuur
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Stel de betaling voor door opname op rekening
 SuggestPaymentByChequeToAddress=Stel betaling per cheque voor aan
 FreeLegalTextOnInvoices=Vrije tekst op facturen
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Instelling leveranciersbetalingen
 PropalSetup=Offertemoduleinstellingen
 ProposalsNumberingModules=Offertenummeringmodules
 ProposalsPDFModules=Offertedocumentsjablonen
-SuggestedPaymentModesIfNotDefinedInProposal=Voorgestelde betalingsmodus op voorstel standaard indien niet gedefinieerd voor voorstel
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Vrije tekst op Offertes
 WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vraag naar bankrekening bestemming van het voorstel
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Vraag te gebruiken magazijn bij order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Vraag naar bankrekeningbestemming van bestelling
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Beheer van verkooporders
 OrdersNumberingModules=Opdrachtennummeringmodules
 OrdersModelModule=Oprachtendocumentsjablonen
@@ -1686,9 +1697,9 @@ CashDeskIdWareHouse=Kies magazijn te gebruiken voor voorraad daling
 StockDecreaseForPointOfSaleDisabled=Voorraadafname vanaf verkooppunt uitgeschakeld
 StockDecreaseForPointOfSaleDisabledbyBatch=Voorraadafname in POS is niet compatibel met module Serieel / Lotbeheer (momenteel actief), dus voorraadafname is uitgeschakeld.
 CashDeskYouDidNotDisableStockDecease=U hebt de voorraaddaling niet uitgeschakeld bij een verkoop vanuit het verkooppunt. Daarom is een magazijn vereist.
-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)
+CashDeskForceDecreaseStockLabel=Afname van voorraad voor batchproducten werd geforceerd.
+CashDeskForceDecreaseStockDesc=Verlaag eerst met de oudste eet- en verkoopdata.
+CashDeskReaderKeyCodeForEnter=Code voor "Enter" gedefinieerd in barcodescanner (Voorbeeld: 13)
 ##### Bookmark #####
 BookmarkSetup=Weblinkmoduleinstellingen
 BookmarkDesc=Met deze module kunt u bladwijzers beheren. U kunt ook snelkoppelingen toevoegen aan Dolibarr-pagina's of externe websites in het linkermenu.
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Waarschuwing, hogere waarden vertragen
 ModuleActivated=Module %s is geactiveerd en vertraagt de interface
 EXPORTS_SHARE_MODELS=Exportmodellen zijn met iedereen te delen
 ExportSetup=Installatie van exportmodule
+ImportSetup=Instellen van module Import
 InstanceUniqueID=Uniek ID van de instantie
 SmallerThan=Kleiner dan
 LargerThan=Groter dan
@@ -1972,12 +1984,14 @@ ConfirmDeleteEmailCollector=Weet je zeker dat je deze e-mailverzamelaar wilt ver
 RecipientEmailsWillBeReplacedWithThisValue=E-mails van ontvangers worden altijd vervangen door deze waarde
 AtLeastOneDefaultBankAccountMandatory=Er moet minimaal 1 standaardbankrekening worden gedefinieerd
 RESTRICT_ON_IP=Alleen toegang tot bepaalde host-IP&#39;s toestaan (jokerteken niet toegestaan, gebruik ruimte tussen waarden). Leeg betekent dat elke gastheer toegang heeft.
-IPListExample=127.0.0.1 192.168.0.2 [::1]
+IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Gebaseerd op de SabreDAV-versie van de bibliotheek
 NotAPublicIp=Geen openbaar IP
 MakeAnonymousPing=Maak een anonieme ping &#39;+1&#39; naar de Dolibarr-funderingsserver (1 keer alleen gedaan na installatie) zodat de stichting het aantal Dolibarr-installaties kan tellen.
 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_USE_ALSO_LANGUAGE_CODE=Als u een bepaalde teksttitel in uw PDF wilt dupliceren in 2 verschillende talen in dezelfde PDF, moet u hier deze tweede taal instellen, zodat de gegenereerde PDF 2 verschillende talen op dezelfde pagina bevat, de taal die is gekozen bij het genereren van PDF en deze (slechts enkele PDF-sjablonen ondersteunen dit). Voor 1 taal per PDF laat u dit leeg.
-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_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=Voer hier de code van een FontAwesome-pictogram in. Als je niet weet wat FontAwesome is, kun je het generieke waarde fa-adresboek gebruiken.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 7b5dd51d05f..7e711e58431 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -66,9 +66,9 @@ paymentInInvoiceCurrency=Factuur valuta
 PaidBack=Terugbetaald
 DeletePayment=Betaling verwijderen
 ConfirmDeletePayment=Weet u zeker dat u deze betaling wilt verwijderen?
-ConfirmConvertToReduc=Wilt u deze %s omzetten in een korting?
+ConfirmConvertToReduc=Wilt u deze %s omzetten in een beschikbaar tegoed?
 ConfirmConvertToReduc2=Het bedrag wordt opgeslagen bij alle kortingen en kan worden gebruikt als korting voor een huidige of toekomstige factuur voor deze klant.
-ConfirmConvertToReducSupplier=Wilt u deze %s omzetten in een korting?
+ConfirmConvertToReducSupplier=Wilt u deze %s omzetten in een beschikbaar tegoed?
 ConfirmConvertToReducSupplier2=Het bedrag wordt opgeslagen bij alle kortingen en kan worden gebruikt als korting voor een huidige of toekomstige factuur voor deze leverancier.
 SupplierPayments=Leveranciersbetalingen
 ReceivedPayments=Ontvangen betalingen
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Situatie factuur weergeven
 UseSituationInvoices=Situatiefactuur toestaan
 UseSituationInvoicesCreditNote=Toestaan factuur creditnota
 Retainedwarranty=Ingehouden garantie
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Standaardgarantiepercentage behouden
+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=Te betalen op %s
 toPayOn=te betalen op %s
 RetainedWarranty=Ingehouden garantie
@@ -509,11 +512,11 @@ ToMakePayment=Betaal
 ToMakePaymentBack=Terugbetalen
 ListOfYourUnpaidInvoices=Lijst van onbetaalde facturen
 NoteListOfYourUnpaidInvoices=Nota: deze lijst bevat enkel facturen voor derde partijen waarvoor je als verkoopsvertegenwoordiger aangegeven bent.
-RevenueStamp=Taxzegel
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Deze optie is alleen beschikbaar wanneer u een factuur maakt op het tabblad "Klant" van een relatie
 YouMustCreateInvoiceFromSupplierThird=Deze optie is alleen beschikbaar bij het maken van een factuur op het tabblad "Leverancier" bij relatie
 YouMustCreateStandardInvoiceFirstDesc=Maak eerst een standaard factuur en converteer naar een sjabloon om deze als sjabloon te gebruiken
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Factuur PDF-sjabloon Crabe. Een volledig factuursjabloon 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Stel de einddatum in voor de servicelijn met de volgende factuur-
 AutoFillDateToShort=Tot datum
 MaxNumberOfGenerationReached=Max aantal gegenereerd bereikt
 BILL_DELETEInDolibarr=Factuur verwijderd
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/nl_NL/blockedlog.lang b/htdocs/langs/nl_NL/blockedlog.lang
index 296cc06c956..ef56512687e 100644
--- a/htdocs/langs/nl_NL/blockedlog.lang
+++ b/htdocs/langs/nl_NL/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Niet aanpasbare logboeken
 ShowAllFingerPrintsMightBeTooLong=Toon alle gearchiveerde logs (kunnen lang zijn)
 ShowAllFingerPrintsErrorsMightBeTooLong=Toon alle ongeldige archieflogboeken (kunnen lang zijn)
 DownloadBlockChain=Vingerafdrukken downloaden
-KoCheckFingerprintValidity=Gearchiveerde logboekinvoer is niet geldig. Het betekent dat iemand (een hacker?) Sommige gegevens van deze opname heeft gewijzigd nadat deze is opgenomen, of de vorige gearchiveerde record heeft gewist (controleer of die regel met vorige # bestaat).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Gearchiveerde logboekrecord is geldig. De gegevens op deze regel zijn niet gewijzigd en de invoer volgt op de vorige.
 OkCheckFingerprintValidityButChainIsKo=Gearchiveerd log lijkt geldig in vergelijking met de vorige, maar de ketting was eerder beschadigd.
 AddedByAuthority=Opgeslagen in autoriteit op afstand
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 0b39ffc7cc6..cb263dc77e9 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Voeg dit artikel
 RestartSelling=Ga terug op de verkopen
 SellFinished=Verkoop gereed
 PrintTicket=Print bon
+SendTicket=Send ticket
 NoProductFound=Geen artikel gevonden
 ProductFound=product gevonden
 NoArticle=Geen artikel
@@ -48,6 +49,7 @@ Footer=Voetnoot
 AmountAtEndOfPeriod=Bedrag aan het einde van de periode (dag, maand of jaar)
 TheoricalAmount=Theoretisch bedrag
 RealAmount=Aanwezig bedrag
+CashFence=Cash fence
 CashFenceDone=Kas te ontvangen voor de periode
 NbOfInvoices=Aantal facturen
 Paymentnumpad=Soort betaling om de betaling in te voeren
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS heeft product-categorieën nodig om te werken
 OrderNotes=Verkoop notities
 CashDeskBankAccountFor=Standaardrekening voor betalingen
 NoPaimementModesDefined=Geen betaalmethode gedefinieerd in TakePOS-configuratie
-TicketVatGrouped=Groeps BTW per tarief in bonnen
-AutoPrintTickets=Bonnen automatisch afdrukken
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Functies inschakelen voor Bar of Restaurant
 ConfirmDeletionOfThisPOSSale=Bevestig je de verwijdering van deze huidige verkoop?
 ConfirmDiscardOfThisPOSSale=Wilt u deze huidige verkoop weggooien?
@@ -87,7 +90,19 @@ HeadBar=Hoofdbalk
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 116a2b34dc0..024acf55a55 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Bedrijf '%s' verwijderd uit de database.
 ListOfContacts=Contactpersonen- / adressenlijst
 ListOfContactsAddresses=Contactpersonen- / adressenlijst
 ListOfThirdParties=Lijst van derden
-ShowCompany=Derde partij weergeven
 ShowContact=Toon contactpersoon
 ContactsAllShort=Alle (Geen filter)
 ContactType=Type contactpersoon
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Vertegenwoordiger voornaam
 SaleRepresentativeLastname=Vertegenwoordiger achternaam
 ErrorThirdpartiesMerge=Er is een fout opgetreden bij het verwijderen van de relatie. Controleer het log. Wijzigingen zijn ongedaan gemaakt.
 NewCustomerSupplierCodeProposed=Klant- of leverancierscode die al wordt gebruikt, wordt een nieuwe code voorgesteld
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Betalingswijze - Klant
 PaymentTermsCustomer=Betalingsvoorwaarden - Klant
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 52f8a29e7ff..e1bc8bc0087 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Zie %sanalyse van betalingen%s voor een berekening va
 SeeReportInDueDebtMode=Zie %sanalyse van facturen%s voor een berekening op basis van bekende geregistreerde facturen, zelfs als deze nog niet in Ledger zijn geregistreerd.
 SeeReportInBookkeepingMode=Zie <b>%s Boekhoudverslag%s</b> voor een berekening op de <b>boekhoudboekentabel</b>
 RulesAmountWithTaxIncluded=- Bedragen zijn inclusief alle belastingen
-RulesResultDue=- Het omvat openstaande facturen, uitgaven, btw, donaties, of ze nu zijn betaald of niet. Is ook inclusief betaalde salarissen. <br> - Het is gebaseerd op de validatiedatum van facturen en btw en op de vervaldatum voor uitgaven. Voor salarissen die zijn gedefinieerd met de module Salaris, wordt de valutadatum gebruikt.
+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=- Het omvat de echte betalingen op facturen, uitgaven, btw en salarissen. <br> - Het is gebaseerd op de betalingsdatums van de facturen, uitgaven, btw en salarissen. De donatiedatum voor donatie.
-RulesCADue=- Het omvat de verschuldigde facturen van de klant, ongeacht of deze zijn betaald of niet. <br> - Het is gebaseerd op de validatiedatum van deze facturen. <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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Het bevat een record in uw grootboek met boekhoudrekeningen met de groep "KOSTEN" of "INKOMSTEN"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Omzet gefactureerd per omzetbelasting-tarief
 TurnoverCollectedbyVatrate=Omzet per BTW tarief
 PurchasebyVatrate=Aankoop bij verkoop belastingtarief
 LabelToShow=Kort 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index df860672f08..87185fbba02 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -59,6 +59,7 @@ 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.
 ErrorFileSizeTooLarge=Bestand is te groot.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Grootte te lang voor int type (%s cijfers maximum)
 ErrorSizeTooLongForVarcharType=Grootte te lang voor string type (%s tekens maximum)
 ErrorNoValueForSelectType=Vul waarde in voor selectielijst
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index d86854df90c..2bd6574b9fd 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Deze PHP ondersteunt Curl.
 PHPSupportCalendar=Deze PHP ondersteunt kalendersextensies.
 PHPSupportUTF8=Deze PHP ondersteunt UTF8-functies.
 PHPSupportIntl=Deze PHP ondersteunt Intl-functies.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=Deze PHP ondersteunt %s-functies.
 PHPMemoryOK=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op <b>%s</b>. Dit zou genoeg moeten zijn.
 PHPMemoryTooLow=Uw PHP max sessie-geheugen is ingesteld op <b>%s</b> bytes. Dit is te laag. Wijzig uw <b>php.ini</b> om de parameter <b>memory_limit in</b> te stellen op ten minste <b>%s</b> bytes.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Uw PHP versie ondersteunt geen Curl.
 ErrorPHPDoesNotSupportCalendar=Uw PHP-installatie ondersteunt geen php-agenda-extensies.
 ErrorPHPDoesNotSupportUTF8=Uw PHP-installatie ondersteunt geen UTF8-functies. Dolibarr kan niet correct werken. Los dit op voordat u Dolibarr installeert.
 ErrorPHPDoesNotSupportIntl=Uw PHP-installatie ondersteunt geen Intl-functies.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Uw PHP-installatie ondersteunt geen %s-functies.
 ErrorDirDoesNotExists=De map %s bestaat niet.
 ErrorGoBackAndCorrectParameters=Ga terug en controleer / corrigeer de parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=De toepassing probeerde zelf te upgraden, maar de
 YouTryInstallDisabledByFileLock=De applicatie probeerde zelf te upgraden, maar de installatie / upgrade-pagina&#39;s zijn om veiligheidsredenen uitgeschakeld (door het bestaan van een slotbestand <strong>install.lock</strong> in de dolibarr-documentenmap). <br>
 ClickHereToGoToApp=Klik hier om naar uw toepassing te gaan
 ClickOnLinkOrRemoveManualy=Klik op de volgende link. Als u altijd dezelfde pagina ziet, moet u het bestand install.lock verwijderen / hernoemen in de documentenmap.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/nl_NL/link.lang b/htdocs/langs/nl_NL/link.lang
index 511af212552..b7a45ea8938 100644
--- a/htdocs/langs/nl_NL/link.lang
+++ b/htdocs/langs/nl_NL/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=De koppeling %s is verwijderd
 ErrorFailedToDeleteLink= Kon de verbinding '<b>%s</b>' niet verwijderen
 ErrorFailedToUpdateLink= Kon verbinding '<b>%s</b>' niet bijwerken
 URLToLink=URL naar link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 1f5a3213894..2897086d4bb 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Geen contact / adres met een categorie gevonden
 NoContactLinkedToThirdpartieWithCategoryFound=Geen contact / adres met een categorie gevonden
 OutGoingEmailSetup=Instellingen uitgaande e-mail
 InGoingEmailSetup=Instellingen inkomende e-mail
-OutGoingEmailSetupForEmailing=Instelling uitgaande e-mail (voor massale e-mail)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Standaard uitgaande e-mail instellen
 Information=Informatie
 ContactsWithThirdpartyFilter=Contacten met filter van derden
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 1c75753876c..eec6c8d732b 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Opslaan en blijven
 SaveAndNew=Opslaan en nieuw
 TestConnection=Test verbinding
 ToClone=Klonen
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Kies gegevens die u wilt klonen:
 NoCloneOptionsSpecified=Geen gegevens om te klonen gedefinieerd.
 Of=van
@@ -829,6 +830,8 @@ Gender=Geslacht
 Genderman=Man
 Genderwoman=Vrouw
 ViewList=Bekijk lijst
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Verplicht
 Hello=Hallo
 GoodBye=Tot ziens
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=Selecteer opties voor deze grafiek
 Measures=Maten
 XAxis=X-as
 YAxis=Y-as
+StatusOfRefMustBe=Status of %s must be %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 87d1f135159..8ef2166b14e 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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=Klantorder gevalideerd
 Notify_ORDER_SENTBYMAIL=Klantorder verzonden per post
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Aankooporder verzonden per e-mail
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL van pagina
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Omschrijving
 WEBSITE_IMAGE=Beeld
-WEBSITE_IMAGEDesc=Relatief pad van de beeldmedia. Je kunt dit leeg laten, omdat dit zelden wordt gebruikt (het kan door dynamische inhoud worden gebruikt om een miniatuur in een lijst met blogberichten weer te geven). Gebruik __WEBSITEKEY__ in het pad als pad afhankelijk is van de naam van de website.
+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=Sleutelwoorden
 LinesToImport=Regels om te importeren
 
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index ab4b6fca55a..845fb659988 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -22,6 +22,8 @@ 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=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Grootboeknummer verkoopboek
 ProductAccountancySellIntraCode=Grootboekrekening (verkoop binnen de Gemeenschap)
 ProductAccountancySellExportCode=Grootboeknummer (verkoop export)
@@ -165,7 +167,7 @@ SuppliersPrices=Prijzen van leveranciers
 SuppliersPricesOfProductsOrServices=Leverancierprijzen (van producten of services)
 CustomCode=Douane / Commodity / HS-code
 CountryOrigin=Land van herkomst
-Nature=Aard van product (materiaal/afgewerkt)
+Nature=Nature of product (material/finished)
 ShortLabel=Kort label
 Unit=Eenheid
 p=u.
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 38424ac5e82..18f66dcf5f5 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=die ik ben gekoppeld aan het project
 Time=Tijd
 ListOfTasks=Lijst met taken
 GoToListOfTimeConsumed=Ga naar de lijst met tijd die is verbruikt
-GoToListOfTasks=Weergeven als lijst
-GoToGanttView=weergeven als Gantt
 GanttView=Gantt-weergave
 ListProposalsAssociatedProject=Lijst van de commerciële voorstellen met betrekking tot het project
 ListOrdersAssociatedProject=Lijst met verkooporders gerelateerd aan het project
@@ -188,7 +186,7 @@ PlannedWorkload=Geplande workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Gerelateerde items
 ProjectMustBeValidatedFirst=Project moet eerst worden gevalideerd
-FirstAddRessourceToAllocateTime=Wijs een gebruikersresource toe aan de taak om tijd toe te wijzen
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per dag
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=Laatste %s aangepaste projecten
 OtherFilteredTasks=Andere gefilterde taken
 NoAssignedTasks=Geen toegewezen taken gevonden (wijs project / taken toe aan de huidige gebruiker uit het bovenste selectievak om de tijd in te voeren)
 ThirdPartyRequiredToGenerateInvoice=Er moet een derde partij in het project worden gedefinieerd om het te kunnen factureren.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Reacties van gebruikers op taken toestaan
 AllowCommentOnProject=Reacties van gebruikers op projecten toestaan
@@ -265,3 +264,4 @@ InvoiceToUse=Te gebruiken factuur
 NewInvoice=Nieuwe factuur
 OneLinePerTask=Eén regel per taak
 OneLinePerPeriod=Eén regel per periode
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/nl_NL/receiptprinter.lang b/htdocs/langs/nl_NL/receiptprinter.lang
index b7cf39904cb..3a1d8b5715d 100644
--- a/htdocs/langs/nl_NL/receiptprinter.lang
+++ b/htdocs/langs/nl_NL/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy printer
 CONNECTOR_NETWORK_PRINT=Netwerkprinter
 CONNECTOR_FILE_PRINT=Lokale printer
 CONNECTOR_WINDOWS_PRINT=Locale Windows printer
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Dummy printer voor testen. Doet niets
 CONNECTOR_NETWORK_PRINT_HELP=10.0.0.0:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computernaam/werkgroep/BonPrinter
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=Standaard profiel
 PROFILE_SIMPLE=Eenvoudig profiel
 PROFILE_EPOSTEP=Epos Tep profiel
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Factuurreferentie
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intracommunautair btw-nummer
+DOL_VALUE_MYSOC_CAPITAL=Kapitaal
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/nl_NL/stripe.lang b/htdocs/langs/nl_NL/stripe.lang
index 23e72f29289..72c35169bb0 100644
--- a/htdocs/langs/nl_NL/stripe.lang
+++ b/htdocs/langs/nl_NL/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Verkopersnaam
 CSSUrlForPaymentForm=URL van het CSS-stijlbestand voor het betalingsformulier
 NewStripePaymentReceived=Nieuwe Stripe-betaling ontvangen
 NewStripePaymentFailed=Nieuwe Stripe-betaling geprobeerd, maar mislukt
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Geheime testsleutel
 STRIPE_TEST_PUBLISHABLE_KEY=Publiceerbare testsleutel
 STRIPE_TEST_WEBHOOK_KEY=Webhook test sleutel
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link om Stripe WebHook in te stellen om de IPN te bel
 ToOfferALinkForLiveWebhook=Link om Stripe WebHook in te stellen om de IPN te bellen (live-modus)
 PaymentWillBeRecordedForNextPeriod=De betaling wordt geregistreerd voor de volgende periode.
 ClickHereToTryAgain=<a href="%s">Klik hier om het opnieuw te proberen ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index dffce964525..459a72f5c90 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -70,7 +70,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 <b>externe</b> gebruiker is een klant, verkoper of andere. <br><br> In beide gevallen definieert machtiging rechten op Dolibarr, ook kan de externe gebruiker een ander menu-manager hebben dan de interne gebruiker (zie Home - Instellingen - Beeld)
+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)
 PermissionInheritedFromAGroup=Toestemming verleend, omdat geërfd van een bepaalde gebruikersgroep.
 Inherited=Overgeërfd
 UserWillBeInternalUser=Gemaakt gebruiker een interne gebruiker te zijn (want niet gekoppeld aan een bepaalde derde partij)
@@ -113,3 +113,5 @@ CantDisableYourself=U kunt uw eigen gebruikersrecord niet uitschakelen
 ForceUserExpenseValidator=Validatierapport valideren
 ForceUserHolidayValidator=Forceer verlofaanvraag validator
 ValidatorIsSupervisorByDefault=Standaard is de validator de supervisor van de gebruiker. Blijf leeg om dit gedrag te behouden.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 4d89f3a1ddd..ec6a14f3860 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Bekijk pagina in nieuw tabblad
 SetAsHomePage=Als startpagina instellen
 RealURL=Echte URL
 ViewWebsiteInProduction=Bekijk website met behulp van eigen URL's
-SetHereVirtualHost=<u>Gebruik met Apache / NGinx / ...</u> <br> Als u op uw webserver (Apache, Nginx, ...) een speciale virtuele host met PHP ingeschakeld en een hoofddirectory op <br> <strong>%s</strong> <br> stel vervolgens de naam in van de virtuele host die u hebt gemaakt in de eigenschappen van de website, zodat de preview ook kan worden gedaan met behulp van deze speciale webservertoegang in plaats van de interne Dolibarr-server.
+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>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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, deze website is momenteel offline. Kom lat
 WEBSITE_USE_WEBSITE_ACCOUNTS=Schakel de website-accounttabel in
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Schakel de tabel in om websiteaccounts (login/wachtwoord) voor elke website/relatie op te slaan
 YouMustDefineTheHomePage=U moet eerst de standaard startpagina definiëren
-OnlyEditionOfSourceForGrabbedContentFuture=Pas op: het maken van een webpagina door een externe webpagina te importeren is voorbehouden aan ervaren gebruikers. Afhankelijk van de complexiteit van de bronpagina, kan het resultaat van de import verschillen van het origineel. Ook als de bronpagina gemeenschappelijke CSS-stijlen of conflicterende javascript gebruikt, kan het uiterlijk of de functies van de Website-editor corrupt raken wanneer u op deze pagina werkt. Deze methode is een snellere manier om een pagina te maken, maar het wordt aanbevolen om uw nieuwe pagina helemaal opnieuw te maken of op basis van een voorgestelde paginasjabloon. <br> Merk ook op dat bewerkingen van HTML-bron mogelijk zijn wanneer pagina-inhoud is geïnitialiseerd door deze van een externe pagina te halen ("Online" -editor is NIET beschikbaar)
+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=Alleen de HTML-bronversie is mogelijk wanneer inhoud van een externe site is opgehaald
 GrabImagesInto=Importeer ook afbeeldingen gevonden in css en pagina.
 ImagesShouldBeSavedInto=Afbeeldingen moeten worden opgeslagen in de directory
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=Gebruik voor goede SEO-praktijken een tekst tussen 5 e
 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
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 6d2ed8fac9c..7c09b1d09c5 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 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
-AntiVirusCommand= Pełna ścieżka do poleceń antivirusa
-AntiVirusCommandExample= ClamWin przykład: c:\\Program Files (x86)\\ClamWin\\bin\\ clamscan.exe<br>Przykład dla ClamAV: /usr/bin/clamscan
+AntiVirusCommand=Pełna ścieżka do poleceń antivirusa
+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= Więcej parametrów w linii poleceń
-AntiVirusParamExample= Przykład dla ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Konfiguracja modułu rachunkowości
 UserSetup=Zarządzanie konfiguracją użytkowników
 MultiCurrencySetup=Konfiguracja multi-walut
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funkcja niedostępna w wersji demo
 FeatureAvailableOnlyOnStable=Funkcjonalność dostępna tylko w oficjalnej stabilnej wersji
 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=Tylko elementy z <a href="%s">aktywnych modułów</a> są widoczne.
-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 (at end of module line) to enable/disable a module/application.
+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=Możesz znaleźć więcej modułów do pobrania na zewnętrznych stronach internetowych...
 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=Znajdź dodatkowe aplikacje / moduły
@@ -212,6 +212,7 @@ CompatibleUpTo=Kompatybilne z wersjÄ… %s
 NotCompatible=ten moduł nie jest kompatybilny z twoją wersją 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=Zobacz konfigurację modułu% s
 Updated=Zaktualizowane
 Nouveauté=Nowość
 AchatTelechargement=Kup / Pobierz
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=External websites for more add-on (non-core) modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Dostępne widgety
 BoxesActivated=Widgety aktywowane
 ActivateOn=Uaktywnij
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Zostaw puste by używać domyślnych wartości
 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=Moduł zewnętrzny - Zainstalowane w katalogu% s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regiony
 DictionaryCountry=Kraje
 DictionaryCurrency=Waluty
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Typy zdarzeń w  agendzie
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Stawki VAT lub stawki podatku od sprzedaży
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Stawka
 LocalTax1IsNotUsed=Nie należy używać drugiego podatku
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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=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
@@ -1018,6 +1025,7 @@ 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
 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audyt
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Użytkownicy modułu konfiguracji
 UserMailRequired=Email required to create a new user
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Ustawianie modułu HR
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Faktura dokumentów modele
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Siły daty wystawienia faktury do walidacji daty
-SuggestedPaymentModesIfNotDefinedInInvoice=Sugerowane tryb płatności na fakturze domyślnie jeśli nie jest zdefiniowane w fakturze
+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=Wolny tekst na fakturach
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 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
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Zapytaj o magazyn źródłowy dla zamówien
 ##### 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=Zamówienia numeracji modules
 OrdersModelModule=Zamów dokumenty modeli
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index ce9dbccea41..316c3c46629 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Faktura dostawcy
 SupplierBills=Faktury Dostawców
 Payment=Płatność
-PaymentBack=Zwrot płatności
-CustomerInvoicePaymentBack=Zwrot płatności
+PaymentBack=Zwrot
+CustomerInvoicePaymentBack=Zwrot
 Payments=Płatności
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 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 absolute discount?
+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 absolute discount?
+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=Otrzymane płatności
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ 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=Znaczek skarbowy
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Faktura usunięta
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/pl_PL/blockedlog.lang b/htdocs/langs/pl_PL/blockedlog.lang
index 68bd518eded..8ca78fd8046 100644
--- a/htdocs/langs/pl_PL/blockedlog.lang
+++ b/htdocs/langs/pl_PL/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 830d06ed5f6..364ed5404c1 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Dodaj ten artykuł
 RestartSelling=Wróć na sprzedaż
 SellFinished=Sprzedaż zakończona
 PrintTicket=Bilet do druku
+SendTicket=Send ticket
 NoProductFound=Artykuł nie znaleziony
 ProductFound=Znaleziono produkt
 NoArticle=Brak artykułu
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Ilość faktur
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 68d0f5cdc9c..a20144ad9b0 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Firma " %s" usunięta z bazy danych.
 ListOfContacts=Lista kontaktów/adresów
 ListOfContactsAddresses=Lista kontaktów/adresów
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Pokaż kontakt
 ContactsAllShort=Wszystkie (bez filtra)
 ContactType=Typ kontaktu
@@ -447,6 +446,7 @@ 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
 #Imports
 PaymentTypeCustomer=Payment Type - Customer
 PaymentTermsCustomer=Payment Terms - Customer
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 601a0312dd6..87f0a968943 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Kwoty podane sÄ… Å‚Ä…cznie z podatkami
-RulesResultDue=- Obejmuje zaległe faktury, koszty, podatek VAT, darowizny niezaleznie czy zostały one zapłacone. Obejmuje również wypłacane pensje. <br> - Podstawą jest data zatwierdzania faktur i VAT oraz terminów płatności za wydatki. Dla wynagrodzeń określonych w module wynagrodzeń brana jest pod uwagę data wypłaty wynagrodzeń.
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Obejmuje rzeczywiste płatności dokonywane za faktury, koszty, podatek VAT oraz wynagrodzenia. <br> Opiera się na  datach płatności faktur, wygenerowania kosztów, podatku VAT oraz wynagrodzeń. Dla darowizn brana jest pod uwagę data przekazania darowizny.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 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
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 662d89577fb..7782b651a07 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -59,6 +59,7 @@ 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.
 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 9b531c90fab..0a10dd12033 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na <b>%s</b>. Powinno wystarczyć.
 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.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Twoja instalacja PHP nie wspiera 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=Katalog %s nie istnieje.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/pl_PL/link.lang b/htdocs/langs/pl_PL/link.lang
index 4da60227bfa..29ff5e2a6b2 100644
--- a/htdocs/langs/pl_PL/link.lang
+++ b/htdocs/langs/pl_PL/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Link %s został usunięty
 ErrorFailedToDeleteLink= Niemożna usunąc linku '<b>%s</b>'
 ErrorFailedToUpdateLink= Niemożna uaktualnić linku '<b>%s</b>'
 URLToLink=Adres URL linka
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 26161193ec3..70e3426dcdb 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacja
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index bbd0c051546..8842026e3aa 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 SaveAndNew=Save and new
 TestConnection=Test połączenia
 ToClone=Duplikuj
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Choose data you want to clone:
 NoCloneOptionsSpecified=Brak zdefiniowanych danych do zduplikowania.
 Of=z
@@ -829,6 +830,8 @@ Gender=Płeć
 Genderman=Mężczyzna
 Genderwoman=Kobieta
 ViewList=Widok listy
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Zleceniobiorca
 Hello=Witam
 GoodBye=Do widzenia
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 2a5656c5024..b496de9d07e 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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=SÅ‚owa kluczowe
 LinesToImport=Lines to import
 
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 058010e7791..188bfd5ff09 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
 ProductAccountancySellCode=Kod księgowy (sprzedaż)
 ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
 ProductAccountancySellExportCode=Accounting code (sale export)
@@ -165,7 +167,7 @@ SuppliersPrices=Ceny dostawców
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Kraj pochodzenia
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 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 f03a7e40d56..4e3eb48d808 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Czas
 ListOfTasks=Lista zadań
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planowany nakład pracy
 PlannedWorkloadShort=Nakład pracy
 ProjectReferers=PowiÄ…zane elementy
 ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzony
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Wejścia na dzień
 InputPerWeek=Wejścia w tygodniu
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nowa faktura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/pl_PL/receiptprinter.lang b/htdocs/langs/pl_PL/receiptprinter.lang
index 09e767f4d34..5da4c9a5a4e 100644
--- a/htdocs/langs/pl_PL/receiptprinter.lang
+++ b/htdocs/langs/pl_PL/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Atrapa drukarki
 CONNECTOR_NETWORK_PRINT=Drukarka sieciowa
 CONNECTOR_FILE_PRINT=Drukarka lokalna
 CONNECTOR_WINDOWS_PRINT=Lokalna drukarka Windowsowa
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Fałszywe Drukarka do testu, nie robi nic
 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://użytkownik:tajny@nazwa_komputera/grupa_robocza/drukarka
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=Profil domyślny
 PROFILE_SIMPLE=Profil prosty
 PROFILE_EPOSTEP=Profil Epos Tep
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Nr referencyjny faktury
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapitał
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/pl_PL/stripe.lang b/htdocs/langs/pl_PL/stripe.lang
index d0a7f958f5a..2583d38db89 100644
--- a/htdocs/langs/pl_PL/stripe.lang
+++ b/htdocs/langs/pl_PL/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Nazwa dostawcy
 CSSUrlForPaymentForm=Arkusz styli CSS dla formularza płatności
 NewStripePaymentReceived=Nowa płatność Stripe otrzymana
 NewStripePaymentFailed=Próbowano wykonać płatność Stripe, ale nie powiodła się
+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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 45dd6b658ba..19dd2de7727 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -70,7 +70,7 @@ ExportDataset_user_1=Users and their properties
 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.<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.<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)
 PermissionInheritedFromAGroup=Zezwolenie udzielone ponieważ odziedziczył od jednego z użytkowników grupy.
 Inherited=Odziedziczone
 UserWillBeInternalUser=Utworzony użytkownik będzie wewnętrzny użytkownik (ponieważ nie związane z konkretnym trzeciej)
@@ -110,3 +110,8 @@ UserLogged=Użytkownik zalogowany
 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
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 3be18159200..3a2a005d91d 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -42,7 +42,8 @@ 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>Gdy Twój rzeczywisty web serwer to Apache/NGinx/...</u><br>Jeśli na Twym rzeczywistym web serwerze masz uprawnienia do tworzenia wirtualnego web serwera (Virtual Host), to utwórz go i odpowiednio skonfiguruj - np. włącz obsługę PHP, wskaż katalog Root na<br><strong>%s</strong><br>, ustaw kontrolę dostępu. Następnie, jego URL podaj w Dolibarr jako wartość właściwości Virtualhost witryny, przez co podgląd witryny będzie możliwy również poprzez ten dedykowany web serwerze, a nie tylko przez wewnętrzny web serwer w Dolibarr.
+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> 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>
@@ -84,7 +85,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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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=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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=Aby uzyskać dobre praktyki SEO, użyj tekstu od 5 do
 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
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 9a0d6096705..2b1b7cdef65 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -82,9 +82,7 @@ NoMaxSizeByPHPLimit=Nenhum limite foi configurado no seu PHP
 MaxSizeForUploadedFiles=Tamanho Máximo para uploads de arquivos ('0' para proibir o carregamento)
 UseCaptchaCode=Usar captcha para login (recomendado se os usuários tiverem acesso ao Dolibarr pela internet)
 AntiVirusCommand=Caminho completo para antivirus
-AntiVirusCommandExample=Exemplo com o ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Exemplo com o ClamAv: /usr/bin/clamscan (UNIX)
 AntiVirusParam=Mais parâmetros em linha de comando (CLI)
-AntiVirusParamExample=Exemplo com o ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Conf. do Módulo Contabilidade
 UserSetup=Conf. do Gestor de usuários
 MultiCurrencySetup=Configuração de múltiplas moedas
@@ -170,9 +168,11 @@ FreeModule=Grátis
 NotCompatible=Este módulo não parece ser compatível com o seu Dolibarr %s (Mín %s - Máx %s).
 CompatibleAfterUpdate=Este módulo exige uma atualização do seu Dolibarr %s (Mín %s - Máx %s).
 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.
 DevelopYourModuleDesc=Algumas soluções para o desenvolvimento do seu próprio módulo...
+RelativeURL=URL relativo
 BoxesAvailable=Widgets disponíveis
 BoxesActivated=Widgets ativados
 ActivateOn=Ativar
@@ -337,7 +337,6 @@ KeepEmptyToUseDefault=Deixe em branco para usar o valor padrão
 DefaultLink=Link padrão
 SetAsDefault=Definir como padrão
 ValueOverwrittenByUserSetup=Aviso, esse valor pode ser substituido pela configuração especifícada pelo usuário (cada usuário pode ter seu propria URL CliqueParaDiscar)
-ExternalModule=Módulo externo - Instalado no diretório
 BarcodeInitForProductsOrServices=Inicialização de código de barras em massa ou redefinir de produtos ou serviços
 CurrentlyNWithoutBarCode=Atualmente, você tem <strong>%s</strong> registro(s) no <strong>%s</strong> %s sem um código de barras definido.
 InitEmptyBarCode=Valor Init para o próximo registros vazios
@@ -354,10 +353,13 @@ DisplayCompanyInfoAndManagers=Exibir o endereço da empresa e os nomes dos geren
 ModuleCompanyCodeSupplierAquarium=%s seguido pelo código do fornecedor para um código de contabilidade do fornecedor
 ModuleCompanyCodePanicum=Retornar um código contábil vazio
 ModuleCompanyCodeDigitaria=Retorna um código contábil composto de acordo com nome de terceiros. O código consiste em um prefixo que pode ser definido na primeira posição, seguido pelo número de caracteres definidos no código de terceiros.
+ModuleCompanyCodeCustomerDigitaria=%s seguido pelo nome do cliente truncado pelo número de caracteres: %s para o código contábil do cliente.
+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: Muitas vezes, é melhor configurar e-mails enviados para usar o servidor de e-mail do seu provedor, em vez da configuração padrão. Alguns provedores de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor além do seu próprio servidor. Sua configuração atual usa o servidor do aplicativo para enviar e-mail e não o servidor do seu provedor de e-mail, então alguns destinatários (aquele compatível com o protocolo restritivo do DMARC) perguntarão ao seu provedor de e-mail se eles podem aceitar seu e-mail e alguns provedores de e-mail (como o Yahoo) pode responder "não" porque o servidor não é deles, portanto poucos dos seus e-mails enviados podem não ser aceitos (tome cuidado também com a cota de envio do seu provedor de e-mail). <br> Se o seu provedor de e-mail (como o Yahoo) tiver essa restrição, você deve alterar a configuração de e-mail para escolher o outro método "servidor SMTP" e inserir o servidor SMTP e as credenciais fornecidas pelo seu provedor de e-mail.
 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 no endereço de email do remetente estiver protegido pelo SPF (pergunte ao seu provedor de email), você deverá incluir os seguintes IPs no registro SPF do DNS do 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.
@@ -754,7 +756,6 @@ DictionaryCompanyJuridicalType=Entidades jurídicas de terceiros
 DictionaryProspectLevel=Possível cliente
 DictionaryCanton=Estados / Cidades
 DictionaryRegion=Regiões
-DictionaryCivility=Título da civilidade
 DictionaryActions=Tipos de eventos na agenda
 DictionarySocialContributions=Tipos de impostos sociais ou fiscais
 DictionaryVAT=Taxas de VAT ou imposto sobre vendas de moeda
@@ -870,8 +871,6 @@ Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Cheque depósito não feito
 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):
-SetupDescription3=<a href="%s">%s -> %s</a> <br> Parâmetros básicos usados para personalizar o comportamento padrão do seu aplicativo (por exemplo, para recursos relacionados ao país).
-SetupDescription4=<a href="%s">%s -> %s</a> <br> Este software é um conjunto de muitos módulos/aplicativos, todos mais ou menos independentes. Os módulos relevantes para suas necessidades devem ser ativados e configurados. Novos itens/opções são adicionados aos menus com a ativação de um módulo.
 SetupDescription5=Outras entradas do menu de configuração gerenciam parâmetros opcionais.
 LogEvents=Auditoría de segurança dos eventos
 Audit=Auditoría
@@ -911,6 +910,7 @@ ParameterActiveForNextInputOnly=Parâmetro efetivo somente para a próxima entra
 NoEventOrNoAuditSetup=Nenhum evento de segurança foi registrado. Isso é normal se a Auditoria não tiver sido ativada na página "Configuração - Segurança - Eventos".
 SeeLocalSendMailSetup=Ver sua configuração local de envio de correspondência
 BackupDesc=Um backup <b>completo</b> de uma instalação do Dolibarr requer duas etapas.
+BackupDesc2=Faça backup do conteúdo do diretório "documentos" (<b>%s</b>) que contém todos os arquivos carregados e gerados. Isso também incluirá todos os arquivos de despejo gerados na Etapa 1. Essa operação pode durar vários minutos.
 BackupDesc3=Faça backup da estrutura e do conteúdo do banco de dados ( <b>%s</b> ) em um arquivo de despejo. Para isso, você pode usar o assistente a seguir.
 BackupDescX=O diretório arquivado deve ser armazenado em um local seguro.
 BackupDescY=O arquivo de despeja gerado deverá ser armazenado em um local seguro.
@@ -969,7 +969,9 @@ OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os módulos a se
 SuhosinSessionEncrypt=Sessão armazenada criptografada pelo Suhosin
 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
+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.".
@@ -1005,7 +1007,6 @@ BillsNumberingModule=Faturas e notas de crédito no modelo de numeração
 BillsPDFModules=Modelos de documentos da fatura
 PaymentsPDFModules=Modelos dos documentos de pagamento
 ForceInvoiceDate=Forçar data de fatura para data de validação
-SuggestedPaymentModesIfNotDefinedInInvoice=Sugerir formas de pagamentos na fatura por default se não estiver definida na fatura
 SuggestPaymentByRIBOnAccount=Sugerir pagamento por retirada na conta
 SuggestPaymentByChequeToAddress=Sugerir pagamento por cheque para
 FreeLegalTextOnInvoices=Texto livre nas fatura
@@ -1016,7 +1017,6 @@ SupplierPaymentSetup=Configuração de pagamentos do fornecedor
 PropalSetup=Configurações do módulo de orçamentos
 ProposalsNumberingModules=Modelos de numeração de orçamentos
 ProposalsPDFModules=Modelos de documentos para Orçamentos
-SuggestedPaymentModesIfNotDefinedInProposal=Modo de pagamentos sugeridos na proposta por padrão, se não definido para proposta
 FreeLegalTextOnProposal=Texto livre em orçamentos
 WatermarkOnDraftProposal=Marca d'água no rascunho de orçamentos (nenhum se vazio)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Informar conta bancária de destino da proposta
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 093e7db169b..47a4ce850a6 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -45,15 +45,15 @@ SupplierInvoice=Fatura do fornecedores
 SuppliersInvoices=Faturas de fornecedores
 SupplierBill=Fatura do fornecedores
 SupplierBills=Faturas de fornecedores
-PaymentBack=Reembolso de pagamento
-CustomerInvoicePaymentBack=Reembolso de pagamento
+PaymentBack=Reembolso
+CustomerInvoicePaymentBack=Reembolso
 PaymentsBack=Reembolsos
 PaidBack=Reembolso pago
 DeletePayment=Deletar pagamento
 ConfirmDeletePayment=Você tem certeza que deseja excluir este pagamento?
-ConfirmConvertToReduc=Deseja converter este %s em um desconto absoluto?
+ConfirmConvertToReduc=Deseja converter este %s em um crédito disponível?
 ConfirmConvertToReduc2=O valor será salvo junto a todos os descontos e poderá ser usado como desconto em uma fatura atual ou futura deste cliente.
-ConfirmConvertToReducSupplier=Deseja converter este %s em um desconto absoluto?
+ConfirmConvertToReducSupplier=Deseja converter este %s em um crédito disponível?
 ConfirmConvertToReducSupplier2=O valor será salvo junto a todos os descontos e poderá ser usado como desconto em uma fatura atual ou futura deste fornecedor.
 SupplierPayments=Pagamentos do fornecedor
 ReceivedCustomersPayments=Pagamentos recebidos de cliente
@@ -349,11 +349,10 @@ ClosePaidContributionsAutomatically=Classifique automaticamente todas as contrib
 AllCompletelyPayedInvoiceWillBeClosed=Todas as faturas sem saldo a pagar serão fechadas automaticamente com o status "Pago".
 ToMakePaymentBack=Pagar de volta
 NoteListOfYourUnpaidInvoices=Nota: Essa lista contém faturas de terceiros que você está a ligado como representante de vendas.
-RevenueStamp=Selo de receita
 YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar uma fatura na guia "Cliente" de terceiros
 YouMustCreateInvoiceFromSupplierThird=Essa opção só está disponível ao criar uma fatura na guia "Fornecedor" de terceiros
 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)
+PDFCrabeDescription=Modelo de fatura PDF Crabe. Um modelo de fatura completo 
 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
diff --git a/htdocs/langs/pt_BR/blockedlog.lang b/htdocs/langs/pt_BR/blockedlog.lang
index 52d033bd36e..390258dcf55 100644
--- a/htdocs/langs/pt_BR/blockedlog.lang
+++ b/htdocs/langs/pt_BR/blockedlog.lang
@@ -8,7 +8,6 @@ BrowseBlockedLog=Logs nao modificaveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os Logs Arquivados (pode ser demorado)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os arquivos de log inválidos (pode demorar)
 DownloadBlockChain=Baixar impressoes digitais
-KoCheckFingerprintValidity=A entrada de log arquivada não é válida. Isso significa que alguém (um hacker?) Modificou alguns dados desse arquivo depois que foi gravado ou apagou o registro arquivado anterior (verifique se a linha com o número anterior existe).
 OkCheckFingerprintValidity=O registro de log arquivado é válido. Os dados nesta linha não foram modificados e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi previamente corrompida.
 AddedByAuthority=Salvo na autoridade remota
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index 7af01359574..eefa64d6102 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -34,8 +34,8 @@ TakeposNeedsCategories=TakePOS precisa de categorias de produtos para funcionar
 OrderNotes=Notas de pedidos
 CashDeskBankAccountFor=Conta padrão a ser usada para pagamentos em
 NoPaimementModesDefined=Nenhum modo de embalagem definido na configuração do TakePOS
-TicketVatGrouped=Grupo de IVA por taxa em tickets
-AutoPrintTickets=Imprimir automaticamente os tickets
+TicketVatGrouped=Agrupar IVA por taxa em tickets | recibos
+AutoPrintTickets=Imprimir automaticamente tickets | recibos
 EnableBarOrRestaurantFeatures=Ativar recursos para Bar ou Restaurante
 ConfirmDeletionOfThisPOSSale=Você confirma a exclusão desta venda atual?
 ConfirmDiscardOfThisPOSSale=Deseja descartar esta venda atual?
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 3c0487dbe73..a5d7c9bb26f 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -118,9 +118,7 @@ AnnualByCompanies=Saldo de receitas e despesas, por grupos de conta predefinidos
 AnnualByCompaniesDueDebtMode=Saldo de receitas e despesas, detalhe por grupos predefinidos, modo <b> %sClaims-Debts%s </b> disse <b> Contabilidade de Compromisso </b>.
 AnnualByCompaniesInputOutputMode=Saldo de receitas e despesas, detalhe por grupos predefinidos, modo <b> %sIncomes-Expenses%s </b> chamada <b> fluxo de caixa </b>.
 RulesAmountWithTaxIncluded=- Valores apresentados estão com todos os impostos incluídos
-RulesResultDue=- Isto inclui as faturas vencidas, despesas, ICMS (VAT), doações, pagas ou não. Isto também inclui os salários pagos. <br>- Isto isto baseado na data de validação das faturas e ICMS (VAT) e nas datas devidas para as despesas. Para os salários definidos com o módulo Salário, é usado o valor da data do pagamento.
 RulesResultInOut=- Isto inclui os pagamentos reais feitos nas faturas, despesas, ICMS (VAT) e salários. <br>- Isto é baseado nas datas de pagamento das faturas, despesas, ICMS (VAT) e salários. A data de doação para a doação.
-RulesCADue=- Inclui as faturas do cliente, sejam elas pagas ou não. <br> - É baseado na data de validação dessas faturas. <br>
 RulesCAIn=- Inclui todos os pagamentos efetivos de faturas recebidas de clientes. <br> - É baseado na data de pagamento dessas faturas <br>
 RulesAmountOnInOutBookkeepingRecord=Inclui registro em seu Ledger com contas contábeis que tem o grupo "DESPESAS" ou "RENDIMENTO"
 RulesResultBookkeepingPredefined=Inclui registro em seu Ledger com contas contábeis que tem o grupo "DESPESAS" ou "RENDIMENTO"
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 19ed3e2fa27..4b5f972e55f 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -95,6 +95,7 @@ ErrorLoginDoesNotExists=Não existe um usuário com login <b>%s</b>.
 ErrorLoginHasNoEmail=Este usuário não tem endereço de e-mail. Processo abortado.
 ErrorBadValueForCode=Valor inadequado para código de segurança. Tente novamente com um novo valor...
 ErrorBothFieldCantBeNegative=Os campos %s e %s não podem ser ambos negativos
+ErrorLinesCantBeNegativeForOneVATRate=O total de linhas não pode ser negativo para uma determinada taxa de IVA.
 ErrorLinesCantBeNegativeOnDeposits=As linhas não podem ser negativas em um depósito. Você terá problemas quando precisar apagar o depósito na fatura final, se o fizer.
 ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de clientes não pode ser negativa
 ErrorWebServerUserHasNotPermission=A conta de usuário <b>%s</b> usada para executar o servidor web não possui permissão para isto
diff --git a/htdocs/langs/pt_BR/link.lang b/htdocs/langs/pt_BR/link.lang
index eb57e8c3b2e..f86a13d83c3 100644
--- a/htdocs/langs/pt_BR/link.lang
+++ b/htdocs/langs/pt_BR/link.lang
@@ -4,6 +4,7 @@ LinkedFiles=Arquivos vinculados e documentos
 NoLinkFound=Não há links registrados
 LinkComplete=O arquivo foi associada com sucesso
 ErrorFileNotLinked=O arquivo não pôde ser vinculado
+LinkRemoved=A ligação %s foi removida
 ErrorFailedToDeleteLink=Falha ao remover link '<b>%s</b>'
 ErrorFailedToUpdateLink=Falha ao atualizar link '<b>%s</b>'
 URLToLink=URL para link
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 6a462d11f01..773a06e5e08 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -96,6 +96,5 @@ NoContactWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com um
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
 OutGoingEmailSetup=Configuração de e-mail de saída
 InGoingEmailSetup=Configuração de e-mail de entrada
-OutGoingEmailSetupForEmailing=Configuração de e-mail de saída (para envio em massa)
 DefaultOutgoingEmailSetup=Configuração de e-mail de saída padrão
 ContactsWithThirdpartyFilter=Contatos com filtro de terceiros
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 275ed444a69..3c6b39a8fa1 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -111,7 +111,7 @@ 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 (implementação antiga do modelo Eratosthene)
+PDFEinsteinDescription=Modelo de pedido completo 
 PDFEratostheneDescription=Modelo completo de pedidos
 PDFEdisonDescription=O modelo simplificado do pedido
 PDFProformaDescription=Modelo completo de fatura Proforma
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 00661f29a01..36349482923 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -168,7 +168,7 @@ LibraryUsed=Biblioteca usada
 ExportableDatas=dados exportáveis
 NoExportableData=não existe dados exportáveis (sem módulos com dados exportáveis gastodos, necessitam de permissões)
 WebsiteSetup=Configuração do módulo website
-WEBSITE_IMAGEDesc=Caminho relativo da mídia de imagem. Você pode mantê-lo vazio, pois raramente é usado (ele pode ser usado pelo conteúdo dinâmico para mostrar uma miniatura em uma lista de postagens do blog). Use __WEBSITEKEY__ no caminho se o caminho depender do nome do site.
+WEBSITE_IMAGEDesc=Caminho relativo da mídia de imagem. Você pode mantê-lo vazio, pois raramente é usado (ele pode ser usado pelo conteúdo dinâmico para mostrar uma miniatura em uma lista de postagens do blog). Use __WEBSITE_KEY__ no caminho se o caminho depender do nome do site (por exemplo: image / __ WEBSITE_KEY __ / stories / myimage.png).
 LinesToImport=Linhas para importar
 MemoryUsage=Uso de memória
 RequestDuration=Duração do pedido
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 9df938bca07..9d61b0be2e5 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -103,7 +103,6 @@ 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 (matéria-prima/manufaturado)
 ShortLabel=Etiqueta curta
 set=conjunto
 se=conjunto
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index a752065eea8..21553851201 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -56,8 +56,6 @@ ProgressCalculated=calculado do progresso
 WhichIamLinkedTo=ao qual estou ligado
 WhichIamLinkedToProject=ao qual estou vinculado ao projeto
 GoToListOfTimeConsumed=Ir para a lista de dispêndios de tempo
-GoToListOfTasks=Exibir como lista
-GoToGanttView=mostrar como Gantt
 ListOrdersAssociatedProject=Lista de pedidos de vendas relacionadas ao projeto
 ListSupplierOrdersAssociatedProject=Lista de ordens de compra relacionadas ao projeto
 ListSupplierInvoicesAssociatedProject=Lista de faturas do fornec. relacionadas ao projeto
@@ -114,7 +112,6 @@ SelectElement=Selecionar componente
 AddElement=Link para componente
 PlannedWorkload=carga horária planejada
 ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado
-FirstAddRessourceToAllocateTime=Atribuir o recurso de um usuário à tarefa para alocação do tempo
 ProjectsWithThisUserAsContact=Projetos com este usuário como contato
 TasksWithThisUserAsContact=As tarefas atribuídas a esse usuário
 ProjectOverview=Visão geral
diff --git a/htdocs/langs/pt_BR/stripe.lang b/htdocs/langs/pt_BR/stripe.lang
index 19d2d32ccec..fcb44212d4c 100644
--- a/htdocs/langs/pt_BR/stripe.lang
+++ b/htdocs/langs/pt_BR/stripe.lang
@@ -36,4 +36,3 @@ StripePayoutList=Lista de pagamentos do Stripe
 ToOfferALinkForTestWebhook=Link para configurar o Stripe WebHook para chamar o IPN (modo de teste)
 ToOfferALinkForLiveWebhook=Link para configurar Stripe WebHook para chamar o IPN (modo ao vivo)
 PaymentWillBeRecordedForNextPeriod=O pagamento será registrado para o próximo período.
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Devido às regras de autenticação forte do cliente, a criação de um cartão deve ser feita no backoffice do Stripe. Você pode clicar aqui para ativar o registro de cliente do Stripe: %s
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index b74be4d91f4..b6ba00dce9a 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -60,7 +60,7 @@ 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=Um usuário <b>interno</b> é um usuário que faz parte de sua empresa/organização. <br> Um usuário <b>externo</b> é um cliente, fornecedor ou outro. <br><br> Em ambos os casos, permissões definem direitos no Dolibarr, também o usuário externo pode ter um gerenciador de menu diferente do usuário interno (Veja Início - Configurações - Exibir)
+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)
@@ -96,3 +96,6 @@ UserLogged=Usuário Conectado
 DateEmployment=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
+ForceUserHolidayValidator=Forçar validação da solicitação de licença
+ValidatorIsSupervisorByDefault=Por padrão, a validação é feita pelo supervisor do usuário. Mantenha vazio para continuar desta maneira.
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index a69e817c29a..65c7144a2c1 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -30,7 +30,6 @@ ViewPageInNewTab=Visualizar página numa nova aba
 SetAsHomePage=Definir com Página Inicial
 RealURL=URL real
 ViewWebsiteInProduction=Visualizar website usando origem URLs
-SetHereVirtualHost=<u>Use com o Apache / NGinx / ...</u> <br> Se você puder criar, no seu servidor web (Apache, Nginx, ...), um Host Virtual dedicado com PHP habilitado e um diretório Root no <br> <strong>%s</strong> <br> em seguida, defina o nome do host virtual que você criou nas propriedades do site, para que a visualização possa ser feita também usando esse acesso ao servidor web dedicado, em vez do servidor Dolibarr interno.
 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>
@@ -56,7 +55,6 @@ SorryWebsiteIsCurrentlyOffLine=Desculpe, este site está off-line. Volte mais ta
 WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar a tabela da conta do site
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas do site (login / senha) para cada site /  terceiros
 YouMustDefineTheHomePage=Você deve primeiro definir a Home page padrão
-OnlyEditionOfSourceForGrabbedContentFuture=Atenção: A criação de uma página da web através da importação de uma página web externa é reservada para usuários experientes. Dependendo da complexidade da página de origem, o resultado da importação pode diferir do original. Além disso, se a página de origem usar estilos CSS comuns ou javascript conflitante, isso poderá quebrar a aparência ou os recursos do editor de site ao trabalhar nesta página. Esse método é uma maneira mais rápida de criar uma página, mas é recomendável criar sua nova página a partir do zero ou de um modelo de página sugerido. <br> Note também que as edições de fontes HTML serão possíveis quando o conteúdo da página for inicializado, editando a partir de uma página externa (o editor 'Online' NÃO estará disponível)
 OnlyEditionOfSourceForGrabbedContent=Apenas uma edição de fonte HTML é possível quando o conteúdo foi extraído de um site externo
 GrabImagesInto=Pegue também imagens encontradas no css e na página.
 WebsiteRootOfImages=Diretório raiz para imagens do site
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 8924d7d7e5d..53c118f9204 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Nota: não está definido nenhum limite na sua configuração do PHP
 MaxSizeForUploadedFiles=Tamanho máximo para os ficheiros enviados (0 para rejeitar qualquer envio)
 UseCaptchaCode=Utilizar código gráfico (CAPTCHA) na página de iniciar a sessão
-AntiVirusCommand= Caminho completo para o comando de antivírus
-AntiVirusCommandExample= Exemplo para ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Exemplo para ClamAV: /usr/bin/clamscan
+AntiVirusCommand=Caminho completo para o comando de antivírus
+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= Mais parâmetros na linha de comando
-AntiVirusParamExample= Exemplo para ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuração do módulo de "Contabilidade"
 UserSetup=Configuração e gestão dos utilizadores
 MultiCurrencySetup=Configuração da utilização de várias moedas
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Opção desativada em demo
 FeatureAvailableOnlyOnStable=Funcionalidade apenas disponível em versões estáveis ​​oficiais
 BoxesDesc=Widgets são componentes que mostram algumas informações que você pode adicionar para personalizar algumas páginas. Você pode escolher entre mostrar o widget ou não selecionando a página de destino e clicando em "Ativar" ou clicando na lixeira para desativá-la.
 OnlyActiveElementsAreShown=Só são mostrados os elementos de <a href="%s">módulos ativos</a>.
-ModulesDesc=Os módulos / aplicativos determinam quais recursos estão disponíveis no software. Alguns módulos requerem permissões para serem concedidos aos usuários depois de ativar o módulo. Clique no botão on / off (no final da linha do módulo) para ativar / desativar um módulo / aplicativo.
+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=Pode encontrar mais módulos para descarregar noutros sites da internet...
 ModulesDeployDesc=Se as permissões em seu sistema de arquivos permitirem, você poderá usar essa ferramenta para implantar um módulo externo. O módulo ficará visível na aba <strong> %s </ strong>.
 ModulesMarketPlaces=Procurar aplicações/módulos externos
@@ -212,6 +212,7 @@ CompatibleUpTo=Compatível com a versão %s
 NotCompatible=Este módulo não parece compatível com o seu Dolibarr %s (Min%s - Max%s).
 CompatibleAfterUpdate=Este módulo requer uma atualização para o seu Dolibarr %s(Min%s-Max%s).
 SeeInMarkerPlace=Veja no mercado de modulos
+SeeSetupOfModule=Veja a configuração do módulo %s
 Updated=Atualizado
 Nouveauté=Novidade
 AchatTelechargement=Comprar / Download
@@ -221,6 +222,7 @@ DoliPartnersDesc=Lista de empresas que fornecem módulos ou recursos desenvolvid
 WebSiteDesc=Sites externos para módulos adicionais (não principais) ...
 DevelopYourModuleDesc=Algumas soluções para desenvolver seu próprio módulo ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Aplicativos disponíveis
 BoxesActivated=Aplicativos ativados
 ActivateOn=Ativar sobre
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Deixar em branco para usar o valor por omissão
 DefaultLink=Hiperligação predefinida
 SetAsDefault=Definir como predefinição
 ValueOverwrittenByUserSetup=Aviso: Este valor pode ter sido modificado pela configuração específica de um utilizador (cada utilizador pode definir o seu próprio link ClickToDial)
-ExternalModule=Módulo externo - Instalado no diretório %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Código de barras em massa init para terceiros
 BarcodeInitForProductsOrServices=Inicialização ou reposição de códigos de barras em massa para produtos ou serviços
 CurrentlyNWithoutBarCode=Atualmente, você tem o registo <strong>%s</strong> em <strong>%s</strong> %s sem o código de barras definido.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Distritos
 DictionaryCountry=Países
 DictionaryCurrency=Moedas
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Tipos de eventos da agenda
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Taxa de IVA
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Taxa
 LocalTax1IsNotUsed=Não utilizar um segundo imposto
 LocalTax1IsUsedDesc=Use um segundo tipo de imposto (diferente do primeiro)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=A taxa de IRPF por padrão ao criar prospetos, faturas, or
 LocalTax2IsNotUsedDescES=Por defeito, o IRS proposto é 0. Fim da regra.
 LocalTax2IsUsedExampleES=Em Espanha, os freelancers e profissionais liberais que prestam serviços e empresas que escolheram o regime fiscal dos módulos.
 LocalTax2IsNotUsedExampleES=Em Espanha, são empresas não sujeitas ao sistema fiscal de módulos.
+RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps des 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=Relatórios sobre impostos locais
 CalcLocaltax1=Vendas - Compras
 CalcLocaltax1Desc=Os relatórios de impostos locais são calculados através da diferença entre as vendas de impostos locais e as compras de impostos locais
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Compras
 CalcLocaltax2Desc=Os relatórios de impostos locais são o total de compras de impostos locais
 CalcLocaltax3=Vendas
 CalcLocaltax3Desc=Os relatórios de impostos locais são o total de vendas de impostos locais
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Etiqueta que será utilizada por defeito se não for encontrada tradução para este código
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Etiqueta ou chave de tradução
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Antes de começar a usar o Dolibarr, alguns parâmetros iniciais devem ser definidos e módulos ativados / configurados.
 SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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=Eventos de auditoria da segurança
 Audit=Auditoria
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>utilizadores administradores</b>.
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Configuração do módulo "Utilizadores"
 UserMailRequired=Email required to create a new user
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Configuração do módulo "GRH"
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Modelo de documentos de faturas
 BillsPDFModulesAccordindToInvoiceType=Modelos de documentos de faturas de acordo com o tipo de fatura
 PaymentsPDFModules=Modelos de documentos de pagamento
 ForceInvoiceDate=Forçar a data de fatura para a data de validação
-SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento sugeridas para faturas por defeito, se não estiverem definidas explicitamente
+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=Texto livre em faturas
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=Configuração do módulo de orçamentos
 ProposalsNumberingModules=Modelos de numeração do orçamento
 ProposalsPDFModules=Modelos de documentos de orçamento
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Texto livre nos orçamentos
 WatermarkOnDraftProposal=Marca de água nos orçamentos rascunhos (nenhuma, se vazio)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Pedir por conta bancária do destino do orçamento
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pedir qual o armazém origem para a encomen
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pedir conta bancária destinatária para encomendas a fornecedores
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Sales Orders management setup
 OrdersNumberingModules=Modelos de numeração de encomendas
 OrdersModelModule=Modelos de documentos de encomendas
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index ce64ef91892..2dacb43642f 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Fatura de fornecedor
 SupplierBills=faturas de fornecedores
 Payment=Pagamento
-PaymentBack=Reembolso
-CustomerInvoicePaymentBack=Reembolso
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Pagamentos
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=na moeda das faturas
 PaidBack=Reembolsada
 DeletePayment=Eliminar pagamento
 ConfirmDeletePayment=Tem a certeza que deseja eliminar este pagamento?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Pagamentos recebidos
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Mostrar fatura da situação
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
 ListOfYourUnpaidInvoices=Lista de faturas não pagas
 NoteListOfYourUnpaidInvoices=Nota: Esta lista apenas contém fatura de terceiros dos quais você está definido como representante de vendas.
-RevenueStamp=Selo fiscal
+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=Você precisa criar uma fatura padrão primeiro e convertê-la em "modelo" para criar uma nova fatura modelo
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Definir data final para a linha de serviço com a próxima data d
 AutoFillDateToShort=Definir data final
 MaxNumberOfGenerationReached=Número máximo de gen. alcançado
 BILL_DELETEInDolibarr=Fatura eliminada
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/pt_PT/blockedlog.lang b/htdocs/langs/pt_PT/blockedlog.lang
index fced720f550..d50a1d77f48 100644
--- a/htdocs/langs/pt_PT/blockedlog.lang
+++ b/htdocs/langs/pt_PT/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Logs inalteráveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os logs arquivados (podem ser longos)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os logs de arquivo não válidos (podem ser longos)
 DownloadBlockChain=Baixe impressões digitais
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi corrompida anteriormente.
 AddedByAuthority=Armazenado em autoridade remota
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index d7da654dbc5..43080da1bfc 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Adicionar este artigo
 RestartSelling=Voltar para vendas
 SellFinished=Venda efetuada
 PrintTicket=Imprimir recibo
+SendTicket=Send ticket
 NoProductFound=Nenhum artigo encontrado
 ProductFound=produto encontrado
 NoArticle=Nenhum artigo
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nº de faturas
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index f858136653d..79d4c087127 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=A Empresa "%s" foi Eliminada
 ListOfContacts=Lista de Contactos
 ListOfContactsAddresses=Lista de Contactos
 ListOfThirdParties=Lista de Terceiros
-ShowCompany=Mostrar terceiros
 ShowContact=Mostrar Contacto
 ContactsAllShort=Todos (sem filtro)
 ContactType=Tipo de Contacto
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Primeiro nome do representante de vendas
 SaleRepresentativeLastname=Último nome do representante de vendas
 ErrorThirdpartiesMerge=Houve um erro ao eliminar os terceiros. Por favor, verifique o registo. As alterações foram revertidas.
 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
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 3a29e054498..c19fc1ec380 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Consulte %sanálise de payments%s para um cálculo de
 SeeReportInDueDebtMode=Consulte %sanálise de invoices%s para um cálculo baseado em faturas registradas conhecidas, mesmo que elas ainda não tenham sido contabilizadas no Ledger.
 SeeReportInBookkeepingMode=Consulte <b> %sRelatório de reservas%s </ b> para um cálculo na <b> tabela Razão da contabilidade </ b>
 RulesAmountWithTaxIncluded=- Os montantes exibidos contêm todas as taxas incluídas
-RulesResultDue=- Inclui faturas pendentes, despesas, IVA, doações, sejam elas pagas ou não. Inclui também salários pagos. <br> - Baseia-se na data de validação das faturas e do IVA e na data de vencimento das despesas. Para os salários definidos com o módulo Salário, a data-valor do pagamento é utilizada.
+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=- Inclui os pagamentos reais feitos em faturas, despesas, IVA e salários. <br> - Baseia-se nas datas de pagamento das faturas, despesas, IVA e salários. A data de doação para doação.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<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=Inclui todas as linhas de crédito do diário de venda.
 RulesAmountOnInOutBookkeepingRecord=Inclui registro em seu livro contábil com contas contábeis que tem o grupo "DESPESA" ou "LUCRO"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Volume de negócios faturado por taxa de imposto sobre vendas
 TurnoverCollectedbyVatrate=Volume de negócios cobrado pela taxa de imposto sobre vendas
 PurchasebyVatrate=Compra por taxa de imposto sobre vendas
 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index ae9275ab0c3..b86e65b680a 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -59,6 +59,7 @@ 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 /.
 ErrorFileSizeTooLarge=O tamanho do arquivo é muito grande.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Tamanho demasiado longo para o tipo int (%s máximo dígitos)
 ErrorSizeTooLongForVarcharType=Tamanho demasiado longo para o tipo string (%s máximo chars)
 ErrorNoValueForSelectType=Por favor, preencha o valor para lista de selecção
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Uma senha foi definida para este membro. No entanto, nenhuma conta de usuário foi criada. Portanto, essa senha é armazenada, mas não pode ser usada para fazer login no Dolibarr. Pode ser usado por um módulo externo / interface, mas se você não precisa definir nenhum login nem senha para um membro, você pode desativar a opção "Gerenciar um login para cada membro" da configuração do módulo de membro. Se você precisar gerenciar um login, mas não precisar de nenhuma senha, poderá manter esse campo vazio para evitar esse aviso. Nota: O email também pode ser usado como um login se o membro estiver vinculado a um usuário.
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 9b836cf1158..a13fa7eba64 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Este PHP suporta o Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=Este PHP suporta funções UTF8.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=A sua memória máxima da sessão PHP está definida para <b>%s.</b> Isto deverá ser suficiente.
 PHPMemoryTooLow=Sua memória de sessão do PHP max está configurada para <b> %s </ b> bytes. Isso é muito baixo. Altere seu <b> php.ini </ b> para definir o parâmetro <b> memory_limit </ b> para pelo menos <b> %s </ b> bytes.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=A sua instalação PHP não suporta Curl.
 ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
 ErrorPHPDoesNotSupportUTF8=Sua instalação do PHP não suporta funções UTF8. Dolibarr não pode funcionar corretamente. Resolva isso antes de instalar o 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=A diretoria %s não existe.
 ErrorGoBackAndCorrectParameters=Volte e verifique / corrija os parâmetros.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=O aplicativo tentou fazer o upgrade automático,
 YouTryInstallDisabledByFileLock=O aplicativo tentou fazer o upgrade automático, mas as páginas de instalação / atualização foram desativadas para segurança (pela existência de um arquivo de bloqueio <strong> install.lock </ strong> no diretório de documentos dolibarr).
 ClickHereToGoToApp=Clique aqui para ir ao seu aplicativo
 ClickOnLinkOrRemoveManualy=Clique no link a seguir. Se você sempre vê esta mesma página, você deve remover / renomear o arquivo install.lock no diretório de documentos.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/pt_PT/link.lang b/htdocs/langs/pt_PT/link.lang
index 7ff3b74a22c..49a5aaaef43 100644
--- a/htdocs/langs/pt_PT/link.lang
+++ b/htdocs/langs/pt_PT/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=A hiperligação %s foi removida
 ErrorFailedToDeleteLink= falhou a remoção da ligação '<b>%s</b>'
 ErrorFailedToUpdateLink= Falha na atualização de ligação '<b>%s</b>'
 URLToLink=URL para hiperligação
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 24ce7015897..e742b00fd45 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Nenhum contato / endereço com uma categoria encontra
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum contato / endereço com uma categoria encontrada
 OutGoingEmailSetup=Configuração de email de saída
 InGoingEmailSetup=Configuração de email de entrada
-OutGoingEmailSetupForEmailing=Configuração de email de saída (para envio em massa)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Configuração de email de saída padrão
 Information=Informação
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 273f77e31c6..0b8162089a5 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 SaveAndNew=Save and new
 TestConnection=Testar conexão
 ToClone=Clonar
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Choose data you want to clone:
 NoCloneOptionsSpecified=Não existem dados definidos para clonar.
 Of=de
@@ -829,6 +830,8 @@ Gender=Género
 Genderman=Homem
 Genderwoman=Mulher
 ViewList=Ver Lista
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obrigatório
 Hello=Olá
 GoodBye=Adeus
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 1822aec2da0..0a33852c36e 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL da página
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descrição
 WEBSITE_IMAGE=Imagem
-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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Palavras-chave
 LinesToImport=Linhas a importar
 
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 59c7166cd74..ed279a0744a 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=Inicialização por código de barras em massa
 MassBarcodeInitDesc=Esta página pode ser usada para inicializar um código de barras em objetos que não possuem código de barras definido. Verifique antes que a configuração do código de barras do módulo esteja concluída.
 ProductAccountancyBuyCode=Código de contabilidade (compra)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Código de contabilidade (venda)
 ProductAccountancySellIntraCode=Código contábil (venda intracomunitária)
 ProductAccountancySellExportCode=Código de contabilidade (venda exportação)
@@ -165,7 +167,7 @@ SuppliersPrices=Preços de fornecedor
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Código Aduaneiro / Commodity / HS
 CountryOrigin=País de origem
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 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 73ad2b0c810..d1ec4809bb8 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Tempo
 ListOfTasks=Lista de tarefas
 GoToListOfTimeConsumed=Ir para a lista de tempo consumido
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Vista de Gantt
 ListProposalsAssociatedProject=Lista das propostas comerciais relacionadas ao projeto
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Carga de trabalho prevista
 PlannedWorkloadShort=Carga de trabalho
 ProjectReferers=Itens relacionados
 ProjectMustBeValidatedFirst=Primeiro deve validar o projeto
-FirstAddRessourceToAllocateTime=Atribuir um recurso do usuário à tarefa para alocar tempo
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Entrada por dia
 InputPerWeek=Entrada por semana
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=Últimos %s projetos modificados
 OtherFilteredTasks=Outras tarefas filtradas
 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=Permitir comentários de usuários sobre tarefas
 AllowCommentOnProject=Permitir comentários de usuários em projetos
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nova fatura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/pt_PT/receiptprinter.lang b/htdocs/langs/pt_PT/receiptprinter.lang
index 0a295c55579..b786db547bb 100644
--- a/htdocs/langs/pt_PT/receiptprinter.lang
+++ b/htdocs/langs/pt_PT/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Impressora de Teste
 CONNECTOR_NETWORK_PRINT=Impressora de Rede
 CONNECTOR_FILE_PRINT=Impressora Local
 CONNECTOR_WINDOWS_PRINT=Impressora do Windows Local
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Impressora de Teste para testar, não faz nada
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=Perfil Predefinido
 PROFILE_SIMPLE=Perfil Simples
 PROFILE_EPOSTEP=Epos Tep Profile
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Ref. fatura
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/pt_PT/stripe.lang b/htdocs/langs/pt_PT/stripe.lang
index cc9e30cffc6..ee0f48cc59a 100644
--- a/htdocs/langs/pt_PT/stripe.lang
+++ b/htdocs/langs/pt_PT/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Nome do fornecedor
 CSSUrlForPaymentForm=CSS url folha de estilo para forma de pagamento
 NewStripePaymentReceived=Novo pagamento Stripe recebido
 NewStripePaymentFailed=Nova tentativa de pagamento Stripo, mas falhou
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Chave de teste secreta
 STRIPE_TEST_PUBLISHABLE_KEY=Chave de teste publicável
 STRIPE_TEST_WEBHOOK_KEY=Chave de teste Webhook
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index b200b42a58a..a5e87314b36 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertenece o utilizador.
 Inherited=Herdado
 UserWillBeInternalUser=O utilizador criado irá ser um utilizador interno (porque não está interligado com um terceiro em particular)
@@ -110,3 +110,8 @@ UserLogged=Utilizador conectado
 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
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 5f3112d92c8..404cb9f8cec 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Ver página no novo separador
 SetAsHomePage=Definir como página de 'Início'
 RealURL=URL Real
 ViewWebsiteInProduction=Ver site da Web utilizando URLs de início
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+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> 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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 WEBSITE_USE_WEBSITE_ACCOUNTS=Ativar a tabela de contas do site
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=Primeiro deve definir a página de Início predefinida
-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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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=Somente edição de fonte HTML é possível quando o conteúdo foi obtido de um site externo
 GrabImagesInto=Pegue também imagens encontradas em css e página.
 ImagesShouldBeSavedInto=As imagens devem ser salvas no diretório
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 8f60b7aa1f2..31613a3ef4d 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Notă: configurația <b> dvs. </b>  PHP limitează în p
 NoMaxSizeByPHPLimit=Notă: Nicio limită setată în configuraţia dvs. 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
-AntiVirusCommand= Calea completă la comanda antivirus
-AntiVirusCommandExample= Exemplu pentru ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Examplu pentru ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Calea completă la comanda antivirus
+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= Mai multe despre parametrii în linia de comandă
-AntiVirusParamExample= Exemplu pentru ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Setări Modul Contabilitate
 UserSetup=Setări Modul Utilizatori
 MultiCurrencySetup=Setarea în mai multe valute
@@ -199,7 +199,7 @@ 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.
-ModulesDesc=Modulele / aplicațiile determină care caracteristici sunt disponibile în software. Unele module necesită permisiuni pentru a fi acordate utilizatorilor după activarea modulului. Faceți clic pe butonul on/off (la sfârșitul liniei de module) pentru a activa/dezactiva un modul/aplicație.
+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=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
@@ -212,6 +212,7 @@ 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
 Updated=Updatat
 Nouveauté=Noutate
 AchatTelechargement=Cumpărați / Descărcați
@@ -221,6 +222,7 @@ DoliPartnersDesc=Lista companiilor care oferă module sau caracteristici dezvolt
 WebSiteDesc=Site-uri externe pentru module suplimentare (non-core) ...
 DevelopYourModuleDesc=Unele soluții pentru a vă dezvolta propriul modul ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Widgeturi disponibile
 BoxesActivated=Widgeturile activate
 ActivateOn=Activaţi pe
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Lasă gol pentru utilizarea valorii implicite
 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 - instalat în directorul %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=State/Provincii
 DictionaryRegion=Regiuni
 DictionaryCountry=Ţări
 DictionaryCurrency=Monede
-DictionaryCivility=Titlul de politețe
+DictionaryCivility=Honorific titles
 DictionaryActions=Tipuri evenimente agenda
 DictionarySocialContributions=Tipuri  de taxe sociale si fiscale
 DictionaryVAT=Cote TVA sau Cote Taxe Vanzări
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Implicit, taxa de vânzare propusă este 0, ea poate fi utiliza
 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.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Rată
 LocalTax1IsNotUsed=Nu utilizează taxa secundă
 LocalTax1IsUsedDesc=Utilizați un al doilea tip de taxă (alta decât prima)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Rata IRPF în mod implicit când se creează perspective,
 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.
 LocalTax2IsNotUsedExampleES=În Spania, sunt întreprinderi care nu sunt supuse sistemului de taxare pe module.
+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 des 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=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
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Achiziţii
 CalcLocaltax2Desc=Rapoarte Taxe Locale este totalul taxelor locale de cumpărare
 CalcLocaltax3=Vânzări
 CalcLocaltax3Desc=Rapoarte Taxe Locale este totalul taxelor locale de vanzare
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poate fi găsit de traducere pentru codul
 LabelOnDocuments=Eticheta de pe documente
 LabelOrTranslationKey=Etichetă sau cheie de traducere
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Raportul de cheltuieli pentru aprobare
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Înainte de a începe să utilizați Dolibarr, unii parametri inițiali trebuie să fie definiți and modulele 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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=Alte intrări în meniul de configurare gestionează parametrii opționali.
 LogEvents=Audit de securitate evenimente
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Activați autentificarea pentru anumite evenimente de securitate. A
 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
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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=Parametrii care afectează aspectul şi comportamentul  Dolibarr pot fi modificaţi aici.
@@ -1264,6 +1272,8 @@ 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
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Configurare Modul HRM
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ 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
-SuggestedPaymentModesIfNotDefinedInInvoice=Sugestii cu privire la modul de plata facturii, în mod implicit, dacă nu este definit de factură
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Sugerați plata prin retragere din cont
 SuggestPaymentByChequeToAddress=Sugerați plata de prin cec către
 FreeLegalTextOnInvoices=Free text pe facturi
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Configurarea plăților furnizorului
 PropalSetup=Modul configurare Oferte Comerciale 
 ProposalsNumberingModules=Modele numerotare  Oferte Comerciale 
 ProposalsPDFModules=Modele documente Oferte Comerciale 
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 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
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Cereţi sursa depozitului pentru comandă
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Cereţi contul bancar al beneficiarului unei comenzi de achiziție
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Setări pentru gestionarea comenzilor de vânzări
 OrdersNumberingModules=Ordinele de numerotare module
 OrdersModelModule=Ordinul modele de documente
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index c973f37860a..e947ece0ec0 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Facturi Furnizori
 SupplierBill=Factura furnizorului
 SupplierBills=Facturi Furnizori
 Payment=Plată
-PaymentBack=Restituire Plată
-CustomerInvoicePaymentBack=Restituire Plată
+PaymentBack=Rambursare
+CustomerInvoicePaymentBack=Rambursare
 Payments=Plăţi
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in moneda facturii
 PaidBack=Restituit
 DeletePayment=Ştergere plată
 ConfirmDeletePayment=Sunteţi sigur că doriţi să ştergeţi această plată?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Plățile furnizorului
 ReceivedPayments=Încasări primite
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Afişează factura de situaţie
 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
@@ -509,11 +512,11 @@ 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=Timbru fiscal
+RevenueStamp=Tax stamp
 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ț
 YouMustCreateStandardInvoiceFirstDesc=Intai se poate crea o factură standard si se transforma in model pentru a avea un nou model de factura.
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Setați data de încheiere pentru linia de servicii cu data urmă
 AutoFillDateToShort=Setați data de încheiere
 MaxNumberOfGenerationReached=Numărul maxim de gen. atins
 BILL_DELETEInDolibarr=Factură ştearsă
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/ro_RO/blockedlog.lang b/htdocs/langs/ro_RO/blockedlog.lang
index 8606592e234..854459a81da 100644
--- a/htdocs/langs/ro_RO/blockedlog.lang
+++ b/htdocs/langs/ro_RO/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Înregistrări nemodificate
 ShowAllFingerPrintsMightBeTooLong=Arată toate jurnalele arhivate (ar putea fi lungi)
 ShowAllFingerPrintsErrorsMightBeTooLong=Arată toate jurnalele de arhivă nevalide (ar putea fi lungi)
 DownloadBlockChain=Descărcați amprentele digitale
-KoCheckFingerprintValidity=Intrarea în jurnal arhivată nu este validă. Aceasta înseamnă că cineva (un hacker?) a modificat unele date ale acestei inregistrări după ce a fost înregistrată sau a șters înregistrarea arhivată precedentă (verifică că linia cu # anterior există).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Intrarea în jurnal arhivată este validă. Datele de pe această linie nu au fost modificate şi intrarea urmează cele precedente.
 OkCheckFingerprintValidityButChainIsKo=Jurnalul arhivat pare valabil în comparație cu cel precedent, dar lanțul a fost corupt anterior.
 AddedByAuthority=Stocată în autoritate la distanţă
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index d22a54f9e2a..785065d2cf1 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Adauga acest articol
 RestartSelling=Du-te inapoi la vânzare
 SellFinished=Vanzare completa
 PrintTicket=Print bon
+SendTicket=Send ticket
 NoProductFound=Niciun articol gasit
 ProductFound=produs găsit
 NoArticle=Niciun articol
@@ -48,6 +49,7 @@ Footer=Subsol
 AmountAtEndOfPeriod=Valoare la sfârșitul perioadei (zi, lună sau an)
 TheoricalAmount=Valoare teoretică
 RealAmount=Sumă reală
+CashFence=Cash fence
 CashFenceDone=Limita de bani realizată pentru perioada
 NbOfInvoices=Nr  facturi
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS are nevoie de categorii de produse pentru a lucra
 OrderNotes=Note de comandă
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 0e79c39d744..0f27f96698a 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Societatea " %s" a fost ştearsă din baza de date.
 ListOfContacts=Lista Contacte
 ListOfContactsAddresses=Lista Contacte
 ListOfThirdParties=Lista terților
-ShowCompany=Arată terțul
 ShowContact=Afişeză contact
 ContactsAllShort=Toate (fără filtru)
 ContactType=Tip Contact
@@ -447,6 +446,7 @@ 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.
 NewCustomerSupplierCodeProposed=Codul clientului sau furnizorului utilizat deja, este sugerat un nou cod
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Tip de plată - Client
 PaymentTermsCustomer=Conditii de plata - Client
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 3793fa21abe..5a9926309ff 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Vedeți %sanaliza plăților%s pentru un calcul al pl
 SeeReportInDueDebtMode=Vedeți %sanaliza facturilor%s pentru un calcul bazat pe facturi înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
 SeeReportInBookkeepingMode=Vedeți <b> %sraportul contabil%s </b> pentru un calcul la <b> Tabelul registrului contabil </b>
 RulesAmountWithTaxIncluded=- Valoarea afişată este cu toate taxele incluse
-RulesResultDue=- Include facturi deschise, cheltuieli, TVA, donații, indiferent dacă sunt plătite sau nu. Include, de asemenea, salariile plătite <br> - Se ia  în  calcul data de validare a facturilor pentru TVA și data scadentă pentru cheltuieli. Pentru salarii definite cu modulul Salarii, este utilizată data plății.
+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=- 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 de plată ale clientului, indiferent dacă sunt plătite sau nu. <br> - Se bazează pe data de validare a acestor facturi. <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=- 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"
@@ -255,3 +255,10 @@ 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=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
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index e4087e004cb..81bd2acc725 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -59,6 +59,7 @@ 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.
 ErrorFileSizeTooLarge=Dimensiunea fiÅŸierului este prea mare.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Prea mult timp pentru tipul int (%s cifre maxim) Dimensiune
 ErrorSizeTooLongForVarcharType=Prea mult timp pentru tipul de coarde (%s de caractere maxim) Dimensiune
 ErrorNoValueForSelectType=Completaţi valorile pentru lista de selecţie
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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= 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. 
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 1dbbc1fd370..ed434445473 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Acest PHP suportă Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=Acest PHP suportă functiile UTF8.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=PHP max memorie sesiune este setată la <b>%s.</b> Acest lucru ar trebui să fie suficient.
 PHPMemoryTooLow=Memoria sesiunii PHP max este setată la <b> %s </b> octeți. Această valoare este prea mică. Schimbați-vă <b> php.ini </b> pentru a seta parametrul <b> memory_limit </b> la cel puțin <b> %s </b> octeți.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Instalarea dvs. PHP nu suportă Curl.
 ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
 ErrorPHPDoesNotSupportUTF8=Instalarea dvs. de PHP nu suportă funcții UTF8. Dolibarr nu poate funcționa corect. Rezolvați acest lucru înainte de a instala 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=Directorul  %s  nu există.
 ErrorGoBackAndCorrectParameters=Întoarceți-vă și verificați/corectați parametrii.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Aplicația a încercat să se autoactualizeze, î
 YouTryInstallDisabledByFileLock=Aplicația a încercat să se autoactualizeze, însă paginile de instalare / upgrade au fost dezactivate pentru securitate (prin existența unui fișier de blocare <strong> install.lock </strong> în directorul de documente Dolibarr). <br>
 ClickHereToGoToApp=Faceți clic aici pentru a merge la aplicația dvs.
 ClickOnLinkOrRemoveManualy=Faceți clic pe următorul link. Dacă vedeți întotdeauna aceeași pagină, trebuie să eliminați / redenumiți fișierul install.lock din directorul de documente.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ro_RO/link.lang b/htdocs/langs/ro_RO/link.lang
index 05dc60d8abc..9087a2eec65 100644
--- a/htdocs/langs/ro_RO/link.lang
+++ b/htdocs/langs/ro_RO/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Linkul %s a fost înlăturat
 ErrorFailedToDeleteLink= Eşec la înlăturarea  linkului '<b>%s</b>'
 ErrorFailedToUpdateLink= EÅŸec la modificarea linkului '<b>%s</b>'
 URLToLink=URL la link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 6a37037c8c4..e660aa77eb3 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie
 NoContactLinkedToThirdpartieWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie 
 OutGoingEmailSetup=Setarea emailului de ieșire
 InGoingEmailSetup=Configurarea emailului de primire
-OutGoingEmailSetupForEmailing=Setarea emailului de ieșire (pentru trimiterea de emailuri în masă)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Configurarea implicită a emailurilor de ieșire
 Information=Informatie
 ContactsWithThirdpartyFilter=Contacte cu filtrul terÈ›
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index fa38056f25f..b9026ccd039 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 SaveAndNew=Save and new
 TestConnection=Test conexiune
 ToClone=Clonează
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Alegeți datele pe care doriți să le clonați:
 NoCloneOptionsSpecified=Nu există date definite pentru a clona .
 Of=de
@@ -829,6 +830,8 @@ Gender=Gen
 Genderman=Barbat
 Genderwoman=Femeie
 ViewList=Vedere listă
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obligatoriu
 Hello=Salut
 GoodBye=La revedere
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index cf65af8725e..f528c846026 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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=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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL pagina
 WEBSITE_TITLE=Titlu
 WEBSITE_DESCRIPTION=Descriere
 WEBSITE_IMAGE=Imagine
-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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Cuvânt cheie
 LinesToImport=Linii de import
 
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index e1bfc320a42..90896e14ae9 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Acest instrument actualizează rata TVA definită pe  <
 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=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Codul contabil (vânzare)
 ProductAccountancySellIntraCode=Codul contabil (vânzarea intracomunitară)
 ProductAccountancySellExportCode=Codul contabil (export de vânzare)
@@ -165,7 +167,7 @@ SuppliersPrices=Prețurile furnizorului
 SuppliersPricesOfProductsOrServices=Prețurile furnizorilor (de produse sau servicii)
 CustomCode=Cod Vamal / Marfă / SA
 CountryOrigin=Å¢ara de origine
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Etichetă scurta
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index e7fef439144..ff6bc18336d 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Timp
 ListOfTasks=Lista de sarcini
 GoToListOfTimeConsumed=Accesați lista de timp consumată
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Vizualizare Gantt 
 ListProposalsAssociatedProject=Lista propunerilor comerciale aferente proiectului
 ListOrdersAssociatedProject=Lista comenzilor de vânzări aferente proiectului
@@ -188,7 +186,7 @@ PlannedWorkload=Volum de lucru Planificat
 PlannedWorkloadShort=Volum de muncă
 ProjectReferers=Obiecte asociate
 ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
-FirstAddRessourceToAllocateTime=Atribuiți o resursă de utilizator sarcinii de a aloca timp
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Intrare pe zi
 InputPerWeek=Intrare pe saptamana
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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)
 ThirdPartyRequiredToGenerateInvoice=Un terț trebuie definit pe proiect pentru a putea să fie facturat.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Permiteți comentariile utilizatorilor pe sarcini
 AllowCommentOnProject=Permiteți comentariile utilizatorilor pe proiecte
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Factură nouă
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/ro_RO/receiptprinter.lang b/htdocs/langs/ro_RO/receiptprinter.lang
index e232e0a289e..046a9c068d1 100644
--- a/htdocs/langs/ro_RO/receiptprinter.lang
+++ b/htdocs/langs/ro_RO/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy Printer
 CONNECTOR_NETWORK_PRINT=Imprimanta Retea
 CONNECTOR_FILE_PRINT=Imprimanta locala
 CONNECTOR_WINDOWS_PRINT=Imprimanta locala Windows
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Imprimantă falsă de test, nu face nimic
 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 / Printer Receipt
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=Default Profil
 PROFILE_SIMPLE=Simplu Profil
 PROFILE_EPOSTEP=Epos Tep Profil
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Ref Factură
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Cod de identificare TVA intracomunitar
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index c4cd14aabde..9646bb98cf7 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Numele vânzătorului
 CSSUrlForPaymentForm=CSS foaie de URL-ul de stil pentru forma de plată
 NewStripePaymentReceived=Plata noua Stripe incasata
 NewStripePaymentFailed=Plata noua Stripe incercata dar esuata
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Cheie de testare secreta
 STRIPE_TEST_PUBLISHABLE_KEY=Cheia de test publicabilă
 STRIPE_TEST_WEBHOOK_KEY=Cheia de test Webhook
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index f6bcf41b04b..efe38577914 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -70,7 +70,7 @@ ExportDataset_user_1=Utilizatorii și proprietățile acestora
 DomainUser=Domeniu utilizatorul %s
 Reactivate=Reactivaţi
 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. <br> <br> În ambele cazuri, permisiunile definesc drepturile asupra Dolibarr, de asemenea, utilizatorul extern poate avea un manager de meniu diferit de cel al utilizatorului intern (consultați Home - Setup - Display)
+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)
 PermissionInheritedFromAGroup=Permisiunea acordată deoarece 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ţă)
@@ -113,3 +113,5 @@ CantDisableYourself=Nu vă puteți dezactiva propria înregistrare de utilizator
 ForceUserExpenseValidator=Forţează validarea raportului de cheltuieli
 ForceUserHolidayValidator=Forţează validarea cererii de concediu
 ValidatorIsSupervisorByDefault= În mod implicit, validatorul este superviser-rul utilizatorului. Nu completaţi pentru a păstra acest comportament.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 985c2e2f7b4..6a998de377e 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Afișați pagina în fila nouă
 SetAsHomePage=Seteaza ca  pagina Home 
 RealURL=Real URL
 ViewWebsiteInProduction=Vizualizați site-ul web utilizând URL-urile de home
-SetHereVirtualHost= <u> Utilizați cu Apache / NGinx / ... </u> <br> Dacă puteți crea, pe serverul dvs. de web (Apache, Nginx, ...), un gazdă dedicat cu PHP activat și un director Root pe <br> <strong> %s </strong> <br> apoi setați numele gazdei virtuale pe care ați creat-o în proprietățile site-ului web, astfel încât previzualizarea poate fi făcută și utilizând acest acces dedicat serverului web în loc de serverul intern Dolibarr.
+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> 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>
 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=Verificați, de asemenea, că gazda virtuală are permisiunea <strong> %s </strong> pe fișiere în <br> <strong> %s </strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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ț
 YouMustDefineTheHomePage=Mai întâi trebuie să definiți pagina de Home implicită
-OnlyEditionOfSourceForGrabbedContentFuture=Avertisment: Crearea unei pagini web prin importarea unei pagini web externe este rezervată utilizatorilor experimentați. În funcție de complexitatea paginii sursă, rezultatul importului poate diferi de original. De asemenea, în cazul în care pagina sursă utilizează stiluri CSS comune sau javascript conflictual, este posibil să se spargă aspectul sau caracteristicile editorului de site Web atunci când lucrează pe această pagină. Această metodă reprezintă o modalitate mai rapidă de a crea o pagină, dar este recomandat să creați noua pagină de la zero sau dintr-un șablon de pagină sugerat. <br> Rețineți, de asemenea, că modificările sursei HTML vor fi posibile atunci când conținutul paginii a fost inițializat prin preluarea de pe o pagină externă (editorul "Online" NU va fi disponibil)
+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=Numai ediția 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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 063c10ed781..18a2d706a50 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Примечание: <b>ваша</b> конфигура
 NoMaxSizeByPHPLimit=Примечание: в вашей конфигурации PHP у�тановлено <b>no limit</b>
 MaxSizeForUploadedFiles=Мак�имальный размер загружаемых файлов (0 дл� запрещени� каких-либо загрузок)
 UseCaptchaCode=И�пользовать графиче�кий код (CAPTCHA) на �транице входа
-AntiVirusCommand= Полный путь к антивиру�ной команде
-AntiVirusCommandExample= Пример дл� ClamWin: C: \\ Program Files (x86) \\ ClamWin \\ Bin \\ clamscan.exe <br> Пример дл� ClamAV: / USR / BIN / clamscan
+AntiVirusCommand=Полный путь к антивиру�ной команде
+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= Дополнительные параметры командной �троки
-AntiVirusParamExample= Пример дл� ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=�а�тройка модул� бухгалтер�кого учета
 UserSetup=�а�тройка управлени� пользовател�ми
 MultiCurrencySetup=Многовалютна� на�тройка
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Функци� отключена в демо -
 FeatureAvailableOnlyOnStable=Функци� до�тупна только в официальных �табильных вер�и�х
 BoxesDesc=Виджеты - �то компоненты, показывающие некоторую информацию, которую можно добавить дл� пер�онализации некоторых �траниц. Вы можете выбрать отображать или нет виджет, выбрав целевую �траницу и нажав «�ктивировать», или щелкнув корзину, чтобы отключить ее.
 OnlyActiveElementsAreShown=Показаны только �лементы из <a href="%s">включенных модулей</a>
-ModulesDesc=Модули/приложени� определ�ют, какие функции до�тупны в программном обе�печении. �екоторые модули требуют предо�тавлени� разрешений пользовател�м по�ле активации модул�. �ажмите кнопку включени�/выключени� (в конце �троки модул�), чтобы включить/отключить модуль/приложение.
+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=В интернете вы можете найти больше модулей дл� загрузки...
 ModulesDeployDesc=Е�ли разрешени� вашей файловой �и�теме позвол�ют, вы можете и�пользовать �тот ин�трумент дл� развертывани� внешнего модул�. Модуль будет виден на вкладке <strong>%s</strong> .
 ModulesMarketPlaces=Пои�к внешних приложений/модулей
@@ -212,6 +212,7 @@ CompatibleUpTo=Совме�тимо�ть � вер�ией %s
 NotCompatible=Этот модуль не �овме�тим � вашим Dolibarr%s (Min%s - Max%s).
 CompatibleAfterUpdate=Этот модуль требует обновлени� вашего Dolibarr%s (Min%s - Max%s).
 SeeInMarkerPlace=См. �а рынке
+SeeSetupOfModule=По�мотреть на�тройку модул�  %s
 Updated=Обновлено
 Nouveauté=�овое
 AchatTelechargement=Купить/Скачать
@@ -221,6 +222,7 @@ DoliPartnersDesc=Спи�ок компаний, предо�тавл�ющих 
 WebSiteDesc=Внешние веб-�айты дл� дополнительных модулей (нео�новных) ...
 DevelopYourModuleDesc=�екоторые решени� дл� разработки �об�твенного модул� ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=До�тупные виджеты
 BoxesActivated=Включенные виджеты
 ActivateOn=�ктивировать
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=О�тавьте пу�тым дл� и�пользова
 DefaultLink=С�ылка по умолчанию
 SetAsDefault=У�тановить по умолчанию
 ValueOverwrittenByUserSetup=Предупреждение: �то значение может быть перезапи�ано в на�тройках пользовател� (каждый пользователь может задать �вои на�тройки ��ылки ClickToDial)
-ExternalModule=Внешний модуль - у�тановлен в директорию %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Ма��ова� инициализаци� штрих-кода дл� контрагентов
 BarcodeInitForProductsOrServices=Ма��овое �оздание или удаление штрих-кода дл� Товаров или У�луг
 CurrentlyNWithoutBarCode=В на�то�щее врем� у ва� е�ть <strong>%s</strong>запи�ь на <strong>%s</strong>%s без определенного штрих-кода.
@@ -947,7 +950,7 @@ DictionaryCanton=Штат/Провинци�
 DictionaryRegion=Регионы
 DictionaryCountry=Страны
 DictionaryCurrency=Валюты
-DictionaryCivility=Обращение
+DictionaryCivility=Honorific titles
 DictionaryActions=Тип меропри�ти�
 DictionarySocialContributions=Типы �оциальных или налоговых �боров
 DictionaryVAT=Значени� �ДС или налога � продаж
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=По умолчанию предлагаемый налог �
 VATIsUsedExampleFR=Во Франции �то означает компании или организации, имеющие реальную фи�кальную �и�тему (упрощенна� реальна� или обычна� реальна�). Си�тема, в которой декларирует�� �ДС.
 VATIsNotUsedExampleFR=Во Франции �то означает а��оциации, которые не декларируют �ДС, или компании, организации или либеральные профе��ии, которые выбрали фи�кальную �и�тему микропредпри�тий (�ДС во франшизе) и уплатили налог на франшизу  без какой-либо декларации �ДС. При выборе �того варианта в �четах будет отображать�� ��ылка "Non applicable Sales tax - art-293B of CGI" («�ДС не примен�ет�� - art-293B CGI»).
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Ставка
 LocalTax1IsNotUsed=�е и�пользовать второй налог
 LocalTax1IsUsedDesc=И�пользуйте второй тип налога (кроме первого)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Ставка IRPF (подоходный налог дл�
 LocalTax2IsNotUsedDescES=По умолчанию предлагает�� IRPF 0. Конец правлени�.
 LocalTax2IsUsedExampleES=В И�пании работают фрилан�еры и незави�имые профе��ионалы, предлагающие у�луги, и компании, которые выбрали налоговую �и�тему модулей.
 LocalTax2IsNotUsedExampleES=В И�пании �то предпри�ти�, не подпадающие под налоговую �и�тему модулей.
+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 des 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=Отчеты о ме�тных налогах
 CalcLocaltax1=Продажи-Покупки
 CalcLocaltax1Desc=Отчёты о ме�тных налогах  - �то разница между  ме�тными налогами � продаж и покупок
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Покупки
 CalcLocaltax2Desc=Отчёты о ме�тных налогах  - �то итог ме�тных налогов � покупок
 CalcLocaltax3=Продажи
 CalcLocaltax3Desc=Отчёты о ме�тных налогах  - �то итог ме�тных налогов � продаж
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Метки, и�пользуемые по умолчанию, е�ли нет перевода можно найти код
 LabelOnDocuments=Этикетка на документах
 LabelOrTranslationKey=Метка или ключ перевода
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Отчет о ра�ходах дл� утве
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Перед началом и�пользовани� Dolibarr необходимо определить  параметры и включить/на�троить модули.
 SetupDescription2=Следующие два раздела �вл�ют�� об�зательными (две первые запи�и в меню на�тройки):
-SetupDescription3=<a href="%s">%s -> %s</a> <br> О�новные параметры, и�пользуемые дл� на�тройки поведени� вашего приложени� по умолчанию (например, дл� функций, �в�занных �о �траной).
-SetupDescription4=<a href="%s">%s -> %s</a> <br> Это программное обе�печение пред�тавл�ет �обой набор из множе�тва модулей/приложений, в�е более или менее незави�имые. Модули, �оответ�твующие вашим потребно�т�м, должны быть включены и на�троены. �овые пункты/опции добавл�ют�� в меню при активации модул�.
+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=Безопа�но�ть ревизии �обыти�
 Audit=�удит
@@ -1128,7 +1136,7 @@ LogEventDesc=Включите ведение журнала дл� опреде
 AreaForAdminOnly=Параметры на�тройки могут быть у�тановлены только <b> пользователем админи�тратора </b>.
 SystemInfoDesc=Си�тема информации разного техниче�кую информацию Вы получите в режиме только дл� чтени� и видимые только дл� админи�траторов.
 SystemAreaForAdminOnly=Эта обла�ть до�тупна только дл� админи�траторов. Пользователь�кие разрешени� Dolibarr не могут изменить �то ограничение.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Е�ли у ва� е�ть внешний бухгалтер/бухгалтер, вы можете отредактировать зде�ь �ту информацию.
 AccountantFileNumber=Код бухгалтера
 DisplayDesc=Параметры, вли�ющие на внешний вид и поведение Dolibarr, могут быть изменены зде�ь.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Правила генерации и проверки
 DisableForgetPasswordLinkOnLogonPage=�е показывать ��ылку «Забыли пароль» на �транице входа
 UsersSetup=�а�тройка модул� пользовател�
 UserMailRequired=Требует�� �лектронна� почта дл� �оздани� нового пользовател�
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=�а�тройка модул� HRM (Отдела кадров)
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Модели �четов-фактур
 BillsPDFModulesAccordindToInvoiceType=Модели документов �чета в �оответ�твии � типом �чета
 PaymentsPDFModules=Модели платежных документов
 ForceInvoiceDate=Принудительно приравн�ть дату вы�тавлени� �чета к дате проверки
-SuggestedPaymentModesIfNotDefinedInInvoice=Предложенный �по�об оплаты по умолчанию, е�ли иной не определен в �чете
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Предложить оплату выводом �ред�тв на �чет
 SuggestPaymentByChequeToAddress=Предложить оплату чеком на
 FreeLegalTextOnInvoices=Свободный тек�т на �четах-фактурах
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=�а�тройка платежей по�тавщику
 PropalSetup=�а�тройка модул� Коммерче�ких предложений
 ProposalsNumberingModules=Модели нумерации Коммерче�ких предложений
 ProposalsPDFModules=Модели документов Коммерче�кого предложени�
-SuggestedPaymentModesIfNotDefinedInProposal=Предлагаемый �по�об оплаты по предложению по умолчанию, е�ли иной  не определено предложением
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Свободный тек�т на Коммерче�ких предложени�х
 WatermarkOnDraftProposal=Вод�ные знаки на черновиках Коммерче�ких предложений ("�ет" е�ли пу�то)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Запро� банков�кого �чёта дл� предложени�
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Попро�ите и�точник �кл
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Запро�ить адре� банков�кого �чета дл� заказа на по�тавку
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=�а�тройка управлени� заказами на продажу
 OrdersNumberingModules=Модели нумерации заказов
 OrdersModelModule=Заказ документов моделей
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index bf31ff2450f..9ea55716414 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=�чета-фактуры По�тавщиков
 Payment=Платеж
-PaymentBack=Возврат платежа
-CustomerInvoicePaymentBack=Возврат платежа
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Платежи
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Возврат платежа
 DeletePayment=Удалить платеж
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Платежи по�тавщику
 ReceivedPayments=Полученные платежи
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Платить
 ToMakePaymentBack=Возврат платежа
 ListOfYourUnpaidInvoices=Спи�ок неоплаченных �четов
 NoteListOfYourUnpaidInvoices=Примечание: Этот �пи�ок �одержит �чета только тех контрагентов, которые �в�заны � нами, как пред�тавители по �быту.
-RevenueStamp=Штамп о уплате налогов
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Счёт удалён
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/ru_RU/blockedlog.lang b/htdocs/langs/ru_RU/blockedlog.lang
index 25d4540bff2..99bf472eed0 100644
--- a/htdocs/langs/ru_RU/blockedlog.lang
+++ b/htdocs/langs/ru_RU/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Показать в�е архивные логи (может быть долго)
 ShowAllFingerPrintsErrorsMightBeTooLong=Показать в�е недей�твительные архивные логи (может быть долго)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=�рхивные запи�и недей�твительна. Это значит, что кто-то (хакер?) изменил некоторые данные �того  по�ле того, как они были запи�аны, или удалил предыдущую архивную запи�ь (проверьте, что �трока � предыдущим # �уще�твует).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=�рхивна� запи�ь в журнале дей�твительна. Данные в �той �троке не были изменены, и запи�ь �ледует за предыдущей.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 6d6a4ce119c..23bb45edead 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Добавить �ту �татью
 RestartSelling=Верните�ь на продажу
 SellFinished=Продажа завершена
 PrintTicket=Печать билетов
+SendTicket=Send ticket
 NoProductFound=�и одна �тать� найдены
 ProductFound=продукт найден
 NoArticle=�и одна �тать�
@@ -48,6 +49,7 @@ Footer=�ижний колонтитул
 AmountAtEndOfPeriod=Сумма на конец периода (день, ме��ц или год)
 TheoricalAmount=Теоретиче�ка� �умма
 RealAmount=Дей�твительна� �умма
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Кол-во �четов-фактур
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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=Подтверждаете ли вы удаление �той  продажи?
 ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 2b688e7cb51..86a3fe13b24 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Компани� " %s" удалена из базы данных.
 ListOfContacts=Спи�ок контактов/адре�ов
 ListOfContactsAddresses=Спи�ок контактов/адре�ов
 ListOfThirdParties=Спи�ок контрагентов
-ShowCompany=Показать контрагента
 ShowContact=Показать контакт
 ContactsAllShort=В�е (без фильтра)
 ContactType=Вид контакт
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Им� торгового пред�тавител�
 SaleRepresentativeLastname=Фамили� торгового пред�тавител�
 ErrorThirdpartiesMerge=При удалении третьих �торон произошла ошибка. Проверьте журнал. Изменени� были отменены.
 NewCustomerSupplierCodeProposed=Код Клиента или По�тавщика уже и�пользует��, предлагает�� новый код
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Тип оплаты - Клиент
 PaymentTermsCustomer=У�лови� оплаты - Клиент
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 1123381eec9..393e05bc995 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded= - Суммы даны � учётом в�ех налогов
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=Коротка� метка
+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
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index dae49432ec1..b1594465426 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Файл не получил полно�тью на �ерве
 ErrorNoTmpDir=Временна� директори� %s не �уще�твует.
 ErrorUploadBlockedByAddon=Добавить заблокирован PHP / Apache плагин.
 ErrorFileSizeTooLarge=Размер файла �лишком велик.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Размер �лишком долго дл� целого типа (%s цифр мак�имум)
 ErrorSizeTooLongForVarcharType=Размер �лишком долго дл� �трунного типа (%s �имволов мак�имум)
 ErrorNoValueForSelectType=Пожалуй�та, заполните значение дл� выпадающего �пи�ка
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index edfd3a9f826..926bf70b7f7 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK= Мак�имально допу�тимый размер пам�ти дл� �е��ии у�тановлен <b>в %s.</b> Это должно быть до�таточно.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Ваша у�тановка PHP не поддержи
 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=Каталог %s не �уще�твует.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 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=�ажмите зде�ь, чтобы перейти к вашей за�вке
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/ru_RU/link.lang b/htdocs/langs/ru_RU/link.lang
index 8e02c8350b7..6ec241979e2 100644
--- a/htdocs/langs/ru_RU/link.lang
+++ b/htdocs/langs/ru_RU/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=С�ылка на файл %s удалена
 ErrorFailedToDeleteLink= При удалении ��ылки на файл '<b>%s</b>' возникла ошибка
 ErrorFailedToUpdateLink= При обновлении ��ылки на файл '<b>%s</b>' возникла ошибка
 URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index b059b4ada96..938569bc947 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Информаци�
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index f325f268aab..a284a80792b 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 SaveAndNew=Save and new
 TestConnection=Проверка подключени�
 ToClone=Дублировать
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Выберите данные дл� клонировани�:
 NoCloneOptionsSpecified=Данные дл� дублировани� не определены.
 Of=из
@@ -829,6 +830,8 @@ Gender=Пол
 Genderman=Мужчина
 Genderwoman=Женщина
 ViewList=По�мотреть �пи�ок
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Об�зательно
 Hello=Здрав�твуйте
 GoodBye=До �видани�
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index d229559ec81..6e128840716 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=�азвание
 WEBSITE_DESCRIPTION=Опи�ание
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index dc669d9b69d..371b5e9c53f 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=Ма��овое �оздание штрих-кода
 MassBarcodeInitDesc=Эта �траница может быть и�пользована дл� �оздани� штрих-кодов дл� объектов, у которых нет штрих-кода. Проверьте перед выполнением на�тройки модул� штрих-кодов.
 ProductAccountancyBuyCode=Учетный код (покупка)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Учетный код (продажа)
 ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
 ProductAccountancySellExportCode=Учетный код (�к�порт)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Таможенный / Товарный / HS код
 CountryOrigin=Страна прои�хождени�
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Коротка� метка
 Unit=Единица
 p=u.
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index c233f1d4a67..70aee875338 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Врем�
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Запланированна� нагрузка
 PlannedWorkloadShort=Рабоча� нагрузка
 ProjectReferers=Св�занные �лементы
 ProjectMustBeValidatedFirst=Проект должен быть �начала подтверждён
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Ввод по дн�м
 InputPerWeek=Ввод по неделе
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=�овый �чёт
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/ru_RU/receiptprinter.lang b/htdocs/langs/ru_RU/receiptprinter.lang
index 5fcf8b3f605..db6b24e5bb4 100644
--- a/htdocs/langs/ru_RU/receiptprinter.lang
+++ b/htdocs/langs/ru_RU/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Капитал
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
index 402a8c57df3..7f3d995c77b 100644
--- a/htdocs/langs/ru_RU/stripe.lang
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Им� по�тавщика
 CSSUrlForPaymentForm=CSS-�тилей URL дл� оплаты форме
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 8fc8b5d136c..888fc7191ae 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -70,7 +70,7 @@ 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.<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)
 PermissionInheritedFromAGroup=Разрешение предо�тавл�ет��, по�кольку уна�ледовал от одного из пользователей в группы.
 Inherited=Уна�ледованный
 UserWillBeInternalUser=Созданный пользователь будет внутреннего пользовател� (потому что не �в�заны � определенным третьим лицам)
@@ -110,3 +110,8 @@ UserLogged=Пользователь вошел
 DateEmployment=Дата начала трудоу�трой�тва
 DateEmploymentEnd=Дата окончани� зан�то�ти
 CantDisableYourself=Вы не можете отключить �вою �об�твенную запи�ь пользовател�
+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
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 0b410a27fbd..94d11400665 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index b61fb750c2b..84124c3fb7f 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Poznámka: No limit je nastavený v konfigurácii PHP
 MaxSizeForUploadedFiles=Maximálna veľkosť nahraných súborov (0, aby tak zabránil akejkoľvek odosielanie)
 UseCaptchaCode=Pomocou grafického kód (CAPTCHA) na prihlasovacej stránke
-AntiVirusCommand= Úplná cesta k antivírusovej príkazu
-AntiVirusCommandExample= Príklad pre ClamWin: C: \\ PROGRA ~ 1 \\ ClamWin \\ bin \\ clamscan.exe <br> Príklad pre ClamAV: / usr / bin / clamscan
+AntiVirusCommand=Úplná cesta k antivírusovej príkazu
+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= Ďalšie parametre príkazového riadka
-AntiVirusParamExample= Príklad ClamWin: - databáza = &quot;C: \\ Program Files (x86) \\ ClamWin \\ lib&quot;
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Ú�tovné modul nastavenia
 UserSetup=Správa užívateľov Nastavenie
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funkcia zakázaný v demo
 FeatureAvailableOnlyOnStable=Táto možnosť je dostupná iba v oficiálnej stabilnej verzií
 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=Iba prvky z <a href="%s">povolených modulov</a> sú uvedené.
-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 (at end of module line) to enable/disable a module/application.
+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=Viac modulov na stiahnutie môžete nájst na internete
 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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=External websites for more add-on (non-core) modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Dostupné doplnky
 BoxesActivated=Aktivované doplnky
 ActivateOn=Aktivácia na
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Majte prázdny použiť predvolené hodnoty
 DefaultLink=Východiskový odkaz
 SetAsDefault=Nastaviť ako predvolené
 ValueOverwrittenByUserSetup=Pozor, táto hodnota môže byť prepísaná užívateľom špecifické nastavenia (každý užívateľ môže nastaviť vlastné clicktodial url)
-ExternalModule=Externý modul - inštalovaný do adresára %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Masové na�ítanie �iarových kódov alebo reset pre produkty alebo služby
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Okres
 DictionaryCountry=Štáty
 DictionaryCurrency=Platobné meny
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Typy udalostí agendy
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Sadzby DPH alebo Sociálnej dane
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Nepoužívajte druhá daň
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=V predvolenom nastavení je navrhovaná IRPF je 0. Koniec vlády.
 LocalTax2IsUsedExampleES=V Španielsku, na voľnej nohe a nezávislí odborníci, ktorí poskytujú služby a firmy, ktorí sa rozhodli daňového systému modulov.
 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 des 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=Vypisy lokálnej dane
 CalcLocaltax1=Predaj - Platba
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Platby
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=Predaje
 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 používa v predvolenom nastavení, pokiaľ nie je preklad možno nájsť kód
 LabelOnDocuments=Štítok na dokumenty
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informácie je rôzne technické informácie získate v režime iba pre �ítanie a viditeľné len pre správcov.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Užívatelia modul nastavenia
 UserMailRequired=Email required to create a new user
+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 #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Faktura�né doklady modely
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Force faktúry dátum Dátum overenia
-SuggestedPaymentModesIfNotDefinedInInvoice=Navrhované platby režime na faktúre v predvolenom nastavení, ak nie je definovaný pre faktúry
+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=Voľný text na faktúrach
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=Obchodné návrhy modul nastavenia
 ProposalsNumberingModules=Komer�né návrh �íslovanie modely
 ProposalsPDFModules=Komer�né návrh doklady modely
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Voľný text o obchodných návrhov
 WatermarkOnDraftProposal=Vodoznak na predlôh návrhov komer�ných (none ak prázdny)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
@@ -1322,6 +1332,7 @@ 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=Objednávky �íslovanie modelov
 OrdersModelModule=Objednať dokumenty modely
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 3f27a2822d7..24fb68ab4e1 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=dodávatelia faktúry
 Payment=Platba
-PaymentBack=Platba späť
-CustomerInvoicePaymentBack=Platba späť
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Platby
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Platené späť
 DeletePayment=Odstrániť platby
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Prijaté platby
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Zaplatiť
 ToMakePaymentBack=Oplatiť
 ListOfYourUnpaidInvoices=Zoznam nezaplatených faktúr
 NoteListOfYourUnpaidInvoices=Poznámka: Tento zoznam obsahuje iba faktúry pre tretie strany si sú prepojené ako obchodného zástupcu.
-RevenueStamp=Kolek
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Faktúra zmazaná
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/sk_SK/blockedlog.lang b/htdocs/langs/sk_SK/blockedlog.lang
index 4aa4b7616f7..bce0ea3bd25 100644
--- a/htdocs/langs/sk_SK/blockedlog.lang
+++ b/htdocs/langs/sk_SK/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 44096e6bc4d..aabc1f6d1ef 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Pridať tento �lánok
 RestartSelling=Vráťte sa na predaj
 SellFinished=Predaj ukon�ený
 PrintTicket=Tla� vstupeniek
+SendTicket=Send ticket
 NoProductFound=Žiadny �lánok nájdených
 ProductFound=výrobky, ktoré sa
 NoArticle=Žiadny �lánok
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb faktúr
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index ba91a15b328..01282f4f853 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Spolo�nosť &quot;%s&quot; vymazaný z databázy.
 ListOfContacts=Zoznam kontaktov adries /
 ListOfContactsAddresses=Zoznam kontaktov adries /
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Zobraziť kontakt
 ContactsAllShort=VÅ¡etko (Bez filtra)
 ContactType=Kontaktujte typ
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 859d3e5ae70..49dc4cebc1c 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Uvedené sumy sú so všetkými daňami
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=Krátky názov
+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
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index e75d00a8928..2f24a7664d6 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Súbor nedostali úplne servera.
 ErrorNoTmpDir=Do�asné direct %s neexistuje.
 ErrorUploadBlockedByAddon=Pridať zablokovaný PHP / Apache pluginu.
 ErrorFileSizeTooLarge=Súbor je príliš veľký.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Veľkosť príliš dlhá pre typ int (%s �íslice maximum)
 ErrorSizeTooLongForVarcharType=Veľkosť príliš dlho typu string (%s znakov maximum)
 ErrorNoValueForSelectType=Vyplňte, prosím, hodnotu zoznamu vyberte
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index acefbcaba3c..d635526db59 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maximálna pamäť pre relácie v PHP je nastavená na <b>%s</b>. To by malo sta�iť.
 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.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Vaše nainštalované PHP nepodporuje 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=Adresár %s neexistuje.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/sk_SK/link.lang b/htdocs/langs/sk_SK/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/sk_SK/link.lang
+++ b/htdocs/langs/sk_SK/link.lang
@@ -8,3 +8,4 @@ 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/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 2235e30da51..fc8cb12b03f 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informácie
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 2cf453311ea..f288b52c783 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=Žiadne údaje nie sú k klonovať definovaný.
 Of=z
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=Zobrazenie zoznamu
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Ahoj
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index ad1fb336b1f..af9a401705e 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Názov
 WEBSITE_DESCRIPTION=Popis
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index ec2e1a7a291..503c6d5da77 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=Hromadné na�ítanie �iarového kódu
 MassBarcodeInitDesc=Tu môžete na�ítať �iarový kód pre produkt kde nie je definovaný. Skontroluje pred na�ítaním modulu �iarového kódu
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Krajina pôvodu
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 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 6151c06cbb8..6563c5fe07c 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=ÄŒas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Plánované zaťaženie
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nová faktúra
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/sk_SK/receiptprinter.lang b/htdocs/langs/sk_SK/receiptprinter.lang
index 4b6b0f8b42c..bb556776a93 100644
--- a/htdocs/langs/sk_SK/receiptprinter.lang
+++ b/htdocs/langs/sk_SK/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Fiktívna tla�iareň
 CONNECTOR_NETWORK_PRINT=Sieťová tla�iareň
 CONNECTOR_FILE_PRINT=Lokálna tla�iareň
 CONNECTOR_WINDOWS_PRINT=Lokálna Windows tla�iareň
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Testovacia tla�iareň, ni� nerobí
 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=Základný profil
 PROFILE_SIMPLE=Jednoduchý profil
 PROFILE_EPOSTEP=Epos Tep Profil
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Faktúra 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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapitál
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/sk_SK/stripe.lang b/htdocs/langs/sk_SK/stripe.lang
index b8fc19af2e8..dca68cf8cda 100644
--- a/htdocs/langs/sk_SK/stripe.lang
+++ b/htdocs/langs/sk_SK/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Názov dodávateľa
 CSSUrlForPaymentForm=CSS štýlov url platobného formulára
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index 866513bc538..a5c18482b77 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Povolenie udelené, pretože dedia z jednej zo skupiny užívateľov.
 Inherited=Zdedený
 UserWillBeInternalUser=Vytvorený užívateľ bude interný užívateľ (pretože nie je spojený s ur�itou treťou stranou)
@@ -110,3 +110,8 @@ UserLogged=Užívateľ prihlásený
 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
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 6881e75021b..c1ecdc37147 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Zobraziť stránku na novej karte
 SetAsHomePage=Nastaviť ako domovskú stránku
 RealURL=Skuto�ná URL
 ViewWebsiteInProduction=Zobraziť web stránku použitím domovskej URL
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 23ec165b087..5ce59884f3d 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Opomba: V vaši PHP konfiguraciji ni nastavljenih omejitev
 MaxSizeForUploadedFiles=Najve�ja velikost prenesene datoteke (0 za prepoved vseh prenosov)
 UseCaptchaCode=Na prijavni strani uporabi grafi�no kodo (CAPTCHA)
-AntiVirusCommand= Celotna pot za antivirusno ukazno vrstico
-AntiVirusCommandExample= Primer za ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Primer za ClamAv: /usr/bin/clamscan
+AntiVirusCommand=Celotna pot za antivirusno ukazno vrstico
+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= Ve� parametrov v ukazni vrstici
-AntiVirusParamExample= Primer za ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Nastavitve ra�unovodskega modula
 UserSetup=Nastavitve upravljanja uporabnikov
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funkcija onemogo�ena v demo razli�ici
 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=Prikazani so samo elementi <a href="%s">omogo�enih modulov </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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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=Glejte nastavitev modula %s
 Updated=Updated
 Nouveauté=Novelty
 AchatTelechargement=Buy / Download
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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=Aktiviran na
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Pusti prazno za uporabo privzete vrednosti
 DefaultLink=Privzeta povezava
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Pozor, ta vrednost bo morda prepisana s specifi�no nastavitvijo uporabnika (vsak uporabnik lahko nastavi lastno povezavo za klic s klikom)
-ExternalModule=Zunanji modul - nameš�en v mapo %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Vzpostavitev ali resetiranje masovne �rtne kode za proizvode in storitve
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regije
 DictionaryCountry=Države
 DictionaryCurrency=Valute
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Stopnje DDV ali davkov
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=Stopnja
 LocalTax1IsNotUsed=Ne uporabi drugega davka
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=Privzeto predlagani IRPF je 0. Konec pravila.
 LocalTax2IsUsedExampleES=V Španiji, samostojnimi in neodvisni strokovnjaki, ki opravljajo storitve in podjetja, ki so se odlo�ili dav�ni sistem modulov.
 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 des 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=Poro�ila o lokalnih davkih
 CalcLocaltax1=Prodaja - Nabava
 CalcLocaltax1Desc=Poro�ila o lokalnih davkih so izra�unana kot razlika med nabavnimi in prodajnimi davki
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Nabava
 CalcLocaltax2Desc=Poro�ila o lokalnih davkih so seštevek nabavnih davkov
 CalcLocaltax3=Prodaja
 CalcLocaltax3Desc=Poro�ila o lokalnih davkih so seštevek prodajnih davkov
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Privzet naziv, �e za kodo ne obstaja prevod
 LabelOnDocuments=Naslov na dokumentu
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Nadzor
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemske informacije so raznovrstne tehni�ne informacije, ki so na voljo samo v bralnem na�inu in jih vidi samo administrator.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=Nastavitve modula uporabnikov
 UserMailRequired=Email required to create a new user
+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 #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Modeli obrazcev ra�unov
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=Vsili datum ra�una kot datum potrditve
-SuggestedPaymentModesIfNotDefinedInInvoice=Privzet predlagan na�in pla�ila na ra�unu, �e ni definiran druga�en na�in
+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=Poljubno besedilo na ra�unu
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=Nastavitve modula za komercialne ponudbe
 ProposalsNumberingModules=Moduli za števil�enje komercialnih ponudb
 ProposalsPDFModules=Modeli obrazcev komercialnih ponudb
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi
 WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, �e je prazno)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vprašajte za ciljni ban�ni ra�un ponudbe
@@ -1322,6 +1332,7 @@ 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=Moduli za števil�enje naro�il
 OrdersModelModule=Modeli obrazcev naro�il
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 2f982841f8b..31b4151c077 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=Ra�uni dobaviteljev
 Payment=Pla�ilo
-PaymentBack=Vrnitev pla�ila
-CustomerInvoicePaymentBack=Vrnitev pla�ila
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Pla�ila
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Vrnjeno pla�ilo
 DeletePayment=Brisanje pla�ila
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Prejeta pla�ila
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pla�ati
 ToMakePaymentBack=Vrniti pla�ilo
 ListOfYourUnpaidInvoices=Seznam nepla�anih ra�unov
 NoteListOfYourUnpaidInvoices=Opomba: Ta seznam vsebuje samo ra�une za partnerje, ki so povezani z referentom.
-RevenueStamp=Žig prihodka
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/sl_SI/blockedlog.lang b/htdocs/langs/sl_SI/blockedlog.lang
index 45943d31b76..84dc7eb9c06 100644
--- a/htdocs/langs/sl_SI/blockedlog.lang
+++ b/htdocs/langs/sl_SI/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index c837cdf5f5d..8238cbd78d0 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Dodaj ta proizvod
 RestartSelling=Vrni se na prodajo
 SellFinished=Sale complete
 PrintTicket=Natisni ra�un
+SendTicket=Send ticket
 NoProductFound=Proizvod ne obstaja
 ProductFound=Najden proizvod
 NoArticle=Ni proizvoda
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Število ra�unov
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 4ae82256d89..912b2494f8e 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Podjetje "%s" izbrisano iz baze.
 ListOfContacts=Seznam kontaktov
 ListOfContactsAddresses=Seznam kontaktov
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Pokaži kontakt
 ContactsAllShort=Vsi (brez filtra)
 ContactType=Vrsta kontakta
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index f10f0569bd5..4af0e6f6512 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Prikazane vrednosti vklju�ujejo vse davke
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=Kratek naziv
+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
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 276aa6fc50e..58c06bd93f3 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -59,6 +59,7 @@ 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.
 ErrorFileSizeTooLarge=Datoteka je prevelika.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Velikost predolgo int tip (%s številke najve�)
 ErrorSizeTooLongForVarcharType=Velikost predolgo za tip za nize (%s znakov najve�)
 ErrorNoValueForSelectType=Please fill value for select list
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index 32184850fbb..6c3e9d43d0d 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maksimalni spomin za sejo vašega PHP je nastavljen na <b>%s</b>. To bi moralo zadoš�ati.
 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.
@@ -26,6 +27,7 @@ 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=Mapa %s ne obstaja.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/sl_SI/link.lang b/htdocs/langs/sl_SI/link.lang
index 3a10359abad..0e71c159759 100644
--- a/htdocs/langs/sl_SI/link.lang
+++ b/htdocs/langs/sl_SI/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Povezava %s je bila odstranjena
 ErrorFailedToDeleteLink= Napaka pri odstranitvi povezave '<b>%s</b>'.
 ErrorFailedToUpdateLink= Napaka pri posodobitvi povezave '<b>%s</b>'.
 URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index ba9d3b65e69..aa37bd15448 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index a8d2be54027..1f758fda89b 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=Ni definiranih podatkov za kloniranje.
 Of=od
@@ -829,6 +830,8 @@ Gender=Spol
 Genderman=Moški
 Genderwoman=Ženska
 ViewList=Glej seznam
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obvezno
 Hello=Pozdravljeni
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 6c6f44e83e2..96dee868c4e 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Naziv
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 1f35bae2caf..876f92df779 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=Vzpostavitev masovne �rtne kode
 MassBarcodeInitDesc=Na tej strani lahko vzpostavite �rtno kodo za objekte, ki �rtne kode nimajo dolo�ene. Pred tem preverite, da je zaklju�ena nastavitev modula za �rtne kode.
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Država porekla
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Kratek naziv
 Unit=Enota
 p=e.
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 2234b08a74c..415d234eec8 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=ÄŒas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planirana delovna obremenitev
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Nov ra�un
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/sl_SI/receiptprinter.lang b/htdocs/langs/sl_SI/receiptprinter.lang
index 0f6086b22fb..406600eff5d 100644
--- a/htdocs/langs/sl_SI/receiptprinter.lang
+++ b/htdocs/langs/sl_SI/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Referenca ra�una
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/sl_SI/stripe.lang b/htdocs/langs/sl_SI/stripe.lang
index 3793e15c016..71e190cf1fa 100644
--- a/htdocs/langs/sl_SI/stripe.lang
+++ b/htdocs/langs/sl_SI/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Ime prodajalca
 CSSUrlForPaymentForm=url CSS vzorca obrazca pla�ila
 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
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index e9c0d301d11..2851c76fc90 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Dovoljenje dodeljeno zaradi podedovanja od druge uporabniške skupine.
 Inherited=Podedovan
 UserWillBeInternalUser=Kreiran uporabnik bo interni uporabnik (ker ni povezan z dolo�enim partnerjem)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 4fda52e2721..f5f8502d7e8 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index e83fede6fe0..73bb36b8597 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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=Bli / Shkarko
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index ab5c2a41c39..c76900fe8a7 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=Lista e faturave të papaguara
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/sq_AL/blockedlog.lang b/htdocs/langs/sq_AL/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/sq_AL/blockedlog.lang
+++ b/htdocs/langs/sq_AL/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 24afe7ea7ad..71618eff28b 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 2aac2fc23b4..514473dbd97 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 7bea59962f2..6d530dd3923 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index ca3ac621bd7..686f2884cca 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/sq_AL/link.lang b/htdocs/langs/sq_AL/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/sq_AL/link.lang
+++ b/htdocs/langs/sq_AL/link.lang
@@ -8,3 +8,4 @@ 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/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 5edad1a7673..7d0a2626fb9 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 824703a6761..998a733182b 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gjinia
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 78d91f32b94..ea794014393 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Title
 WEBSITE_DESCRIPTION=Përshkrimi
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 6f49421dacc..f3aea3ae0f5 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index e51bf91ad44..c7a65cff25d 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/sq_AL/receiptprinter.lang b/htdocs/langs/sq_AL/receiptprinter.lang
index c615b6619d6..0e7cb8a8d7a 100644
--- a/htdocs/langs/sq_AL/receiptprinter.lang
+++ b/htdocs/langs/sq_AL/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy Printer
 CONNECTOR_NETWORK_PRINT=Printer rrjeti
 CONNECTOR_FILE_PRINT=Printer lokal
 CONNECTOR_WINDOWS_PRINT=Printer lokal Windows
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Pritner falso pёr test, s'bёn asgjё
 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/sq_AL/stripe.lang b/htdocs/langs/sq_AL/stripe.lang
index 74d3e35e22c..a40c8e67339 100644
--- a/htdocs/langs/sq_AL/stripe.lang
+++ b/htdocs/langs/sq_AL/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index 84bc13176ae..de230588802 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 9e5c4ba3ff8..c802b2d2ae8 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 6f1b3c1b0c3..658acef8a25 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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=Vidi podešavanja modula %s
 Updated=Updated
 Nouveauté=Novelty
 AchatTelechargement=Buy / Download
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Podešavanja HRM modula
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pitaj za izvorni magacin za narudžbinu
 ##### 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index c2348e4b581..8da848053e3 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=ra�uni dobavlja�a
 Payment=Plaćanje
-PaymentBack=Refundiranje
-CustomerInvoicePaymentBack=Refundiranje
+PaymentBack=Povraćaj
+CustomerInvoicePaymentBack=Povraćaj
 Payments=Plaćanja
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Refundirano
 DeletePayment=Obriši plaćanje
 ConfirmDeletePayment=Da li ste sigurni da želite da obrišete ovu uplatu?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Primljene uplate
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 33f7cac33cb..120721fcf9b 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Dodaj ovaj artikal
 RestartSelling=Vrati se nazad na prodaju
 SellFinished=Prodaja završena
 PrintTicket=Å tampaj kartu
+SendTicket=Send ticket
 NoProductFound=Artikal nije pronađen
 ProductFound=proizvod pronađen
 NoArticle=Nema artikla
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index b3dc0d176c8..d210f745fe3 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Kompanija "%s" je obrisana iz baze.
 ListOfContacts=Lista kontakta/adresa
 ListOfContactsAddresses=Lista kontakta/adresa
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Prikaži kontakt
 ContactsAllShort=Sve (Bez filtera)
 ContactType=Tip kontakta
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 6c862fdd0cc..6e3b7c3777d 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Prikazani su bruto iznosi
-RulesResultDue=- Sadrži sve ra�une, troškove, PDV, donacije, bez obzira da li su uplaćene ili ne. Takođe sadrži isplaćene zarade<br>- Zasniva se na datumu potvrde ra�una i PDV-a i na zadatom datumu troškova. Za zarade definisane u modulu Zarade se koristi vrednosni datum isplate.
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Sadrži realne uplate ra�una, troškova, PDV-a i zarada.<br>- Zasniva se na datumima isplate ra�una, troškova, PDV-a i zarada. Za donacije se zasniva na datumu donacije.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=Kratak naziv
+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
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 0a117fcfffc..9d7c709b7d6 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Fajl nije u celosti primljen na server.
 ErrorNoTmpDir=Privremeni folder %s ne postoji.
 ErrorUploadBlockedByAddon=Upload blokiran PHP/Apache pluginom.
 ErrorFileSizeTooLarge=Fajl je preveliki.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Preduga�ka vrednost za int tip (%s cifara maksimum)
 ErrorSizeTooLongForVarcharType=Preduga�ka vrednost za string tip (%s karaktera maksimum)
 ErrorNoValueForSelectType=Molimo izaberite vrednost u select listi
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog �lana, ali korisnik nije kreiran. To zna�i da je lozinka sa�uvana, ali se �lan ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za �lanove, možete deaktivirati opciju "Upravljanje lozinkama za svakog �lana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je �lan povezan sa korisnikom.
diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
index b5dc57a6069..62075489dad 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Maksimalna memorija za sesije je <b>%s</b>. To bi trebalo biti dovoljno.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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=Folder %s ne postoji.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/sr_RS/link.lang b/htdocs/langs/sr_RS/link.lang
index 81f23a8b366..36e3aaf6aea 100644
--- a/htdocs/langs/sr_RS/link.lang
+++ b/htdocs/langs/sr_RS/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Link %s je uklonjen
 ErrorFailedToDeleteLink= Greška prilikom uklanjanja linka '<b>%s</b>'
 ErrorFailedToUpdateLink= Greška prilikom ažuriranja linka '<b>%s</b>'
 URLToLink=URL za link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index f218481df16..e5c1eb91c6a 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 3c34cb00fe6..5d825d7454e 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=Podaci za dupliranje nisu definisani:
 Of=od
@@ -829,6 +830,8 @@ Gender=Pol
 Genderman=Muško
 Genderwoman=Žensko
 ViewList=Prikaz liste
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obavezno
 Hello=Zdravo
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 30bd32cca66..e5f9f4c63ed 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL stranice
 WEBSITE_TITLE=Naslov
 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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Klju�ne re�i
 LinesToImport=Lines to import
 
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 8db9e1111a7..c48e11cd93e 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=Masivna inicijalizacija bar code-a.
 MassBarcodeInitDesc=Na ovoj strani možete inicijalizovati bar kod za objekte koji još uvek nemaju definisan kod. Prethodno proverite da li je završeno podešavanje modula bar kod.
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Zemlja porekla
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Kratak naziv
 Unit=Jedinica
 p=j.
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index ce609997c1e..3717041a79c 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Vreme
 ListOfTasks=Lista zadataka
 GoToListOfTimeConsumed=Idi na listu utrošenog vremena
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planirano utrošeno vreme
 PlannedWorkloadShort=Utrošeno vreme
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekat prvo mora biti odobren
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Ulaz po danu
 InputPerWeek=Ulaz po nedelji
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Novi ra�un
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index 122c5389901..29da9e8dd7e 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Prava su dodeljena jer su nasleđena od jedne od korisnikovih grupa.
 Inherited=Nasleđeno
 UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije vezan za određeni subjekat)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 18b2269d80c..c8505262020 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Obs! <b> din </b> konfiguration för PHP begränsar för
 NoMaxSizeByPHPLimit=Obs: Ingen gräns som anges i din PHP konfiguration
 MaxSizeForUploadedFiles=Maximala storleken för uppladdade filer (0 att förkasta varje uppladdning)
 UseCaptchaCode=Använd grafisk kod (CAPTCHA) på inloggningssidan
-AntiVirusCommand= Fullständiga sökvägen till antivirus kommandot
-AntiVirusCommandExample= Exempel för ClamWin: C: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe <br> Exempel för clamav: / usr / bin / clamscan
+AntiVirusCommand=Fullständiga sökvägen till antivirus kommandot
+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= Fler parametrar på kommandoraden
-AntiVirusParamExample= Exempel för ClamWin - databas = &quot;C: \\ Program Files (x86) \\ ClamWin \\ lib&quot;
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Redovisning modul inställning
 UserSetup=Användarens hantering inställning
 MultiCurrencySetup=Multi-valuta inställning
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Funktion avstängd i demo
 FeatureAvailableOnlyOnStable=Funktionen är endast tillgänglig på officiella stabila versioner
 BoxesDesc=Widgets är komponenter som visar lite information som du kan lägga till för att anpassa vissa sidor. Du kan välja mellan att visa widgeten eller inte, genom att välja målsida och klicka på "Aktivera", eller genom att klicka på papperskorgen för att inaktivera den.
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
-ModulesDesc=Modulerna / programmen bestämmer vilka funktioner som finns i programvaran. Vissa moduler kräver att behörigheter beviljas användare efter aktivering av modulen. Klicka på på / av-knappen (vid slutet av modullinjen) för att aktivera / inaktivera en modul / applikation.
+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=Du kan hitta fler moduler att ladda ner på externa webbplatser på Internet ...
 ModulesDeployDesc=Om behörigheter i ditt filsystem tillåter det kan du använda det här verktyget för att distribuera en extern modul. Modulen kommer då att visas på fliken <strong> %s </strong>.
 ModulesMarketPlaces=Hitta externa app / moduler
@@ -212,6 +212,7 @@ CompatibleUpTo=Kompatibel med version %s
 NotCompatible=Den här modulen verkar inte vara kompatibel med din Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Den här modulen kräver en uppdatering av din Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Se på marknaden
+SeeSetupOfModule=See setup of module %s
 Updated=Uppdaterad
 Nouveauté=Nyhet
 AchatTelechargement=Köp / Hämta
@@ -221,6 +222,7 @@ DoliPartnersDesc=Lista över företag som tillhandahåller anpassade moduler ell
 WebSiteDesc=Externa webbplatser för fler moduler utan tillägg...
 DevelopYourModuleDesc=Några lösningar för att utveckla din egen modul ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Widgets tillgängliga
 BoxesActivated=Widgets aktiverade
 ActivateOn=Aktivera på
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Lämna tom för standardvärde
 DefaultLink=Standardlänk
 SetAsDefault=Ange som standard
 ValueOverwrittenByUserSetup=Varning, kan detta värde skrivas över av användarspecifik installation (varje användare kan ställa in sin egen clicktodial url)
-ExternalModule=Extern modul - Installerad i katalogen %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass streckkod init för tredje part
 BarcodeInitForProductsOrServices=Mass streckkod init eller återställning efter produkter eller tjänster
 CurrentlyNWithoutBarCode=För närvarande har du  <strong>%s</strong> rader på <strong>%s</strong> %s utan steckkod angett.
@@ -947,7 +950,7 @@ DictionaryCanton=Stater / Provinser
 DictionaryRegion=Regioner
 DictionaryCountry=Länder
 DictionaryCurrency=Valutor
-DictionaryCivility=Behörighetens namn
+DictionaryCivility=Honorific titles
 DictionaryActions=Typer av agendahändelser
 DictionarySocialContributions=Typer av sociala eller skattemässiga skatter
 DictionaryVAT=Moms Priser och Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Den föreslagna försäljningsskatten är som standard 0 som ka
 VATIsUsedExampleFR=I Frankrike betyder det att företag eller organisationer har ett riktigt finanssystem (förenklad verklig eller normal verklig). Ett system där momsen deklareras.
 VATIsNotUsedExampleFR=I Frankrike betyder det föreningar som inte är Försäljningsskatt deklarerade eller företag, organisationer eller liberala yrken som har valt mikroföretagets skattesystem (Försäljningsskatt i franchise) och betalat en franchise Försäkringsskatt utan någon momsdeklaration. Detta val kommer att visa referensen "Ej tillämplig Försäljningsskatt - art-293B av CGI" på fakturor.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Betyg
 LocalTax1IsNotUsed=Använd inte andra skatte
 LocalTax1IsUsedDesc=Använd en andra typ av skatt (annan än den första)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=IRPF-räntan som standard när du skapar prospekt, fakturo
 LocalTax2IsNotUsedDescES=Som standard föreslås IRPF är 0. Slut på regeln.
 LocalTax2IsUsedExampleES=I Spanien, frilansare och oberoende yrkesutövare som tillhandahåller tjänster och företag som har valt skattesystemet i moduler.
 LocalTax2IsNotUsedExampleES=I Spanien är de företag som inte omfattas av skattesystem för moduler.
+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 des 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=Rapporter om lokala skatter
 CalcLocaltax1=Försäljning - Inköp
 CalcLocaltax1Desc=Lokala skatter rapporter beräknas med skillnaden mellan localtaxes försäljning och localtaxes inköp
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Inköp
 CalcLocaltax2Desc=Lokala skatter rapporter är summan av localtaxes inköp
 CalcLocaltax3=Försäljning
 CalcLocaltax3Desc=Lokala skatter rapporter är summan av localtaxes försäljning
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Etikett som används som standard om ingen översättning kan hittas för kod
 LabelOnDocuments=Etikett på dokument
 LabelOrTranslationKey=Etikett eller översättningstangent
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Utläggsrapport att godkänna
 Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Innan du börjar använda Dolibarr måste vissa initialparametrar definieras och moduler aktiveras / konfigureras.
 SetupDescription2=Följande två avsnitt är obligatoriska (de två första inmatningarna i inställningsmenyn):
-SetupDescription3= <a href="%s"> %s -> %s </a> <br> Grundläggande parametrar som används för att anpassa standardbeteendet för din applikation (t.ex. för landrelaterade funktioner).
-SetupDescription4= <a href="%s"> %s -> %s </a> <br> Denna programvara är en serie med många moduler / applikationer, allt mer eller mindre oberoende. Modulerna som är relevanta för dina behov måste aktiveras och konfigureras. Nya objekt / alternativ läggs till i menyer med aktivering av en modul.
+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
 Audit=Revision
@@ -1128,7 +1136,7 @@ LogEventDesc=Aktivera loggning för specifika säkerhetshändelser. Administrat
 AreaForAdminOnly=Inställningsparametrar kan ställas in av <b> endast administratörs användare </b>.
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
 SystemAreaForAdminOnly=Det här området är endast tillgängligt för administratörsanvändare. Dolibarr användarbehörigheter kan inte ändra denna begränsning.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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=Parametrar som påverkar utseende och beteende hos Dolibarr kan ändras här.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Regler för att generera och bekräfta lösenord
 DisableForgetPasswordLinkOnLogonPage=Visa inte länken "Glömt lösenord" på sidan Inloggning
 UsersSetup=Användare modul inställning
 UserMailRequired=E-post krävs för att skapa en ny användare
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Inställning av HRM-modulen
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Faktura dokument modeller
 BillsPDFModulesAccordindToInvoiceType=Faktura dokumentmodeller enligt fakturatyp
 PaymentsPDFModules=Betalningsdokumentmodeller
 ForceInvoiceDate=Force fakturadatum till giltighetsdatum
-SuggestedPaymentModesIfNotDefinedInInvoice=Föreslagna betalningar läge på faktura som standard om inte definierat för faktura
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Föreslå betalning genom uttag på konto
 SuggestPaymentByChequeToAddress=Föreslå betalning med check till
 FreeLegalTextOnInvoices=Fri text på fakturor
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Inställningar för leverantörsbetalningar
 PropalSetup=Kommersiella förslag modul inställning
 ProposalsNumberingModules=Kommersiella förslag numrering moduler
 ProposalsPDFModules=Kommersiella förslag dokument modeller
-SuggestedPaymentModesIfNotDefinedInProposal=Förslag till betalningsläge på förslag som standard om det inte är definierat för förslag
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Fri text på affärsförslag
 WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Be om lagerkälla för order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Be om kontokortdestination för inköpsorder
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Försäljningsorderhanteringsinställningar
 OrdersNumberingModules=Beställningar numrering moduler
 OrdersModelModule=Beställ dokument modeller
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Varning, högre värden sänker dramati
 ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Exportmodeller delas med alla
 ExportSetup=Inställning av modul Export
+ImportSetup=Setup of module Import
 InstanceUniqueID=Unikt ID för förekomsten
 SmallerThan=Mindre än
 LargerThan=Större än
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index d802fcefff9..a2e64a6b307 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Leverantörer fakturor
 SupplierBill=Leverantörsfaktura
 SupplierBills=leverantörer fakturor
 Payment=Betalning
-PaymentBack=Betalning tillbaka
-CustomerInvoicePaymentBack=Betalning tillbaka
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Betalningar
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=i faktura valuta
 PaidBack=Ã…terbetald
 DeletePayment=Radera betalning
 ConfirmDeletePayment=Är du säker på att du vill radera denna betalning?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Leverantörsbetalningar
 ReceivedPayments=Mottagna betalningar
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Visa lägesfaktura
 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
@@ -509,11 +512,11 @@ ToMakePayment=Betala
 ToMakePaymentBack=Ã…terbetala
 ListOfYourUnpaidInvoices=Lista över obetalda fakturor
 NoteListOfYourUnpaidInvoices=OBS: Denna lista innehåller bara fakturor för tredje parti som du är kopplade till som en försäljning representant.
-RevenueStamp=Intäkt stämpel
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Det här alternativet är endast tillgängligt när du skapar en faktura från fliken "Kund" från tredje part
 YouMustCreateInvoiceFromSupplierThird=Det här alternativet är endast tillgängligt när du skapar en faktura från fliken "Leverantör" till tredje part
 YouMustCreateStandardInvoiceFirstDesc=Du måste först skapa en standardfaktura och konvertera den till "mall" för att skapa en ny mallfaktura
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=Ange slutdatum för servicelinje med nästa fakturadatum
 AutoFillDateToShort=Ange slutdatum
 MaxNumberOfGenerationReached=Max antal gen. nådde
 BILL_DELETEInDolibarr=Faktura deleted
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/sv_SE/blockedlog.lang b/htdocs/langs/sv_SE/blockedlog.lang
index 192f1020baa..480f38a923d 100644
--- a/htdocs/langs/sv_SE/blockedlog.lang
+++ b/htdocs/langs/sv_SE/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Oföränderliga loggar
 ShowAllFingerPrintsMightBeTooLong=Visa alla arkiverade loggar (kan vara långa)
 ShowAllFingerPrintsErrorsMightBeTooLong=Visa alla icke-giltiga arkivloggar (kan vara långa)
 DownloadBlockChain=Ladda ner fingeravtryck
-KoCheckFingerprintValidity=Arkiverad loggpost är inte giltig. Det betyder att någon (en hackare?) Har ändrat vissa data av det här reet efter det har spelats in eller har raderat den tidigare arkiverade posten (kontrollera den raden med tidigare # existerar).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Arkiverad loggpost är giltig. Uppgifterna på den här raden ändrades inte och posten följer den föregående.
 OkCheckFingerprintValidityButChainIsKo=Arkiverad logg verkar giltig jämfört med tidigare men kedjan förstördes tidigare.
 AddedByAuthority=Lagras i fjärrmyndighet
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 37ff85fd139..9db8feed413 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Lägg till den här artikeln
 RestartSelling=Gå tillbaka på sälj
 SellFinished=Försäljning avslutad
 PrintTicket=Skriv ut biljetten
+SendTicket=Send ticket
 NoProductFound=Ingen artikel hittades
 ProductFound=Produkt hittad
 NoArticle=Ingen artikel
@@ -48,6 +49,7 @@ Footer=sidfot
 AmountAtEndOfPeriod=Belopp vid periodens utgång (dag, månad eller år)
 TheoricalAmount=Teoretisk mängd
 RealAmount=Verklig mängd
+CashFence=Cash fence
 CashFenceDone=Kassaskydd gjord för perioden
 NbOfInvoices=Antal av fakturor
 Paymentnumpad=Typ av kudde för att komma in i betalningen
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS behöver produktkategorier för att fungera
 OrderNotes=Beställ anteckningar
 CashDeskBankAccountFor=Standardkonto som ska användas för betalningar i
 NoPaimementModesDefined=Inget paimentläge definierat i TakePOS-konfiguration
-TicketVatGrouped=Grupp moms enligt sats i biljetter
-AutoPrintTickets=Skriv ut biljetter automatiskt
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Aktivera funktioner för bar eller restaurang
 ConfirmDeletionOfThisPOSSale=Bekräftar du att du har raderat den aktuella försäljningen?
 ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 1061325c921..28d99141d05 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Företaget "%s" raderad från databasen.
 ListOfContacts=Lista med kontakter / adresser
 ListOfContactsAddresses=Lista med kontakter / adresser
 ListOfThirdParties=Förteckning över tredjeparter
-ShowCompany=Visa tredjepart
 ShowContact=Visa kontakt
 ContactsAllShort=Alla (inget filter)
 ContactType=Kontakttyp
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Förnamn på försäljningsrepresentant
 SaleRepresentativeLastname=Efternamn för försäljare
 ErrorThirdpartiesMerge=Ett fel uppstod vid borttagning av tredjepart. Kontrollera loggen. Ändringar har återställts.
 NewCustomerSupplierCodeProposed=Kunder eller leverantörskod som redan används, föreslås en ny kod
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Betalningstyp - Kund
 PaymentTermsCustomer=Betalningsvillkor - Kund
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 18229edd1cf..defa9852e23 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Se %sanalys av payments%s för en beräkning av fakti
 SeeReportInDueDebtMode=Se %sanalys av fakturor%s för en beräkning baserad på kända inspelade fakturor, även om de ännu inte är redovisade i huvudboken.
 SeeReportInBookkeepingMode=Se <b> %sBokföringsrapport%s </b> för en beräkning på <b> Bokföring huvudboken tabell </b>
 RulesAmountWithTaxIncluded=- Belopp som visas är med alla skatter inkluderade
-RulesResultDue=- Det inkluderar utestående fakturor, utgifter, moms, donationer om de betalas eller inte. Ingår även betalda löner. <br> - Det baseras på datum för bekräftande för fakturor och moms och på förfallodagen för utgifter. För löner som definieras med lönemodul används värdet för betalningen.
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Det inkluderar de reala betalningarna på fakturor, utgifter, moms och löner. <br> - Det baseras på fakturadatum för fakturor, utgifter, moms och löner. Donationsdatum för donation.
-RulesCADue=- Det inkluderar kundens fakturaer om de betalas eller inte. <br> - Det baseras på bekräftandesdatumet för dessa fakturor. <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=- 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.
 RulesAmountOnInOutBookkeepingRecord=Det innehåller post i din huvudboken med bokföringskonto som har gruppen "EXPENSE" eller "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Omsättning fakturerad med försäljningsskattesats
 TurnoverCollectedbyVatrate=Omsättning upptagen med försäljningsskattesats
 PurchasebyVatrate=Inköp med försäljningsskattesats
 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 86bfc3d9a3d..b96d1461a0e 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=Handlingar den mottagit inte helt av server.
 ErrorNoTmpDir=Tillfälliga directy %s inte existerar.
 ErrorUploadBlockedByAddon=Ladda upp blockeras av en PHP / Apache plugin.
 ErrorFileSizeTooLarge=Filen är för stor.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Storlek för lång för int typ (%s siffror max)
 ErrorSizeTooLongForVarcharType=Storlek för lång för sträng typ (%s tecken max)
 ErrorNoValueForSelectType=Vänligen fyll i värde för utvald lista
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index 491874ee286..cdce0b03cda 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Detta PHP stöder Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=Detta PHP stöder UTF8 funktioner.
 PHPSupportIntl=Detta PHP stöder Intl-funktioner.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Din PHP max session minne är inställt på <b>%s.</b> Detta bör vara nog.
 PHPMemoryTooLow=Ditt PHP max-sessionminne är inställt på <b> %s </b> bytes. Detta är för lågt. Ändra din <b> php.ini </b> för att ställa in <b> memory_limit </b> parameter till minst <b> %s </b> bytes.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Din PHP-installation stöder inte Curl.
 ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
 ErrorPHPDoesNotSupportUTF8=Din PHP-installation stöder inte UTF8-funktioner. Dolibarr kan inte fungera korrekt. Lös det här innan du installerar Dolibarr.
 ErrorPHPDoesNotSupportIntl=Din PHP-installation stöder inte Intl-funktioner.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
 ErrorDirDoesNotExists=Nummer %s finns inte.
 ErrorGoBackAndCorrectParameters=GÃ¥ tillbaka och kontrollera / korrigera parametrarna.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Applikationen försökte självuppgradera, men in
 YouTryInstallDisabledByFileLock=Applikationen försökte självuppgradera, men installations- / uppgraderingssidorna har inaktiverats för säkerhet (genom att det finns en låsfil <strong> install.lock </strong> i katalogen dolibarr documents). <br>
 ClickHereToGoToApp=Klicka här för att gå till din ansökan
 ClickOnLinkOrRemoveManualy=Klicka på följande länk. Om du alltid ser samma sida måste du ta bort / byta namn på filen install.lock i dokumentkatalogen.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/sv_SE/link.lang b/htdocs/langs/sv_SE/link.lang
index 2abbb488f14..123ec53d089 100644
--- a/htdocs/langs/sv_SE/link.lang
+++ b/htdocs/langs/sv_SE/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Länken %s har tagits bort
 ErrorFailedToDeleteLink= Det gick inte att ta bort länk '<b>%s</b>'
 ErrorFailedToUpdateLink= Det gick inte att uppdatera länken '<b>%s</b>'
 URLToLink=URL för länk
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index b9b24d111c8..0ba4ba088f7 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Ingen kontakt / adress med en kategori hittad
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakt / adress med en kategori hittad
 OutGoingEmailSetup=Utgående e-postinstallation
 InGoingEmailSetup=Inkommande e-postinstallation
-OutGoingEmailSetupForEmailing=Utgående e-postuppsättning (för massmailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Standard utgående e-postinstallation
 Information=Information
 ContactsWithThirdpartyFilter=Kontakter med filter från tredje part
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 0e50639d12d..96783492da5 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=Inga uppgifter att klona definierade.
 Of=av
@@ -829,6 +830,8 @@ Gender=Kön
 Genderman=Man
 Genderwoman=Kvinna
 ViewList=Visa lista
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Obligatorisk
 Hello=Hallå
 GoodBye=Adjö
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 9eeffcccdb4..f26e71b3a70 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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=Försäljningsorder bekräftat
 Notify_ORDER_SENTBYMAIL=Försäljningsorder skickad via post
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Beställningsorder skickad via e-post
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=Webbadressen
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Beskrivning
 WEBSITE_IMAGE=Bild
-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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Nyckelord
 LinesToImport=Rader att importera
 
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index b6d4440a3e5..8e916fcbdf3 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Detta verktyg uppdaterar mervärdesskattesatsen som def
 MassBarcodeInit=Massvis streckkodinitiering
 MassBarcodeInitDesc=Denna sida kan användas för att initialisera en streckkod på objekt som inte har någon streckkod definierad. Kontrollera först att streckkodsmodulen har fullständiga inställningar.
 ProductAccountancyBuyCode=Redovisningskod (köp)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Redovisningskod (försäljning)
 ProductAccountancySellIntraCode=Redovisningskod (försäljning inom gemenskapen)
 ProductAccountancySellExportCode=Redovisningskod (försäljningsexport)
@@ -165,7 +167,7 @@ SuppliersPrices=Leverantörspriser
 SuppliersPricesOfProductsOrServices=Leverantörspriser (av produkter eller tjänster)
 CustomCode=Tull / Varu / HS-kod
 CountryOrigin=Ursprungsland
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Kort etikett
 Unit=Enhet
 p=u.
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 1b943aef3cc..094019b2be1 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Tid
 ListOfTasks=Lista över uppgifter
 GoToListOfTimeConsumed=Gå till listan över tidskrävt
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslagen relaterade till projektet
 ListOrdersAssociatedProject=Förteckning över försäljningsorder relaterade till projektet
@@ -188,7 +186,7 @@ PlannedWorkload=Planerad arbetsbelastning
 PlannedWorkloadShort=Arbetsbelastning
 ProjectReferers=Relaterade saker
 ProjectMustBeValidatedFirst=Projekt måste bekräftas först
-FirstAddRessourceToAllocateTime=Tilldela en användarresurs till uppgift för att allokera tid
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Ingång per dag
 InputPerWeek=Ingång per vecka
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=Senaste %s modifierade projekten
 OtherFilteredTasks=Andra filtrerade uppgifter
 NoAssignedTasks=Inga tilldelade uppgifter hittades (tilldela projekt / uppgifter till den nuvarande användaren från den övre väljrutan för att ange tid på det)
 ThirdPartyRequiredToGenerateInvoice=En tredje part måste definieras på projekt för att kunna fakturera det.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Tillåt användar kommentarer på uppgifter
 AllowCommentOnProject=Tillåt användar kommentarer på projekt
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Ny faktura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/sv_SE/receiptprinter.lang b/htdocs/langs/sv_SE/receiptprinter.lang
index 50c2ff73257..b4e931e94a2 100644
--- a/htdocs/langs/sv_SE/receiptprinter.lang
+++ b/htdocs/langs/sv_SE/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Dummy-skrivare
 CONNECTOR_NETWORK_PRINT=Nätverksskrivare
 CONNECTOR_FILE_PRINT=Lokal skrivare
 CONNECTOR_WINDOWS_PRINT=Lokal Windows-skrivare
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Fake Printer för test, gör ingenting
 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: hemligt @ datornamn / arbetsgrupp / mottagningsskrivare
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=Standardprofil
 PROFILE_SIMPLE=Enkel profil
 PROFILE_EPOSTEP=Epos Tep Profile
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Faktura 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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Kapital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/sv_SE/stripe.lang b/htdocs/langs/sv_SE/stripe.lang
index 7d7cd49c57f..e4e1a522be6 100644
--- a/htdocs/langs/sv_SE/stripe.lang
+++ b/htdocs/langs/sv_SE/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Namn på leverantör
 CSSUrlForPaymentForm=CSS-formatmall URL för inbetalningskort
 NewStripePaymentReceived=Ny Stripbetalning mottagen
 NewStripePaymentFailed=Ny Stripbetalning försökte men misslyckades
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Hemlig testnyckel
 STRIPE_TEST_PUBLISHABLE_KEY=Publicerbar testnyckel
 STRIPE_TEST_WEBHOOK_KEY=Webhook testnyckel
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 7c65184e1da..36c4c77529d 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -70,7 +70,7 @@ 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=En <b> intern </b> användare är en användare som ingår i ditt företag / organisation. <br> En <b> extern </b> användare är en kund, leverantör eller annan. <br> <br> I båda fallen definierar behörigheter rättigheter på Dolibarr, även extern användare kan ha en annan menyhanterare än intern användare (Se Hem - Inställning - Display)
+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)
 PermissionInheritedFromAGroup=Tillstånd beviljas, eftersom ärvt från en av en användares grupp.
 Inherited=Ärvda
 UserWillBeInternalUser=Skapad användare kommer att vara en intern användare (eftersom inte kopplade till en viss tredje part)
@@ -109,4 +109,9 @@ UserLogoff=Användarutloggning
 UserLogged=Användare loggad
 DateEmployment=Anställningens startdatum
 DateEmploymentEnd=Anställningens slutdatum
-CantDisableYourself=You can't disable your own user record
+CantDisableYourself=Du kan inte inaktivera din egen användarrekord
+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
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 9f7c08790bb..20a211e774d 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Visa sida i ny flik
 SetAsHomePage=Sätt som hemsida
 RealURL=Verklig URL
 ViewWebsiteInProduction=Visa webbplats med hjälp av hemadresser
-SetHereVirtualHost=<u> Använd med Apache / NGinx / ... </u> <br> Om du kan skapa, på din webbserver (Apache, Nginx, ...), en dedikerad Virtual Host med PHP aktiverad och en Root-katalog på <br><strong> %s </strong><br> sedan ställa in namnet på den virtuella värd som du har skapat i egenskaperna hos webbplatsen, så förhandsgranskningen kan också göras med hjälp av den här dedicerade webbserveråtkomsten i stället för den interna Dolibarr-servern.
+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> 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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktivera webbsidokontotabellen
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivera tabellen för att lagra webbplatskonton (inloggning / överföring) för varje webbplats / tredje part
 YouMustDefineTheHomePage=Du måste först definiera standard startsida
-OnlyEditionOfSourceForGrabbedContentFuture=Varning: Skapa en webbsida genom att importera en extern webbsida är reserverad för erfarna användare. Beroende på källsidans komplexitet kan resultatet av importen skilja sig från originalet. Även om källsidan använder vanliga CSS-format eller motstridigt javascript kan det bryta utseendet eller funktionerna på webbplatsredigeraren när du arbetar på den här sidan. Den här metoden är ett snabbare sätt att skapa en sida men det rekommenderas att du skapar din nya sida från början eller från en föreslagen sidmall. <br> Observera att redigeringar av HTML-källan kommer att vara möjliga när sidinnehållet har initierats genom att ta tag i det från en extern sida ("Online" -redigeraren kommer INTE att vara tillgänglig)
+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=Endast upplagan av HTML-källan är möjlig när innehållet greppades från en extern webbplats
 GrabImagesInto=Ta även bilder som finns i css och sidan.
 ImagesShouldBeSavedInto=Bilder ska sparas i katalogen
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 2f36c876c1a..0205f246b0c 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 6d7c61784f7..8c22ce0159a 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 7ddbc71f3e9..f9f00015840 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index c569a48c84a..f8b3d0354e2 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 1de030a1905..6cd046c5607 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/sw_SW/link.lang b/htdocs/langs/sw_SW/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/sw_SW/link.lang
+++ b/htdocs/langs/sw_SW/link.lang
@@ -8,3 +8,4 @@ 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/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 8b92cef3103..7b3bfd3852a 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 686f3ac1849..2082506c405 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 00259d976bc..ba85f51e739 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index d8a3192551f..a31243a07b6 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 94e440f9ab9..cdc0e6b3c95 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index 43fa5342da3..aea4e7676e4 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index a5ff9a413ac..773bab926c6 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=หมายเหตุ: ไม่ จำ�ัด มี�ารตั้งค่าใน�าร�ำหนดค่าของ PHP
 MaxSizeForUploadedFiles=ขนาดสูงสุดของไฟล์ที่อัปโหลด (0 ไม่อนุ�าตให้อัปโหลดใด ๆ )
 UseCaptchaCode=ใช้รหัส�บบ�ราฟิ� (CAPTCHA) บนหน้าเข้าสู่ระบบ
-AntiVirusCommand= เส้นทาง�บบเต็มคำสั่งป้อง�ันไวรัส
-AntiVirusCommandExample= ตัวอย่าง ClamWin: c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe <br> ตัวอย่าง ClamAV: / usr / bin / clamscan
+AntiVirusCommand=เส้นทาง�บบเต็มคำสั่งป้อง�ันไวรัส
+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= พารามิเตอร์เพิ่มเติมเ�ี่ยว�ับบรรทัดคำสั่ง
-AntiVirusParamExample= ตัวอย่าง ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=บั�ชี�ารติดตั้งโมดูล
 UserSetup=�ารตั้งค่า�ารจัด�ารผู้ใช้
 MultiCurrencySetup=Multi-currency setup
@@ -199,7 +199,7 @@ 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.
 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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=ดู�ารตั้งค่าของโมดูล% s
 Updated=Updated
 Nouveauté=Novelty
 AchatTelechargement=Buy / Download
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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=เปิดใช้งานบน
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=ให้ว่างเพื่อใช้ค่าเ
 DefaultLink=เริ่มต้น�ารเชื่อมโยง
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=คำเตือนค่านี้อาจถู�เขียนทับโดย�ารตั้งค่าของผู้ใช้เฉพาะ (ผู้ใช้�ต่ละคนสามารถตั้งค่า URL clicktodial ของตัวเอง)
-ExternalModule=โมดูลภายนอ� - ติดตั้งลงในไดเร�ทอรี% s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=init บาร์โค้ดมวลหรือตั้งค่าสำหรับผลิตภัณฑ์หรือบริ�าร
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=ภูมิภาค
 DictionaryCountry=ประเทศ
 DictionaryCurrency=ส�ุลเงิน
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=ภาษีมูลค่าเพิ่มราคาหรืออัตราภาษี�ารขาย
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=ประเมิน
 LocalTax1IsNotUsed=อย่าใช้ภาษีที่สอง
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=โดยค่าเริ่มต้น IRPF เสนอคือ 0 สิ้นสุดของ�ารป�ครอง
 LocalTax2IsUsedExampleES=ในสเปนมือปืนรับจ้าง�ละอาชีพอิสระที่ให้บริ�าร�ละ บริษัท ที่ได้รับเลือ�ให้ระบบภาษีของโมดูล
 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 des 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=รายงานเ�ี่ยว�ับภาษีท้องถิ่น
 CalcLocaltax1=ขาย - ซื้อ
 CalcLocaltax1Desc=รายงานภาษีท้องถิ่นที่มี�ารคำนวณมีความ�ต�ต่างระหว่าง�ารขาย�ละ�ารซื้อ localtaxes localtaxes
@@ -1018,6 +1025,7 @@ CalcLocaltax2=�ารสั่งซื้อสินค้า
 CalcLocaltax2Desc=รายงานภาษีท้องถิ่นรวมของ�ารซื้อ localtaxes
 CalcLocaltax3=ขาย
 CalcLocaltax3Desc=รายงานภาษีท้องถิ่นรวมของยอดขาย localtaxes
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=ฉลา�ใช้โดยเริ่มต้นถ้า�ปลไม่สามารถพบได้สำหรับรหัส
 LabelOnDocuments=ป้ายเ�ี่ยว�ับเอ�สาร
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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=ตรวจสอบเหตุ�ารณ์�ารรั�ษาความปลอดภัย
 Audit=�ารตรวจสอบบั�ชี
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=ผู้ใช้ติดตั้งโมดูล
 UserMailRequired=Email required to create a new user
+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 #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=รูป�บบเอ�สารใบ�จ้งหนี
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=Payment documents models
 ForceInvoiceDate=วันที่ใบ�จ้งหนี้�องทัพวันที่ตรวจสอบ
-SuggestedPaymentModesIfNotDefinedInInvoice=โหมด�ารชำระเงินในใบ�จ้งหนี้ที่�นะนำโดยค่าเริ่มต้นหา�ไม่ได้�ำหนดไว้สำหรับใบ�จ้งหนี้
+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=ข้อความฟรีในใบ�จ้งหนี้
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=ข้อเสนอเชิงพาณิชย์�ารติดตั้งโมดูล
 ProposalsNumberingModules=จำนวนข้อเสนอในเชิงพาณิชย์รุ่น
 ProposalsPDFModules=เอ�สารข้อเสนอในเชิงพาณิชย์รุ่น
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=ข้อความฟรีเ�ี่ยว�ับข้อเสนอในเชิงพาณิชย์
 WatermarkOnDraftProposal=ลายน้ำในร่างข้อเสนอในเชิงพาณิชย์ (ไม่มีถ้าว่างเปล่า)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=ขอปลายทางบั�ชีธนาคารของข้อเสนอ
@@ -1322,6 +1332,7 @@ 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=สั่งซื้อจำนวนรุ่น
 OrdersModelModule=เอ�สาร�ารสั่งซื้อรุ่น
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 61606afb95b..c78795bd6d4 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=ซัพพลายเออร์ใบ�จ้งหนี้
 Payment=�ารชำระเงิน
-PaymentBack=�ารชำระเงิน�ลับ
-CustomerInvoicePaymentBack=�ารชำระเงิน�ลับ
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=วิธี�ารชำระเงิน
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=จ่ายคืน
 DeletePayment=ลบ�ารชำระเงิน
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=�ารชำระเงินที่ได้รับ
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=จ่ายเงิน
 ToMakePaymentBack=คืนทุน
 ListOfYourUnpaidInvoices=ราย�ารของใบ�จ้งหนี้ที่ค้างชำระ
 NoteListOfYourUnpaidInvoices=หมายเหตุ: ราย�ารนี​​้จะมีใบ�จ้งหนี้เฉพาะบุคคลที่สามคุณจะเชื่อมโยง�ับ�ารเป็นตัว�ทนขาย
-RevenueStamp=อา�ร�สตมป์
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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 ไม่มี
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/th_TH/blockedlog.lang b/htdocs/langs/th_TH/blockedlog.lang
index b7e41472b88..88511cd5fbd 100644
--- a/htdocs/langs/th_TH/blockedlog.lang
+++ b/htdocs/langs/th_TH/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index e128eaefc3a..37114cb5d8f 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=เพิ่มบทความนี้
 RestartSelling=�ลับไปขาย
 SellFinished=Sale complete
 PrintTicket=ตั๋วพิมพ์
+SendTicket=Send ticket
 NoProductFound=บทความไม่พบ
 ProductFound=สินค้าที่พบ
 NoArticle=บทความไม่มี
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=nb ของใบ�จ้งหนี้
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 7bfd0bcff28..3cb75476145 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=บริษัท "% s" ลบออ�จา��านข้
 ListOfContacts=รายชื่อผู้ติดต่อ / ที่อยู่
 ListOfContactsAddresses=รายชื่อผู้ติดต่อ / ที่อยู่
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=�สดงรายชื่อผู้ติดต่อ
 ContactsAllShort=ทั้งหมด (ไม่�รอง)
 ContactType=ประเภทติดต่อ
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 5d8340365f7..9b30b80baca 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- จ�านวนเงินที่�สดงเป็น�ับภาษีรวมทั้งหมด
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=ป้ายสั้น
+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
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index fa3e3db00dd..a300df92288 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=ไฟล์ไม่ได้รับอย่างสมบ
 ErrorNoTmpDir=ชั่วคราวโดยตรงได้% s ไม่ได้มีอยู่
 ErrorUploadBlockedByAddon=อัพโหลดบล็อ�โดย PHP / ปลั๊�อินอาปาเช่
 ErrorFileSizeTooLarge=ขนาดไฟล์มีขนาดให�่เ�ินไป
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=ขนาดยาวเ�ินไปสำหรับประเภท int (s% ตัวเลขสูงสุด)
 ErrorSizeTooLongForVarcharType=ขนาดยาวเ�ินไปสำหรับประเภทสตริง (% s ตัวอั�ษรสูงสุด)
 ErrorNoValueForSelectType=�รุณา�รอ�ค่าส​​ำหรับราย�ารเลือ�
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 91b703ed8fa..cd4c2c1f6cb 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=หน่วยความจำสูงสุด PHP <b>เซสชั่นของคุณตั้ง%</b> s นี้ควรจะเพียงพอ
 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.
@@ -26,6 +27,7 @@ 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=สารบบ% s ไม่ได้อยู่
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/th_TH/link.lang b/htdocs/langs/th_TH/link.lang
index 1d7f7021311..7a1e16ba362 100644
--- a/htdocs/langs/th_TH/link.lang
+++ b/htdocs/langs/th_TH/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=�ารเชื่อมโยง% s ได้ถู�ลบอ
 ErrorFailedToDeleteLink= ล้มเหลวใน�ารลบ�ารเชื่อมโยง <b>'% s'</b>
 ErrorFailedToUpdateLink= ล้มเหลวใน�ารปรับปรุง�ารเชื่อมโยง <b>'% s'</b>
 URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 74c88d35808..e880ef23289 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=ข้อมูล
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index b1b92cb459a..9951363424e 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=ไม่มีข้อมูลที่จะโคลนที่�ำหนดไว้
 Of=ของ
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=คน
 Genderwoman=ห�ิง
 ViewList=มุมมองราย�าร
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=สวัสดี
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 2bc5e24fb97..3852fa08125 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=ชื่อเรื่อง
 WEBSITE_DESCRIPTION=ลั�ษณะ
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index f5768cbb3c5..25d33c1d271 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=init บาร์โค้ดมวล
 MassBarcodeInitDesc=หน้านี้สามารถนำมาใช้ใน�ารเริ่มต้นบาร์โค้ดบนวัตถุที่ไม่ได้มี�าร�ำหนดบาร์โค้ด �่อนที่จะตรวจสอบ�ารตั้งค่าของบาร์โค้ดโมดูลที่เสร็จสมบูรณ์
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=ประเทศ�หล่ง�ำเนิดสินค้า
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=ป้ายสั้น
 Unit=หน่วย
 p=ยู
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index c9975018266..58543c6538b 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=เวลา
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=ภาระงานที่วาง�ผนไว้
 PlannedWorkloadShort=จำนวนงาน
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=โครง�ารจะต้องผ่าน�ารตรวจสอบครั้ง�ร�
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=�ารป้อนข้อมูลต่อวัน
 InputPerWeek=�ารป้อนข้อมูลต่อสัปดาห์
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=ใบ�จ้งหนี้ใหม่
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/th_TH/receiptprinter.lang b/htdocs/langs/th_TH/receiptprinter.lang
index 6585fbf8b0e..4c11334a70d 100644
--- a/htdocs/langs/th_TH/receiptprinter.lang
+++ b/htdocs/langs/th_TH/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=เมืองหลวง
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/th_TH/stripe.lang b/htdocs/langs/th_TH/stripe.lang
index bd13d3c44da..4da17697604 100644
--- a/htdocs/langs/th_TH/stripe.lang
+++ b/htdocs/langs/th_TH/stripe.lang
@@ -32,6 +32,7 @@ VendorName=ชื่อของผู้ขาย
 CSSUrlForPaymentForm=รูป�บบ CSS url ของ�ผ่นสำหรับรูป�บบ�ารชำระเงิน
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index d2daca778b2..8bee6d24478 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=ได้รับอนุ�าตเพราะรับมาจา�หนึ่งใน�ลุ่มของผู้ใช้
 Inherited=ที่สืบทอด
 UserWillBeInternalUser=ผู้ใช้ที่สร้างจะเป็นผู้ใช้งานภายใน (เพราะไม่เชื่อมโยง�ับบุคคลที่สามโดยเฉพาะ)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index b23ac9dce8a..4925729beba 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index ec470f8f06f..4fdacce278c 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -69,8 +69,8 @@ DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle
 DisableJavascriptNote=Not: Test veya hata ayıklama amaçlıdır. Görme engelli kişiler veya metin tarayıcılara yönelik optimizasyon için kullanıcı profilinde yer alan ayarları kullanmayı tercih edebilirsiniz.
 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=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)
+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=Aşağı açılır listeden Kişi içeriği listelemeden önce bir tuşa basarak arama yapmanızı bekler.<br>Çok sayıda kişi mevcutsa bu performansı artırabilir, fakat daha az kullanışlıdır
 NumberOfKeyToSearch=Aramayı tetikleyecek karakter sayısı: %s
 NumberOfBytes=Bayt Sayısı
 SearchString=Arama dizisi
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Not: Mevcut <b>PHP yapılandırmanız</b> yükleme için
 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= ClamWin için örnek: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>ClamAv için örnek: /usr/bin/clamscan
+AntiVirusCommand=Antivirüs komutu tam yolu
+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= Komut satırında daha çok parametre
-AntiVirusParamExample= ClamWin için örnek: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Muhasebe modülü ayarları
 UserSetup=Kullanıcı yönetimi ayarları
 MultiCurrencySetup=Çoklu para birimi ayarları
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Özellik demoda devre dışıdır
 FeatureAvailableOnlyOnStable=Özellik sadece resmi olarak kararlı sürümlerde kullanılabilir
 BoxesDesc=Ekran etiketleri, bazı sayfaları özelleştirmek için ekleyebileceğiniz çeşitli bilgileri gösteren bileşenlerdir. Hedef sayfayı seçip 'Etkinleştir' seçeneğini tıklayarak ekran etiketini göstermeyi veya çöp kutusuna tıklayarak devre dışı bırakıp göstermemeyi seçebilirsiniz.
 OnlyActiveElementsAreShown=Yalnızca <a href="%s">etkinleştirilmiş modüllerin</a> öğeleri gösterilir.
-ModulesDesc=Modüller/Uygulamalar, hangi özelliklerin yazılımda mevcut olduğunu belirler. Bazı modüller, modülü etkinleştirdikten sonra kullanıcılara izin verilmesini gerektirir. Açma/kapama butonuna (modül satırının sonunda yer alır) tıklayarak ilgili modülü etkinleştirebilir veya devre dışı bırakabilirsiniz.
+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=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
 ModulesDeployDesc=Dosya sisteminizdeki izinler imkan veriyorsa harici bir modül kurmak için bu aracı kullanabilirsiniz. Modül daha sonra <strong>%s</strong> sekmede görünecektir.
 ModulesMarketPlaces=Dış uygulama/modül bul
@@ -212,6 +212,7 @@ CompatibleUpTo=%ssürümü ile uyumlu
 NotCompatible=Bu modül Dolibarr'ınızla uyumlu görünmüyor %s (Min %s - Maks %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Market place alanına bakın
+SeeSetupOfModule=%s modülü kurulumuna bak
 Updated=Güncellendi
 Nouveauté=Novelty
 AchatTelechargement=Satın Al / Yükle
@@ -221,6 +222,7 @@ DoliPartnersDesc=Özel olarak geliştirilmiş modüller veya özellikler sağlay
 WebSiteDesc=Daha fazla eklenti modülleri (ana yazılımda bulunmayan) için harici web siteleri
 DevelopYourModuleDesc=Kendi modülünüzü geliştirmek için bazı çözümler...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Mevcut ekran etiketleri
 BoxesActivated=Etkin ekran etiketleri
 ActivateOn=Etkinleştirme açık
@@ -270,7 +272,7 @@ Emails=E-postalar
 EMailsSetup=E-posta kurulumları
 EMailsDesc=Bu sayfa, e-posta gönderimi için varsayılan PHP parametrelerinizin üzerine yazma imkanı verir. Unix/Linux OS sistemindeki çoğu durumda PHP kurulumu doğrudur ve bu parametreler gereksizdir.
 EmailSenderProfiles=E-posta gönderici profilleri
-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.
+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ış)
@@ -356,7 +358,7 @@ UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
 UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
 SeeWikiForAllTeam=Katkıda bulunanlar ve kuruluşlarının bir listesi için Wiki sayfasına göz atın
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
-DisableLinkToHelpCenter=oturum açma sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
+DisableLinkToHelpCenter=Oturum açma sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
 DisableLinkToHelp=Çevrimiçi yardım bağlantısını gizle "<b>%s</b>"
 AddCRIfTooLong=Otomatik metin kaydırma özelliği olmadığı çok uzun metinlerdeki taşmalar belgeler üzerinde gösterilmeyecektir. Lütfen gerekirse metin alanına satır başı ekleyin.
 ConfirmPurge=Bu temizleme işlemini çalıştırmak istediğinizden emin misiniz?<br>Bu işlem tüm veri dosyalarınızı bir daha geri alınamayacak şekilde kalıcı olarak silecektir (ECM dosyaları, ekli dosyalar…).
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Varsayılan değeri kullanmak için boş bırak
 DefaultLink=Varsayılan bağlantı
 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 - %s dizinine kurulmuştur
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Üçüncü partiler 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.
@@ -605,7 +608,7 @@ Module2000Desc=CKEditor (html) kullanarak metin alanlarının düzenlenmesine/bi
 Module2200Name=Dinamik Fiyatlar
 Module2200Desc=Otomatik fiyat üretimi için matematiksel ifadeler kullanın
 Module2300Name=Planlı İşler
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+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
@@ -947,7 +950,7 @@ DictionaryCanton=Ä°ller Listesi
 DictionaryRegion=Bölgeler
 DictionaryCountry=Ãœlkeler
 DictionaryCurrency=Para birimleri
-DictionaryCivility=Mesleki ünvanlar
+DictionaryCivility=Honorific titles
 DictionaryActions=Gündem etkinlik türleri
 DictionarySocialContributions=Sosyal veya mali vergi türleri
 DictionaryVAT=KDV Oranları veya Satış Vergisi Oranları
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Dernekler, şahıslar veya küçük şirketler söz konusu oldu
 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=Oran
 LocalTax1IsNotUsed=Ä°kinci vergiyi kullanma
 LocalTax1IsUsedDesc=İkinci bir vergi türü kullanın (birinci dışında)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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=Yerel vergi raporları
 CalcLocaltax1=Satışlar - Alışlar
 CalcLocaltax1Desc=Yerel Vergi raporları, yerel satış vergileri ile yerel alış vergileri farkı olarak hesaplanır
@@ -1018,6 +1025,7 @@ 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
 LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanılan etiket
 LabelOnDocuments=Belgeler üzerindeki etiket
 LabelOrTranslationKey=Etiket veya çeviri anahtarı
@@ -1067,7 +1075,7 @@ BackgroundImageLogin=Arka plan görüntüsü
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Varsayılan dil
 EnableMultilangInterface=Çoklu dil desteğini etkinleştir
-EnableShowLogo=Show the company logo in the menu
+EnableShowLogo=Şirket logosunu menüde göster
 CompanyInfo=Åžirket/KuruluÅŸ
 CompanyIds=Åžirket/KuruluÅŸ kimlik bilgileri
 CompanyName=Adı
@@ -1076,11 +1084,11 @@ CompanyZip=Posta Kodu
 CompanyTown=İlçesi
 CompanyCountry=Ãœlkesi
 CompanyCurrency=Ana para birimi
-CompanyObject=Firmaya ait öğe
+CompanyObject=Şirketin amacı
 IDCountry=ID country
 Logo=Logo
 LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
+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).
 DoNotSuggestPaymentMode=Önerme
 NoActiveBankAccountDefined=Tanımlı etkin banka hesabı yok
@@ -1105,11 +1113,11 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Bekleyen banka mutabakatı
 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=Leave requests to approve
+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. 
 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>Uygulamanızın varsayılan davranışını özelleştirmek için kullanılan temel parametreler (örneğin ülkeyle ilişkili özellikler).
-SetupDescription4=<a href="%s">%s -> %s</a><br>Bu yazılım, tamamı hemen hemen bağımsız olan birçok modül ve uygulamanın paket halidir. İhtiyaçlarınıza uygun olan modüller etkinleştirilmiş ve yapılandırılmış olmalıdır. Bir modülün etkinleştirilmesi ile yeni öğe ve seçenekler menülere eklenir. 
+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=Ayarlar menüsündeki diğer girişler isteğe bağlı parametreleri yönetmenizi sağlar.
 LogEvents=Güvenlik denetimi etkinlikleri
 Audit=Denetim
@@ -1128,7 +1136,7 @@ LogEventDesc=Belirli güvenlik etkinlikleri için günlüğe kaydetmeyi etkinle
 AreaForAdminOnly=Kurulum parametreleri sadece <b>yönetici olan kullanıcılar</b> tarafından ayarlanabilir.
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
 SystemAreaForAdminOnly=Bu alan yalnızca yönetici kullanıcılar tarafından kullanılabilir. Dolibarr kullanıcı izinleri bu kısıtlamayı değiştiremez.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+CompanyFundationDesc=Şirketinizin/kuruluşunuzun bilgilerini düzenleyebilirsiniz. İşiniz bittiğinde sayfanın altındaki "%s" butonuna tıklayarak işleminizi tamamlayın.
 AccountantDesc=Harici bir muhasebeciniz/saymanınız varsa, onun bilgilerini burada düzenleyebilirsiniz.
 AccountantFileNumber=Muhasebeci kodu
 DisplayDesc=Dolibarr'ın görünümünü ve davranışını etkileyen parametreler buradan özelleştirilebilir.
@@ -1144,7 +1152,7 @@ TriggerAlwaysActive=Bu dosyadaki tetikleyiciler, etkin Dolibarr modülleri ne ol
 TriggerActiveAsModuleActive=Bu dosyadaki tetikleyiciler <b>%s</b> modülü etkinleştirildiğinde etkin olur.
 GeneratedPasswordDesc=Otomatik olarak oluşturulan şifreler için kullanılacak yöntemi seçin.
 DictionaryDesc=Bütün referans verisini ekleyin. Değerlerinizi varsayılana ekleyebilirsiniz.
-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=Bu sayfa, diğer sayfalarda bulunmayan parametreleri düzenlemenizi (üzerine yazmanızı) sağlar. Bunlar çoğunlukla sadece geliştiriciler/gelişmiş sorun giderme için ayrılmış parametrelerdir.
 MiscellaneousDesc=Burada güvenlik ile ilgili diğer tüm parametreler tanımlanır.
 LimitsSetup=Sınırlar/Doğruluk kurulumu
 LimitsDesc=Dolibarr tarafından kullanılan limitleri, hassasiyetleri ve iyileştirmeleri buradan tanımlayabilirsiniz
@@ -1264,6 +1272,8 @@ 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
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=İK modülü ayarları
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Fatura belgesi modelleri
 BillsPDFModulesAccordindToInvoiceType=Fatura türüne göre fatura döküman modelleri
 PaymentsPDFModules=Ödeme belge modelleri
 ForceInvoiceDate=Fatura tarihini fatura doÄŸrulama tarihine zorla
-SuggestedPaymentModesIfNotDefinedInInvoice=Varsayılan olarak faturada tanımlanmamışsa önerilen ödeme biçimi
+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=Faturada serbest metin
@@ -1307,7 +1317,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 for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
 WatermarkOnDraftProposal=Taslak tekliflerde filigran (boÅŸsa yoktur)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
@@ -1322,6 +1332,7 @@ 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
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Müşteri Siparişleri yönetim ayarları
 OrdersNumberingModules=Sipariş numaralandırma modülü
 OrdersModelModule=SipariÅŸ belgesi modelleri
@@ -1523,8 +1534,8 @@ NumberOfProductShowInSelect=Aşağı açılan seçim listelerinde gösterilecek
 ViewProductDescInFormAbility=Ürün açıklamalarını formlarda göster (aksi takdirde araç ipucu penceresinde gösterilir)
 MergePropalProductCard=Eğer ürün/hizmet teklifte varsa Ekli Dosyalar sekmesinde ürün/hizmet seçeneğini etkinleştirin, böylece ürün PDF belgesini PDF azur teklifine birleştirirsiniz
 ViewProductDescInThirdpartyLanguageAbility=Ürün açıklamalarını üçün partinin dilinde görüntüle
-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)
+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ü
 SetDefaultBarcodeTypeThirdParties=Üçüncü partiler için kullanılacak varsayılan barkod tipi
 UseUnits=Sipariş, teklif ya da fatura satırlarının yazımı sırasında kullanmak üzere Miktar için bir ölçü birimi tanımlayın
@@ -1601,7 +1612,7 @@ FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines fo
 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=WYSIWIG creation/edition for tickets
+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.
@@ -1737,7 +1748,7 @@ ProjectsSetup=Proje modülü kurulumu
 ProjectsModelModule=Proje raporu belge modeli
 TasksNumberingModules=Görev numaralandırma modülü
 TaskModelModule=Görev raporu belge modeli
-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.
+UseSearchToSelectProject=Aşağı açılır listeden Proje içeriği listelemeden önce bir tuşa basarak arama yapmanızı bekler.<br>Çok sayıda projeniz mevcutsa bu performansı artırabilir, fakat daha az kullanışlıdır
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Muhasebe dönemleri
@@ -1885,7 +1896,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
 GDPRContact=Veri Koruma Görevlisi (DPO, Veri Gizliliği veya GDPR kişisi)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+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
@@ -1893,7 +1904,7 @@ ChartLoaded=Chart of account loaded
 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=Swap sender and recipient address position on PDF documents
+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.
 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).
@@ -1927,7 +1938,7 @@ MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Otomatik ECM ağacını göster
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<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=Açılış saatleri
-OpeningHoursDesc=Enter here the regular opening hours of your company.
+OpeningHoursDesc=Buraya şirketinizin normal çalışma saatlerini girin.
 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Dışa aktarma modelleri herkesle paylaşılır
 ExportSetup=Dışa aktarma modülünün kurulumu
+ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 14f091f6081..73cb73cd3ff 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Tedarikçi faturaları
 SupplierBill=Tedarikçi faturası
 SupplierBills=tedarikçi faturaları
 Payment=Ödeme
-PaymentBack=Geri ödeme
-CustomerInvoicePaymentBack=Geri ödeme
+PaymentBack=Ä°ade
+CustomerInvoicePaymentBack=Ä°ade
 Payments=Ödemeler
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=fatura para biriminde
 PaidBack=Geri ödenen
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
-ConfirmConvertToReduc=Bu %s öğesini mutlak bir indirime dönüştürmek ister misiniz?
+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=Bu %s öğesini mutlak bir indirime dönüştürmek ister misiniz?
+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=Tedarikçi ödemeleri
 ReceivedPayments=Alınan ödemeler
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Hakediş faturası göster
 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
@@ -509,11 +512,11 @@ ToMakePayment=Öde
 ToMakePaymentBack=Geri öde
 ListOfYourUnpaidInvoices=Ödenmemiş fatura listesi
 NoteListOfYourUnpaidInvoices=Not: Bu liste, satış temsilcisi olarak bağlı olduğunuz üçüncü partilere ait faturaları içerir.
-RevenueStamp=Bandrol
+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=Yeni bir fatura şablonu oluşturmak için önce bir standart fatura oluşturmalı ve onu "şablona" dönüştürmelisiniz
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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.
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/tr_TR/blockedlog.lang b/htdocs/langs/tr_TR/blockedlog.lang
index 7797a0814fd..072bf60a6d8 100644
--- a/htdocs/langs/tr_TR/blockedlog.lang
+++ b/htdocs/langs/tr_TR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index dfc653aa7bb..552521dd61a 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Bu malı ekle
 RestartSelling=Satışa geri dön
 SellFinished=Satış tamamlandı
 PrintTicket=Fiş yazdır
+SendTicket=Destek bildirimini gönder
 NoProductFound=Hiç mal bulunamadı
 ProductFound=ürün bulundu
 NoArticle=Mal yok
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Teorik tutar
 RealAmount=Gerçek tutar
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Fatura sayısı
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS needs product categories to work
 OrderNotes=Sipariş Notları
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets
-AutoPrintTickets=Destek bildirimlerini otomatik olarak yazdır
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index ba12f3799a1..56cd0f70353 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted="%s" Firması veritabanından silindi.
 ListOfContacts=KiÅŸi/adres listesi
 ListOfContactsAddresses=KiÅŸi/adres listesi
 ListOfThirdParties=Üçüncü Partilerin Listesi
-ShowCompany=Üçüncü Partiyi Göster
 ShowContact=Kişi göster
 ContactsAllShort=Hepsi (süzmeden)
 ContactType=KiÅŸi tipi
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Satış temsilcisinin adı
 SaleRepresentativeLastname=Satış temsilcisinin soyadı
 ErrorThirdpartiesMerge=Üçüncü partiler silinirken bir hata oluştu. Lütfen günlüğü denetleyin. Değişiklikler geri alındı.
 NewCustomerSupplierCodeProposed=Müşteri veya Tedarikçi kodu zaten kullanılmış, yeni bir kod önerilir
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Ödeme Türü - Müşteri
 PaymentTermsCustomer=Ödeme Koşulları - Müşteri
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 8f49b0d36b6..925d1926f02 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Gösterilen tutarlara tüm vergiler dahildir
-RulesResultDue=- Ödenmemiş faturaları, giderleri ve KDV ni, ödenmiş ya da ödenmemiş bağışları içerir. Aynı zamanda ödenmiş maaşları da içerir.<br>- Faturaların ve KDV nin doğrulanma tarihleri ve giderlerin ödenme tarihleri baz alınır. Ücretler Maaş modülünde tanımlanır, ödeme tarihi değeri kullanılır.
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Faturalarda, giderlerde, KDV inde ve maaşlarda yapılan gerçek ödemeleri içerir. <br>- Faturaların, giderleri, KDV nin ve maaşların ödeme tarihleri baz alınır. Bağışlar için bağış tarihi.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Turnover invoiced by sale tax rate
 TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
 PurchasebyVatrate=Purchase by sale tax rate
 LabelToShow=Kısa etiket
+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
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 762f5e44590..96c1a4b6e2a 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -59,6 +59,7 @@ 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ş.
 ErrorFileSizeTooLarge=Dosya boyutu çok büyük.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Tam sayı türü için boyut çok uzun (ençok %s ondalık)
 ErrorSizeTooLongForVarcharType=Dize türü için boyut çok uzun (ençok %s karakter)
 ErrorNoValueForSelectType=Değer gir ya da liste seç
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak e-posta adresi de kullanılabilir.
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 83da2e22b2a..f06e9617411 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=Bu PHP, Curl'u destekliyor.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=Bu PHP, UTF8 iÅŸlevlerini destekliyor.
 PHPSupportIntl=Bu PHP, Intl fonksiyonlarını destekliyor.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=PHP nizin ençok oturum belleği <b>%s</b> olarak ayarlanmış. Bu yeterli olacaktır.
 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.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=PHP kurulumunuz Curl. desteklemiyor
 ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
 ErrorPHPDoesNotSupportUTF8=PHP kurulumunuz UTF8 işlevlerini desteklemiyor. Dolibarr düzgün çalışamaz. Dolibarr'ı yüklemeden önce bunu çözün.
 ErrorPHPDoesNotSupportIntl=PHP kurulumunuz Intl fonksiyonlarını desteklemiyor.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
 ErrorDirDoesNotExists=%s Dizini yoktur.
 ErrorGoBackAndCorrectParameters=Geri gidin ve parametreleri kontrol edin/düzeltin.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 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=Uygulamanıza gitmek için buraya tıklayın
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/tr_TR/link.lang b/htdocs/langs/tr_TR/link.lang
index 244396b0e8f..daaf0291ac3 100644
--- a/htdocs/langs/tr_TR/link.lang
+++ b/htdocs/langs/tr_TR/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=%s bağlantısı kaldırıldı
 ErrorFailedToDeleteLink= '<b>%s</b>' bağlantısı kaldırılamadı
 ErrorFailedToUpdateLink= '<b>%s</b>' bağlantısı güncellenemedi
 URLToLink=Bağlantılanalıcak URL
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 4ae97915eae..0787f4873f1 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Kategorisi olan hiç bir kişi/adres bulunamadı
 NoContactLinkedToThirdpartieWithCategoryFound=Kategorisi olan hiç bir kişi/adres bulunamadı
 OutGoingEmailSetup=Giden e-posta kurulumu
 InGoingEmailSetup=Gelen e-posta kurulumu
-OutGoingEmailSetupForEmailing=Giden e-posta kurulumu (toplu e-posta için)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Varsayılan giden e-posta kurulumu
 Information=Bilgi
 ContactsWithThirdpartyFilter=Üçüncü parti filtreli kişiler
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 83574648634..291b24e3c1b 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -4,8 +4,8 @@ DIRECTION=ltr
 # 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=DejaVuSans
-FONTSIZEFORPDF=8
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
 SeparatorDecimal=,
 SeparatorThousand=.
 FormatDateShort=%d/%m/%Y
@@ -28,7 +28,7 @@ NoTemplateDefined=Bu e-posta türü için mevcut şablon yok
 AvailableVariables=Mevcut yedek deÄŸiÅŸkenler
 NoTranslation=Çeviri yok
 Translation=Çeviri
-EmptySearchString=Enter a non empty search string
+EmptySearchString=BoÅŸ olmayan bir arama dizesi girin
 NoRecordFound=Kayıt bulunamadı
 NoRecordDeleted=Hiç kayıt silinmedi
 NotEnoughDataYet=Yeterli bilgi yok
@@ -174,6 +174,7 @@ SaveAndStay=Kaydet ve kal
 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:
 NoCloneOptionsSpecified=Kopyası oluşturulacak hiçbir veri tanımlanmamış.
 Of=ile ilgili
@@ -535,7 +536,7 @@ Photos=Resimler
 AddPhoto=Resim ekle
 DeletePicture=Resim sil
 ConfirmDeletePicture=Resim silmeyi onayla
-Login=Oturum açma
+Login=Kullanıcı adı
 LoginEmail=GiriÅŸ (e-posta)
 LoginOrEmail=Oturum açma adı veya E-posta adresi
 CurrentLogin=Geçerli kullanıcı
@@ -771,7 +772,7 @@ LinkToSupplierProposal=Tedarikçi teklifine bağlantıla
 LinkToSupplierInvoice=Tedarikçi faturasına bağlantıla
 LinkToContract=Kişiye bağlantıla
 LinkToIntervention=Müdahaleye bağlantıla
-LinkToTicket=Link to ticket
+LinkToTicket=Destek bildirimine bağlantı
 CreateDraft=Taslak oluÅŸtur
 SetToDraft=Taslağa geri dön
 ClickToEdit=Düzenlemek için tıklayın
@@ -829,6 +830,8 @@ Gender=Cinsiyet
 Genderman=Adam
 Genderwoman=Kadın
 ViewList=Liste görünümü
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Zorunlu
 Hello=Merhaba
 GoodBye=Güle güle
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 8e39c3c450b..1033709c7a1 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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=Müşteri siparişi doğrulandı
 Notify_ORDER_SENTBYMAIL=Müşteri siparişi e-posta ile gönderildi
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Tedarikçi siparişi e-posta ile gönderildi
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=Sayfanın URL si
 WEBSITE_TITLE=Unvan
 WEBSITE_DESCRIPTION=Açıklama
 WEBSITE_IMAGE=Görüntü
-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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Anahtar kelimeler
 LinesToImport=Lines to import
 
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 53c71e2f9f1..d79bf8cc61c 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Bu araç <b><u>TÜM</u></b> ürün ve hizmetler üzerin
 MassBarcodeInit=Toplu barkod baÅŸlatma
 MassBarcodeInitDesc=Bu sayfa, barkod tanımlanmamış nesneler üzerinde barkod başlatmak için kullanılabilir. Önce barkod modülü kurulumunun tamamlandığını denetleyin.
 ProductAccountancyBuyCode=Muhasebe kodu (satın alma)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Muhasebe kodu (satış)
 ProductAccountancySellIntraCode=Muhasebe kodu (Topluluk içi satış)
 ProductAccountancySellExportCode=Muhasebe kodu (ihracat)
@@ -153,7 +155,7 @@ 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
 ClonePricesProduct=Fiyatların kopyasını oluştur
-CloneCategoriesProduct=Clone tags/categories linked
+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
 ProductIsUsed=Bu ürün kullanılır.
@@ -165,7 +167,7 @@ SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürün veya hizmetlerin)
 CustomCode=G.T.İ.P Numarası
 CountryOrigin=Menşei ülke
-Nature=Ürün yapısı (ham madde/bitmiş ürün)
+Nature=Nature of product (material/finished)
 ShortLabel=Kısa etiket
 Unit=Birim
 p=Adet
@@ -238,8 +240,8 @@ UseMultipriceRules=İlk segmente göre diğer tüm segmentlerin fiyatlarını ot
 PercentVariationOver=%s üzerindeki %% değişim
 PercentDiscountOver=%s üzerindeki %% indirim
 KeepEmptyForAutoCalculation=Bunun ürünlerin ağırlık veya hacimlerinden otomatik olarak hesaplanması için boş bırakın.
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantRefExample=Örnek: RENK, EBAT
+VariantLabelExample=Örnek: Renk, Ebat
 ### composition fabrication
 Build=Ãœret
 ProductsMultiPrice=Her fiyat düzeyi için ürünler ve fiyatlar
@@ -317,10 +319,10 @@ ProductWeight=1 ürün ağırlığı
 ProductVolume=1 ürün hacmi
 WeightUnits=Ağırlık birimi
 VolumeUnits=Hacim birimi
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=GeniÅŸlik birimi
+LengthUnits=Uzunluk birimi
+HeightUnits=Yükseklik birimi
+SurfaceUnits=Yüzey birimi
 SizeUnits=Boyut birimi
 DeleteProductBuyPrice=Satınalma fiyatı sil
 ConfirmDeleteProductBuyPrice=Bu satınalma fiyatını silmek istediğinizden emin misiniz?
@@ -332,7 +334,7 @@ GoOnMenuToCreateVairants=Nitelik varyantlarını hazırlamak için (renk, boyut
 UseProductFournDesc=Müşterilere yönelik açıklamalara ek olarak, tedarikçiler tarafından belirlenen ürün açıklamalarını tanımlamak için bir özellik ekleyin
 ProductSupplierDescription=Ürün için tedarikçi açıklaması
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
+PackagingForThisProduct=Paketleme
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
@@ -367,7 +369,7 @@ UsePercentageVariations=Yüzde varyasyonlarını kullan
 PercentageVariation=Yüzde varyasyonu
 ErrorDeletingGeneratedProducts=Mevcut ürün varyantlarını silmeye çalışırken bir hata oluştu
 NbOfDifferentValues=Farklı değerlerin sayısı
-NbProducts=Number of products
+NbProducts=Ürün sayısı
 ParentProduct=Ana ürün
 HideChildProducts=Değişken ürünleri sakla
 ShowChildProducts=Varyant ürünlerini göster
@@ -379,5 +381,5 @@ ErrorDestinationProductNotFound=Hedef ürün bulunamadı
 ErrorProductCombinationNotFound=Ürün değişkeni bulunamadı
 ActionAvailableOnVariantProductOnly=Eylem yalnızca ürün değişkeninde mevcuttur
 ProductsPricePerCustomer=Müşteri başına ürün fiyatları
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
+ProductSupplierExtraFields=Ek Nitelikler (Tedarikçi Fiyatları)
+DeleteLinkedProduct=Kombinasyonla bağlantılı alt ürünü silin
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index a37d8e3050e..44d35644f1c 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Süre
 ListOfTasks=Görevler listesi
 GoToListOfTimeConsumed=Tüketilen süre listesine git
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=Proje ile ilgili müşteri siparişlerinin listesi
@@ -188,7 +186,7 @@ PlannedWorkload=Planlı işyükü
 PlannedWorkloadShort=İşyükü
 ProjectReferers=İlgili öğeler
 ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
-FirstAddRessourceToAllocateTime=Zaman tahsisi için göreve bir kullanıcı kaynağı ilişkilendir
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Günlük giriş
 InputPerWeek=Haftalık giriş
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=DeÄŸiÅŸtirilen son %s proje
 OtherFilteredTasks=Diğer filtrelenmiş görevler
 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=Görevlere kullanıcı yorumlarına izin ver
 AllowCommentOnProject=Projelerde kullanıcı yorumlarına izin ver
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Yeni fatura
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/tr_TR/receiptprinter.lang b/htdocs/langs/tr_TR/receiptprinter.lang
index 775969b454e..0fdd7f993a5 100644
--- a/htdocs/langs/tr_TR/receiptprinter.lang
+++ b/htdocs/langs/tr_TR/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Yardımcı Yazıcı
 CONNECTOR_NETWORK_PRINT=Ağ Yazıcısı
 CONNECTOR_FILE_PRINT=Yerel Yazıcı
 CONNECTOR_WINDOWS_PRINT=Yerel Windows Yazıcısı
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Deneme için Sahte Yazıcı, hiçbir şey yapmaz
 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=Varsayılan profil
 PROFILE_SIMPLE=Basit profil
 PROFILE_EPOSTEP=Epos Tep Profili
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Fatura 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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Topluluk İçi Vergi Numarası
+DOL_VALUE_MYSOC_CAPITAL=Sermaye
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/tr_TR/stripe.lang b/htdocs/langs/tr_TR/stripe.lang
index 97dc7ae5661..faabde173b6 100644
--- a/htdocs/langs/tr_TR/stripe.lang
+++ b/htdocs/langs/tr_TR/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Satıcının Adı
 CSSUrlForPaymentForm=Ödeme formu için CSS stil sayfası url'si
 NewStripePaymentReceived=Yeni Stripe ödemesi alındı
 NewStripePaymentFailed=Yeni Stripe ödemesi denendi ancak başarısız oldu
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Gizli test anahtarı
 STRIPE_TEST_PUBLISHABLE_KEY=Yayımlanabilir test anahtarı
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
 PaymentWillBeRecordedForNextPeriod=Ödeme gelecek dönem için kaydedilecektir.
 ClickHereToTryAgain=<a href="%s">Tekrar denemek için burayı tıklayın...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 50b800b2d52..2ca8694ed66 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -70,7 +70,7 @@ ExportDataset_user_1=Kullanıcılar ve özellikleri
 DomainUser=Etki alanı kullanıcısı %s
 Reactivate=Yeniden etkinleÅŸtir
 CreateInternalUserDesc=Bu form, şirketiniz/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ı, şirketinizin/kuruluşunuzun parçası olan bir kullanıcıdır.<br>Bir <b>Dış</b> kullanıcı ise, müşteri, tedarikçi veya buna benzer 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=Bir <b>İç</b> kullanıcı, şirketinizin/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).
 PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti.
 Inherited=Ä°ntikal eden
 UserWillBeInternalUser=Oluşturulacak kullanıcı bir iç kullanıcı olacaktır (çünkü belirli bir üçüncü parti ile bağlantılı değildir)
@@ -105,8 +105,13 @@ ExpectedWorkedHours=Haftalık beklenen çalışma saatleri
 ColorUser=Kullanıcı rengi
 DisabledInMonoUserMode=Bakım modunda devre dışıdır
 UserAccountancyCode=Kullanıcı muhasebe kodu
-UserLogoff=Kullanıcı çıktı
-UserLogged=Kullanıcı bağlandı
+UserLogoff=Kullanıcı çıkış yaptı
+UserLogged=Kullanıcı giriş yaptı
 DateEmployment=Ä°ÅŸe BaÅŸlama Tarihi
 DateEmploymentEnd=İşi Bırakma Tarihi
 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
+ValidatorIsSupervisorByDefault=Varsayılan olarak, doğrulayıcı kullanıcının denetimcisidir. Bu durumu korumak için boş bırakın.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 28380e99411..2c6025eb4dd 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Siteyi yeni sekmede izle
 SetAsHomePage=Giriş Sayfası olarak ayarla
 RealURL=Gerçek URL
 ViewWebsiteInProduction=Web sitesini giriÅŸ URL si kullanarak izle
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+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>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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 WEBSITE_USE_WEBSITE_ACCOUNTS=Web sitesi hesap tablosunu etkinleÅŸtir
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=Öncelikle varsayılan Giriş sayfasını tanımlamanız gerekir
-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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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=Görüntüler dizine kaydedilmelidir
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 17b0f823011..2e96db5c8dc 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 4fc90ffb4fa..d481e665112 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=рахунки-фактури по�тачальників
 Payment=Платіж
-PaymentBack=Поверненн� платежу
-CustomerInvoicePaymentBack=Поверненн� платежу
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=Платежі
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Поверненн� платежу
 DeletePayment=Видалити платіж
 ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=Отримані платежі
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Поверненн� платежу
 ListOfYourUnpaidInvoices=Спи�ок неоплачених рахунків
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/uk_UA/blockedlog.lang b/htdocs/langs/uk_UA/blockedlog.lang
index cff8f7d657b..5afae6e9e53 100644
--- a/htdocs/langs/uk_UA/blockedlog.lang
+++ b/htdocs/langs/uk_UA/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index 72238fe1fed..05314c6dd09 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=К-ть рахунків-фактур
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index b4ff027e4df..64082ef929a 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index db4c2fecf25..25d9f2b34e4 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/uk_UA/link.lang b/htdocs/langs/uk_UA/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/uk_UA/link.lang
+++ b/htdocs/langs/uk_UA/link.lang
@@ -8,3 +8,4 @@ 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/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 5650dbb3967..8b1cb50fe79 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 29fc4f2f58c..4a8db0781af 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 00259d976bc..ba85f51e739 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 21d7b5eaca1..ae0f5ef2874 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 7e9b2dca54e..5e499f4b2c7 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=�овий рахунок-фактура
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/uk_UA/receiptprinter.lang b/htdocs/langs/uk_UA/receiptprinter.lang
index 9681691ae48..807a476009d 100644
--- a/htdocs/langs/uk_UA/receiptprinter.lang
+++ b/htdocs/langs/uk_UA/receiptprinter.lang
@@ -15,10 +15,12 @@ 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
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=Capital
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/uk_UA/stripe.lang b/htdocs/langs/uk_UA/stripe.lang
index eb77441d2cd..844762040af 100644
--- a/htdocs/langs/uk_UA/stripe.lang
+++ b/htdocs/langs/uk_UA/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index 43fa5342da3..aea4e7676e4 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 7fe18b58621..1fe75b2993e 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -42,7 +42,8 @@ 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>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 2f36c876c1a..0205f246b0c 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
 UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
-AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
+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 ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+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
@@ -199,7 +199,7 @@ 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 (at end of module line) to enable/disable a module/application.
+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
@@ -212,6 +212,7 @@ 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
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 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
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=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.
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
 DictionaryCurrency=Currencies
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=VAT Rates or Sales Tax Rates
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 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 des 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
@@ -1018,6 +1025,7 @@ 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
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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
 Audit=Audit
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 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 the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ 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
+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 #####
@@ -1295,7 +1305,7 @@ 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 for invoice
+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
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 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 for proposal
+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
@@ -1322,6 +1332,7 @@ 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
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 6d7c61784f7..8c22ce0159a 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=suppliers invoices
 Payment=Payment
-PaymentBack=Payment back
-CustomerInvoicePaymentBack=Payment back
+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 absolute discount?
+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 absolute discount?
+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
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Show situation invoice
 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
@@ -509,11 +512,11 @@ ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+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)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ 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
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 7ddbc71f3e9..f9f00015840 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -16,6 +16,7 @@ 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
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index c569a48c84a..f8b3d0354e2 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/addresses
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -447,6 +446,7 @@ 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
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 1de030a1905..6cd046c5607 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on act
 SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 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 validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
+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 validation date of these invoices.<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.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,3 +255,10 @@ 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.
+ReportPurchaseTurnover=Purchase turnover invoiced
+ReportPurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 3ffc686e62f..7c67aeca8b5 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -59,6 +59,7 @@ 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
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # 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.
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index bf9c08c4ba7..f67dff57184 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ 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.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/uz_UZ/link.lang b/htdocs/langs/uz_UZ/link.lang
index fdcf07aeff4..1ffcd41a18b 100644
--- a/htdocs/langs/uz_UZ/link.lang
+++ b/htdocs/langs/uz_UZ/link.lang
@@ -8,3 +8,4 @@ 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/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 8b92cef3103..7b3bfd3852a 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 0b31a6d85e2..e571f74d43e 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -174,6 +174,7 @@ 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
@@ -829,6 +830,8 @@ Gender=Gender
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 00259d976bc..ba85f51e739 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ 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 __WEBSITEKEY__ in the path if path depends on website name.
+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
 
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index d8a3192551f..a31243a07b6 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 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)
@@ -165,7 +167,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 94e440f9ab9..cdc0e6b3c95 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ 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
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index 43fa5342da3..aea4e7676e4 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
@@ -110,3 +110,8 @@ UserLogged=User logged
 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
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index af3b098f54f..5c39e62c272 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Lưu ý: cấu hình PHP <b>của bạn</b> hiện giớ
 NoMaxSizeByPHPLimit=Ghi chú: Không có giới hạn được chỉnh sửa trong phần chỉnh sửa PHP
 MaxSizeForUploadedFiles=Kích thước tối đa của tập tin được tải lên (0 sẽ tắt chế độ tải lên)
 UseCaptchaCode=Sử dụng mã xác nhận (CAPTCHA) ở trang đăng nhập
-AntiVirusCommand= �ư�ng dẫn đầy đủ để thi hành việc quét virus
-AntiVirusCommandExample= Thí dụ dành cho ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Thí dụ cho ClamAv: /usr/bin/clamscan
+AntiVirusCommand=�ư�ng dẫn đầy đủ để thi hành việc quét virus
+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= Nhi�u thông số trên dòng lệnh
-AntiVirusParamExample= Thí dụ với ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Cài đặt module kế toán
 UserSetup=Cài đặt quản lý ngư�i dùng
 MultiCurrencySetup=Thiết lập đa ti�n tệ
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=Tính năng đã vô hiệu hóa trong bản demo
 FeatureAvailableOnlyOnStable=Tính năng chỉ khả dụng trên các phiên bản ổn định chính thức
 BoxesDesc=Widget là các thành phần hiển thị một số thông tin mà bạn có thể thêm để cá nhân hóa một số trang. Bạn có thể ch�n giữa hiển thị tiện ích hoặc không bằng cách ch�n trang đích và nhấp vào 'Kích hoạt' hoặc bằng cách nhấp vào thùng rác để tắt nó.
 OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">module kích hoạt</a> được hiển thị.
-ModulesDesc=Các mô-đun / ứng dụng xác định các tính năng có sẵn trong phần m�m. Một số mô-đun yêu cầu quy�n được cấp cho ngư�i dùng sau khi kích hoạt mô-đun. Nhấp vào nút bật / tắt (ở cuối dòng mô-đun) để bật / tắt mô-đun / ứng dụng.
+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=Bạn có thể tìm thấy nhi�u mô-đun để tải v� ở các websites trên Internet ...
 ModulesDeployDesc=Nếu quy�n trên hệ thống tệp của bạn cho phép, bạn có thể sử dụng công cụ này để triển khai mô-đun bên ngoài. Mô-đun sau đó sẽ hiển thị trên tab <strong>%s</strong> .
 ModulesMarketPlaces=Tìm ứng dụng bên ngoài/ mô-đun
@@ -212,6 +212,7 @@ CompatibleUpTo=Tương thích với phiên bản %s
 NotCompatible=Mô-đun này dư�ng như không tương thích với Dolibarr %s của bạn (Min %s - Max %s).
 CompatibleAfterUpdate=Mô-đun này yêu cầu cập nhật lên Dolibarr %s của bạn (Min %s - Max %s).
 SeeInMarkerPlace=Xem ở chợ
+SeeSetupOfModule=Xem thiết lập mô-đun %s
 Updated=�ã cập nhật
 Nouveauté=Mới lạ
 AchatTelechargement=Mua / Tải xuống
@@ -221,6 +222,7 @@ DoliPartnersDesc=Danh sách các công ty cung cấp các mô-đun hoặc tính
 WebSiteDesc=Các trang web bên ngoài để có thêm các mô-đun bổ sung (không lõi) ...
 DevelopYourModuleDesc=Một số giải pháp để phát triển mô-đun của riêng bạn ...
 URL=URL
+RelativeURL=Relative URL
 BoxesAvailable=Widgets có sẵn
 BoxesActivated=Widgets được kích hoạt
 ActivateOn=Kích hoạt trên
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=Giữ trống để sử dụng giá trị mặc định
 DefaultLink=Liên kết mặc định
 SetAsDefault=�ặt làm mặc định
 ValueOverwrittenByUserSetup=Cảnh báo, giá trị này có thể được ghi đè bởi các thiết lập cụ thể ngư�i sử dụng (mỗi ngư�i dùng có thể thiết lập url clicktodial riêng của mình)
-ExternalModule=Module bên ngoài được cài đặt vào thư mục %s
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Khởi tạo mã vạch hàng loạt cho bên thứ ba
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Hiện tại, bạn có <strong>%s</strong> bản ghi <strong>%s</strong> %s không xác định được mã vạch
@@ -947,7 +950,7 @@ DictionaryCanton=Bang / Tỉnh
 DictionaryRegion=Vùng
 DictionaryCountry=Quốc gia
 DictionaryCurrency=Ti�n tệ
-DictionaryCivility=Chức vụ
+DictionaryCivility=Honorific titles
 DictionaryActions=Các loại sự kiện chương trình nghị sự
 DictionarySocialContributions=Các loại thuế xã hội hoặc tài chính
 DictionaryVAT=Tỉ suất VAT hoặc Tỉ xuất thuế bán hàng
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=Theo mặc định, thuế Bán hàng được đ� xuất là
 VATIsUsedExampleFR=Ở Pháp, nó có nghĩa là các công ty hoặc tổ chức có một hệ thống tài chính thực sự (�ơn giản hóa thực tế hoặc thực tế bình thư�ng). Một hệ thống trong đó VAT được khai báo.
 VATIsNotUsedExampleFR=Ở Pháp, đi�u đó có nghĩa là các hiệp hội không khai thuế bán hàng hoặc các công ty, tổ chức hoặc ngành ngh� tự do đã ch�n hệ thống tài chính doanh nghiệp siêu nh� (Thuế bán hàng trong nhượng quy�n thương mại) và nộp thuế nhượng quy�n Thuế bán hàng mà không cần khai báo thuế Bán hàng. Lựa ch�n này sẽ hiển thị tham chiếu "Thuế bán hàng không áp dụng - art-293B của CGI" trên hóa đơn.
 ##### Local Taxes #####
+TypeOfSaleTaxes=Type of sales tax
 LTRate=Tỷ suất
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Sử dụng loại thuế thứ hai (không phải loại thứ nhất)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=Tỷ lệ IRPF theo mặc định khi tạo khách hàng t
 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=Ở Tây Ban Nha, h� là các doanh nghiệp không phải chịu hệ thống thuế của các mô-đun.
+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 des 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=Báo cáo thuế địa phương
 CalcLocaltax1=Bán - Mua
 CalcLocaltax1Desc=Báo cáo Thuế địa phương được tính toán với sự khác biệt giữa localtaxes bán hàng và mua hàng localtaxes
@@ -1018,6 +1025,7 @@ CalcLocaltax2=Mua
 CalcLocaltax2Desc=Báo cáo Thuế địa phương là tổng của localtaxes mua
 CalcLocaltax3=Bán
 CalcLocaltax3Desc=Báo cáo Thuế địa phương là tổng của localtaxes bán hàng
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy với code đó
 LabelOnDocuments=Nhãn trên các tài liệu
 LabelOrTranslationKey=Nhãn hoặc từ khóa dịch
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Báo cáo chi phí để phê duyệt
 Delays_MAIN_DELAY_HOLIDAYS=Yêu cầu nghỉ phép để phê duyệt
 SetupDescription1=Trước khi bắt đầu sử dụng Dolibarr, một số tham số ban đầu phải được xác định và các mô-đun được kích hoạt/ định cấu hình.
 SetupDescription2=Hai phần sau đây là bắt buộc (hai mục đầu tiên trong menu Cài đặt):
-SetupDescription3=<a href="%s">%s -> %s</a> <br> Các tham số cơ bản được sử dụng để tùy chỉnh hành vi mặc định của ứng dụng của bạn (ví dụ: đối với các tính năng liên quan đến quốc gia).
-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.
+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=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
 Audit=Kiểm toán
@@ -1128,7 +1136,7 @@ LogEventDesc=Cho phép đăng nhập cho các sự kiện bảo mật cụ thể
 AreaForAdminOnly=Thông số cài đặt chỉ có thể được đặt bởi <b>ngư�i dùng quản trị viên</b> .
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đ�c và có thể nhìn thấy chỉ cho quản trị viên.
 SystemAreaForAdminOnly=Khu vực này chỉ dành cho ngư�i dùng quản trị viên. Quy�n ngư�i dùng Dolibarr không thể thay đổi hạn chế này.
-CompanyFundationDesc=Chỉnh sửa thông tin của công ty/tổ chức. Nhấp vào nút "%s" ở cuối trang.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=Nếu bạn có một kế toán viên/ kế toán bên ngoài, bạn có thể chỉnh sửa thông tin ở đây.
 AccountantFileNumber=Mã kế toán
 DisplayDesc=Các thông số ảnh hưởng đến giao diện và hành vi của Dolibarr có thể được sửa đổi tại đây.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Quy tắc tạo và xác thực mật khẩu
 DisableForgetPasswordLinkOnLogonPage=Không hiển thị liên kết "Quên mật khẩu" trên trang �ăng nhập
 UsersSetup=Thiết lập module ngư�i dùng
 UserMailRequired=Yêu cầu email để tạo ngư�i dùng mới
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Thiết lập mô-đun Nhân sự
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=Mô hình chứng từ hóa đơn
 BillsPDFModulesAccordindToInvoiceType=Mẫu chứng từ hóa đơn theo loại hóa đơn
 PaymentsPDFModules=Mẫu chứng từ thanh toán
 ForceInvoiceDate=Buộc ngày hóa đơn là ngày xác nhận
-SuggestedPaymentModesIfNotDefinedInInvoice=�� nghị chế độ thanh toán trên hoá đơn theo mặc định nếu không được xác định cho hóa đơn
+SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=�� nghị thanh toán bằng cách rút ti�n trên tài khoản
 SuggestPaymentByChequeToAddress=�� nghị thanh toán bằng séc
 FreeLegalTextOnInvoices=Free text on invoices
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Thiết lập thanh toán của nhà cung cấp
 PropalSetup=Cài đặt module đơn hàng đ� xuất
 ProposalsNumberingModules=Mô hình đánh số đơn hàng đ� xuất
 ProposalsPDFModules=Mô hình chứng từ đơn hàng đ� xuất
-SuggestedPaymentModesIfNotDefinedInProposal=Chế độ thanh toán được gợi ý theo đ� xuất theo mặc định nếu không có định nghĩa cho đ� xuất
+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=Yêu cầu tài khoản ngân hàng của đơn hàng đ� xuất
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=H�i nguồn kho để đặt hàng
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=H�i tài khoản ngân hàng đích của đơn đặt hàng mua
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Thiết lập quản lý đơn đặt hàng
 OrdersNumberingModules=Mô hình đánh số đơn hàng
 OrdersModelModule=Mô hình chứng từ đơn hàng
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Cảnh báo, giá trị cao hơn làm c
 ModuleActivated=Mô-đun %s được kích hoạt và làm chậm giao diện
 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=Setup of module Import
 InstanceUniqueID=ID duy nhất của đối tượng
 SmallerThan=Nh� hơn
 LargerThan=Lớn hơn
@@ -1979,5 +1991,7 @@ 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=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 1d1d40bd268..d57824e370e 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Hóa đơn nhà cung cấp
 SupplierBill=Hóa đơn nhà cung cấp
 SupplierBills=Hóa đơn nhà cung cấp
 Payment=Thanh toán
-PaymentBack=Thanh toán lại
-CustomerInvoicePaymentBack=Thanh toán lại
+PaymentBack=Hoàn thuế
+CustomerInvoicePaymentBack=Hoàn thuế
 Payments=Thanh toán
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=ti�n tệ trên hóa đơn
 PaidBack=�ã trả lại
 DeletePayment=Xóa thanh toán
 ConfirmDeletePayment=Bạn có chắc chắn muốn xóa khoản thanh toán này?
-ConfirmConvertToReduc=Bạn có muốn chuyển đổi %s này thành giảm giá tuyệt đối không?
+ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=Số ti�n sẽ được lưu trong số tất cả các khoản giảm giá và có thể được sử dụng làm khoản giảm giá cho hóa đơn hiện tại hoặc tương lai cho khách hàng này.
-ConfirmConvertToReducSupplier=Bạn có muốn chuyển đổi %s này thành giảm giá tuyệt đối không?
+ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=Số ti�n sẽ được lưu trong số tất cả các khoản giảm giá và có thể được sử dụng làm khoản giảm giá cho hóa đơn hiện tại hoặc tương lai cho nhà cung cấp này.
 SupplierPayments=Thanh toán của nhà cung cấp
 ReceivedPayments=�ã nhận thanh toán
@@ -219,7 +219,10 @@ ShowInvoiceSituation=Xem hóa đơn tình huống
 UseSituationInvoices=Cho phép hóa đơn tình huống
 UseSituationInvoicesCreditNote=Cho phép ghi chú tín dụng hóa đơn tình huống
 Retainedwarranty=Giữ lại bảo hành
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=Giữ lại phần trăm mặc định bảo hành
+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=Thanh toán trên %s
 toPayOn=thanh toán trên %s
 RetainedWarranty=Giữ lại bảo hành
@@ -509,11 +512,11 @@ ToMakePayment=Trả
 ToMakePaymentBack=Trả lại
 ListOfYourUnpaidInvoices=Danh sách các hoá đơn chưa trả
 NoteListOfYourUnpaidInvoices=Ghi chú: Danh sách này chỉ chứa các hoá đơn cho bên thứ ba mà bạn liên quan như là một đại diện bán hàng.
-RevenueStamp=Doanh thu đóng dấu
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=Tùy ch�n này chỉ khả dụng khi tạo hóa đơn từ tab "Khách hàng" của bên thứ ba
 YouMustCreateInvoiceFromSupplierThird=Tùy ch�n này chỉ khả dụng khi tạo hóa đơn từ tab "Nhà cung cấp" của bên thứ ba
 YouMustCreateStandardInvoiceFirstDesc=Trước tiên, bạn phải tạo hóa đơn chuẩn và chuyển đổi thành "mẫu" để tạo hóa đơn mẫu mới
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template 
 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
@@ -575,3 +578,4 @@ AutoFillDateTo=�ặt ngày kết thúc cho dòng dịch vụ với ngày hóa 
 AutoFillDateToShort=�ặt ngày kết thúc
 MaxNumberOfGenerationReached=Số lượng tạo ra đạt tối đa
 BILL_DELETEInDolibarr=Hóa đơn đã bị xóa
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/vi_VN/blockedlog.lang b/htdocs/langs/vi_VN/blockedlog.lang
index 96ec346012a..d0ed0570da4 100644
--- a/htdocs/langs/vi_VN/blockedlog.lang
+++ b/htdocs/langs/vi_VN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Nhật ký không thể thay đổi
 ShowAllFingerPrintsMightBeTooLong=Hiển thị tất cả các nhật ký lưu trữ (có thể dài)
 ShowAllFingerPrintsErrorsMightBeTooLong=Hiển thị tất cả các nhật ký lưu trữ không hợp lệ (có thể dài)
 DownloadBlockChain=Tải dấu vân tay
-KoCheckFingerprintValidity=Lưu trữ nhật ký không hợp lệ. Nó có nghĩa là ai đó (một hacker?) �ã sửa đổi một số dữ liệu của lần này sau khi nó được ghi lại hoặc đã xóa bản ghi lưu trữ trước đó (kiểm tra dòng đó với # tồn tại trước đó).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Bản ghi nhật ký lưu trữ là hợp lệ. Dữ liệu trên dòng này không được sửa đổi và mục nhập theo sau.
 OkCheckFingerprintValidityButChainIsKo=Nhật ký lưu trữ có vẻ hợp lệ so với trước đó nhưng chuỗi đã bị h�ng trước đó.
 AddedByAuthority=Lưu trữ vào ủy quy�n từ xa
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index 3e7a9e7d3bd..ccfe1669ae1 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=Thêm bài viết này
 RestartSelling=Quay trở lại trên bán
 SellFinished=Hoàn thành bán hàng
 PrintTicket=In vé
+SendTicket=Send ticket
 NoProductFound=Không có bài viết được tìm thấy
 ProductFound=sản phẩm tìm thấy
 NoArticle=Không có bài viết
@@ -48,6 +49,7 @@ Footer=Chân trang
 AmountAtEndOfPeriod=Số ti�n cuối kỳ (ngày, tháng hoặc năm)
 TheoricalAmount=Số lượng lý thuyết
 RealAmount=Số ti�n thực tế
+CashFence=Cash fence
 CashFenceDone=Rào cản ti�n mặt được thực hiện trong kỳ
 NbOfInvoices=Nb của hoá đơn
 Paymentnumpad=Loại Bảng để nhập thanh toán
@@ -58,8 +60,9 @@ TakeposNeedsCategories=TakePOS cần các danh mục sản phẩm để hoạt 
 OrderNotes=Ghi chú đơn hàng
 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=Nhóm VAT theo tỷ lệ trong vé
-AutoPrintTickets=Tự động in vé
+TicketVatGrouped=Group VAT by rate in tickets|receipts
+AutoPrintTickets=Automatically print tickets|receipts
+PrintCustomerOnReceipts=Print customer on tickets|receipts
 EnableBarOrRestaurantFeatures=Cho phép tính năng cho Bar hoặc Restaurant
 ConfirmDeletionOfThisPOSSale=Bạn có xác nhận việc xóa bán hàng hiện tại này không?
 ConfirmDiscardOfThisPOSSale=Bạn có muốn loại b� bán hàng hiện tại này?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 Browser=Trình duyệt
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 63225bdbd93..f5be2da418e 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=Công ty "%s" đã xóa kh�i cơ sở dữ liệu.
 ListOfContacts=Danh sách liên lạc/địa chỉ
 ListOfContactsAddresses=Danh sách liên lạc/địa chỉ
 ListOfThirdParties=Danh sách các bên thứ ba
-ShowCompany=Hiển thị bên thứ ba
 ShowContact=Hiện liên lạc
 ContactsAllShort=Tất cả (không l�c)
 ContactType=Loại liên lạc
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=Tên đại diện bán hàng
 SaleRepresentativeLastname=H� của đại diện bán hàng
 ErrorThirdpartiesMerge=Có lỗi khi xóa các bên thứ ba. Vui lòng kiểm tra nhật ký. Những thay đổi đã được hoàn nguyên.
 NewCustomerSupplierCodeProposed=Mã khách hàng hoặc nhà cung cấp đã được sử dụng, một mã mới được đ� xuất
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=Loại thanh toán - Khách hàng
 PaymentTermsCustomer=�i�u khoản thanh toán - Khách hàng
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index c6b810a1adb..7ac83c9969b 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=Xem %s Phân tích thanh toán %s để biết tính
 SeeReportInDueDebtMode=Xem %s phân tích hóa đơn%s để biết cách tính toán dựa trên hóa đơn đã ghi ngay cả khi chúng chưa được hạch toán vào Sổ cái.
 SeeReportInBookkeepingMode=Xem <b>%s Sổ sách báo cáo %s</b> để biết tính toán trên <b>bảng Sổ sách kế toán</b>
 RulesAmountWithTaxIncluded=- Các khoản hiển thị là với tất cả các loại thuế bao gồm
-RulesResultDue=- Nó bao gồm hóa đơn chưa thanh toán, chi phí, VAT, đóng góp cho dù chúng có được thanh toán hay không. Nó cũng bao gồm ti�n lương được trả. <br> - Nó được dựa trên ngày xác nhận của hóa đơn và VAT và vào ngày đáo hạn cho các chi phí. �ối với mức lương được xác định với mô-đun Lương, giá trị ngày thanh toán được sử dụng.
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- Nó bao gồm các khoản thanh toán thực tế được thực hiện trên hóa đơn, chi phí, VAT và ti�n lương. <br> - Nó dựa trên ngày thanh toán của hóa đơn, chi phí, VAT và ti�n lương. Ngày quyên góp.
-RulesCADue=- Nó bao gồm hóa đơn đáo hạn của khách hàng cho dù h� có được thanh toán hay không. <br> - Nó được dựa trên ngày xác nhận của các hóa đơn này. <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=- 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.
 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"
@@ -255,3 +255,10 @@ TurnoverbyVatrate=Doanh thu được lập hóa đơn theo thuế suất bán h
 TurnoverCollectedbyVatrate=Doanh thu được thu thập theo thuế suất bán hàng
 PurchasebyVatrate=Mua theo thuế suất bán hàng
 LabelToShow=Nhãn ngắn
+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
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 58d85ee7758..fb14daeeb4d 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -59,6 +59,7 @@ 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.
 ErrorFileSizeTooLarge=Kích thước quá lớn.
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Kích thước quá dài cho kiểu int (tối đa số% s)
 ErrorSizeTooLongForVarcharType=Kích thước quá dài cho kiểu chuỗi (ký tự tối đa% s)
 ErrorNoValueForSelectType=Xin vui lòng đi�n giá trị so với danh sách lựa ch�n
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). �ây không phải là một thiết lập phù hợp.
 WarningPasswordSetWithNoAccount=Một mật khẩu đã được đặt cho thành viên này. Tuy nhiên, không có tài khoản ngư�i dùng nào được tạo. Vì vậy, mật khẩu này được lưu trữ nhưng không thể được sử dụng để đăng nhập vào Dolibarr. Nó có thể được sử dụng bởi một mô-đun / giao diện bên ngoài nhưng nếu bạn không cần xác định bất kỳ thông tin đăng nhập hay mật khẩu nào cho thành viên, bạn có thể tắt tùy ch�n "Quản lý đăng nhập cho từng thành viên" từ thiết lập mô-đun Thành viên. Nếu bạn cần quản lý thông tin đăng nhập nhưng không cần bất kỳ mật khẩu nào, bạn có thể để trống trư�ng này để tránh cảnh báo này. Lưu ý: Email cũng có thể được sử dụng làm thông tin đăng nhập nếu thành viên được liên kết với ngư�i dùng.
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index 2a187d73221..2653ffb9df1 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=PHP này hỗ trợ Curl.
 PHPSupportCalendar=PHP này hỗ trợ các lịch phần mở rộng.
 PHPSupportUTF8=PHP này hỗ trợ các chức năng UTF8.
 PHPSupportIntl=PHP này hỗ trợ các chức năng Intl.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b>. �i�u này là đủ.
 PHPMemoryTooLow=Bộ nhớ phiên tối đa PHP của bạn được đặt thành <b>%s</b> byte. �i�u này là quá thấp. Thay đổi <b>php.ini</b> của bạn để đặt tham số <b>memory_limit</b> thành ít nhất <b>%s</b> byte.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=Cài đặt PHP của bạn không hỗ trợ Curl.
 ErrorPHPDoesNotSupportCalendar=Cài đặt PHP của bạn không hỗ trợ các phần mở rộng lịch php.
 ErrorPHPDoesNotSupportUTF8=Cài đặt PHP của bạn không hỗ trợ các chức năng UTF8. Dolibarr không thể hoạt động chính xác. Giải quyết đi�u này trước khi cài đặt Dolibarr.
 ErrorPHPDoesNotSupportIntl=Cài đặt PHP của bạn không hỗ trợ các chức năng Intl.
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
 ErrorDirDoesNotExists=Thư mục %s không tồn tại.
 ErrorGoBackAndCorrectParameters=Quay lại và kiểm tra / sửa các tham số.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=Ứng dụng đã cố gắng tự nâng cấp, n
 YouTryInstallDisabledByFileLock=Ứng dụng đã cố gắng tự nâng cấp, nhưng các trang cài đặt / nâng cấp đã bị vô hiệu hóa để bảo mật (bởi sự tồn tại của tệp khóa <strong>install.lock</strong> trong thư mục tài liệu dolibarr). <br>
 ClickHereToGoToApp=Nhấn vào đây để đi đến ứng dụng của bạn
 ClickOnLinkOrRemoveManualy=Nhấp vào liên kết sau. Nếu bạn luôn thấy cùng trang này, bạn phải xóa / đổi tên tệp install.lock trong thư mục tài liệu.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/vi_VN/link.lang b/htdocs/langs/vi_VN/link.lang
index d47c82a361d..bacbeaf98e2 100644
--- a/htdocs/langs/vi_VN/link.lang
+++ b/htdocs/langs/vi_VN/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=Liên kết %s đã bị xóa
 ErrorFailedToDeleteLink= Không thể xóa liên kết ' <b>%s</b> '
 ErrorFailedToUpdateLink= Không thể cập nhật liên kết ' <b>%s</b> '
 URLToLink=URL để liên kết
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 7a8f92ec982..2ebdc7e1185 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=Không có liên lạc/địa chỉ với một danh
 NoContactLinkedToThirdpartieWithCategoryFound=Không có liên lạc/địa chỉ với một danh mục được tìm thấy
 OutGoingEmailSetup=Thiết lập email đi
 InGoingEmailSetup=Thiết lập email đến
-OutGoingEmailSetupForEmailing=Thiết lập email gửi đi (để gửi email hàng loạt)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Thiết lập email gửi đi mặc định
 Information=Thông tin
 ContactsWithThirdpartyFilter=Danh bạ với bộ l�c của bên thứ ba
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index b8c2d319e12..ab5388d128d 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Lưu và ở lại
 SaveAndNew=Lưu và tạo mới
 TestConnection=Kiểm tra kết nối
 ToClone=Nhân bản
+ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
 ConfirmClone=Ch�n dữ liệu bạn muốn sao chép:
 NoCloneOptionsSpecified=Không có dữ liệu nhân bản được xác định.
 Of=của
@@ -829,6 +830,8 @@ Gender=Giới tính
 Genderman=Nam
 Genderwoman=Nữ
 ViewList=Danh sách xem
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=Bắt buộc
 Hello=Xin chào
 GoodBye=Tạm biệt
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index b353e8230d4..bb29fddc9fe 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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=�ơn đặt hàng bán đã được xác nhận
 Notify_ORDER_SENTBYMAIL=�ơn đặt hàng bán được gửi email
 Notify_ORDER_SUPPLIER_SENTBYMAIL=�ơn đặt hàng mua được gửi qua email
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=URL của trang
 WEBSITE_TITLE=Tiêu đ�
 WEBSITE_DESCRIPTION=Mô tả
 WEBSITE_IMAGE=Hình ảnh
-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 __WEBSITEKEY__ in the path if path depends on website name.
+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=Từ khóa
 LinesToImport=Dòng để nhập
 
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 5759b620e26..1e367dc6db9 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=Công cụ này cập nhật thuế suất VAT được
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra xem trước đó thiết lập các mô-đun mã vạch hoàn tất chưa.
 ProductAccountancyBuyCode=Mã tài khoản kế toán (thu mua)
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=Mã tài khoản kế toán (bán)
 ProductAccountancySellIntraCode=Mã tài khoản kế toán (bán nội bộ)
 ProductAccountancySellExportCode=Mã tài khoản kế toán (xuất khẩu)
@@ -165,7 +167,7 @@ SuppliersPrices=Giá nhà cung cấp
 SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm hoặc dịch vụ)
 CustomCode=Hải quan / Hàng hóa / HS code
 CountryOrigin=Nước xuất xứ
-Nature=Bản chất của sản phẩm (nguyên liệu/ thành phẩm)
+Nature=Nature of product (material/finished)
 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 de89d17291b..81bec314452 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=cái mà tôi liên kết với dự án
 Time=Th�i gian
 ListOfTasks=Danh sách nhiệm vụ
 GoToListOfTimeConsumed=Tới danh sách th�i gian tiêu thụ
-GoToListOfTasks=Hiển thị dưới dạng danh sách
-GoToGanttView=hiển thị dưới dạng Gantt
 GanttView=Chế độ xem Gantt
 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
@@ -188,7 +186,7 @@ PlannedWorkload=Khối lượng công việc dự tính
 PlannedWorkloadShort=Khối lượng công việc
 ProjectReferers=Những thứ có liên quan
 ProjectMustBeValidatedFirst=Dự án phải được xác nhận trước
-FirstAddRessourceToAllocateTime=Chỉ định tài nguyên ngư�i dùng cho nhiệm vụ để phân bổ th�i gian
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=�ầu vào mỗi ngày
 InputPerWeek=�ầu vào mỗi tuần
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=Dự án sửa đổi %s mới nhất
 OtherFilteredTasks=Các nhiệm vụ được l�c khác
 NoAssignedTasks=Không tìm thấy nhiệm vụ được giao (chỉ định dự án / nhiệm vụ cho ngư�i dùng hiện tại từ hộp ch�n trên cùng để nhập th�i gian vào nó)
 ThirdPartyRequiredToGenerateInvoice=Một bên thứ ba phải được xác định trong dự án để có thể lập hóa đơn.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Cho phép ngư�i dùng nhận xét v� các nhiệm vụ
 AllowCommentOnProject=Cho phép ngư�i dùng nhận xét v� các dự án
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=Hóa đơn mới
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/vi_VN/receiptprinter.lang b/htdocs/langs/vi_VN/receiptprinter.lang
index a7bf9271929..1e516ff0f89 100644
--- a/htdocs/langs/vi_VN/receiptprinter.lang
+++ b/htdocs/langs/vi_VN/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=Máy in giả
 CONNECTOR_NETWORK_PRINT=Máy in mạng
 CONNECTOR_FILE_PRINT=Máy in cục bộ
 CONNECTOR_WINDOWS_PRINT=Máy in Windows cục bộ
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=Máy in giả để kiểm tra, không làm gì cả
 CONNECTOR_NETWORK_PRINT_HELP=10.xxx: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=Hồ sơ mặc định
 PROFILE_SIMPLE=Hồ sơ đơn giản
 PROFILE_EPOSTEP=Hồ sơ Epose Tep
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_REF=Hóa đơn tham chiếu
+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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=ID VAT Nội bộ Cộng đồng
+DOL_VALUE_MYSOC_CAPITAL=Vốn
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/vi_VN/stripe.lang b/htdocs/langs/vi_VN/stripe.lang
index 0e1d2c75412..5d18304fdef 100644
--- a/htdocs/langs/vi_VN/stripe.lang
+++ b/htdocs/langs/vi_VN/stripe.lang
@@ -32,6 +32,7 @@ VendorName=Tên nhà cung cấp
 CSSUrlForPaymentForm=CSS style sheet Url cho hình thức thanh toán
 NewStripePaymentReceived=�ã nhận thanh toán Stripe mới
 NewStripePaymentFailed=Thanh toán Stripe mới đã thử nhưng không thành công
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=Khóa kiểm tra bí mật
 STRIPE_TEST_PUBLISHABLE_KEY=Khóa kiểm tra có thể xuất bản
 STRIPE_TEST_WEBHOOK_KEY=Khóa kiểm tra webhook
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Liên kết để thiết lập Stripe WebHook để
 ToOfferALinkForLiveWebhook=Liên kết để thiết lập Stripe WebHook để g�i IPN (chế độ trực tiếp)
 PaymentWillBeRecordedForNextPeriod=Thanh toán sẽ được ghi lại cho giai đoạn tiếp theo.
 ClickHereToTryAgain=<a href="%s">Bấm vào đây để thử lại...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 33e533443af..97c911d59d0 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -70,7 +70,7 @@ 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=Ngư�i dùng <b>nội bộ</b> là ngư�i dùng là một phần của công ty/ tổ chức của bạn. <br> Một ngư�i dùng <b>bên ngoài</b> là một khách hàng, nhà cung cấp hoặc ngư�i khác. <br><br> Trong cả hai trư�ng hợp, quy�n để phân quy�n trên Dolibarr, ngư�i dùng bên ngoài cũng có thể có trình quản lý menu khác với ngư�i dùng nội bộ (Xem Trang chủ - Cài đặt - Hiển thị)
+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)
 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ế
 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ể)
@@ -113,3 +113,5 @@ CantDisableYourself=Bạn không thể vô hiệu hóa hồ sơ ngư�i dùng c
 ForceUserExpenseValidator=Thúc phê duyệt báo cáo chi phí
 ForceUserHolidayValidator=Thúc phê duyệt báo cáo chi phí
 ValidatorIsSupervisorByDefault=Theo mặc định, việc xác nhận là ngư�i giám sát của ngư�i dùng. Giữ trống để giữ hành vi này.
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 68db7fce100..6c3e12df2e3 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=Xem trang trong tab má»›i
 SetAsHomePage=�ặt làm trang chủ
 RealURL=URL thật
 ViewWebsiteInProduction=Xem trang web bằng URL nhà
-SetHereVirtualHost=<u>Sử dụng với Apache / NGinx / ...</u> <br> Nếu bạn có thể tạo, trên máy chủ web của bạn (Apache, Nginx, ...), Máy chủ ảo chuyên dụng có bật PHP và thư mục Root trên <br> <strong>%s</strong> <br> sau đó đặt tên của máy chủ ảo mà bạn đã tạo trong các thuộc tính của trang web, do đó, việc xem trước cũng có thể được thực hiện bằng cách sử dụng quy�n truy cập máy chủ web chuyên dụng này thay vì máy chủ Dolibarr nội bộ.
+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>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>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Xin lỗi, trang web này hiện đang tắt. Vui
 WEBSITE_USE_WEBSITE_ACCOUNTS=Kích hoạt bảng tài khoản trang web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Cho phép bảng để lưu trữ tài khoản trang web (đăng nhập / mật khẩu) cho mỗi trang web / bên thứ ba
 YouMustDefineTheHomePage=Trước tiên bạn phải xác định Trang chủ mặc định
-OnlyEditionOfSourceForGrabbedContentFuture=Cảnh báo: Tạo trang web bằng cách nhập trang web bên ngoài được dành riêng cho ngư�i dùng có kinh nghiệm. Tùy thuộc vào độ phức tạp của trang nguồn, kết quả nhập có thể khác với trang gốc. Ngoài ra, nếu trang nguồn sử dụng các kiểu CSS phổ biến hoặc javascript xung đột, nó có thể phá vỡ giao diện hoặc tính năng của trình chỉnh sửa Trang web khi làm việc trên trang này. Phương pháp này là một cách nhanh hơn để tạo một trang nhưng bạn nên tạo trang mới của mình từ đầu hoặc từ một mẫu trang được đ� xuất. <br> Cũng lưu ý rằng có thể chỉnh sửa nguồn HTML khi nội dung trang đã được khởi tạo bằng cách lấy nó từ một trang bên ngoài (trình chỉnh sửa "Trực tuyến" sẽ KHÔNG khả dụng)
+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=Chỉ có phiên bản nguồn HTML khi nội dung được lấy từ một trang bên ngoài
 GrabImagesInto=Lấy hình ảnh cũng được tìm thấy trong css và trang.
 ImagesShouldBeSavedInto=Hình ảnh nên được lưu vào thư mục
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=�ể thực hành SEO tốt, hãy sử dụng văn b
 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
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 5afa44d00c2..1c4c03260c0 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=Note: <b>your</b> PHP configuration currently limits the
 NoMaxSizeByPHPLimit=注：您的 PHP �置�数中没有设置�制
 MaxSizeForUploadedFiles=上传文件的最大尺寸（0表示��许上传）
 UseCaptchaCode=登陆页��用图形验��
-AntiVirusCommand= 防毒命令的完整路径
-AntiVirusCommandExample= ClamWin 示例：c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>ClamAv 实例：/usr/bin/clamscan
+AntiVirusCommand=防毒命令的完整路径
+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= 更多命令行�数
-AntiVirusParamExample= ClamWin的示例： -  database =“C：\\ Program Files（x86）\\ ClamWin \\ lib�
+AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=会计模�设置
 UserSetup=用户管�设置
 MultiCurrencySetup=多��设置
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=功能在演示版中已�用
 FeatureAvailableOnlyOnStable=功能仅适用于官方稳定版本
 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 (at end of module line) to enable/disable a module/application.
+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=你能在外部互�网查找到并下载更多的功能模�...
 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=更多模�...
@@ -212,6 +212,7 @@ CompatibleUpTo=与版本%s兼容
 NotCompatible=此模�似乎与您的Dolibarr %s（Min %s  -  Max %s）�兼容。
 CompatibleAfterUpdate=此模�需�更新Dolibarr %s（Min %s  -  Max %s）。
 SeeInMarkerPlace=在市场上看到
+SeeSetupOfModule=��模�设置 %s
 Updated=已更新
 Nouveauté=新颖
 AchatTelechargement=购买/下载
@@ -221,6 +222,7 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=�考网�查找更多模�...
 DevelopYourModuleDesc=一些开�自己模�的解决方案......
 URL=网�
+RelativeURL=Relative URL
 BoxesAvailable=�件�用
 BoxesActivated=�件已�用
 ActivateOn=�用
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=�填表示使用默认值
 DefaultLink=默认链接
 SetAsDefault=设为默认
 ValueOverwrittenByUserSetup=警告，此设置�能被用户设置所覆盖(用户�以设置�自的网络电�链接)
-ExternalModule=附加模� - 安装于 %s 目录下
+ExternalModule=External module
+InstalledInto=Installed into directory %s
 BarcodeInitForthird-parties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=产�或�务��批��始化或�置
 CurrentlyNWithoutBarCode=目�，您在<strong> %s </ strong> %s上没有定义�形�时有<strong> %s </ strong>记录。
@@ -947,7 +950,7 @@ DictionaryCanton=States/Provinces
 DictionaryRegion=地区
 DictionaryCountry=国家
 DictionaryCurrency=货�
-DictionaryCivility=Title of civility
+DictionaryCivility=Honorific titles
 DictionaryActions=活动议程类型
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=增值税率和消费税率
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for ca
 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=税率
 LocalTax1IsNotUsed=�使用第二税率
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices
 LocalTax2IsNotUsedDescES=默认情况下，建议IRPF为0。规则结�。
 LocalTax2IsUsedExampleES=在西�牙，�供�务的自由�业者和独立专业人士以�选择模�税制的公�。
 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 des 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=地税报表
 CalcLocaltax1=销售 - 采购
 CalcLocaltax1Desc=地税报表已�分别计算了在销售和采购时所产生的��税。
@@ -1018,6 +1025,7 @@ CalcLocaltax2=采购
 CalcLocaltax2Desc=地税报表是采购总计
 CalcLocaltax3=销售
 CalcLocaltax3Desc=地税报表是销售总计
+NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
 LabelUsedByDefault=如果代�没有翻译则默认使用以下标签
 LabelOnDocuments=文档中的标签
 LabelOrTranslationKey=Label or translation key
@@ -1108,8 +1116,8 @@ 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>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>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+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=安全稽核事件
 Audit=安全稽核
@@ -1128,7 +1136,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=此功能仅供<b>管�员用户</b> 使用。
 SystemInfoDesc=系统信�指以�读方�显示的其它技术信�，�对系统管�员��。
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+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.
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords
 DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
 UsersSetup=用户模�设置
 UserMailRequired=Email required to create a new user
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=人力资�管�模�设置
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=�票文档模�
 BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
 PaymentsPDFModules=付款文件模型
 ForceInvoiceDate=强制�票中的日期为确认日期
-SuggestedPaymentModesIfNotDefinedInInvoice=如果�票中未设置付款方�，设置一个默认值付款方�。
+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=�票中的�外说明文本
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=Vendor payments setup
 PropalSetup=报价�模�设置
 ProposalsNumberingModules=报价�编�模�
 ProposalsPDFModules=报价�文档模�
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
 FreeLegalTextOnProposal=报价�中的�外说明文本
 WatermarkOnDraftProposal=为商业计划书�案添加水�(无则留空)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=询问银行账户
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=�求仓库��订购
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=询问采购订�的银行�户目的地
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
 OrdersSetup=Sales Orders management setup
 OrdersNumberingModules=订�编�模�
 OrdersModelModule=订�文档模�
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1979,5 +1991,7 @@ 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_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate 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=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.
+RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+JumpToBoxes=Jump to Setup -> Widgets
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 866a4c523d0..36bcc71b879 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
 SupplierBills=供应商�票
 Payment=付款
-PaymentBack=付款
-CustomerInvoicePaymentBack=付款
+PaymentBack=Refund
+CustomerInvoicePaymentBack=Refund
 Payments=付款
 PaymentsBack=Refunds
 paymentInInvoiceCurrency=在�票货�
 PaidBack=已退款
 DeletePayment=删除付款
 ConfirmDeletePayment=您确定�删除此付款�？
-ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount?
+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 absolute discount?
+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=收到的付款
@@ -219,7 +219,10 @@ ShowInvoiceSituation=显示情况�票
 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
@@ -509,11 +512,11 @@ ToMakePayment=支付
 ToMakePaymentBack=支付
 ListOfYourUnpaidInvoices=未付�票清�
 NoteListOfYourUnpaidInvoices=注：此清��包�链接到指派给您作为销售代表的�作方�票。
-RevenueStamp=�花税票
+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=您必须先创建标准�票并将其转�为“模��以创建新模��票
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice 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
@@ -575,3 +578,4 @@ AutoFillDateTo=使用下一个�票日期设置�务项目的结�日期
 AutoFillDateToShort=设置结�日期
 MaxNumberOfGenerationReached=最大数�。到达
 BILL_DELETEInDolibarr=�票已删除
+BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
diff --git a/htdocs/langs/zh_CN/blockedlog.lang b/htdocs/langs/zh_CN/blockedlog.lang
index 7b122b28452..ce7718f76c4 100644
--- a/htdocs/langs/zh_CN/blockedlog.lang
+++ b/htdocs/langs/zh_CN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this re after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index c2fd056546a..92be0b9ad8a 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -16,6 +16,7 @@ AddThisArticle=添加项目
 RestartSelling=回去就�
 SellFinished=销售完�
 PrintTicket=打�零售记录
+SendTicket=Send ticket
 NoProductFound=空空如也——没有找到项目
 ProductFound=找到产�
 NoArticle=没有项目
@@ -48,6 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
+CashFence=Cash fence
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=�票数
 Paymentnumpad=Type of Pad to enter payment
@@ -58,8 +60,9 @@ 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
-AutoPrintTickets=Automatically print tickets
+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 ?
@@ -87,7 +90,19 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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 de cloud.
+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 payment icon on numpad
+CashDeskRefNumberingModules=Numbering module for cash desk
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
+TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
+ControlCashOpening=Control cash box at opening pos
+CloseCashFence=Close cash fence
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 8f920f891d1..3491674f194 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=公�“%的�从数�库中删除。
 ListOfContacts=�系人列表
 ListOfContactsAddresses=�系人列表
 ListOfThirdParties=List of Third Parties
-ShowCompany=Show Third Party
 ShowContact=显示�系人
 ContactsAllShort=全部 (�筛选)
 ContactType=�系人类型
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=销售代表的�字
 SaleRepresentativeLastname=销售代表的姓�
 ErrorThirdpartiesMerge=删除第三方时出错。请检查日志。�更已被��。
 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
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index af8ca4a19e6..a861221bd87 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=有关实际付款的计算，请�阅%s of payments
 SeeReportInDueDebtMode=请�阅%s对invoices%s的分�，以便根�已知的记录�票进行计算，�使它们尚未计入分类�。
 SeeReportInBookkeepingMode=有关<b>簿记分类�表</b>的计算，请�阅<b> %sBookeeping report%s </b>
 RulesAmountWithTaxIncluded=- 所示金���税
-RulesResultDue=- 它包括未付的�票，费用，增值税和�款。还包括带薪工资。<br>  - 它基于�票和增值税的确认日期以�费用到期日。对于使用Salary模�定义的工资，使用付款的起�日期。
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- 它包括�票，费用，增值税和工资的实际付款。 <br>  - 它基于�票，费用，增值税和工资的付款日期。�赠的�赠日期。
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<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=它包括Sale日常报表中的所有信用�度。
 RulesAmountOnInOutBookkeepingRecord=它包括在您的账目中记录具有“EXPENSE�或“INCOME�组的会计科目
@@ -255,3 +255,10 @@ TurnoverbyVatrate=�业税按销售税率开具
 TurnoverCollectedbyVatrate=按销售税率收�的�业�
 PurchasebyVatrate=按销售税率购买
 LabelToShow=标签别�
+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
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 2205f13963c..ba3f2328466 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=文件未收到了完全由�务器。
 ErrorNoTmpDir=临时的说明书%s�存在。
 ErrorUploadBlockedByAddon=上传��一个PHP / Apache的�件。
 ErrorFileSizeTooLarge=文件大�是太大。
+ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=尺寸int类型的长（%s最大�数）
 ErrorSizeTooLongForVarcharType=尺寸长字符串类型（%s字符最大）
 ErrorNoValueForSelectType=请填写选�列表值
@@ -234,7 +235,8 @@ ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated pa
 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 user 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 ?
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=为此�员设置了密�。但是，未创建任何用户�户。因此，此密�已存储，但无法用于登录Dolibarr。它�以由外部模�/接�使用，但如果您�需�为�员定义任何登录�或密�，则�以从�员模�设置中�用“管��个�员的登录��选项。如果您需�管�登录但�需�任何密�，则�以将此字段�留为空以��此警告。注�：如果�员链接到用户，则电�邮件也�用作登录。
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index a45a7907320..49e1a98b5d8 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=This PHP supports calendars extensions.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=This PHP supports %s functions.
 PHPMemoryOK=您的PHP最大session会�内存设置为<b>%s</b>。这应该够了的。
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=你的PHP�务器�支�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=目录 %s �存在。
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the in
 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=点击此处转到您的申请
 ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/zh_CN/link.lang b/htdocs/langs/zh_CN/link.lang
index 390f4fcaf81..3c715594202 100644
--- a/htdocs/langs/zh_CN/link.lang
+++ b/htdocs/langs/zh_CN/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=链接 %s 已移除
 ErrorFailedToDeleteLink= 移除链接失败 '<b>%s</b>'
 ErrorFailedToUpdateLink= 更新链接失败 '<b>%s</b>'
 URLToLink=URL网�超链接
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index bada6e2d7be..127a61c350d 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=分类没有�系人/地�
 NoContactLinkedToThirdpartieWithCategoryFound=分类没有�系人/地�
 OutGoingEmailSetup=�件�务器设置
 InGoingEmailSetup=传入电�邮件设置
-OutGoingEmailSetupForEmailing=外�电�邮件设置（用于群�电�邮件）
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=默认外�电�邮件设置
 Information=信�
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 63080052051..7fd64d81418 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=Save and stay
 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:
 NoCloneOptionsSpecified=未定义��制数�
 Of=çš„
@@ -829,6 +830,8 @@ Gender=性别
 Genderman=男人
 Genderwoman=女人
 ViewList=列表视图
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=强制性
 Hello=你好
 GoodBye=��
@@ -1022,3 +1025,6 @@ 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?
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 1d4465eb6fd..c966cf74cde 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mo
 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
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=页�URL地�
 WEBSITE_TITLE=标题
 WEBSITE_DESCRIPTION=�述
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITEKEY__ in the path if path depends on website name.
+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=关键字
 LinesToImport=�导入的行
 
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 1726d77971c..54bafe71412 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u>
 MassBarcodeInit=批����始化
 MassBarcodeInitDesc=此页��用于�始化未定义�形�的对象上的�形�。在模��形�设置完�之�检查。
 ProductAccountancyBuyCode=科目代�（采购）
+ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=科目代�（销售）
 ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
 ProductAccountancySellExportCode=科目代�（销售导出）
@@ -165,7 +167,7 @@ SuppliersPrices=供应商价格
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=海关/商�/ HS编�
 CountryOrigin=产地国
-Nature=Nature of produt (material/finished)
+Nature=Nature of product (material/finished)
 ShortLabel=标签别�
 Unit=��
 p=u.
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 477b06658ca..e797f15a346 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
 Time=时间
 ListOfTasks=任务列表
 GoToListOfTimeConsumed=转到消耗的时间列表
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
 GanttView=甘特视图
 ListProposalsAssociatedProject=List of the commercial proposals related to the project
 ListOrdersAssociatedProject=List of sales orders related to the project
@@ -188,7 +186,7 @@ PlannedWorkload=计划的工作�
 PlannedWorkloadShort=工作�
 ProjectReferers=关�物料
 ProjectMustBeValidatedFirst=项目首先必须认�
-FirstAddRessourceToAllocateTime=将用户资�分�给任务以分�时间
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=输入天数
 InputPerWeek=输入周数
 InputPerMonth=Input per month
@@ -240,6 +238,7 @@ LatestModifiedProjects=最新的%s编辑过的项目
 OtherFilteredTasks=其他过滤任务
 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=�许用户对任务�表评论
 AllowCommentOnProject=�许用户对项目�表评论
@@ -265,3 +264,4 @@ InvoiceToUse=Draft invoice to use
 NewInvoice=新建�票
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
+RefTaskParent=Ref. Parent Task
diff --git a/htdocs/langs/zh_CN/receiptprinter.lang b/htdocs/langs/zh_CN/receiptprinter.lang
index d475890c290..f52af233aac 100644
--- a/htdocs/langs/zh_CN/receiptprinter.lang
+++ b/htdocs/langs/zh_CN/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=虚拟打�机
 CONNECTOR_NETWORK_PRINT=网络打�机
 CONNECTOR_FILE_PRINT=本地打�机
 CONNECTOR_WINDOWS_PRINT=本地Windows打�机
+CONNECTOR_CUPS_PRINT=Cups Printer
 CONNECTOR_DUMMY_HELP=伪造测试打�，啥也��的
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
 PROFILE_DEFAULT=默认�置
 PROFILE_SIMPLE=简��置
 PROFILE_EPOSTEP=Epos Tep�置
@@ -61,3 +63,33 @@ 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
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=Intra-Community VAT ID
+DOL_VALUE_MYSOC_CAPITAL=注册资金
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/zh_CN/stripe.lang b/htdocs/langs/zh_CN/stripe.lang
index 3ed146a77a1..31131a72634 100644
--- a/htdocs/langs/zh_CN/stripe.lang
+++ b/htdocs/langs/zh_CN/stripe.lang
@@ -32,6 +32,7 @@ VendorName=供应商�称
 CSSUrlForPaymentForm=付款方�的CSS样�表的URL
 NewStripePaymentReceived=收到新Stripe付款
 NewStripePaymentFailed=新Stripe付款�试但失败了
+FailedToChargeCard=Failed to charge card
 STRIPE_TEST_SECRET_KEY=秘密测试密钥
 STRIPE_TEST_PUBLISHABLE_KEY=��布的测试密钥
 STRIPE_TEST_WEBHOOK_KEY=Webhook测试密钥
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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 Authenticatin rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+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/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index 366bb926d9e..d84917431eb 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -70,7 +70,7 @@ 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.<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.<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)
 PermissionInheritedFromAGroup=因为从��授予一个用户的一组继承。
 Inherited=�传
 UserWillBeInternalUser=创建的用户将是一个内部用户(因为没有�系到一个特定的�伙人)
@@ -110,3 +110,8 @@ UserLogged=用户登录
 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
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 3ec26dc1c61..bf972ed8656 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=在新标签页查看页�
 SetAsHomePage=设为首页
 RealURL=真实URL地�
 ViewWebsiteInProduction=使用主页URL网�查看网页
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
+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=还�检查虚拟主机是�有��<strong> %s </strong>将文件转�为<br> <strong> %s </strong>
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 WEBSITE_USE_WEBSITE_ACCOUNTS=�用网站�户表
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=您必须先定义默认主页
-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 edits of HTML source will be possible when page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available)
+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=当从外部站点获�内容时，�能使用HTML�代�
 GrabImagesInto=抓��现到css和页�的图�。
 ImagesShouldBeSavedInto=图�应�存到目录中
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 ch
 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
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index bfb5d3c2862..d91885d1812 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -54,8 +54,8 @@ SetupArea=設定
 UploadNewTemplate=上傳新的範本
 FormToTestFileUploadForm=用於測試檔案上傳的表格（根據設定）
 IfModuleEnabled=註：若模組<b>%s</b>啓用時，「是的�有效。
-RemoveLock=如果存在<b>%s</b>,刪除/�命�文件，以�許使用更新/安�工具。
-RestoreLock=以唯讀權�還原檔案<b>%s</b> ，以�止進一步使用更新/安�工具。
+RemoveLock=如果存在<b>%s</b>檔案,刪除/�新命�文件以�許使用更新/安�工具。
+RestoreLock=還原檔案唯讀權�檔案<b>%s</b> ，以�止使用更新/安�工具。
 SecuritySetup=安全設定
 SecurityFilesDesc=在此定義上傳檔案相關的安全設定。
 ErrorModuleRequirePHPVersion=錯誤，這個模組需�的PHP版本是 %s 或更高版本
@@ -98,10 +98,10 @@ MustBeLowerThanPHPLimit=注�： <b>您的</b> PHP設定目��制了上傳
 NoMaxSizeByPHPLimit=註：你的 PHP �好設定為無�制
 MaxSizeForUploadedFiles=上傳檔案最大值（0 為�止上傳）
 UseCaptchaCode=在登入�中的使用圖形碼 (CAPTCHA)
-AntiVirusCommand= 防毒命令的完整路徑
-AntiVirusCommandExample= 例如 ClamWin 為 c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>例如 ClamAv 為 /usr/bin/clamscan
+AntiVirusCommand=防毒命令的完整路徑
+AntiVirusCommandExample=ClamAv Daemon 的範例（需� clamav-daemon）: / usr / bin / clamdscan <br> ClamWin的範例（�常慢）: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= 在命令列中更多的�數
-AntiVirusParamExample= 例如 ClamWin 為 --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=ClamAv Daemon 範例: --fdpass <br> ClamWin的範例: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=會計模組設定
 UserSetup=用戶管�設定
 MultiCurrencySetup=多國幣別設定
@@ -199,7 +199,7 @@ FeatureDisabledInDemo=DEMO模�下已�用功能
 FeatureAvailableOnlyOnStable=在官方穩定版本中�用的功能
 BoxesDesc=�工具是顯示一些訊�的元件，您�以增加這些訊�來個性化�些��。通��擇目標��並點擊“啟用�，或點擊垃圾桶將其�用，�以�擇顯示�工具或是�顯示�工具。
 OnlyActiveElementsAreShown=僅顯示<a href="%s">已啟用模組</a>中的元件。
-ModulesDesc=模組/應用程�確定軟體中�用的功能。�些模組需�在啟用模組後授予用戶權�。點擊開啟/關閉按鈕（在模組行的末尾）以啟用/�用模組/應用程�。
+ModulesDesc=模組/應用程�决定軟體中�用的功能。�些模組需�在啟用模組後授予用戶權�。點擊開啟/關閉按鈕<span class="small valignmiddle">%s</span>以啟用/�用模組/應用程�。
 ModulesMarketPlaceDesc=您�在外部網站中找到更多�下載的模組...
 ModulesDeployDesc=如果檔案系統權��許，則�以使用此工具部署外部模組。然後，該模組將在分�<strong>%s</strong>上顯示。
 ModulesMarketPlaces=找外部 app / 模組
@@ -212,6 +212,7 @@ CompatibleUpTo=與版本%s相容
 NotCompatible=此模組似乎�相容您 Dolibarr %s (�用最低版本 %s - 最高版本 %s)。
 CompatibleAfterUpdate=此模組需��級您的 Dolibarr %s (最低版本%s -最高版本 %s)。
 SeeInMarkerPlace=在市場�以看到
+SeeSetupOfModule=請�閱模組%s的設定
 Updated=�級
 Nouveauté=新奇
 AchatTelechargement=購買 / 下載
@@ -221,6 +222,7 @@ DoliPartnersDesc=�供訂製開發的模組或功能的公�清單。 <br>注
 WebSiteDesc=外部網站以��更多附加（�核心）模組...
 DevelopYourModuleDesc=一些開發自己模組的解決方案...
 URL=網�
+RelativeURL=關�網�
 BoxesAvailable=�用�工具
 BoxesActivated=�工具已啟用
 ActivateOn=啟用
@@ -330,7 +332,7 @@ InfDirAlt=從第3版起，�定義替代根資料夾。此�許您儲存到指
 InfDirExample=<br>在 <strong>conf.php</strong> 檔案宣告 <br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>若這幾行已用"#"方�註解了，啟用他，也就是移除 "#"。
 YouCanSubmitFile=您�以從此處上傳模組的.zip檔案：
 CurrentVersion=Dolibarr 目�版本
-CallUpdatePage=�覽更新資料庫�構和資料的��：%s。
+CallUpdatePage=�覽�級資料庫�構和資料的��：%s。
 LastStableVersion=最新穩定版本
 LastActivationDate=最新啟動日期
 LastActivationAuthor=最新啟動的作者
@@ -446,7 +448,8 @@ KeepEmptyToUseDefault=�留為空白以使用�設值
 DefaultLink=�設連�
 SetAsDefault=設為�設值
 ValueOverwrittenByUserSetup=警告，此值�能會被用戶特定的設定覆蓋（�個用戶都�以設定自己的clicktodial網�）
-ExternalModule=外部模組 - 已安�到資料夾 %s
+ExternalModule=外部模組
+InstalledInto=已安�到 %s 資料夾
 BarcodeInitForthird-parties=�作方的批次�碼�始化
 BarcodeInitForProductsOrServices=批次�碼�始化或產�或�務�置
 CurrentlyNWithoutBarCode=目�您在沒有�碼<strong>%s</strong>%s中有<strong>%s</strong>的記錄。
@@ -947,7 +950,7 @@ DictionaryCanton=州/�
 DictionaryRegion=地�
 DictionaryCountry=國家
 DictionaryCurrency=幣別
-DictionaryCivility=文明頭銜
+DictionaryCivility=榮譽稱號
 DictionaryActions=行程事件類型
 DictionarySocialContributions=社會稅或財政稅類型
 DictionaryVAT=營業稅率或銷售稅率
@@ -988,6 +991,7 @@ VATIsNotUsedDesc=�設情�下，建議的營業稅為0，�用於諸如�
 VATIsUsedExampleFR=在法國，這表示�有真實財務系統（簡化的真實貨幣或正常真實貨幣）的公�或組織。申報營業稅的系統。
 VATIsNotUsedExampleFR=在法國，它表示�宣告營業稅的�會，或者�擇微型�業財務系統（特許經營營業稅）並繳�特許經營營業稅的公�，組織或自由�業者，而無需任何營業稅申報。此�擇將在發票上顯示�考“��用的營業稅-CGI的art-293B�。
 ##### Local Taxes #####
+TypeOfSaleTaxes=銷售稅類型
 LTRate=稅率
 LocalTax1IsNotUsed=�使用第二種稅率
 LocalTax1IsUsedDesc=使用第二種稅種（第一類除外）
@@ -1011,6 +1015,9 @@ LocalTax2IsUsedDescES=建立潛在客戶，發票，訂單等時，�設情�
 LocalTax2IsNotUsedDescES=�設情�下，建議的IRPF為0。�則��。
 LocalTax2IsUsedExampleES=在西�牙，自由�業者��供�務的專業人士��擇稅務系統模組的公�。
 LocalTax2IsNotUsedExampleES=在西�牙，它們是��模組稅制約�的�業。
+RevenueStampDesc=“稅票�或“收入票�是�張發票的固定稅�（與發票金�無關）。稅�也�以是百分比稅，但是使用第二種或第三種類型的稅�百分比稅更好，因為稅票��供任何報告。�有極少數國家/地�使用此類稅種。
+UseRevenueStamp=使用�花稅
+UseRevenueStampExample=稅票的�設值在字典設置中定義（%s-%s-%s）
 CalcLocaltax=地方稅收報告
 CalcLocaltax1=銷售 - 採購
 CalcLocaltax1Desc=地方稅收報告是根據地方稅銷售與地方稅採購之間的差�計算得出的
@@ -1018,6 +1025,7 @@ CalcLocaltax2=採購
 CalcLocaltax2Desc=地方稅收報告是地方稅採購的總�
 CalcLocaltax3=銷售
 CalcLocaltax3Desc=地方稅收報告是地方稅銷售總�
+NoLocalTaxXForThisCountry=根據稅收設置（請�閱%s-%s-%s），您所在的國家�需�使用此類稅種
 LabelUsedByDefault=若代號沒有找翻譯字�，則使用�設標籤
 LabelOnDocuments=文件標籤
 LabelOrTranslationKey=標籤或翻譯秘鑰
@@ -1108,8 +1116,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=費用報表批准
 Delays_MAIN_DELAY_HOLIDAYS=休�申請批准
 SetupDescription1=在開始使用Dolibarr之�，必須定義一些�始�數並啟用/設定模組。
 SetupDescription2=以下兩個部分是必需的（“設定��單中的�兩個項目）：
-SetupDescription3=<a href="%s">%s -> %s</a><br>應用軟體中�設行為，其基本�數是�以客製化的(例如：與國家相關的功能)。
-SetupDescription4=<a href="%s">%s-> %s</a> <br>此軟體是許多模組/應用程�的套件，或多或少是�立的。必須啟用和設定與您需求相關的模組。隨著模組的啟動，新項目/�項會增加到�單中。
+SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>用於自訂您應用程�默�行為的基本�數（例如 跟國家相關的功能）。
+SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>此軟件是許多模塊/應用程�的套件。必須啟用和�置與您的需求相關的模塊。這些模塊的激活將顯示�單�目。
 SetupDescription5=其他設定�單項目管����數。
 LogEvents=安全稽核事件
 Audit=稽核
@@ -1128,7 +1136,7 @@ LogEventDesc=啟用特定安全事件的日誌記錄。通��單<b>%s-%s來</
 AreaForAdminOnly=設定�數僅�由<b>管�員</b>進行設定。
 SystemInfoDesc=僅供系統管�員以唯讀��見模��得系統資訊。
 SystemAreaForAdminOnly=此�域僅管�員�用。 Dolibarr用戶權�無法更改此�制。
-CompanyFundationDesc=編輯公�/項目的資訊。點擊��底部的“ %s�按鈕。
+CompanyFundationDesc=編輯您的 公�/組織 資訊。完�後，點擊��底部的“ %s�按鈕。
 AccountantDesc=如果您有外部會計師/簿記員，則�以在此處編輯其資訊。
 AccountantFileNumber=會計代碼
 DisplayDesc=�以在此處修改影響Dolibarr外觀和行為的�數。
@@ -1264,6 +1272,8 @@ RuleForGeneratedPasswords=產生和驗證密碼的�則
 DisableForgetPasswordLinkOnLogonPage=��在登入��顯示“忘記密碼�連�
 UsersSetup=用戶模組設定
 UserMailRequired=建立新用戶需�電�郵件
+UsersDocModules=文件模�給從使用者紀錄生�的文件
+GroupsDocModules=文件模�給從群組紀錄生�的文件
 ##### HRM setup #####
 HRMSetup=人資模組設定
 ##### Company setup #####
@@ -1295,7 +1305,7 @@ BillsPDFModules=發票文件模型
 BillsPDFModulesAccordindToInvoiceType=根據發票類型的發票文件模型
 PaymentsPDFModules=付款文件模型
 ForceInvoiceDate=強制使用驗證日期為發票日期
-SuggestedPaymentModesIfNotDefinedInInvoice=未定義付款方�發票的�設建議付款方�
+SuggestedPaymentModesIfNotDefinedInInvoice=未定義付款方�發票的�設付款方�
 SuggestPaymentByRIBOnAccount=建議以帳戶匯款付款
 SuggestPaymentByChequeToAddress=建議以支票付款給
 FreeLegalTextOnInvoices=在發票中加註文字
@@ -1307,7 +1317,7 @@ SupplierPaymentSetup=供應商付款設定
 PropalSetup=商業�案/建議書模組設定
 ProposalsNumberingModules=商業�案/建議書編號模型
 ProposalsPDFModules=商業�案/建議書文件模型
-SuggestedPaymentModesIfNotDefinedInProposal=未定義付款方�商業�案/建議書的�設建議付款方�
+SuggestedPaymentModesIfNotDefinedInProposal=�設�案付款方�
 FreeLegalTextOnProposal=在商業�案/建議書中加註文字
 WatermarkOnDraftProposal=商業�案/建議書�稿上的浮水�(若空白則無)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=詢��案/建議書的目地的銀行帳戶
@@ -1322,6 +1332,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=詢�訂單的倉庫來�
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=詢�供應商訂單中目的地銀行帳戶
 ##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=未定義付款方�發票的�設付款方�
 OrdersSetup=銷售訂單管�設定
 OrdersNumberingModules=訂單編號模組
 OrdersModelModule=訂單文件模型
@@ -1959,6 +1970,7 @@ WarningValueHigherSlowsDramaticalyOutput=警告，較高的值會嚴��低輸
 ModuleActivated=模組%s已啟動並顯示於界�上
 EXPORTS_SHARE_MODELS=匯出模組功能�分享此模組給所有人
 ExportSetup=模組匯出設定
+ImportSetup=模組匯入設定
 InstanceUniqueID=實例的唯一ID
 SmallerThan=�於
 LargerThan=大於
@@ -1979,5 +1991,7 @@ MakeAnonymousPing=�Dolibarr基金會�務器進行匿�Ping'+1'（僅在安
 FeatureNotAvailableWithReceptionModule=啟用接收模組後，此功能��用
 EmailTemplate=電�郵件模�
 EMailsWillHaveMessageID=電�郵件將具有與此語法匹�的標籤“�考�
-PDF_USE_ALSO_LANGUAGE_CODE=如果�在�一個產生的PDF中以兩種��的語言複製PDF中的�些文字標題，則必須在此處設置第二種語言，這樣產生的PDF將在�一��中包�兩種��的語言，一種是在產生PDF時�擇的語言，�一種是此種語言（�有少數PDF模�支�此功能）。�個PDF一種語言則�留為空。
+PDF_USE_ALSO_LANGUAGE_CODE=如果您�在生��一的PDF中以兩種��的語言複製一些文字，則必須在此處設置第二種語言讓生�的PDF在�一�中包�兩種��的語言，�擇的�以用來生�PDF跟�一種語言（�有少數PDF模�支�此功能)。PDF�有一種語言則留空。
 FafaIconSocialNetworksDesc=在此處輸入FontAwesome圖示的代碼。如果您�知�什麼是FontAwesome，則�以使用通用值fa-address-book。
+RssNote=注�：�個RSS feed定義都�供一個�部件，您必須啟用該�部件�能使其在儀表�中看到
+JumpToBoxes=跳至設定 -> �部件
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 35563bc4664..08639a1d3d1 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -58,17 +58,17 @@ SuppliersInvoices=供應商發票
 SupplierBill=供應商發票
 SupplierBills=供應商發票
 Payment=付款
-PaymentBack=還款
-CustomerInvoicePaymentBack=還款
+PaymentBack=退款
+CustomerInvoicePaymentBack=退款
 Payments=付款
 PaymentsBack=退回付款
 paymentInInvoiceCurrency=發票幣別
 PaidBack=退款
 DeletePayment=刪除付款
 ConfirmDeletePayment=您確定�刪除此付款？
-ConfirmConvertToReduc=您是��將%s轉�為絕�折扣？
+ConfirmConvertToReduc=您是��將%s轉�為�用信用？
 ConfirmConvertToReduc2=此金�將�存在所有折扣中，並�用作此客戶目�或未來發票的折扣。
-ConfirmConvertToReducSupplier=您是��將%s轉�為絕�折扣？
+ConfirmConvertToReducSupplier=您是��將%s轉�為�用信用？
 ConfirmConvertToReducSupplier2=此金�將�存在所有折扣中，並�用作此供應商目�或未來發票的折扣。
 SupplierPayments=供應商付款
 ReceivedPayments=收到付款
@@ -219,7 +219,10 @@ ShowInvoiceSituation=顯示發票狀�
 UseSituationInvoices=�許發票狀�
 UseSituationInvoicesCreditNote=�許發票狀�信用票據(折讓單-credit notes)
 Retainedwarranty=有�修
+AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
 RetainedwarrantyDefaultPercent=有�修�設百分比
+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=支付%s
 toPayOn=支付%s
 RetainedWarranty=�修
@@ -509,7 +512,7 @@ ToMakePayment=付款
 ToMakePaymentBack=退還款項
 ListOfYourUnpaidInvoices=未付款發票清單
 NoteListOfYourUnpaidInvoices=注�：此列表僅包�被您連接的銷售代表�作方發票。
-RevenueStamp=�花稅
+RevenueStamp=Tax stamp
 YouMustCreateInvoiceFromThird=僅當從�作方的“客戶�標籤建立發票時，此�項��使用
 YouMustCreateInvoiceFromSupplierThird=僅當從�作方的“供應商�標籤建立發票時，此�項��用
 YouMustCreateStandardInvoiceFirstDesc=您必須先建立標準發票，然後將其轉�為“範本��能建立新的發票範本
@@ -575,3 +578,4 @@ AutoFillDateTo=設定�務行的��日期為下一個發票日期
 AutoFillDateToShort=設定��日期
 MaxNumberOfGenerationReached=已�到最大產生數目
 BILL_DELETEInDolibarr=發票已刪除
+BILL_SUPPLIER_DELETEInDolibarr=供應商發票已刪除
diff --git a/htdocs/langs/zh_TW/blockedlog.lang b/htdocs/langs/zh_TW/blockedlog.lang
index 73993af78d0..98a1bcf5d5c 100644
--- a/htdocs/langs/zh_TW/blockedlog.lang
+++ b/htdocs/langs/zh_TW/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=��更改的日誌
 ShowAllFingerPrintsMightBeTooLong=顯示所有存檔的日誌（�能很長）
 ShowAllFingerPrintsErrorsMightBeTooLong=顯示所有無效的歸檔日誌（�能很長）
 DownloadBlockChain=下載指紋
-KoCheckFingerprintValidity=歸檔的日誌�目無效。這�味著�人（黑客？）在記錄此記錄後已修改了該記錄的�些數據，或者已刪除了先�的存檔記錄（檢查是�存在具有先�＃號的行）。
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
 OkCheckFingerprintValidity=歸檔日誌記錄有效。此行上的數據未修改，並且該�目�於上一個�目之後。
 OkCheckFingerprintValidityButChainIsKo=與以�的日誌相比，已歸檔的日誌似乎有效，但是先�的�已�壞。
 AddedByAuthority=已儲存到�端授權中
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 3c7f249c9d2..b91ab4d9243 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -15,23 +15,24 @@ NewSell=新銷售
 AddThisArticle=加入此文章
 RestartSelling=回到銷售
 SellFinished=銷售完�
-PrintTicket=列��務單
-NoProductFound=沒有找到文章
+PrintTicket=列�銷售單
+SendTicket=�出銷售單
+NoProductFound=未找到文章
 ProductFound=找到產�
-NoArticle=沒有文章
+NoArticle=無文章
 Identification=證明
 Article=文章
 Difference=差異
-TotalTicket=全部�務單
+TotalTicket=全部銷售單
 NoVAT=此銷售沒有營業稅
-Change=收到�多
+Change=超�已收到
 BankToPay=付款帳戶
 ShowCompany=顯示公�
 ShowStock=顯示倉庫
 DeleteArticle=點擊刪除此文章
 FilterRefOrLabelOrBC=�索（�考/標籤）
-UserNeedPermissionToEditStockToUsePos=您�求減少發票建立中的庫存，因此使用POS的用戶需�具有編輯庫存的權�。
-DolibarrReceiptPrinter=Dolibarr收據�表機
+UserNeedPermissionToEditStockToUsePos=您�求減少由發票建立的庫存，所以使用POS的使用者需�具有編輯庫存的權�。
+DolibarrReceiptPrinter=Dolibarr 收據�表機
 PointOfSale=銷售點
 PointOfSaleShort=POS
 CloseBill=�帳
@@ -45,21 +46,23 @@ SearchProduct=�尋商�
 Receipt=收據
 Header=�首
 Footer=�尾
-AmountAtEndOfPeriod=期末金�（天，月或年）
+AmountAtEndOfPeriod=��的金�（天，月或年）
 TheoricalAmount=�論金�
 RealAmount=實際金�
+CashFence=Cash fence
 CashFenceDone=本期�金�欄完�
 NbOfInvoices=發票數
 Paymentnumpad=輸入付款的便籤類型
 Numberspad=號碼便籤
 BillsCoinsPad=硬幣和紙幣便籤
 DolistorePosCategory=用於Dolibarr的TakePOS模組與其他POS解決方案
-TakeposNeedsCategories=TakePOS需�產�類別�能使用
+TakeposNeedsCategories=TakePOS 需�產�類別�能使用
 OrderNotes=訂購須知
 CashDeskBankAccountFor=用於付款的�設帳戶
-NoPaimementModesDefined=在TakePOS設定中未定義付款方�
-TicketVatGrouped=在�務單中�營業稅率分組
-AutoPrintTickets=自動列��務單
+NoPaimementModesDefined=在 TakePOS 設定中未定義付款方�
+TicketVatGrouped=按銷售單中的費率�計營業稅
+AutoPrintTickets=自動列�銷售單|收據
+PrintCustomerOnReceipts=列�客戶在銷售單收據上
 EnableBarOrRestaurantFeatures=啟用酒�或�廳的功能
 ConfirmDeletionOfThisPOSSale=您確�刪除目�銷售嗎？
 ConfirmDiscardOfThisPOSSale=您是��放棄目�銷售？
@@ -67,27 +70,39 @@ History=歷�紀錄
 ValidateAndClose=驗證並關閉
 Terminal=終端機
 NumberOfTerminals=終端機數
-TerminalSelect=�擇您�使用的站�:
-POSTicket=POS�務單
-POSTerminal=POS終端機
-POSModule=POS模組
+TerminalSelect=�擇您�使用的終端機:
+POSTicket=POS 銷售單
+POSTerminal=POS 終端機
+POSModule=POS 模組
 BasicPhoneLayout=在手機上使用基本佈局
-SetupOfTerminalNotComplete=站�%s的設定未完�
+SetupOfTerminalNotComplete=終端機%s的設定尚未完�
 DirectPayment=直接付款
 DirectPaymentButton=直接�金付款按鈕
 InvoiceIsAlreadyValidated=發票已通�驗證
 NoLinesToBill=無計費項目
-CustomReceipt=自定義收據
+CustomReceipt=自訂收據
 ReceiptName=收據�稱
 ProductSupplements=產�補充
 SupplementCategory=補充�類別
 ColorTheme=�色主題
 Colorful=彩色
 HeadBar=標題欄
-SortProductField=Field for sorting products
+SortProductField=產�分類欄�
 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 de cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
+BrowserMethodDescription=簡易列�收據。僅需幾個�數��設定收據。通��覽器打�。
+TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
+PrintMethod=列�方�
+ReceiptPrinterMethodDescription=具有很多�數的強大方法。完全�定制的模�。無法從雲端列�。
+ByTerminal=�照站�
+TakeposNumpadUsePaymentIcon=在數字�上使用付款圖示
+CashDeskRefNumberingModules=收銀�編號模組
+CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站�
+TakeposGroupSameProduct=群組相�產�線
+StartAParallelSale=開啟新的平行銷售
+ControlCashOpening=打開銷售點時控制收銀機
+CloseCashFence=關閉�金�籬
+CashReport=�金報告
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 7920527ed13..6cfc559ea43 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -325,7 +325,6 @@ CompanyDeleted=已從資料庫中刪除“%s�公�。
 ListOfContacts=通訊錄/地�清單
 ListOfContactsAddresses=通訊錄/地�清單
 ListOfThirdParties=�作方清單
-ShowCompany=顯示�作方
 ShowContact=顯示連絡人
 ContactsAllShort=全部（��濾）
 ContactType=連絡型�
@@ -447,6 +446,7 @@ SaleRepresentativeFirstname=業務代表的�字
 SaleRepresentativeLastname=業務代表的姓�
 ErrorThirdpartiesMerge=刪除�作方時發生錯誤。請檢查日誌。原變更已被回復。
 NewCustomerSupplierCodeProposed=客戶或供應商代碼已使用，已建議新代碼
+KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
 #Imports
 PaymentTypeCustomer=付款方�-客戶
 PaymentTermsCustomer=付款�件-客戶
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index cfe4c56d496..a60f23bb772 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -157,9 +157,9 @@ SeeReportInInputOutputMode=有關實際付款(�使尚未在分類帳中實際
 SeeReportInDueDebtMode=有關基於已記錄發票(�使尚未在分類帳中進行核算)的計算，請�閱%s發票分�%s。
 SeeReportInBookkeepingMode=請�閱<b>%s簿記報告%s</b>了解關於<b>簿記分類帳表</b>的計算
 RulesAmountWithTaxIncluded=-顯示的金�包括所有稅費
-RulesResultDue=-包括未�發票，費用，營業稅，�贈（無論是�付款）。還包括帶薪工資。 <br> -它基於發票和營業稅的確�日期以�費用的到期日。�於使用“工資�模組定義的工資，將使用付款的起算日。
+RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=-它包括發票，費用，營業稅和薪水的實際付款。 <br> -它基於發票，費用，營業稅和薪水的付款日期。�贈的�贈日期。
-RulesCADue=-它包括客戶無論是�已付款的到期發票。 <br> -它基於這些發票的生效日期。 <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=-包括從客戶收到的所有有效發票付款。 <br> -此基於這些發票的付款日期<br>
 RulesCATotalSaleJournal=它包括“銷售�日記帳中的所有信用�度。
 RulesAmountOnInOutBookkeepingRecord=它包括分類帳中具有“ 費用�或“ 收入�組的會計帳戶中的記錄
@@ -255,3 +255,10 @@ TurnoverbyVatrate=�營業稅率開票的營業�
 TurnoverCollectedbyVatrate=�營業稅率收�的營業�
 PurchasebyVatrate=�銷售購買稅率
 LabelToShow=短標籤
+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
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 1a413cdd581..5f3c373da1c 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -59,6 +59,7 @@ ErrorPartialFile=伺�器未完整的收到檔案。
 ErrorNoTmpDir=臨時指示%s�存在。
 ErrorUploadBlockedByAddon=PHP / Apache的�件已阻擋上傳。
 ErrorFileSizeTooLarge=檔案太大。
+ErrorFieldTooLong=欄�%s太長。
 ErrorSizeTooLongForIntType=�數超�int類型（最大�數%s）
 ErrorSizeTooLongForVarcharType=�數超�字串類型（最大�數%s）
 ErrorNoValueForSelectType=請填寫所�清單的值
@@ -96,7 +97,7 @@ ErrorBadMaskFailedToLocatePosOfSequence=錯誤，�罩沒有�列號
 ErrorBadMaskBadRazMonth=錯誤，�好的�置值
 ErrorMaxNumberReachForThisMask=已�到此�罩的最大數�
 ErrorCounterMustHaveMoreThan3Digits=計數器必須超�3�數字
-ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorSelectAtLeastOne=錯誤，請至少�擇一項。
 ErrorDeleteNotPossibleLineIsConsolidated=無法刪除，因為記錄連�到已調解的銀行交易
 ErrorProdIdAlreadyExist=%s已被分�到�一個�作方
 ErrorFailedToSendPassword=無法傳�密碼
@@ -117,8 +118,8 @@ ErrorLoginDoesNotExists=找�到登入�稱<b>%s</b>的用戶。
 ErrorLoginHasNoEmail=這�用戶沒有電�郵件地�。程�中止。
 ErrorBadValueForCode=安全代碼有錯誤的值。請嘗試新的值...
 ErrorBothFieldCantBeNegative=欄�%s和%s�能都為負值
-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 can't be negative for a given VAT rate.
+ErrorFieldCantBeNegativeOnInvoice=此類型的發票欄�<strong> %s </strong>�能為負。如果您需�增加折扣行，�需先建立折扣（從�作方�中的欄�“ %s�開始）並將其使用於發票。
+ErrorLinesCantBeNegativeForOneVATRate=�於給定的營業稅率，行總數�能為負。
 ErrorLinesCantBeNegativeOnDeposits=存款中的行數�能為負。如果您需�在最終發票中消耗定金，會�到�題。
 ErrorQtyForCustomerInvoiceCantBeNegative=客戶發票行的數��能為負值
 ErrorWebServerUserHasNotPermission=用戶帳戶<b>%s</b>沒有權�用來執行網�伺�器
@@ -229,12 +230,13 @@ ErrorFieldRequiredForProduct=產�%s必須有欄�'%s'
 ProblemIsInSetupOfTerminal=�題在於站�%s的設定。
 ErrorAddAtLeastOneLineFirst=請先至少增加一行
 ErrorRecordAlreadyInAccountingDeletionNotPossible=錯誤，記錄已在會計中轉移，無法刪除。
-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 user 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 ?
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=錯誤，如果將��設定為�一��的翻譯，則語言為必填項目。
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=錯誤，翻譯��的語言與此相�。
+ErrorBatchNoFoundForProductInWarehouse=在倉庫“ %s�中找�到產�“ %s�的批次/�列。
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=倉庫“ %s�中產�“ %s�的此批次/�列沒有足夠的數�。
+ErrorOnlyOneFieldForGroupByIsPossible=“群組�據��能使用1個欄�（其他欄�則被丟棄）
+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
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP�數upload_max_filesize（%s）高於PHP�數post_max_size（%s）。這�是相�的設定。
 WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是，沒有建立用戶帳戶。因此，雖然密碼已儲存，但�能用於登入Dolibarr。外部模組/界��以使用它，但是如果您�需�為會員定義任何登入�稱或密碼，則�以從會員模組設定中�用�項“管��個會員的登入�稱�。如果您需�管�登入�稱但�需�任何密碼，則�以將此欄��留為空白以��此警告。注�：如果會員連�到用戶，電�郵件也�以用作登入�稱。
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index 12a86f20e15..2c284ef7fd7 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -16,6 +16,7 @@ PHPSupportCurl=此PHP支�Curl。
 PHPSupportCalendar=此PHP支�日曆外掛。
 PHPSupportUTF8=此PHP支�UTF8函數。
 PHPSupportIntl=此PHP支�Intl函數。
+PHPSupportxDebug=This PHP supports extended debug functions.
 PHPSupport=此PHP支�%s函數。
 PHPMemoryOK=您的PHP最大session記憶體設定為<b>%s</b> 。這應該足夠了。
 PHPMemoryTooLow=您的PHP最大session記憶體為<b>%s</b>bytes。這太低了。更改您的<b>php.ini，</b>以將<b>記憶體�制/b>�數設定為至少<b>%s</b>bytes。
@@ -26,6 +27,7 @@ ErrorPHPDoesNotSupportCurl=您的PHP安��支�Curl。
 ErrorPHPDoesNotSupportCalendar=您的PHP安��支�php日曆外掛。
 ErrorPHPDoesNotSupportUTF8=您的PHP安��支�UTF8函數。 Dolibarr無法正常工作。必須在安�Dolibarr之�修復此�題。
 ErrorPHPDoesNotSupportIntl=您的PHP安��支�Intl函數。
+ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
 ErrorPHPDoesNotSupport=您的PHP安��支�%s函數。
 ErrorDirDoesNotExists=資料夾%s�存在。
 ErrorGoBackAndCorrectParameters=返回並檢查/更正�數。
@@ -217,3 +219,5 @@ YouTryInstallDisabledByDirLock=該應用程�嘗試進行自我�級，但是
 YouTryInstallDisabledByFileLock=此應用程�嘗試進行自我�級，但是出於安全性考慮，已�用了安�/�級��（由於dolibarr檔案資料夾中存在鎖定文件<strong>install.lock</strong> ）。 <br>
 ClickHereToGoToApp=點擊此處�往您的應用程�
 ClickOnLinkOrRemoveManualy=點擊以下連�。如果始終看到�一��，則必須在檔案資料夾中刪除/�命�檔案install.lock。
+Loaded=Loaded
+FunctionTest=Function test
diff --git a/htdocs/langs/zh_TW/link.lang b/htdocs/langs/zh_TW/link.lang
index eaf82ee5cf6..23949b86a29 100644
--- a/htdocs/langs/zh_TW/link.lang
+++ b/htdocs/langs/zh_TW/link.lang
@@ -8,3 +8,4 @@ LinkRemoved=此連線%s已被刪除
 ErrorFailedToDeleteLink= 無法刪除連線“ <b>%s</b> �
 ErrorFailedToUpdateLink= 無法更新連線' <b>%s</b>'
 URLToLink=連線網�
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index fc28e885056..dbcd1715b72 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -1,170 +1,170 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=發�電�郵件
-EMailing=發�電�郵件
-EMailings=EMailings
-AllEMailings=所有eMailings
-MailCard=通�電�郵件發��
+EMailing=電�郵件
+EMailings=電�郵件
+AllEMailings=所有電�郵件
+MailCard=電�郵件�片
 MailRecipients=收件人
 MailRecipient=收件人
 MailTitle=�述
 MailFrom=寄件人
-MailErrorsTo=誤差的
-MailReply=回復
+MailErrorsTo=錯誤收件箱
+MailReply=回覆
 MailTo=收件人
-MailToUsers=給用戶
+MailToUsers=發�給用戶
 MailCC=副本
-MailToCCUsers=複製到用戶
-MailCCC=緩存副本
+MailToCCUsers=CC
+MailCCC=CCC
 MailTopic=電�郵件主題
 MailText=郵件內容
 MailFile=附加檔案
-MailMessage=電�郵件正文
+MailMessage=電�郵件內容
 SubjectNotIn=�在主題中
-BodyNotIn=Not in Body
+BodyNotIn=�在內容中
 ShowEMailing=顯示電�郵件
-ListOfEMailings=�單emailings
+ListOfEMailings=電�郵件清單
 NewMailing=新電�郵件
 EditMailing=編輯電�郵件
 ResetMailing=�新發�電�郵件
 DeleteMailing=刪除電�郵件
 DeleteAMailing=刪除一個電�郵件
 PreviewMailing=�覽電�郵件
-CreateMailing=創建電�郵件
-TestMailing=測試的電�郵件
+CreateMailing=建立電�郵件
+TestMailing=測試電�郵件
 ValidMailing=有效的電�郵件
 MailingStatusDraft=�案
-MailingStatusValidated=é©—è­‰
+MailingStatusValidated=已驗證
 MailingStatusSent=發�
-MailingStatusSentPartialy=發�部分
-MailingStatusSentCompletely=發�完全
+MailingStatusSentPartialy=部分發�
+MailingStatusSentCompletely=完全發�
 MailingStatusError=錯誤
 MailingStatusNotSent=�發�
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
-MailingSuccessfullyValidated=EMailing successfully validated
+MailSuccessfulySent=已�功接收電�郵件（從%s到%s）
+MailingSuccessfullyValidated=電�郵件�功驗證
 MailUnsubcribe=退訂
 MailingStatusNotContact=����繫
 MailingStatusReadAndUnsubscribe=讀�和退訂
 ErrorMailRecipientIsEmpty=電�郵件收件人是空的
-WarningNoEMailsAdded=沒有新的電�郵件添加到收件人的�單。
+WarningNoEMailsAdded=沒有新的電�郵件�增加到收件人清單。
 ConfirmValidMailing=您確定�驗證此電�郵件嗎？
-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?
+ConfirmResetMailing=警告，通��新�始化電�郵件<b>%s</b> ，您�以批次發�此電�郵件。你確定�這麼�嗎？
 ConfirmDeleteMailing=您確定�刪除此電�郵件嗎？
-NbOfUniqueEMails=��複的電�郵件數
+NbOfUniqueEMails=�特電�郵件的數�
 NbOfEMails=電�郵件數�
-TotalNbOfDistinctRecipients=�助人數目明顯
-NoTargetYet=�助人還沒有確定（走�標簽'收件人'）
-NoRecipientEmail=沒有有關%s收件人的電�郵件
+TotalNbOfDistinctRecipients=��複收件人數�
+NoTargetYet=尚未定義收件人（在“收件人�分�上）
+NoRecipientEmail=沒有有關收件人%s的電�郵件
 RemoveRecipient=刪除收件人
-YouCanAddYourOwnPredefindedListHere=�創建您的電�郵件�擇模塊，見htdocs中/包括/模塊/郵寄/自述文件。
-EMailTestSubstitutionReplacedByGenericValues=當使用測試模�，替�變�的值�代通用
+YouCanAddYourOwnPredefindedListHere=�建立您的電�郵件�擇器模組，請�閱htdocs/core/modules/mailings/README。
+EMailTestSubstitutionReplacedByGenericValues=使用測試模�時，替�變數將替�為通用值
 MailingAddFile=附加這個文件
 NoAttachedFiles=沒有附加檔案
-BadEMail=Bad value for Email
+BadEMail=電�郵件地��正確
 ConfirmCloneEMailing=您確定�複製此電�郵件嗎？
-CloneContent=克隆消�
-CloneReceivers=克隆者
+CloneContent=複製訊�
+CloneReceivers=複製收件人
 DateLastSend=最新發�的日期
 DateSending=發�日期
 SentTo=發�到<b>%s</b>
-MailingStatusRead=閱讀
-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.
+MailingStatusRead=讀�
+YourMailUnsubcribeOK=電�郵件<b>%s</b>已正確從郵件清單中退訂
+ActivateCheckReadKey=用於“讀�回��和“�消訂閱�功能的加密網�密鑰
+EMailSentToNRecipients=電�郵件已發�給%s收件人。
+EMailSentForNElements=已發�有關%s元件的電�郵件。
+XTargetsAdded=<b>%s</b>收件人已增加到目標清單
+OnlyPDFattachmentSupported=如果已經為�發�的項目產生了PDF文件，它們將被附加到電�郵件中。�則，將�會發�電�郵件（也請注�，在此版本的批次發�中，僅支�pdf文件作為附件）。
+AllRecipientSelected=已�擇%s記錄的收件人（如果知�他們的電�郵件）。
+GroupEmails=群組電�郵件
+OneEmailPerRecipient=��收件人一�電�郵件（�設情�下，��記錄�擇一�電�郵件）
+WarningIfYouCheckOneRecipientPerEmail=警告，如果�中此框，則�味著將為�定的多個��記錄發�一�電�郵件，因此，如果您的訊�包�引用記錄資料的替�變數，則無法替�它們。
+ResultOfMailSending=批次電�郵件發�的�果
+NbSelected=已�擇數�
+NbIgnored=已忽略數�
+NbSent=已發�數�
+SentXXXmessages=已發�%s訊�
+ConfirmUnvalidateEmailing=您確定�將電�郵件<b>%s</b>更改為�稿狀態嗎？
+MailingModuleDescContactsWithThirdpartyFilter=有客戶�濾器的�絡人
+MailingModuleDescContactsByCompanyCategory=�作方類別的�絡人
+MailingModuleDescContactsByCategory=�類別�絡
+MailingModuleDescContactsByFunction=����絡
+MailingModuleDescEmailsFromFile=來自檔案的電�郵件
+MailingModuleDescEmailsFromUser=用戶輸入的電�郵件
+MailingModuleDescDolibarrUsers=�有電�郵件的用戶
+MailingModuleDescThirdPartiesByCategories=�作方（�類別）
+SendingFromWebInterfaceIsNotAllowed=��許從Web界�發�。
 
 # Libelle des modules de liste de destinataires mailing
-LineInFile=在文件%s的線
-RecipientSelectionModules=為收件人的�擇定義的�求
-MailSelectedRecipients=�擇收件人
-MailingArea=EMailings�
-LastMailings=Latest %s emailings
-TargetsStatistics=統計指標
-NbOfCompaniesContacts=公��特的接觸
-MailNoChangePossible=為驗證電�郵件收件人無法改變
+LineInFile=在檔案%s的行
+RecipientSelectionModules=已定義收件人的�擇�求
+MailSelectedRecipients=已�擇收件人
+MailingArea=電�郵件�域
+LastMailings=最新%s的電�郵件
+TargetsStatistics=目標統計
+NbOfCompaniesContacts=�特的�絡人/地�
+MailNoChangePossible=已驗證電�郵件的收件人無法更改
 SearchAMailing=�尋郵件
-SendMailing=發�電�郵件
-SentBy=發�
-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=但是您�以發�到網上，加入與最大的電�郵件數�值�數MAILING_LIMIT_SENDBYWEB你�發�的會議。
-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=清除�單
-ToClearAllRecipientsClickHere=點擊這�以清除此電�郵件的收件人列表
-ToAddRecipientsChooseHere=添加從�單中�擇收件人
-NbOfEMailingsReceived=收到群眾emailings
-NbOfEMailingsSend=Mass emailings sent
-IdRecord=編號記錄
-DeliveryReceipt=Delivery Ack.
+SendMailing=發�郵件
+SentBy=寄件人
+MailingNeedCommand=�以從命令行發�電�郵件。請您的伺�器管�員啟動以下命令，以將電�郵件發�給所有收件人：
+MailingNeedCommand2=您�以��增加MAILING_LIMIT_SENDBYWEB�數並設定�次程�中�發�最大電�郵件數�以在線發�。啟動此功能，請�往首�-設定-其他。
+ConfirmSendingEmailing=如果�直接從此畫�發�電�郵件，請確�您確定�立�從�覽器發�電�郵件嗎？
+LimitSendingEmailing=注�：出於安全性和超時的原因，從Web界�多次進行發�電�郵件已完�，�次發�程�皆一個收件人<b>%s</b> 。
+TargetsReset=清除清單
+ToClearAllRecipientsClickHere=點擊這�以清除此電�郵件的收件人清單
+ToAddRecipientsChooseHere=從清單中增加收件人
+NbOfEMailingsReceived=收到大�電�郵件
+NbOfEMailingsSend=已發�批次電�郵件
+IdRecord=ID記錄
+DeliveryReceipt=已讀�回�。
 YouCanUseCommaSeparatorForSeveralRecipients=您�以使用<b>逗號</b>來指定多個收件人。
-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.
+TagCheckMail=追蹤郵件讀�
+TagUnsubscribe=�消訂閱連�
+TagSignature=發�用戶的簽�
+EMailRecipient=收件人電�郵件
+TagMailtoEmail=收件人電�郵件（包括html“ mailto：�連�）
+NoEmailSentBadSenderOrRecipientEmail=沒有發�電�郵件。寄件人或收件人的電�郵件�正確。驗證用戶資料。
 # Module Notifications
 Notifications=通知
-NoNotificationsWillBeSent=沒有電�郵件通知此事件的計劃和公�
-ANotificationsWillBeSent=1通知將通�電�郵件發�
+NoNotificationsWillBeSent=沒有為此事件和公�計畫的電�郵件通知
+ANotificationsWillBeSent=1個通知將通�電�郵件發�
 SomeNotificationsWillBeSent=%s的通知將通�電�郵件發�
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
+AddNewNotification=啟動新的電�郵件通知目標/事件
+ListOfActiveNotifications=列出所有活動目標/事件以進行電�郵件通知
 ListOfNotificationsDone=列出所有發�電�郵件通知
-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 email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+MailSendSetupIs=電�郵件發�的設定已設定為“ %s�。此模��能用於發�批次電�郵件。
+MailSendSetupIs2=您必須先使用管�員帳戶進入�單%s首�-設定-EMails%s以將�數<strong>'%s'</strong>更改為使用模� '%s'。使用此模� ，您�以輸入Internet�務供應商�供的SMTP伺�器的設定，並使用批次電�郵件功能。
+MailSendSetupIs3=如果�如何設定SMTP伺�器有任何疑�，�以詢�%s。
+YouCanAlsoUseSupervisorKeyword=您還�以增加關�字<strong>__SUPERVISOREMAIL__</strong>以將電�郵件發�給用戶的主管（僅在為此主管定義了電�郵件的情�下有效）
+NbOfTargetedContacts=目�目標�絡人電�郵件的數�
+UseFormatFileEmailToTarget=匯入檔案的格�必須為<strong>電�郵件; 姓;�;其他</strong>
+UseFormatInputEmailToTarget=輸入字串格�為<strong>電�郵件; 姓;�;其他</strong>
+MailAdvTargetRecipients=收件人（進階�項）
+AdvTgtTitle=填寫輸入欄�以�先�擇�作方或�絡人/地�
+AdvTgtSearchTextHelp=使用%%作為通用字元。例如，�尋找�是<b>jean，joe，jim</b>的所有項目，�以輸入 <b>j%%</b> ，也�以使用;作為數值的分隔字元，並使用�排除此值。例如 <b>jean;joe;jim%%;!jimo;!jima%</b> 將會指�所有沒有jimo與所有以jima開始的jean,joe
+AdvTgtSearchIntHelp=使用空格�擇整數或浮點值
+AdvTgtMinVal=最�值
+AdvTgtMaxVal=最大值
+AdvTgtSearchDtHelp=使用空白�擇日期值
+AdvTgtStartDt=開始目標。
+AdvTgtEndDt=��目標。
+AdvTgtTypeOfIncudeHelp=�作方的目標電�郵件與�作方的�絡人電�郵件，或僅�作方電�郵件或僅�絡人電�郵件
+AdvTgtTypeOfIncude=目標電�郵件類型
+AdvTgtContactHelp=僅用於您將�絡人定�為“目標電�郵件類型�時使用
+AddAll=全部加入
+RemoveAll=移除全部
+ItemsCount=é …ç›®
+AdvTgtNameTemplate=�濾器�稱
+AdvTgtAddContact=根據�件加入電�郵件
+AdvTgtLoadFilter=載入�濾器
+AdvTgtDeleteFilter=刪除�濾器
+AdvTgtSaveFilter=儲存�濾器
+AdvTgtCreateFilter=建立�濾器
+AdvTgtOrCreateNewFilter=新�濾器�稱
+NoContactWithCategoryFound=找�到具有類別的�絡人/地�
+NoContactLinkedToThirdpartieWithCategoryFound=找�到具有類別的�絡人/地�
+OutGoingEmailSetup=發�電�郵件設定
+InGoingEmailSetup=接收電�郵件設定
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+DefaultOutgoingEmailSetup=�設發�電�郵件設定
 Information=資訊
-ContactsWithThirdpartyFilter=Contacts with third-party filter
+ContactsWithThirdpartyFilter=帶有�作方�濾器的�絡人
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index b7bf557b6a8..bf598fad411 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -174,6 +174,7 @@ SaveAndStay=儲存並留下
 SaveAndNew=儲存並新增
 TestConnection=測試連線
 ToClone=複製
+ConfirmCloneAsk=您確定�複製物件 <b>%s</b>?
 ConfirmClone=�擇您�複製的數據：
 NoCloneOptionsSpecified=沒有已定義�複製的資料。
 Of=çš„
@@ -829,6 +830,8 @@ Gender=性別
 Genderman=ç”·
 Genderwoman=女
 ViewList=檢視清單
+ViewGantt=Gantt view
+ViewKanban=Kanban view
 Mandatory=必�
 Hello=哈囉
 GoodBye=�見
@@ -1022,3 +1025,6 @@ SelectYourGraphOptionsFirst=�擇您的圖形�項以建立圖形
 Measures=措施
 XAxis=X軸
 YAxis=Y軸
+StatusOfRefMustBe= %s 的狀態必須是 %s
+DeleteFileHeader=Confirm file delete
+DeleteFileText=Do you really want delete this file?
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 23bb161f5bd..316388ffb1b 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -30,11 +30,11 @@ PreviousYearOfInvoice=發票日期的上一年
 NextYearOfInvoice=發票日期的下一年
 DateNextInvoiceBeforeGen=下一張發票的日期（產生�）
 DateNextInvoiceAfterGen=下一張發票的日期（產生後）
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
+GraphInBarsAreLimitedToNMeasures=於“ Bars�模�下，圖形被�制於%s�段。自動�擇了“行�模�。
 OnlyOneFieldForXAxisIsPossible=目��能將1個欄�用作X軸。僅�擇了第一個�定欄�。
 AtLeastOneMeasureIsRequired=至少需�1個測�欄�
 AtLeastOneXAxisIsRequired=X軸至少需�1個欄�
-
+LatestBlogPosts=Latest Blog Posts
 Notify_ORDER_VALIDATE=銷售訂單已驗證
 Notify_ORDER_SENTBYMAIL=使用郵件寄�的銷售訂單
 Notify_ORDER_SUPPLIER_SENTBYMAIL=使用電�郵件寄�的採購訂單
@@ -274,7 +274,7 @@ WEBSITE_PAGEURL=��網�
 WEBSITE_TITLE=標題
 WEBSITE_DESCRIPTION=�述
 WEBSITE_IMAGE=圖片
-WEBSITE_IMAGEDesc=影�媒體的相�路徑。您�以將其�留為空，因為它很少使用（動態內容�以使用它在部�格文章清單中顯示縮圖）。如果路徑�決於網站�稱，請在路徑中使用__WEBSITEKEY__。
+WEBSITE_IMAGEDesc=影�媒體的相�路徑。您�以將其�留為空，因為它很少使用（動態內容�以使用它在部�格文章清單中顯示縮圖）。如果路徑�決於網站�稱，請在路徑中使用__WEBSITE_KEY __（例如：image / __ WEBSITE_KEY __ / stories / myimage.png）。
 WEBSITE_KEYWORDS=關�字
 LinesToImport=�匯入的行
 
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 883d3b2869d..72233c0d88a 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -22,6 +22,8 @@ ProductVatMassChangeDesc=此工具將更新<b><u>所有</u></b>產�和�務
 MassBarcodeInit=批次�碼�始化
 MassBarcodeInitDesc=此���用將未定義�碼的項目�始化�碼。在完�模組�碼的設定之�進行檢查。
 ProductAccountancyBuyCode=會計代碼（購買）
+ProductAccountancyBuyIntraCode=會計代碼（在�盟內採購）
+ProductAccountancyBuyExportCode=Accounting code (purchase import)
 ProductAccountancySellCode=會計代碼（銷售）
 ProductAccountancySellIntraCode=會計代碼（內部銷售）
 ProductAccountancySellExportCode=會計代碼（出�銷售）
@@ -165,7 +167,7 @@ SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產�或�務）
 CustomCode=海關/商�/ HS編碼
 CountryOrigin=原產地
-Nature=產�的性質（�料/��）
+Nature=Nature of product (material/finished)
 ShortLabel=短標籤
 Unit=單�
 p=u.
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 14475c2442b..dd85077e28a 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=此我已連�到專案
 Time=時間
 ListOfTasks=任務清單
 GoToListOfTimeConsumed=�往工作時間清單
-GoToListOfTasks=顯示清單
-GoToGanttView=顯示甘特圖
 GanttView=甘特圖
 ListProposalsAssociatedProject=與專案有關的商業建議書清單
 ListOrdersAssociatedProject=與專案相關的銷售訂單清單
@@ -188,7 +186,7 @@ PlannedWorkload=計劃的工作�
 PlannedWorkloadShort=工作�
 ProjectReferers=相關項目
 ProjectMustBeValidatedFirst=必須先驗證專案
-FirstAddRessourceToAllocateTime=為任務分�用戶資�以分�時間
+FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=�天輸入
 InputPerWeek=�週輸入
 InputPerMonth=�月輸入
@@ -240,6 +238,7 @@ LatestModifiedProjects=最新%s件修改專案
 OtherFilteredTasks=其他�濾任務
 NoAssignedTasks=找�到分�的任務（從頂部�擇框�目�用戶分�專案/任務以輸入時間）
 ThirdPartyRequiredToGenerateInvoice=必須在專案上定義�作方�能開立發票。
+ChooseANotYetAssignedTask=�擇一個尚未分�給您的任務
 # Comments trans
 AllowCommentOnTask=�許用戶�任務發表評論
 AllowCommentOnProject=�許用戶�專案發表評論
@@ -257,7 +256,7 @@ InvoiceGeneratedFromTimeSpent=根據專案花費的時間產生了發票%s
 ProjectBillTimeDescription=請勾�如果您輸入了有關專案任務的時間表，並計劃從此時間表中產生發票以�此專案的客戶開立帳單（��勾�如果您打算建立�基於輸入時間表的發票）。注�：�產生發票，請�往專案的“花費時間�分�上，並�擇�包括的行。
 ProjectFollowOpportunity=追蹤機會
 ProjectFollowTasks=追蹤任務
-Usage=Usage
+Usage=使用率
 UsageOpportunity=用法：機會
 UsageTasks=用法：任務
 UsageBillTimeShort=用法：帳單時間
@@ -265,3 +264,4 @@ InvoiceToUse=發票�稿
 NewInvoice=新發票
 OneLinePerTask=�個任務一行
 OneLinePerPeriod=�個週期一行
+RefTaskParent=�考上層任務
diff --git a/htdocs/langs/zh_TW/receiptprinter.lang b/htdocs/langs/zh_TW/receiptprinter.lang
index 45a8847db4a..0732468cc3a 100644
--- a/htdocs/langs/zh_TW/receiptprinter.lang
+++ b/htdocs/langs/zh_TW/receiptprinter.lang
@@ -15,10 +15,12 @@ CONNECTOR_DUMMY=虛擬�表機
 CONNECTOR_NETWORK_PRINT=網路�表機
 CONNECTOR_FILE_PRINT=本地�表機
 CONNECTOR_WINDOWS_PRINT=本地Windows�表機
+CONNECTOR_CUPS_PRINT=Cups �表機
 CONNECTOR_DUMMY_HELP=測試用��表機，什麼都��
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS �表機�稱，如：HPRT_TP805L
 PROFILE_DEFAULT=�設設定文件
 PROFILE_SIMPLE=簡易設定文件
 PROFILE_EPOSTEP=Epos Tep設定文件
@@ -61,3 +63,33 @@ DOL_VALUE_MONTH_LETTERS=發票月份(以字�為單�)
 DOL_VALUE_MONTH=發票月份
 DOL_VALUE_DAY=發票日
 DOL_VALUE_DAY_LETTERS=發票日(以字�為單�)
+DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_OBJECT_ID=Invoice ID
+DOL_VALUE_OBJECT_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
+DOL_VALUE_MYSOC_ADDRESS=Your company address
+DOL_VALUE_MYSOC_ZIP=Your zip code
+DOL_VALUE_MYSOC_TOWN=Your town
+DOL_VALUE_MYSOC_COUNTRY=Your country
+DOL_VALUE_MYSOC_IDPROF1=Your IDPROF1
+DOL_VALUE_MYSOC_IDPROF2=Your IDPROF2
+DOL_VALUE_MYSOC_IDPROF3=Your IDPROF3
+DOL_VALUE_MYSOC_IDPROF4=Your IDPROF4
+DOL_VALUE_MYSOC_IDPROF5=Your IDPROF5
+DOL_VALUE_MYSOC_IDPROF6=Your IDPROF6
+DOL_VALUE_MYSOC_TVA_INTRA=�盟營業稅ID
+DOL_VALUE_MYSOC_CAPITAL=資本
+DOL_VALUE_VENDOR_LASTNAME=Vendor last name
+DOL_VALUE_VENDOR_FIRSTNAME=Vendor first name
+DOL_VALUE_VENDOR_MAIL=Vendor mail
+DOL_VALUE_CUSTOMER_POINTS=Customer points
+DOL_VALUE_OBJECT_POINTS=Object points
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index 8341304831b..d5ca122f272 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/stripe.lang
@@ -32,6 +32,7 @@ VendorName=供應商�稱
 CSSUrlForPaymentForm=CSS樣�付款表單網�
 NewStripePaymentReceived=收到新的Stripe付款
 NewStripePaymentFailed=已嘗試新的Stripe付款但失敗
+FailedToChargeCard=儲值失敗
 STRIPE_TEST_SECRET_KEY=秘密測試金鑰
 STRIPE_TEST_PUBLISHABLE_KEY=�發布的測試金鑰
 STRIPE_TEST_WEBHOOK_KEY=Webhook測試金鑰
@@ -68,4 +69,4 @@ ToOfferALinkForTestWebhook=連�到Stripe WebHook設定以呼�IPN（測試模
 ToOfferALinkForLiveWebhook=連�到Stripe WebHook設定以呼�IPN（live模�）
 PaymentWillBeRecordedForNextPeriod=付款將記錄在下一個期間。
 ClickHereToTryAgain=<a href="%s">點擊此處�試... </a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=根據嚴格的客戶身份驗證�則，必須在Stripe後�建立�。您�以點擊此處打開Stripe客戶記錄：%s
+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/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 485e7e9db7f..4afcba3ee3f 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -70,7 +70,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>以上兩種情形，在 Dolibarr 權�定義權利，外部使用者�以使用一個跟內部使用者��的�單管�器 (見 首� - 設定 - 顯示)
 PermissionInheritedFromAGroup=因為從權�授予一個用戶的一組繼承。
 Inherited=繼承
 UserWillBeInternalUser=建立的用戶將是一個內部用戶（因為沒有連�到一個特定的第三方）
@@ -113,3 +113,5 @@ CantDisableYourself=您�能�用自己的用戶記錄
 ForceUserExpenseValidator=強制使用費用報告表驗證
 ForceUserHolidayValidator=強制使用休�請求驗證
 ValidatorIsSupervisorByDefault=�設情�下，驗證者是用戶的主管。��空白狀態以��這種行為。
+UserPersonalEmail=Personal email
+UserPersonalMobile=Personal mobile phone
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 5ed3c336d17..6cf4b0381d9 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -42,7 +42,8 @@ ViewPageInNewTab=在新分�中檢視��
 SetAsHomePage=設為首�
 RealURL=真實網�
 ViewWebsiteInProduction=使用家庭網�檢視網站
-SetHereVirtualHost=如果您會建立請<u>使用Apache/NGinx/...</u><br>, 在您的網站伺�器上 (Apache, Nginx, ...), 已啟用PHP的專用虛擬主機並且根資料夾�於<br><strong>%s</strong><br>然後在網站的屬性中設定您建立的虛擬主機�稱, 因此也�以�覽此網站伺�器而�是內部Dolibarr伺�器.
+SetHereVirtualHost=<u>使用Apache/NGinx/...</u><br>建立您的網�伺�器 (Apache, Nginx, ...) 啟用了�有PHP的專用虛擬主機並且根目錄資料夾�於<br><strong>%s</strong>
+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>的權�
@@ -84,7 +85,7 @@ SorryWebsiteIsCurrentlyOffLine=抱歉，此網站目�離線。請�後�來
 WEBSITE_USE_WEBSITE_ACCOUNTS=啟用網站帳戶列表
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=啟用表格以存儲�個網站/�作方的網站帳戶（登入/通�）
 YouMustDefineTheHomePage=您必須先定義�設首�
-OnlyEditionOfSourceForGrabbedContentFuture=警告：通�匯入外部網�來建立網�僅供有經驗的用戶使用。根據來���的複雜程度，匯入�果�能與原始�果��。�樣，如果來���使用常見的CSS樣�或��的javascript，則在處�此��時，它�能會破壞網站編輯器的外觀或功能。此方法是建立��的較快方法，但建議從頭開始或從建議的��模�建立新��。 <br>�請注�，通�從外部��抓���內容來�始化��內容後，將�以�HTML來�代碼進行編輯（“線上�編輯器將��用）
+OnlyEditionOfSourceForGrabbedContentFuture=警告：通�匯入外部網�來建立網�僅供有經驗的用戶使用。根據來���的複雜程度，匯入�果�能與原始�果��。�樣，如果來���使用常見的CSS樣�或��的javascript，則在處�此��時，它�能會破壞網站編輯器的外觀或功能。此方法是建立��的較快方法，但建議從頭開始或從建議的��模�建立新��。<br>�請注�，在抓�的外部��上使用時，內�編輯器�能無法正確工作。
 OnlyEditionOfSourceForGrabbedContent=從外部網站��內容時，�能使用HTML�代碼版本
 GrabImagesInto=抓�圖�到css和��。
 ImagesShouldBeSavedInto=圖片應儲存到目錄中
@@ -124,3 +125,6 @@ UseTextBetween5And70Chars=為了�得良好的SEO實�，請使用5到70個字
 MainLanguage=主�語言
 OtherLanguages=其他語言
 UseManifest=�供manifest.json檔案
+PublicAuthorAlias=公共作者別�
+AvailableLanguagesAreDefinedIntoWebsiteProperties=�用語言已定義到網站屬性中
+ReplacementDoneInXPages=Replacement done in %s pages or containers

From 97b0cabb142c7b4cb5da6aa8e98496607ac5a6cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Apr 2020 18:47:31 +0200
Subject: [PATCH 100/144] Trans

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

diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index fa3f3098389..f07b314db1b 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -103,6 +103,6 @@ ControlCashOpening=Popup d'ouverture de caisse à l'ouverture
 CloseCashFence=Clôturer la caisse
 CashReport=Rapport de caisse
 MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
+OrderPrinterToUse=Printer to use
 MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
+OrderTemplateToUse=Template to use for order

From 770fca0b335dd6a0b135a7a45026be8ac2f305f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Apr 2020 20:16:36 +0200
Subject: [PATCH 101/144] Debug the double language feature in pdf

---
 .../core/class/commondocgenerator.class.php   |  6 ++--
 .../facture/doc/pdf_sponge.modules.php        | 32 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index e868934e55a..a5cb9bf7d35 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1466,6 +1466,7 @@ abstract class CommonDocGenerator
                     // save curent cell padding
                     $curentCellPaddinds = $pdf->getCellPaddings();
 
+                    // Add space for lines (more if we need to show a second alternative language)
                     global $outputlangsbis;
                     if (is_object($outputlangsbis)) {
                         // set cell padding with column title definition
@@ -1480,8 +1481,8 @@ abstract class CommonDocGenerator
                     $textWidth = $colDef['width'];
                     $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
 
-
-                    if (is_object($outputlangsbis)) {
+                    // Add variant of translation if $outputlangsbis is an object
+                    if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {
                         $pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
                     	$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
                     	$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
@@ -1495,6 +1496,7 @@ abstract class CommonDocGenerator
                 }
             }
         }
+
         return $this->tabTitleHeight;
     }
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 6fad6fc4665..8f48f31fddb 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1272,7 +1272,15 @@ class pdf_sponge extends ModelePDFFactures
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$tab2_top = $posy;
+        $outputlangsbis = null;
+        if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+        	$outputlangsbis = new Translate('', $conf);
+        	$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+        	$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+        	$default_font_size--;
+        }
+
+        $tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
@@ -1287,13 +1295,6 @@ class pdf_sponge extends ModelePDFFactures
 		$useborder = 0;
 		$index = 0;
 
-		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			$outputlangsbis = new Translate('', $conf);
-			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
-		}
-
 		// Add trigger to allow to edit $object
 		$parameters = array(
 			'object' => &$object,
@@ -1708,7 +1709,7 @@ class pdf_sponge extends ModelePDFFactures
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-					$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty").' ('.$object->retained_warranty.'%)';
+					$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RetainedWarranty") : '').' ('.$object->retained_warranty.'%)';
 					$retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 
 					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
@@ -2028,7 +2029,12 @@ class pdf_sponge 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), '', 'R');
 
 		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
 		{
@@ -2043,7 +2049,11 @@ class pdf_sponge 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)

From 758246c2a9618f4334a7f6bd49222d932697742c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 21 Apr 2020 20:33:41 +0200
Subject: [PATCH 102/144] Update MyGerman.isl

---
 build/exe/doliwamp/Languages/MyGerman.isl | 53 +++++++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/build/exe/doliwamp/Languages/MyGerman.isl b/build/exe/doliwamp/Languages/MyGerman.isl
index 9c3a1d38bfc..134d50c2c0a 100644
--- a/build/exe/doliwamp/Languages/MyGerman.isl
+++ b/build/exe/doliwamp/Languages/MyGerman.isl
@@ -1,12 +1,47 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 Version %2
-AdditionalIcons=Zusätzliche Symbole:
-CreateDesktopIcon=&Desktop-Symbol erstellen
-CreateQuickLaunchIcon=Symbol in der Schnellstartleiste erstellen
-ProgramOnTheWeb=%1 im Internet
-UninstallProgram=%1 entfernen
-LaunchProgram=%1 starten
-AssocFileExtension=&Registriere %1 mit der %2-Dateierweiterung
-AssocingFileExtension=%1 wird mit der %2-Dateierweiterung registriert...
+NameAndVersion = %1 Version %2
+AdditionalIcons = Zusätzliche Symbole:
+CreateDesktopIcon = &Desktop-Symbol erstellen
+CreateQuickLaunchIcon = Symbol in der Schnellstartleiste erstellen
+ProgramOnTheWeb = %1 im Internet
+UninstallProgram = %1 entfernen
+LaunchProgram = %1 starten
+AssocFileExtension = &Registriere %1 mit der %2-Dateierweiterung
+AssocingFileExtension = %1 wird mit der %2-Dateierweiterung registriert...
+
+
+YouWillInstallDoliWamp = Sie installieren DoliWamp (also Dolibarr + alle erforderliche Software von Drittanbietern wie Apache, MySQL und PHP) auf Ihrem Computer.
+ThisAssistantInstallOrUpgrade = WARNUNG: Die Verwendung eines auf einem lokalen Computer installierten ERP-CRM kann gefährlich sein: Wenn Ihr Computer ausfällt, können Sie alle Ihre Daten verlieren. Tun Sie dies, wenn Sie bereit sind, das Backup selbst ernsthaft zu verwalten. Wenn nicht, verwenden Sie stattdessen eine Installation in Saas (siehe https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge = Wenn Sie über technische Kenntnisse verfügen und Apache, MySQL und PHP selbst verwalten möchten, sollten Sie diesen Assistenten nicht verwenden und eine manuelle Installation von Dolibarr auf Ihrem vorhandenen Server mit Apache, MySQL und PHP durchführen.
+ButIfYouLook = Aber wenn Sie auf Ihrem lokalen Computer nach einer automatischen Einrichtung suchen, sind Sie auf dem besten Weg ...
+DoYouWantToStart = Möchten Sie den Installationsprozess starten?
+
+TechnicalParameters = technische Parameter
+IfFirstInstall = Geben Sie bei der Erstinstallation einige technische Parameter an. Wenn Sie nicht verstehen, sich nicht sicher sind oder ein Upgrade durchführen, belassen Sie einfach die Standardwerte.
+
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS 
+SMTPServer=SMTP Server (your own or ISP SMTP server, first install only) :
+ApachePort=Apache Port (first install only, Standard ist 80) :
+MySqlPort=MySQL Port (first install only, Standard ist 3306) :
+MySqlPassword=MySQL Server und Datenbank Passwort für root (first install only):
+
+FailedToDeleteLock = Fehler beim Löschen der Datei %1/www/dolibarr/install.lock. Sie können die Warnung ignorieren, müssen sie jedoch möglicherweise später manuell entfernen, wenn Sie dazu aufgefordert werden. Klicken Sie auf OK, um fortzufahren ...
+
+PortAlreadyInUse = Port %1 scheint bereits verwendet zu werden. Sie sollten zurückgehen und einen anderen Wert für %2 Port wählen.  Auswahl abbrechen und einen anderen Wert wählen ? 
+
+FirefoxDetected = Firefox wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
+ChromeDetected = Chrome wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
+ChooseDefaultBrowser = Bitte wählen Sie Ihren Standardbrowser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Wenn Sie sich nicht sicher sind, klicken Sie einfach auf Öffnen:
+
+LaunchNow = Starten Sie jetzt Dolibarr
+
+ProgramHasBeenRemoved = Die Dolibarr-Programmdateien wurden entfernt. Alle Ihre Daten befinden sich jedoch noch im Verzeichnis %1. Für eine vollständige Deinstallation, müssen Sie dieses Verzeichnis manuell entfernen.
+DoliWampWillStartApacheMysql = Die DoliWamp-Installation wird nun starten oder Apache und MySQL neu starten. Dies kann nach dieser Bestätigung einige Sekunden bis eine Minute dauern. Wollen Sie mit der Installation oder Aktualisierung des von Dolibarr benötigten Web- und Datenbankservers starten ?
+
+OldVersionFoundAndMoveInNew = Eine alte Datenbankversion wurde gefunden und verschoben, um von der neuen Dolibarr-Version verwendet zu werden.
+OldVersionFoundButFailedToMoveInNew = Eine alte Datenbankversion wurde gefunden, konnte jedoch nicht verschoben werden, um mit der neuen Dolibarr-Version verwendet zu werden.
+
+DLLMissing = Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
+ContinueAnyway = Fahren Sie trotzdem fort (der Installationsvorgang kann ohne diese Voraussetzung fehlschlagen).

From 50ea0ee92a498452d4b08d7e9e65a63832151eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 21 Apr 2020 22:40:24 +0200
Subject: [PATCH 103/144] Update modMyModule.class.php

---
 .../template/core/modules/modMyModule.class.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index e51eeb51921..ba956e46af9 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -396,11 +396,11 @@ class modMyModule extends DolibarrModules
         // Create extrafields during init
         //include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         //$extrafields = new ExtraFields($this->db);
-        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
-        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
-        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
-        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
-        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
+        //$result1=$extrafields->addExtraField('mymodule_myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
+        //$result2=$extrafields->addExtraField('mymodule_myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
+        //$result3=$extrafields->addExtraField('mymodule_myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
+        //$result4=$extrafields->addExtraField('mymodule_myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
+        //$result5=$extrafields->addExtraField('mymodule_myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
 
         // Permissions
         $this->remove($options);

From 14cdf19bf5a68f449b65711af890e23694daaf02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 21 Apr 2020 22:57:48 +0200
Subject: [PATCH 104/144] Update modulebuilder.lang

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

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 9dd6e9c9b30..b815cf997cc 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -84,7 +84,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). Using a negative value means field is not shown by default on list but can be selected for viewing). 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 : eratostene (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)

From cf05796f31112737fca5f2e77250121a1976635d Mon Sep 17 00:00:00 2001
From: Laurent Paumier <laurent@home.lan>
Date: Tue, 21 Apr 2020 23:01:21 +0200
Subject: [PATCH 105/144] FIX #13027 expensereport status in generated pdf

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index db46d591816..dfa9a7c5b95 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -704,8 +704,8 @@ class ExpenseReport extends CommonObject
     	// phpcs:enable
     	global $langs;
 
-    	$labelStatus = $langs->trans($this->statuts[$status]);
-    	$labelStatusShort = $langs->trans($this->statuts_short[$status]);
+    	$labelStatus = $langs->transnoentities($this->statuts[$status]);
+    	$labelStatusShort = $langs->transnoentities($this->statuts_short[$status]);
 
     	$statusType = $this->statuts_logo[$status];
 

From 2fde77703d8cb3cae1249f1fa33fac13b8949939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 21 Apr 2020 23:06:41 +0200
Subject: [PATCH 106/144] add extrafields in note for enstein

---
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index b8740fa60de..3838b9146e6 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2012       Cedric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2017-2018  Ferran Marcet       <fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-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
@@ -372,6 +372,12 @@ class pdf_einstein extends ModelePDFCommandes
 						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
+                // Extrafields in note
+                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+                if (!empty($extranote)) {
+                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
+                }
+
 				if ($notetoshow)
 				{
 					$tab_top -= 2;

From 7972a35e369a886003fc16748ac74b7900a08e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 21 Apr 2020 23:12:12 +0200
Subject: [PATCH 107/144] Update pdf_azur.modules.php

---
 htdocs/core/modules/propale/doc/pdf_azur.modules.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 07074888409..c285f560678 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2017-2018 Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019      Pierre Ardoin      	<mapiolca@me.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -439,6 +439,11 @@ class pdf_azur extends ModelePDFPropales
 						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
+                // Extrafields in note
+                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+                if (!empty($extranote)) {
+                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
+                }
 				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
 				{
 				    $tmpuser = new User($this->db);

From 8f4270722009cbacd54d0ae3af71e8dbbe67c003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 21 Apr 2020 23:20:11 +0200
Subject: [PATCH 108/144] Update pdf_crabe.modules.php

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 4d9df1c662a..dcb6cc33a96 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2012-2014	Raphaël Doursenaud	<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2015		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2017-2018	Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -456,6 +456,11 @@ class pdf_crabe extends ModelePDFFactures
 						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
+                // Extrafields in note
+                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+                if (!empty($extranote)) {
+                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
+                }
 				if ($notetoshow)
 				{
 					$tab_top -= 2;

From e8ead1d9245c55b41a5ee1fd46b1659eab457959 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 00:36:46 +0200
Subject: [PATCH 109/144] Update expensereport.class.php

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index dfa9a7c5b95..ab54a4f3915 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -704,8 +704,8 @@ class ExpenseReport extends CommonObject
     	// phpcs:enable
     	global $langs;
 
-    	$labelStatus = $langs->transnoentities($this->statuts[$status]);
-    	$labelStatusShort = $langs->transnoentities($this->statuts_short[$status]);
+    	$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
+    	$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts_short[$status]);
 
     	$statusType = $this->statuts_logo[$status];
 

From 5c573e197b6d0a488c41cbe1cc4d0a953e602792 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 00:50:04 +0200
Subject: [PATCH 110/144] Look and feel v12

---
 htdocs/categories/index.php       | 2 +-
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/theme/eldy/global.inc.php  | 2 +-
 htdocs/user/hierarchy.php         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index d3b8f81c94d..2103a4081d3 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -197,7 +197,7 @@ print '<table class="liste nohover" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td></td><td class="right">';
 if (!empty($conf->use_javascript_ajax))
 {
-	print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">'.img_picto('', 'folder').' '.$langs->trans("UndoExpandAll").'</a> | <a class="notasortlink" href="#">'.img_picto('', 'folder-open').' '.$langs->trans("ExpandAll").'</a></div>';
+	print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a class="notasortlink" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>';
 }
 print '</td></tr>';
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index da1b7ac632e..16ecae4298b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3249,7 +3249,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			// Add CSS
 			$arrayconvpictotomorcess = array(
 				'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'bank_account'=>'bg-infobox-bank_account', 'cash-register'=>'bg-infobox-bank_account',
-				'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'dollyrevert'=>'flip', 'folder'=>'bg-infobox-action',
+				'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'dollyrevert'=>'flip', 'ecm'=>'bg-infobox-action',
 				'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat',
 				'multicurrency'=>'bg-infobox-bank_account',
 				'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'money-bill-alt'=>'bg-infobox-bank_account',
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e56cd8ee36a..b3327bbf84e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3769,7 +3769,7 @@ div.info {
     padding-bottom: 8px;
     margin: 1em 0em 1em 0em;
     background: #eff8fc;
-    color: #666;
+    color: #558;
 }
 
 /* Warning message */
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index cd93d6106e7..3a05bb3d640 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -153,7 +153,7 @@ else
 
     $morehtmlright .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
 
-    print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton);
+    print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton, 'user');
 
     print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -181,7 +181,7 @@ else
 
     print '<tr class="liste_titre">';
     print_liste_field_titre("HierarchicView");
-    print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'object_category').' '.$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('', 'object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
+    print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
     print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", 'align="right"');
     print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
     print '</tr>';

From f52408cec1e114b5d254cbbcc8aa8b801832d860 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 00:55:38 +0200
Subject: [PATCH 111/144] Look and feel v12

---
 htdocs/categories/viewcat.php      | 4 ++--
 htdocs/core/lib/usergroups.lib.php | 2 +-
 htdocs/theme/eldy/global.inc.php   | 2 +-
 htdocs/user/param_ihm.php          | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index d259c8ca5a5..c4366ebf19c 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -317,9 +317,9 @@ print '<td class="right">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print '<div id="iddivjstreecontrol">';
-	print '<a class="notasortlink" href="#">'.img_picto('', 'object_category').' '.$langs->trans("UndoExpandAll").'</a>';
+	print '<a class="notasortlink" href="#">'.img_picto('', 'folder').' '.$langs->trans("UndoExpandAll").'</a>';
 	print " | ";
-	print '<a class="notasortlink" href="#">'.img_picto('', 'object_category-expanded').' '.$langs->trans("ExpandAll").'</a>';
+	print '<a class="notasortlink" href="#">'.img_picto('', 'folder-open').' '.$langs->trans("ExpandAll").'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index f3e7cee141d..5b7c923001b 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -331,7 +331,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile) $colspan = 4;
 
 	$thumbsbyrow = 6;
-	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').'">';
+	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').' tableforfield">';
 
 	// Title
 	if ($foruserprofile)
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index b3327bbf84e..89d803781ba 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3769,7 +3769,7 @@ div.info {
     padding-bottom: 8px;
     margin: 1em 0em 1em 0em;
     background: #eff8fc;
-    color: #558;
+    color: #668;
 }
 
 /* Warning message */
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 23ac2d421d0..f9ebd310cfa 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -261,8 +261,8 @@ if ($action == 'edit')
 
     clearstatcache();
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
+    print '<table class="noborder centpercent tableforfield">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
     // Landing page
     print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';
@@ -333,8 +333,8 @@ else
 
     dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
+    print '<table class="noborder centpercent tableforfield">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
     // Landing page
     print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';

From d54c093ae2e7283675c9c087e2083c32c3faa182 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 00:57:28 +0200
Subject: [PATCH 112/144] Fix file

---
 build/exe/doliwamp/Languages/MyGerman.isl | 56 +++++++++++------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/build/exe/doliwamp/Languages/MyGerman.isl b/build/exe/doliwamp/Languages/MyGerman.isl
index 134d50c2c0a..8bfd78dbea2 100644
--- a/build/exe/doliwamp/Languages/MyGerman.isl
+++ b/build/exe/doliwamp/Languages/MyGerman.isl
@@ -1,25 +1,25 @@
 
 [CustomMessages]
 
-NameAndVersion = %1 Version %2
-AdditionalIcons = Zusätzliche Symbole:
-CreateDesktopIcon = &Desktop-Symbol erstellen
-CreateQuickLaunchIcon = Symbol in der Schnellstartleiste erstellen
-ProgramOnTheWeb = %1 im Internet
-UninstallProgram = %1 entfernen
-LaunchProgram = %1 starten
-AssocFileExtension = &Registriere %1 mit der %2-Dateierweiterung
-AssocingFileExtension = %1 wird mit der %2-Dateierweiterung registriert...
+NameAndVersion=%1 Version %2
+AdditionalIcons=Zusätzliche Symbole:
+CreateDesktopIcon=&Desktop-Symbol erstellen
+CreateQuickLaunchIcon=Symbol in der Schnellstartleiste erstellen
+ProgramOnTheWeb=%1 im Internet
+UninstallProgram=%1 entfernen
+LaunchProgram=%1 starten
+AssocFileExtension=&Registriere %1 mit der %2-Dateierweiterung
+AssocingFileExtension=%1 wird mit der %2-Dateierweiterung registriert...
 
 
-YouWillInstallDoliWamp = Sie installieren DoliWamp (also Dolibarr + alle erforderliche Software von Drittanbietern wie Apache, MySQL und PHP) auf Ihrem Computer.
-ThisAssistantInstallOrUpgrade = WARNUNG: Die Verwendung eines auf einem lokalen Computer installierten ERP-CRM kann gefährlich sein: Wenn Ihr Computer ausfällt, können Sie alle Ihre Daten verlieren. Tun Sie dies, wenn Sie bereit sind, das Backup selbst ernsthaft zu verwalten. Wenn nicht, verwenden Sie stattdessen eine Installation in Saas (siehe https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge = Wenn Sie über technische Kenntnisse verfügen und Apache, MySQL und PHP selbst verwalten möchten, sollten Sie diesen Assistenten nicht verwenden und eine manuelle Installation von Dolibarr auf Ihrem vorhandenen Server mit Apache, MySQL und PHP durchführen.
-ButIfYouLook = Aber wenn Sie auf Ihrem lokalen Computer nach einer automatischen Einrichtung suchen, sind Sie auf dem besten Weg ...
-DoYouWantToStart = Möchten Sie den Installationsprozess starten?
+YouWillInstallDoliWamp=Sie installieren DoliWamp (also Dolibarr + alle erforderliche Software von Drittanbietern wie Apache, MySQL und PHP) auf Ihrem Computer.
+ThisAssistantInstallOrUpgrade=WARNUNG: Die Verwendung eines auf einem lokalen Computer installierten ERP-CRM kann gefährlich sein: Wenn Ihr Computer ausfällt, können Sie alle Ihre Daten verlieren. Tun Sie dies, wenn Sie bereit sind, das Backup selbst ernsthaft zu verwalten. Wenn nicht, verwenden Sie stattdessen eine Installation in Saas (siehe https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Wenn Sie über technische Kenntnisse verfügen und Apache, MySQL und PHP selbst verwalten möchten, sollten Sie diesen Assistenten nicht verwenden und eine manuelle Installation von Dolibarr auf Ihrem vorhandenen Server mit Apache, MySQL und PHP durchführen.
+ButIfYouLook=Aber wenn Sie auf Ihrem lokalen Computer nach einer automatischen Einrichtung suchen, sind Sie auf dem besten Weg ...
+DoYouWantToStart=Möchten Sie den Installationsprozess starten?
 
-TechnicalParameters = technische Parameter
-IfFirstInstall = Geben Sie bei der Erstinstallation einige technische Parameter an. Wenn Sie nicht verstehen, sich nicht sicher sind oder ein Upgrade durchführen, belassen Sie einfach die Standardwerte.
+TechnicalParameters=technische Parameter
+IfFirstInstall=Geben Sie bei der Erstinstallation einige technische Parameter an. Wenn Sie nicht verstehen, sich nicht sicher sind oder ein Upgrade durchführen, belassen Sie einfach die Standardwerte.
 
 ; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS 
 SMTPServer=SMTP Server (your own or ISP SMTP server, first install only) :
@@ -27,21 +27,21 @@ ApachePort=Apache Port (first install only, Standard ist 80) :
 MySqlPort=MySQL Port (first install only, Standard ist 3306) :
 MySqlPassword=MySQL Server und Datenbank Passwort für root (first install only):
 
-FailedToDeleteLock = Fehler beim Löschen der Datei %1/www/dolibarr/install.lock. Sie können die Warnung ignorieren, müssen sie jedoch möglicherweise später manuell entfernen, wenn Sie dazu aufgefordert werden. Klicken Sie auf OK, um fortzufahren ...
+FailedToDeleteLock=Fehler beim Löschen der Datei %1/www/dolibarr/install.lock. Sie können die Warnung ignorieren, müssen sie jedoch möglicherweise später manuell entfernen, wenn Sie dazu aufgefordert werden. Klicken Sie auf OK, um fortzufahren ...
 
-PortAlreadyInUse = Port %1 scheint bereits verwendet zu werden. Sie sollten zurückgehen und einen anderen Wert für %2 Port wählen.  Auswahl abbrechen und einen anderen Wert wählen ? 
+PortAlreadyInUse=Port %1 scheint bereits verwendet zu werden. Sie sollten zurückgehen und einen anderen Wert für %2 Port wählen.  Auswahl abbrechen und einen anderen Wert wählen ? 
 
-FirefoxDetected = Firefox wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
-ChromeDetected = Chrome wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
-ChooseDefaultBrowser = Bitte wählen Sie Ihren Standardbrowser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Wenn Sie sich nicht sicher sind, klicken Sie einfach auf Öffnen:
+FirefoxDetected=Firefox wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
+ChromeDetected=Chrome wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
+ChooseDefaultBrowser=Bitte wählen Sie Ihren Standardbrowser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Wenn Sie sich nicht sicher sind, klicken Sie einfach auf Öffnen:
 
-LaunchNow = Starten Sie jetzt Dolibarr
+LaunchNow=Starten Sie jetzt Dolibarr
 
-ProgramHasBeenRemoved = Die Dolibarr-Programmdateien wurden entfernt. Alle Ihre Daten befinden sich jedoch noch im Verzeichnis %1. Für eine vollständige Deinstallation, müssen Sie dieses Verzeichnis manuell entfernen.
-DoliWampWillStartApacheMysql = Die DoliWamp-Installation wird nun starten oder Apache und MySQL neu starten. Dies kann nach dieser Bestätigung einige Sekunden bis eine Minute dauern. Wollen Sie mit der Installation oder Aktualisierung des von Dolibarr benötigten Web- und Datenbankservers starten ?
+ProgramHasBeenRemoved=Die Dolibarr-Programmdateien wurden entfernt. Alle Ihre Daten befinden sich jedoch noch im Verzeichnis %1. Für eine vollständige Deinstallation, müssen Sie dieses Verzeichnis manuell entfernen.
+DoliWampWillStartApacheMysql=Die DoliWamp-Installation wird nun starten oder Apache und MySQL neu starten. Dies kann nach dieser Bestätigung einige Sekunden bis eine Minute dauern. Wollen Sie mit der Installation oder Aktualisierung des von Dolibarr benötigten Web- und Datenbankservers starten ?
 
-OldVersionFoundAndMoveInNew = Eine alte Datenbankversion wurde gefunden und verschoben, um von der neuen Dolibarr-Version verwendet zu werden.
-OldVersionFoundButFailedToMoveInNew = Eine alte Datenbankversion wurde gefunden, konnte jedoch nicht verschoben werden, um mit der neuen Dolibarr-Version verwendet zu werden.
+OldVersionFoundAndMoveInNew=Eine alte Datenbankversion wurde gefunden und verschoben, um von der neuen Dolibarr-Version verwendet zu werden.
+OldVersionFoundButFailedToMoveInNew=Eine alte Datenbankversion wurde gefunden, konnte jedoch nicht verschoben werden, um mit der neuen Dolibarr-Version verwendet zu werden.
 
-DLLMissing = Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
-ContinueAnyway = Fahren Sie trotzdem fort (der Installationsvorgang kann ohne diese Voraussetzung fehlschlagen).
+DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
+ContinueAnyway=Fahren Sie trotzdem fort (der Installationsvorgang kann ohne diese Voraussetzung fehlschlagen).

From ae519a1009c2a5c598f79486d82493a797091c24 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 00:59:22 +0200
Subject: [PATCH 113/144] Update fournisseur.facture.class.php

---
 .../fourn/class/fournisseur.facture.class.php | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index c886588ee9b..bc353e7ef0d 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3128,7 +3128,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public function delete($notrigger = 0)
 	{
-		global $user;
+		global $user, $conf;
 
 		dol_syslog(get_class($this)."::deleteline rowid=".$this->id, LOG_DEBUG);
 
@@ -3144,6 +3144,17 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 		$this->deleteObjectLinked();
 
+		// Remove extrafields
+        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        {
+        	$result=$this->deleteExtraFields();
+        	if ($result < 0)
+        	{
+        		$error++;
+        		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+        	}
+        }
+		
 		if (!$error) {
 			// Supprime ligne
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det ';
@@ -3156,17 +3167,6 @@ class SupplierInvoiceLine extends CommonObjectLine
 			}
 		}
 
-		// Remove extrafields
-        if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
-        {
-        	$result=$this->deleteExtraFields();
-        	if ($result < 0)
-        	{
-        		$error++;
-        		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-        	}
-        }
-
 		if (!$error)
 		{
 			$this->db->commit();

From 8ed9c30a892144493276c7503cc60158fa5c2ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Apr 2020 09:02:02 +0200
Subject: [PATCH 114/144] clean tab/whitespace

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

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index bc353e7ef0d..f2f1bac9257 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2015-2019	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -3154,7 +3154,7 @@ class SupplierInvoiceLine extends CommonObjectLine
         		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
         	}
         }
-		
+
 		if (!$error) {
 			// Supprime ligne
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det ';

From cce3085a79ceda311df5eb3a5b169f791687383f Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Wed, 22 Apr 2020 10:44:23 +0200
Subject: [PATCH 115/144] NEW can update contact in import model

---
 htdocs/core/modules/modSociete.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 0d74fea9b24..7d64a1a7499 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -579,6 +579,7 @@ class modSociete extends DolibarrModules
 			'extra' => MAIN_DB_PREFIX.'socpeople_extrafields'
 		); // List of tables to insert into (insert done in same order)
 		$this->import_fields_array[$r] = array(//field order as per structure of table llx_socpeople
+			's.rowid' => 'Id',
 			's.datec' => "DateCreation",
 			's.fk_soc' => 'ThirdPartyName',
 			's.civility' => 'UserTitle',
@@ -645,6 +646,7 @@ class modSociete extends DolibarrModules
 			's.datec' => '^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$'
 		);
 		$this->import_examplevalues_array[$r] = array(//field order as per structure of table llx_socpeople
+			's.rowid' => '1',
 			's.datec' => 'formatted as '.dol_print_date(dol_now(), '%Y-%m-%d'),
 			's.fk_soc' => 'Third Party name eg. TPBigCompany',
 			's.civility' => 'Title of civility eg: MR...matches field "code" in table "'.MAIN_DB_PREFIX.'c_civility"',
@@ -666,6 +668,9 @@ class modSociete extends DolibarrModules
 			's.note_private' => "My private note",
 			's.note_public' => "My public note"
 		);
+		$this->import_updatekeys_array[$r] = array(
+			's.rowid' => 'Id'
+		);
 
 		// Import Bank Accounts
 		$r++;

From 8be14060d64f635d6142c0db1f6c36728440f4ac Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Wed, 22 Apr 2020 12:08:05 +0200
Subject: [PATCH 116/144] fix: avoid php notice

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

diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 4fb5cb175b0..1b8c2d7f7e5 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -579,7 +579,7 @@ class modService extends DolibarrModules
 					'sp.remise_percent'=>'DiscountQtyMin'
 				));
 
-				if ($conf->multicurrency->enabled)
+				if (!empty($conf->multicurrency->enabled))
 				{
 				    $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
 				        'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
@@ -616,7 +616,7 @@ class modService extends DolibarrModules
 					// TODO Make this field not required and calculate it from price and qty
 					'sp.remise_percent' => '20'
 				));
-				if ($conf->multicurrency->enabled)
+				if (!empty($conf->multicurrency->enabled))
 				{
 					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 						'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',

From f6f9ca48dd9b6d76aadeca33021c8ab30a7cd020 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 22 Apr 2020 12:23:26 +0200
Subject: [PATCH 117/144] FIX missing fk_bank during export of suppliers
 invoices

---
 htdocs/core/modules/modFournisseur.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index e5ce01e3c72..4b7c8ff3ed2 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -418,7 +418,7 @@ class modFournisseur extends DolibarrModules
 			's.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",
 			'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",
 			'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment',
-			'p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber','project.rowid'=>'ProjectId','project.ref'=>'ProjectRef','project.title'=>'ProjectLabel'
+			'p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber','p.fk_bank'=>'IdTransaction','project.rowid'=>'ProjectId','project.ref'=>'ProjectRef','project.title'=>'ProjectLabel'
 		);
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text',
@@ -430,14 +430,14 @@ class modFournisseur extends DolibarrModules
 			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text',
 			's.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Numeric",
 			'f.total_ttc'=>"Numeric",'f.total_tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Numeric',
-			'p.datep'=>'Date','p.num_paiement'=>'Numeric','project.ref'=>'Text','project.title'=>'Text'
+			'p.datep'=>'Date','p.num_paiement'=>'Numeric','p.fk_bank'=>'Numeric','project.ref'=>'Text','project.title'=>'Text'
 		);
 		$this->export_entities_array[$r]=array(
 			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company',
 			's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company',
 			'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",
 			'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment',
-		    'p.datep'=>'payment','p.num_paiement'=>'payment','project.rowid'=>'project','project.ref'=>'project','project.title'=>'project');
+			'p.datep'=>'payment','p.num_paiement'=>'payment','p.fk_bank'=>'account','project.rowid'=>'project','project.ref'=>'project','project.title'=>'project');
 		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";

From 1788b1b252d5da23fe062bbf93ac65c4f362f597 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 12:32:20 +0200
Subject: [PATCH 118/144] Update mo.class.php

Use the accuracy of stock for rounding
---
 htdocs/mrp/class/mo.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 570281ac294..5f753f24443 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -649,7 +649,7 @@ class Mo extends CommonObject
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {
-								$moline->qty = round($line->qty * ($this->qty / $bom->qty) / $line->efficiency, 8); // Calculate with Qty to produce and  more presition
+								$moline->qty = price2num(($line->qty / $bom->qty) * $this->qty / $line->efficiency, 'MS'); // Calculate with Qty to produce and  more presition
 							}
 							if ($moline->qty <= 0) {
 								$error++;

From 169378f2764ce9b84d09fcc28de73e303b59e458 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 12:34:02 +0200
Subject: [PATCH 119/144] Update mo.class.php

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

diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 5f753f24443..fdfe43f4069 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -591,7 +591,7 @@ class Mo extends CommonObject
 	}
 
 	/**
-	 * Erase and update the line to produce.
+	 * Erase and update the line to consume and to produce.
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers

From 9a5986e190ccf2aff13f18564196d4f053c6ea86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 12:40:11 +0200
Subject: [PATCH 120/144] css

---
 htdocs/bom/tpl/objectline_edit.tpl.php | 8 ++++++--
 htdocs/core/lib/functions.lib.php      | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 36862e48708..3840f495dea 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -128,12 +128,16 @@ $coldisplay++;
 print '<td class="nobottom nowrap linecollost right">';
 print '<input type="text" size="1" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>';
 
+$coldisplay++;
+print '<td class="nobottom nowrap linecolcostprice right">';
+print '</td>';
+
 $coldisplay += $colspan;
 print '<td class="nobottom linecoledit center valignmiddle" colspan="'.$colspan.'">';
 $coldisplay += $colspan;
-print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button buttongen marginbottomonly" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
 print '<br>';
-print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'">';
+print '<input type="submit" class="button buttongen marginbottomonly" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'">';
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 16ecae4298b..9e5584bf7ae 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4663,9 +4663,9 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 /**
  *	Function that return a number with universal decimal format (decimal separator is '.') from an amount typed by a user.
  *	Function to use on each input amount before any numeric test or database insert. A better name for this function
- *  should be text2num().
+ *  should be roundtext2num().
  *
- *	@param	float	$amount			Amount to convert/clean
+ *	@param	float	$amount			Amount to convert/clean or round
  *	@param	string	$rounding		''=No rounding
  * 									'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
  *									'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)

From a5def19cff1021a046eeb84ae8171af5e4a75aeb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 12:56:52 +0200
Subject: [PATCH 121/144] Fix calculation from a BOM > 1

---
 htdocs/langs/en_US/mrp.lang              | 2 +-
 htdocs/mrp/class/mo.class.php            | 7 ++++++-
 htdocs/mrp/mo_card.php                   | 1 +
 htdocs/mrp/mo_production.php             | 2 +-
 htdocs/mrp/tpl/originproductline.tpl.php | 9 ++++++++-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 4e653e04409..d3591be3f1d 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -60,7 +60,7 @@ ConsumeOrProduce=Consume or Produce
 ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf1=For a quantity to produce of 1
+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
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 84bf44c84fe..1fd60907763 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1268,7 +1268,7 @@ 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("ForAQuantityOf1").')</span></td>';
+		print '<td class="right">'.$langs->trans('Qty').' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", $this->bom->qty).')</span></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>';
@@ -1334,6 +1334,11 @@ class Mo extends CommonObject
 			// TODO
 		}
 
+		$this->tpl['qty_bom'] = 1;
+		if (is_object($this->bom) && $this->bom->qty > 1) {
+			$this->tpl['qty_bom'] = $this->bom->qty;
+		}
+
 		$this->tpl['qty'] = $line->qty;
 		$this->tpl['qty_frozen'] = $line->qty_frozen;
 		$this->tpl['disable_stock_change'] = $line->disable_stock_change;
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 91f6f75b332..59dd5ed7a7c 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -293,6 +293,7 @@ if ($action == 'create')
 		print '<table class="noborder centpercent">';
 
 		$object->lines = $objectbom->lines;
+		$object->bom = $objectbom;
 
 		$object->printOriginLinesList('', array());
 
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 70e248eaf3a..f1e847a6213 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -691,7 +691,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
     		print '<td class="right"></td>';
     		print '<td>';
-    		print '<input type="submit" class="button" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
+    		print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
     		print '</td>';
     		if ($conf->productbatch->enabled) {
     			print '<td></td>';
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index abe5dfdb427..6f3b63f6d4e 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -24,13 +24,20 @@ if (empty($conf) || !is_object($conf))
 }
 
 if (!is_object($form)) $form = new Form($db);
+
+$qtytoconsumeforline = $this->tpl['qty'] / $this->tpl['efficiency'];
+/*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) {
+	$qtytoconsumeforline = $qtytoconsumeforline / $this->tpl['qty_bom'];
+}*/
+$qtytoconsumeforline = price2num($qtytoconsumeforline, 'MS');
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE originproductline.tpl.php -->
 <?php
 print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
 print '<td>'.$this->tpl['label'].'</td>';
-print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.round($this->tpl['qty'] / $this->tpl['efficiency'], 2) : '').'</td>';
+print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.$qtytoconsumeforline : '').'</td>';
 print '<td class="center">'.($this->tpl['qty_frozen'] ? yn($this->tpl['qty_frozen']) : '').'</td>';
 print '<td class="center">'.($this->tpl['disable_stock_change'] ? yn($this->tpl['disable_stock_change']) : '').'</td>';
 //print '<td class="right">'.$this->tpl['efficiency'].'</td>';

From 22162ac57e8aab005305bde181c84d373790ad1e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 13:14:50 +0200
Subject: [PATCH 122/144] Fix rounding of quantities

---
 htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 0e7433677ed..d42beadf791 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -229,6 +229,7 @@ ALTER TABLE llx_product_batch MODIFY COLUMN batch varchar(128);
 ALTER TABLE llx_commande_fournisseur_dispatch MODIFY COLUMN batch varchar(128);
 ALTER TABLE llx_stock_mouvement MODIFY COLUMN batch varchar(128);
 ALTER TABLE llx_mrp_production MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_mrp_production MODIFY qty real NOT NULL DEFAULT 1;
 
 create table llx_categorie_website_page
 (

From 3588ae8792e6c937039320667f71f3d03ae67f1d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 13:47:33 +0200
Subject: [PATCH 123/144] Complete rules for PR

---
 .github/CONTRIBUTING.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 5e56ac2a1fc..eb50ed3a3eb 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -104,27 +104,28 @@ Long description (Can span accross multiple lines).
 Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and 
 a process to follow to optimize the chance to have PRs merged efficiently...
 
-When submitting a pull request, use same rule as [Commits](#commits) for the message.
-If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you.
-Otherwise, please be a bit verbose about what you're providing.
+* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it means your PR is not atomic.
+
+* Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
+
+* When submitting a pull request, use same rule as [Commits](#commits) for the message. If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you. Otherwise, please be a bit verbose about what you're providing.
 
-Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
 Also, some code changes need a prior approbation:
 
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
 
-* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@eldy) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
+* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-jedi) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
 
 Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
 
-If the label of PR start with "WIP" (Work In Progress), it will not be analyzed (until you change the label of PR).
+If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).
 
 If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. 
 
 If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
 In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
 
-Statistics on Dolibarr project shows that around 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source project (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
+Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
 
 
 ### Resources

From 0b6d1a29c5c5048678ce2b1b28cfc02eb0af13fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 13:48:47 +0200
Subject: [PATCH 124/144] Fix links

---
 .github/CONTRIBUTING.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index eb50ed3a3eb..e8e2d222c0e 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,7 +4,7 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------
 
-<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum).
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum).
 
 Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
 
@@ -129,7 +129,7 @@ Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and t
 
 
 ### Resources
-[Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
+[Developer documentation](https://wiki.dolibarr.org/index.php/Developer_documentation)
 
 Translations
 ------------
@@ -145,11 +145,11 @@ to retreive all old translation of a source text, and restore the translation in
 
 
 ### Resources
-[Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
+[Translator documentation](https://wiki.dolibarr.org/index.php/Translator_documentation)
 
 Documentation
 -------------
-The project's documentation is maintained on the [Wiki](http://wiki.dolibarr.org/index.php).
+The project's documentation is maintained on the [Wiki](https://wiki.dolibarr.org/index.php).
 
 *Note*: to help prevent spam, you need to create an account before being able to edit. Everybody is welcome to contribute to its content.
 

From 1ed66bfe8909a6ca60f52984dddfd595881d871d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 13:51:23 +0200
Subject: [PATCH 125/144] Fix bad tag

---
 .github/CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index e8e2d222c0e..39234ebb181 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -112,9 +112,9 @@ a process to follow to optimize the chance to have PRs merged efficiently...
 
 Also, some code changes need a prior approbation:
 
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-yoda in your issue) to see if such a library can be accepted.
 
-* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-jedi) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
+* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-yoda) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
 
 Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
 

From e5d3250e47c1fa51e0edc05ba20a2e28ed4f8b1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 14:09:52 +0200
Subject: [PATCH 126/144] Doc

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 39234ebb181..fed73d7b002 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -104,7 +104,7 @@ Long description (Can span accross multiple lines).
 Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and 
 a process to follow to optimize the chance to have PRs merged efficiently...
 
-* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it means your PR is not atomic.
+* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic.
 
 * Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
 

From 4777c74366321f56bffaa7bdad18891fc2755bb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 14:11:03 +0200
Subject: [PATCH 127/144] Update main.inc.php

---
 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 73c21459b5c..481fffbfef6 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2367,7 +2367,7 @@ function main_area($title = '')
 	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 
     // Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT
-    if ($conf->global->SHOW_SOCINFO_ON_PRINT && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
+    if (! empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
     {
         global $hookmanager;
         $hookmanager->initHooks(array('showsocinfoonprint'));

From 63186a60ae84f394854c638033d5bf1a14d5f082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Apr 2020 14:23:38 +0200
Subject: [PATCH 128/144] Update 11.0.0-12.0.0.sql

---
 .../install/mysql/migration/11.0.0-12.0.0.sql   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index d42beadf791..9c09b8b9247 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -42,6 +42,15 @@ ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande
 
 UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version = 'SYSCOHADA';
 
+create table if not exists llx_c_shipment_package_type
+(
+    rowid        integer  AUTO_INCREMENT PRIMARY KEY,
+    label        varchar(50) NOT NULL,  -- Short name
+    description	 varchar(255), -- Description
+    active       integer DEFAULT 1 NOT NULL, -- Active or not	
+    entity       integer DEFAULT 1 NOT NULL -- Multi company id 
+)ENGINE=innodb;
+
 
 
 -- For v12
@@ -253,11 +262,3 @@ ALTER TABLE llx_categorie ADD COLUMN fk_user_modif	integer;
 ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commandefourndet FOREIGN KEY (fk_commandefourndet) REFERENCES llx_commande_fournisseurdet (rowid);
 
 --Dictionary of package type because filename in V11 was incomplete
-create table llx_c_shipment_package_type
-(
-    rowid        integer  AUTO_INCREMENT PRIMARY KEY,
-    label        varchar(50) NOT NULL,  -- Short name
-    description	 varchar(255), -- Description
-    active       integer DEFAULT 1 NOT NULL, -- Active or not	
-    entity       integer DEFAULT 1 NOT NULL -- Multi company id 
-)ENGINE=innodb;

From 43f4c5ac962d3a99b33f9cab2410c6d323a8a411 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Wed, 22 Apr 2020 15:29:54 +0200
Subject: [PATCH 129/144] FIX : model export list must be sorted by label

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

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 9556fd6c423..cf3cd58355c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -75,7 +75,7 @@ class FormOther
         $sql.= " FROM ".MAIN_DB_PREFIX."export_model";
         $sql.= " WHERE type = '".$type."'";
 		if (!empty($fk_user)) $sql.=" AND fk_user IN (0, ".$fk_user.")";  // An export model
-        $sql.= " ORDER BY rowid";
+        $sql.= " ORDER BY label";
         $result = $this->db->query($sql);
         if ($result)
         {

From f2356aa15836b8464d663dd326d84b18abf8f68c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 22 Apr 2020 15:37:01 +0200
Subject: [PATCH 130/144] Update README.md

---
 README.md | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index fbf59a27a74..3f329c678a7 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelances.
+It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelancers.
 
 You can freely use, study, modify or distribute it according to its Free Software licence.
 
@@ -27,7 +27,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
 
-- DoliWamp for Windows
+- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp)
 - DoliDeb for Debian or Ubuntu
 - DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
@@ -67,6 +67,7 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
 
 If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
 
+
 ## UPGRADING
 
 - At first make a backup of your Dolibarr files & than see https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr
@@ -85,28 +86,27 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### Main application/modules (all optional)
 
-- Customers, Prospects (Leads) and/or Suppliers directory
+- Customers, Prospects (Leads) and/or Suppliers directory + Contacts
+- Members management 
 - Products and/or Services catalog
 - Commercial proposals management
-- Customer and Supplier Orders management
+- Customer & Supplier Orders management
+- Shipping management
+- Warehouse/Stock management
 - Invoices and payment management
 - Standing orders management (European SEPA)
 - Bank accounts management
 - Accounting management
 - Shared calendar/agenda (with ical and vcal export for third party tools integration)
 - Opportunities and/or project management
-- Projects management
+- Projects & Tasks management
 - Contracts management
-- Warehouse/Stock management
-- Shipping management
 - Interventions management
 - Employee's leave requests management
 - Expense reports
 - Timesheets
 - Electronic Document Management (EDM)
 - Foundations members management
-- Mass emailing
-- Surveys
 - Point of Sale (POS)
 - …
 
@@ -115,11 +115,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Bookmarks management
 - Donations management
 - Reporting
+- Surveys
 - Data export/import
 - Barcodes support
 - Margin calculations
 - LDAP connectivity
 - ClickToDial integration
+- Mass emailing
 - RSS integration
 - Skype integration
 - Payment platforms integration (PayPal, Stripe, Paybox...)

From eee9e79436d0cee7328b889e59906d06b80c247a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 16:35:25 +0200
Subject: [PATCH 131/144] Tooltip

---
 htdocs/bom/tpl/objectline_title.tpl.php | 2 +-
 htdocs/langs/en_US/mrp.lang             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index b6197342136..ab0184189a8 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -52,7 +52,7 @@ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum c
 print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
 
 // Qty
-print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
+print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), $langs->trans("QtyRequiredIfNoLoss")).'</td>';
 
 if ($conf->global->PRODUCT_USE_UNITS)
 {
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index d3591be3f1d..d3c4d3253c6 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -56,6 +56,7 @@ 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

From 8207d27d00237335430421ff265c9eb6edac2a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 22 Apr 2020 17:36:10 +0200
Subject: [PATCH 132/144] Update MyCatalan.isl

---
 build/exe/doliwamp/Languages/MyCatalan.isl | 54 +++++++++++-----------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/build/exe/doliwamp/Languages/MyCatalan.isl b/build/exe/doliwamp/Languages/MyCatalan.isl
index d8b86eae5ba..b157d1cea27 100644
--- a/build/exe/doliwamp/Languages/MyCatalan.isl
+++ b/build/exe/doliwamp/Languages/MyCatalan.isl
@@ -1,45 +1,47 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versió %2
+NameAndVersion=%1 versió %2
 AdditionalIcons=Icones addicionals:
 CreateDesktopIcon=Crea una icona a l'&Escriptori
 CreateQuickLaunchIcon=Crea una icona a la &Barra de tasques
 ProgramOnTheWeb=%1 a Internet
-UninstallProgram=Desinstal·la %1
+UninstallProgram=Desinstal·la %1
 LaunchProgram=Obre %1
-AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
-AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
+AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
+AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
 
-YouWillInstallDoliWamp=Va a instal·lar o actualitzar (Apache + Mysql + PHP + Dolibarr) al seu ordinador.
-ThisAssistantInstallOrUpgrade=Aquest assistent instal·la o actualitza Dolibarr ERP-CRM i tots els seus requisits (Apache, Mysql i PHP) optimitzats per a l'ús de Dolibarr.
-IfYouHaveTechnicalKnowledge=Si teniu coneixements tècnics i necessita usar la seva Apache, Mysql i PHP amb altres aplicacions a part de Dolibarr, no utilitzeu aquest assistent, hauria lació manual d'Dolibarr sobre un Apache, Mysql i PHP existent.
-ButIfYouLook=Però si busca una instal·lació automàtica, es troba en el bon camí...
-DoYouWantToStart=Vol iniciar el procés d'instal·lació/actualització?
+YouWillInstallDoliWamp=Instal·laràs DoliWamp (Dolibarr i altres programaris com Apache, Mysql i PHP) al teu ordinador.
+ThisAssistantInstallOrUpgrade=ALERTA: Utilitzar un ERP CRM instal·lat en un ordinador en local pot ser perillós: si l'ordinador s'espatlla, pots perdre totes les teves dades. Fes-ho si estàs preparat per autogestionar-te còpies de seguretat. Si no, pots utilitzar una instal·lació Saas (pots veure https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Si tens coneixements tècnics i vols autogestionar el teu Apache, Mysql i PHP, no utilitzis aquest assistent i fes una instal·lació manual de Dolibarr sobre un servidor existent d'Apache, Mysql i PHP.
+ButIfYouLook=Però si busques una instal·lació automàtica en el teu propi ordinador, et trobes en el bon camí...
+DoYouWantToStart=Vols iniciar el procés d'instal·lació?
 
-TechnicalParameters=Paràmetres tècnics
-IfFirstInstall=Si es tracta de la primera instal lació, haurà d'especificar alguns paràmetres tècnics. Si no els entén, no sabeu o va a procedir a una actualització, deixi els camps amb els valors proposats per defecte.
+TechnicalParameters=Paràmetres tècnics
+IfFirstInstall=Si es tracta de la primera instal·lació, hauràs d'especificar alguns paràmetres tècnics. Si no els entens, no n'estàs segur, o estàs fent una actualització, pots deixar els valors per defecte.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Servidor SMTP (El seu o el del seu ISP, únicament primera instal.lació) :
-ApachePort=Puerto Apache (únicament primera instal.lació, normalment és el 80) :
-MySqlPort=Puerto Mysql (únicament primera instal.lació, normalment és el 3306) :
-MySqlPassword=Contrasenya del servidor i la base de dades MySQL de root (únicament primera instal.lació):
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Servidor SMTP (propi o ISP, només primera instal·lació) :
+ApachePort=Port Apache (només primera instal·lació, normalment el 80) :
+MySqlPort=Port MySql (només primera instal·lació, normalment el 3306) :
+MySqlPassword=Contrasenya del servidor i base de dades MySql de root (només primera instal·lació):
 
-FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminació del fitxer %1/www/dolibarr/install.lock. Pot ignorar l'avís però és possible que hagi de eliminar-lo manualment més tard. En aquest cas, serà informat. Feu clic a OK per continuar...
+FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminació del fitxer %1/www/dolibarr/install.lock. Pots ignorar l'avís però és possible que hagis d'eliminar-lo manualment més tard. En aquest cas, serà informat. Fes clic a OK per continuar...
 
-PortAlreadyInUse=Sembla que el port %1 ja està sent utilitzat. Es recomana cancel·lar, tornar enrere i especificar un altre valor per al port% 2. Cancel·lar i escollir un altre valor?
+PortAlreadyInUse=Sembla que el port %1 ja està sent utilitzat. Es recomana cancel·lar, tornar enrere i especificar un altre valor per al port% 2. Vols cancel·lar i escollir un altre valor?
 
-FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
-ChromeDetected=S'ha detectat Chrome al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
-ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no està segur, simplement feu clic a Obrir:
+FirefoxDetected=S'ha detectat Firefox al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
+ChromeDetected=S'ha detectat Chrome al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
+ChooseDefaultBrowser=Escull el teu navegador per defecte (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...).. Si no estàs segur, simplement fes clic a Obre:
 
-LaunchNow=Llançar ara Dolibarr
+LaunchNow=Obre ara el Dolibarr
 
-ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant això tots els seus arxius de dades es troben encara al directori %1. Haurà eliminar aquest directori manualment per a una desinstal completa.
+ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant això tots els seus arxius de dades es troben encara al directori %1. Hauràs d'eliminar aquest directori manualment per a una desinstal·lació completa.
 
-DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reiniciar Apache i MySQL, això pot durar des de diversos segons a un minut després de la confirmació. Iniciar la instal·lació o actualització dels servidors web i bases de dades requerides per Dolibarr?
+DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reiniciar Apache i MySQL, això pot durar des de diversos segons a un minut després de la confirmació. Vols iniciar la instal·lació o actualització dels servidors web i de base de dades requerides per Dolibarr?
 
-OldVersionFoundAndMoveInNew=S'ha trobat una versió antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versió de Dolibarr
-OldVersionFoundButFailedToMoveInNew=S'ha trobat una versió antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió de Dolibarr
+OldVersionFoundAndMoveInNew=S'ha trobat una versió antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versió de Dolibarr
+OldVersionFoundButFailedToMoveInNew=S'ha trobat una versió antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió de Dolibarr
 
+DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2012". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
+ContinueAnyway=Continua igualment (el procés d'instal·lació podria fallar sense aquest prerequisit)

From 3f071462ab7c81a4cb19e0d6eb9803fbc1d972ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?= <joseplluis@lliuretic.cat>
Date: Wed, 22 Apr 2020 17:50:15 +0200
Subject: [PATCH 133/144] Update MySpanish.isl

---
 build/exe/doliwamp/Languages/MySpanish.isl | 50 +++++++++++-----------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/build/exe/doliwamp/Languages/MySpanish.isl b/build/exe/doliwamp/Languages/MySpanish.isl
index 63c0136f351..c31aedf895f 100644
--- a/build/exe/doliwamp/Languages/MySpanish.isl
+++ b/build/exe/doliwamp/Languages/MySpanish.isl
@@ -1,45 +1,47 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versión %2
+NameAndVersion=%1 versión %2
 AdditionalIcons=Iconos adicionales:
 CreateDesktopIcon=Crear un icono en el &escritorio
-CreateQuickLaunchIcon=Crear un icono de Inicio Rápido
+CreateQuickLaunchIcon=Crear un icono de Inicio Rápido
 ProgramOnTheWeb=%1 en la Web
 UninstallProgram=Desinstalar %1
 LaunchProgram=Ejecutar %1
-AssocFileExtension=&Asociar %1 con la extensión de archivo %2
-AssocingFileExtension=Asociando %1 con la extensión de archivo %2...
+AssocFileExtension=&Asociar %1 con la extensión de archivo %2
+AssocingFileExtension=Asociando %1 con la extensión de archivo %2...
 
-YouWillInstallDoliWamp=Va a instalar o actualizar (Apache+Mysql+PHP+Dolibarr) en su ordenador.
-ThisAssistantInstallOrUpgrade=Este asistente instala o actualiza Dolibarr ERP-CRM y todos sus requisitos (Apache, Mysql y PHP) optimizados para el uso de  Dolibarr.
-IfYouHaveTechnicalKnowledge=Si tiene conocimientos técnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no debería usar este asistente, debería realizar una instalación manual de Dolibarr sobre un Apache, Mysql y PHP existente.
-ButIfYouLook=Pero si busca una instalación automática, se encuentra en el buen camino...
-DoYouWantToStart=¿Quiere iniciar el proceso de instalación/actualización?
+YouWillInstallDoliWamp=Va a instalar DoliWamp (Dolibarr y otro software como Apache, Mysql y PHP) en su ordenador.
+ThisAssistantInstallOrUpgrade=ALERTA: Utilizar un ERP CRM instalado en un ordenador en local puede ser peligroso: si el ordenador se estropea, puede perder todos sus datos. Hágalo si está preparado para autogestionar sus copias de seguridad. Si no, puede utilizar una instalacion Saas (puede ver https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Si tiene conocimientos técnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no debería usar este asistente, debería realizar una instalación manual de Dolibarr sobre un Apache, Mysql y PHP existente.
+ButIfYouLook=Pero si busca una instalación automática en tu propio ordenador, se encuentra en el buen camino...
+DoYouWantToStart=¿Quiere iniciar el proceso de instalación?
 
-TechnicalParameters=Parámetros técnicos
-IfFirstInstall=Si se trata de la primera instalación, deberá especificar algunos parámetros técnicos. Si no los entiende, no está seguro o va a proceder a una actualización, deje los campos con los valores propuestos por defecto.
+TechnicalParameters=Parámetros técnicos
+IfFirstInstall=Si se trata de la primera instalación, deberá especificar algunos parámetros técnicos. Si no los entiende, no está seguro o va a proceder a una actualización, deje los campos con los valores propuestos por defecto.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Servidor SMTP (El suyo o el de su ISP, únicamente primera instalación) :
-ApachePort=Puerto Apache (únicamente primera instalación, normalmente es el 80) :
-MySqlPort=Puerto Mysql (únicamente primera instalación, normalmente es el 3306) :
-MySqlPassword=Contraseña del servidor y la base de datos MySQL de root (únicamente primera instalación):
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Servidor SMTP (propio o su ISP, sólo primera instalación) :
+ApachePort=Puerto Apache (sólo primera instalación, normalmente el 80) :
+MySqlPort=Puerto Mysql (sólo primera instalación, normalmente el 3306) :
+MySqlPassword=Contraseña del servidor y la base de datos MySQL de root (sólo primera instalación):
 
-FailedToDeleteLock=Error en la eliminación del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente más tarde. En este caso, será informado. Haga clic en OK para continuar...
+FailedToDeleteLock=Error en la eliminación del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente más tarde. En este caso, será informado. Haga clic en OK para continuar...
 
-PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. ¿Cancelar y escojer otro valor?
+PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. ¿Cancelar y escojer otro valor?
 
 FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
 ChromeDetected=Se ha detectado Chrome en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
-ChooseDefaultBrowser=Escoja su navegador por defecto. Si no está seguro, simplementa haga clic en Abrir :
+ChooseDefaultBrowser=Escoja su navegador por defecto (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si no está seguro, simplementa haga clic en Abrir :
 
 LaunchNow=Lanzar ahora Dolibarr
 
-ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todavía en el directorio %1. Deberá eliminar este directorio manualmente para una desinstalación completa.
+ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todavía en el directorio %1. Deberá eliminar este directorio manualmente para una desinstalación completa.
 
-DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto después de la confirmación. ¿Iniciar la instalación o actualización de los servidores Web y bases de datos requeridas por Dolibarr?
+DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto después de la confirmación. ¿Iniciar la instalación o actualización de los servidores Web y bases de datos requeridas por Dolibarr?
 
-OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr
-OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr
- 	  	 
\ No newline at end of file
+OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr
+OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr
+ 	  	 
+DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2012". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
+ContinueAnyway=Continua igualmente (el proceso de instalación podría fallar sin este prerequisito)

From 496d8f354f83d7c03d22b6cf8bfda2a27acfaed2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 17:59:54 +0200
Subject: [PATCH 134/144] Look and feel v12

---
 htdocs/admin/accountant.php                  |  2 +-
 htdocs/admin/company.php                     |  2 +-
 htdocs/contact/card.php                      | 78 +++++++++++++-------
 htdocs/core/class/commonobject.class.php     |  2 +-
 htdocs/core/lib/functions.lib.php            | 15 ++--
 htdocs/core/tpl/objectline_view.tpl.php      | 14 +++-
 htdocs/langs/en_US/main.lang                 |  1 +
 htdocs/product/stock/card.php                | 23 ++++--
 htdocs/product/stock/movement_list.php       |  4 +-
 htdocs/societe/card.php                      |  2 +
 htdocs/theme/eldy/global.inc.php             |  4 +-
 htdocs/theme/eldy/main_menu_fa_icons.inc.php |  2 +-
 12 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 7a436c5a363..c8c082db6ae 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -128,7 +128,7 @@ print '<input name="town" class="minwidth100" id="town" value="'.($conf->global-
 
 // Country
 print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
-//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
+print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
 if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 3229eda7365..d4664a13de1 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -429,7 +429,7 @@ print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth100" id="MAIN_INFO_SO
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
-//if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
+print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 print $form->select_country($mysoc->country_id, 'country_id');
 if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>'."\n";
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index cecc7867b0f..ce948211c46 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -691,6 +691,7 @@ else
 
             // Country
             print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+            print img_picto('', 'globe-americas', 'class="paddingrightonly"');
             print $form->select_country((GETPOST("country_id", 'alpha') ? GETPOST("country_id", 'alpha') : $object->country_id), 'country_id');
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td></tr>';
@@ -722,24 +723,34 @@ else
             if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) $object->fax = $objsoc->fax; // Predefined with third party
 
             // Phone / Fax
-            print '<tr><td>'.img_picto('', 'object_phoning').' '.$form->editfieldkey('PhonePro', 'phone_pro', '', $object, 0).'</td>';
-            print '<td><input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" value="'.(GETPOSTISSET('phone_pro') ? GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
+            print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', '', $object, 0).'</td>';
+            print '<td>';
+            print img_picto('', 'object_phoning');
+            print '<input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" value="'.(GETPOSTISSET('phone_pro') ? GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
             if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.img_picto('', 'object_phoning').' '.$form->editfieldkey('PhonePerso', 'phone_perso', '', $object, 0).'</td>';
-            print '<td><input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
+            print '<td>'.$form->editfieldkey('PhonePerso', 'phone_perso', '', $object, 0).'</td>';
+            print '<td>';
+            print img_picto('', 'object_phoning');
+            print '<input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
 
-            print '<tr><td>'.img_picto('', 'object_phoning_mobile').' '.$form->editfieldkey('PhoneMobile', 'phone_mobile', '', $object, 0).'</td>';
-            print '<td><input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
+            print '<tr><td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', '', $object, 0).'</td>';
+            print '<td>';
+            print img_picto('', 'object_phoning_mobile');
+            print '<input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
             if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.img_picto('', 'object_phoning_fax').' '.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-            print '<td><input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
+            print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
+            print '<td>';
+            print img_picto('', 'object_phoning_fax');
+            print '<input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
             print '</tr>';
 
             if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email; // Predefined with third party
 
             // Email
-            print '<tr><td>'.img_picto('', 'object_email').' '.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '').'</td>';
-            print '<td><input type="text" name="email" id="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'"></td>';
+            print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '').'</td>';
+            print '<td>';
+            print img_picto('', 'object_email');
+            print '<input type="text" name="email" id="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'"></td>';
 			print '</tr>';
 
             if (!empty($conf->mailing->enabled))
@@ -964,12 +975,12 @@ else
 
             // Lastname
             print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
-            print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="minwidth200" maxlength="80" value="'.(isset($_POST["lastname"]) ?GETPOST("lastname") : $object->lastname).'" autofocus="autofocus"></td>';
+            print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="minwidth200" maxlength="80" value="'.(GETPOSTISSET("lastname") ? GETPOST("lastname") : $object->lastname).'" autofocus="autofocus"></td>';
             print '</tr>';
             print '<tr>';
             // Firstname
             print '<td><label for="firstname">'.$langs->trans("Firstname").'</label></td>';
-	        print '<td colspan="3"><input name="firstname" id="firstname" type="text" class="minwidth200" maxlength="80" value="'.(isset($_POST["firstname"]) ?GETPOST("firstname") : $object->firstname).'"></td>';
+	        print '<td colspan="3"><input name="firstname" id="firstname" type="text" class="minwidth200" maxlength="80" value="'.(GETPOSTISSET("firstname") ? GETPOST("firstname") : $object->firstname).'"></td>';
 	        print '</tr>';
 
             // Company
@@ -988,13 +999,13 @@ else
             print '</td></tr>';
 
             print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
-	        print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="80" value="'.(isset($_POST["poste"]) ?GETPOST("poste") : $object->poste).'"></td></tr>';
+	        print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="80" value="'.(GETPOSTISSET("poste") ? GETPOST("poste") : $object->poste).'"></td></tr>';
 
             // Address
             print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
             print '<td colspan="3">';
-            print '<div class="paddingrightonly valignmiddle inline-block">';
-            print '<textarea class="flat minwidth200" name="address" id="address">'.(isset($_POST["address"]) ?GETPOST("address") : $object->address).'</textarea>';
+            print '<div class="paddingrightonly valignmiddle inline-block quatrevingtpercent">';
+            print '<textarea class="flat minwidth200 centpercent" name="address" id="address">'.(GETPOSTISSET("address") ? GETPOST("address", 'nohtml') : $object->address).'</textarea>';
             print '</div><div class="paddingrightonly valignmiddle inline-block">';
             if ($conf->use_javascript_ajax) print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a><br>';
             print '</div>';
@@ -1002,13 +1013,14 @@ else
 
             // Zip / Town
             print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-            print $formcompany->select_ziptown((isset($_POST["zipcode"]) ?GETPOST("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6).'&nbsp;';
-            print $formcompany->select_ziptown((isset($_POST["town"]) ?GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+            print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOST("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6).'&nbsp;';
+            print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
             print '</td></tr>';
 
             // Country
             print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-            print $form->select_country(isset($_POST["country_id"]) ?GETPOST("country_id") : $object->country_id, 'country_id');
+            print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+            print $form->select_country(GETPOSTISSET("country_id") ? GETPOST("country_id") : $object->country_id, 'country_id');
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td></tr>';
 
@@ -1029,19 +1041,29 @@ else
             }
 
             // Phone
-            print '<tr><td>'.img_picto('', 'object_phoning').' '.$form->editfieldkey('PhonePro', 'phone_pro', GETPOST('phone_pro', 'alpha'), $object, 0).'</td>';
-            print '<td><input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_pro') ?GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
-            print '<td>'.img_picto('', 'object_phoning').' '.$form->editfieldkey('PhonePerso', 'fax', GETPOST('phone_perso', 'alpha'), $object, 0).'</td>';
-            print '<td><input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_perso') ?GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
+            print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', GETPOST('phone_pro', 'alpha'), $object, 0).'</td>';
+            print '<td>';
+            print img_picto('', 'object_phoning');
+            print '<input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_pro') ?GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
+            print '<td>'.$form->editfieldkey('PhonePerso', 'fax', GETPOST('phone_perso', 'alpha'), $object, 0).'</td>';
+            print '<td>';
+            print img_picto('', 'object_phoning');
+            print '<input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_perso') ?GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
 
-            print '<tr><td>'.img_picto('', 'object_phoning_mobile').' '.$form->editfieldkey('PhoneMobile', 'phone_mobile', GETPOST('phone_mobile', 'alpha'), $object, 0, 'string', '').'</td>';
-            print '<td><input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_mobile') ?GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
-            print '<td>'.img_picto('', 'object_phoning_fax').' '.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
-            print '<td><input type="text" name="fax" id="fax" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_fax') ?GETPOST('phone_fax', 'alpha') : $object->fax).'"></td></tr>';
+            print '<tr><td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', GETPOST('phone_mobile', 'alpha'), $object, 0, 'string', '').'</td>';
+            print '<td>';
+            print img_picto('', 'object_phoning_mobile');
+            print '<input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_mobile') ?GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
+            print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
+            print '<td>';
+            print img_picto('', 'object_phoning_fax');
+            print '<input type="text" name="fax" id="fax" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_fax') ?GETPOST('phone_fax', 'alpha') : $object->fax).'"></td></tr>';
 
             // EMail
-            print '<tr><td>'.img_picto('', 'object_email').' '.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-            print '<td><input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
+            print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
+            print '<td>';
+            print img_picto('', 'object_email');
+            print '<input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
             if (!empty($conf->mailing->enabled))
             {
                 $langs->load("mails");
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7bbf7b6475c..20dbdf18fd3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -667,7 +667,7 @@ abstract class CommonObject
 				$namecoords .= $this->getFullName($langs, 1).'<br>'.$coords;
 				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
 				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
-				$out .= img_picto($langs->trans("Address"), 'object_address.png');
+				$out .= img_picto($langs->trans("Address"), 'map-marker-alt');
 				$out .= '</a> ';
 			}
 			$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9e5584bf7ae..94e9af511ea 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3143,8 +3143,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
         		'address', 'bank_account', 'barcode', 'bank', 'bookmark', 'bom', 'building', 'cash-register', 'check', 'close_title', 'company', 'contact', 'cubes',
         		'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'external-link-alt', 'external-link-square-alt',
-        		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot',
-        		'money-bill-alt', 'mrp', 'note', 'stock',
+        		'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'help', 'language', 'list', 'listlight', 'lot',
+        		'map-marker-alt', 'money-bill-alt', 'mrp', 'note', 'stock',
         		'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bom',
 	        	'object_category', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
         		'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
@@ -3153,10 +3153,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
         		'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal', 'object_supplier_proposal', 'object_service', 'object_stock',
         		'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
         		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_other',
-        		'object_phoning', 'object_phoning_fax', 'object_email',
+        		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email',
         		'off', 'on',
         		'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'resize', 'service', 'stats', 'trip',
-				'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
+				'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
 				'home', 'companies', 'products', 'commercial', 'invoicing', 'accountancy', 'preview', 'project', 'projectpub', 'hrm', 'members', 'ticket', 'generic',
@@ -3194,7 +3194,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	'other'=>'square',
 		    	'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
 				'resize'=>'crop', 'supplier_proposal'=>'file-signature',
-		    	'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+		    	'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 		    	'resource'=>'laptop-house',
 		    	'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
@@ -3271,10 +3271,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'address'=>'#37a', 'building'=>'#37a', 'bom'=>'#a69944',
 				'companies'=>'#37a', 'company'=>'#37a', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',
 				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
-				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
+				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
+				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
-				'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'warning'=>''
+				'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'globe-americas'=>'#aaa'
 			);
 			if (isset($arrayconvpictotocolor[$pictowithouttext])) {
 				$facolor = $arrayconvpictotocolor[$pictowithouttext];
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 57e4c14e5d5..28b6c6f0dbd 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -284,11 +284,19 @@ if ($line->special_code == 3) { ?>
 	{
 		$tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
 		$tooltiponprice .= '<br>'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva);
-		if (price2num($line->total_localtax1)) $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax1);
-		if (price2num($line->total_localtax2)) $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax2);
+		if (! $senderissupplier && is_object($object->thirdparty)) {
+			if ($object->thirdparty->useLocalTax(1)) {
+				if (price2num($line->total_localtax1)) $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax1);
+				else $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'=<span class="opacitymedium">'.$langs->trans("NotUsedForThisCustomer").'</span>';
+			}
+			if ($object->thirdparty->useLocalTax(1)) {
+				if (price2num($line->total_localtax2)) $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax2);
+				else $tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'=<span class="opacitymedium">'.$langs->trans("NotUsedForThisCustomer").'</span>';
+			}
+		}
 		$tooltiponprice .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).'='.price($line->total_ttc);
 
-		print '<span class="classfortooltip" title="'.$tooltiponprice.'">';
+		print '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltiponprice).'">';
 	}
 	print price($line->total_ht);
 	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c34ea6a9e96..7cb9b21791a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1030,3 +1030,4 @@ 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
\ No newline at end of file
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 11b901a9c66..0665cc48e06 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -293,13 +293,19 @@ if ($action == 'create')
 
 	// Country
 	print '<tr><td>'.$langs->trans('Country').'</td><td>';
+	print img_picto('', 'globe-americas', 'class="paddingright"');
 	print $form->select_country((!empty($object->country_id) ? $object->country_id : $mysoc->country_code), 'country_id');
 	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	print '</td></tr>';
 
 	// Phone / Fax
-	print '<tr><td class="titlefieldcreate fieldrequired">'.img_picto('', 'object_phoning').' '.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td><td><input name="phone" size="20" value="'.$object->phone.'"></td></tr>';
-	print '<tr><td class="titlefieldcreate fieldrequired">'.img_picto('', 'object_phoning_fax').' '.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td><td><input name="fax" size="20" value="'.$object->fax.'"></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td><td>';
+	print img_picto('', 'object_phoning', 'class="paddingright"');
+	print '<input name="phone" size="20" value="'.$object->phone.'"></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
+	print '<td>';
+	print img_picto('', 'object_phoning_fax', 'class="paddingright"');
+	print '<input name="fax" size="20" value="'.$object->fax.'"></td></tr>';
 
 	// Status
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
@@ -395,7 +401,7 @@ else
         	print '<div class="fichehalfleft">';
         	print '<div class="underbanner clearboth"></div>';
 
-        	print '<table class="border centpercent">';
+        	print '<table class="border centpercent tableforfield">';
 
 			// Parent entrepot
 			$parentwarehouse = new Entrepot($db);
@@ -429,7 +435,7 @@ else
 			print '<div class="ficheaddleft">';
 			print '<div class="underbanner clearboth"></div>';
 
-			print '<table class="border centpercent">';
+			print '<table class="border centpercent tableforfield">';
 
 			// Value
 			print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
@@ -723,13 +729,18 @@ else
 
 			// Country
 			print '<tr><td>'.$langs->trans('Country').'</td><td>';
+			print img_picto('', 'globe-americas', 'class="paddingright"');
 			print $form->select_country($object->country_id ? $object->country_id : $mysoc->country_code, 'country_id');
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '</td></tr>';
 
 			// Phone / Fax
-			print '<tr><td class="titlefieldcreate fieldrequired">'.img_picto('', 'object_phoning').' '.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td><td><input name="phone" size="20" value="'.$object->phone.'"></td></tr>';
-			print '<tr><td class="titlefieldcreate fieldrequired">'.img_picto('', 'object_phoning_fax').' '.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td><td><input name="fax" size="20" value="'.$object->fax.'"></td></tr>';
+			print '<tr><td class="titlefieldcreate fieldrequired">'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td><td>';
+			print img_picto('', 'object_phoning', 'class="paddingright"');
+			print '<input name="phone" size="20" value="'.$object->phone.'"></td></tr>';
+			print '<tr><td class="titlefieldcreate fieldrequired">'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td><td>';
+			print img_picto('', 'object_phoning_fax', 'class="paddingright"');
+			print '<input name="fax" size="20" value="'.$object->fax.'"></td></tr>';
 
 			// Status
 			print '<tr><td>'.$langs->trans("Status").'</td><td>';
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index e2cd50fd2e2..944462ccdfc 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -574,7 +574,7 @@ if ($resql)
         print '<div class="fichehalfleft">';
         print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border centpercent">';
+        print '<table class="border centpercent tableforfield">';
 
         print '<tr>';
 
@@ -602,7 +602,7 @@ if ($resql)
         print '<div class="ficheaddleft">';
         print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border centpercent">';
+        print '<table class="border centpercent tableforfield">';
 
         // Value
         print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 20ada9bfbaf..8800bd887a1 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1330,6 +1330,7 @@ else
 
         // Country
         print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+        print img_picto('', 'globe-americas', 'class="paddingrightonly"');
         print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id));
         if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td></tr>';
@@ -1977,6 +1978,7 @@ else
 
             // Country
             print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
+            print img_picto('', 'globe-americas', 'class="paddingrightonly"');
             print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id');
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td></tr>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 89d803781ba..e495a3bb4bc 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -210,7 +210,9 @@ textarea.cke_source:focus
 {
 	box-shadow: none;
 }
-
+div#cke_dp_desc {
+    margin-top: 5px;
+}
 textarea {
 	border-radius: 0;
 	border-top:solid 1px rgba(0,0,0,.2);
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index e2cd9d339c5..5b9395fbc04 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -145,7 +145,7 @@ div.mainmenu.generic4::before {
 
 /* Define color of some picto */
 
-.fa-phone, .fa-fax {
+.fa-phone, .fa-mobile-alt, .fa-fax {
 	opacity: 0.5;
 	color: #440;
 }

From 8598fd99c2973b491ea25ef620e5644f40627d6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 18:08:02 +0200
Subject: [PATCH 135/144] if not exists not required

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

diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 9c09b8b9247..4b87b4b9ce3 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -42,7 +42,7 @@ ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande
 
 UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version = 'SYSCOHADA';
 
-create table if not exists llx_c_shipment_package_type
+create table llx_c_shipment_package_type
 (
     rowid        integer  AUTO_INCREMENT PRIMARY KEY,
     label        varchar(50) NOT NULL,  -- Short name

From 7bc8a70b0a593a39d0acb72e29b445e39ccd3812 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 18:23:48 +0200
Subject: [PATCH 136/144] FIX #13670

---
 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 6e71125cbd5..37dbcbf5ded 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4548,7 +4548,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	{
 		if ($currency_code == 'auto') $currency_code = $conf->currency;
 
-		$listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'HKD', 'MXN', 'PEN', 'CNY', 'CAD');
+		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD');
 		$listoflanguagesbefore = array('nl_NL');
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
 		{

From 52c8e3aff10b2bd3afbb08dbde918e109942ab22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 18:30:25 +0200
Subject: [PATCH 137/144] Look and feel v12

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

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index a2db56549e3..4ba581398ee 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -281,8 +281,8 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '<td>'.$form->textwithpicto($langs->trans("CurrencyLayerAccount"), $langs->trans("CurrencyLayerAccount_help_to_synchronize", $urlforapilayer)).'</td>'."\n";
 	print '<td class="right">';
 	print '<textarea id="response" class="hideobject" name="response"></textarea>';
-	print '<input type="submit" name="modify_apilayer" class="button" value="'.$langs->trans("Modify").'">';
-	print '<input type="submit" id="bt_sync" name="bt_sync_apilayer" class="button" value="'.$langs->trans('Synchronize').'" />';
+	print '<input type="submit" name="modify_apilayer" class="button buttongen" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" id="bt_sync" name="bt_sync_apilayer" class="button buttongen" value="'.$langs->trans('Synchronize').'" />';
 	print '</td></tr>';
 
 	print '<tr class="oddeven">';

From 3170060c650acee32e8852d1861c552274c8072b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 18:34:52 +0200
Subject: [PATCH 138/144] Help show format of price

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

diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index d828873be36..0646c7f6d46 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -209,6 +209,8 @@ else
 	// Show examples
 	print load_fiche_titre($langs->trans("ExamplesWithCurrentSetup"), '', '');
 
+	print '<span class="opacitymedium">'.$langs->trans("Format").':</span> '.price(price2num(1234.56789, 'MT'), 0, $langs, 1, -1, -1, $currencycode)."<br>\n";
+
 	// Always show vat rates with vat 0
 	$s = 2 / 7; $qty = 1; $vat = 0;
 	$tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);

From 4605b9ec61350024fc197ae4f5c45c4f2765f971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Apr 2020 19:16:58 +0200
Subject: [PATCH 139/144] Update api_bankaccounts.class.php

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

diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index d947d169695..ad75559b362 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -78,7 +78,7 @@ class BankAccounts extends DolibarrApi
         $sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
     	// Select accounts of given category
     	if ($category > 0) {
-            $sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_account = t.rowid ";
+            $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_account = t.rowid ";
 		}
         // Add sql filters
         if ($sqlfilters)

From 245f89ceaaac7844ecac8ce3ca880bd195433a37 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 21:28:23 +0200
Subject: [PATCH 140/144] Look and feel v12

---
 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 40b7c4916de..aa922c4ab0c 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -715,7 +715,7 @@ class Entrepot extends CommonObject
 
         $result = '';
 
-        $label = '<u>'.$langs->trans("ShowWarehouse").'</u>';
+        $label = '<u>'.$langs->trans("Warehouse").'</u>';
         $label .= '<br><b>'.$langs->trans('Ref').':</b> '.(empty($this->ref) ? (empty($this->label) ? $this->libelle : $this->label) : $this->ref);
         if (!empty($this->lieu)) {
             $label .= '<br><b>'.$langs->trans('LocationSummary').':</b> '.$this->lieu;
@@ -731,7 +731,7 @@ class Entrepot extends CommonObject
         {
             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label = $langs->trans("ShowWarehouse");
+                $label = $langs->trans("Warehouse");
                 $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';

From de90f24bd47ef33892f21a0c6fb86185f8bd7c0c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 21:29:15 +0200
Subject: [PATCH 141/144] Fix phpcs

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

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 3a709e295f7..daf8b3db617 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -262,7 +262,7 @@ class FormOther
     {
         // phpcs:enable
     	global $langs;
-    	
+
     	$out = '';
 
     	$sql = "SELECT r.taux, r.revenuestamp_type";

From 9bda294edcac49f34ba3ca216649f6d9ac6ce247 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 21:41:56 +0200
Subject: [PATCH 142/144] Fix set default warehouse of product in MO
 consumption

---
 htdocs/mrp/mo_production.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index f1e847a6213..301cf4a76ae 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -684,6 +684,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	print '</tr>';
 
     	if ($action == 'addconsumeline') {
+    		print '<!-- Add line to consume -->'."\n";
     		print '<tr class="liste_titre">';
     		print '<td>';
     		print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
@@ -791,6 +792,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
     	    		if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
     	    			$i = 1;
+    	    			print '<!-- Enter line to consume -->'."\n";
     	    			print '<tr>';
     	    			print '<td>'.$langs->trans("ToConsume").'</td>';
     	    			$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
@@ -800,8 +802,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	    			print '<td>';
     	    			if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
     	    				if (empty($line->disable_stock_change)) {
-    	    					$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : 'ifone');
-    	    					print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1);
+    	    					$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
+    	    					print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300');
     	    				} else {
     	    					print '<span class="opacitymedium">'.$langs->trans("DisableStockChange").'</span>';
     	    				}
@@ -949,7 +951,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     					print '<td>';
     					if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
     						$preselected = (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i) ? GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) : ($object->fk_warehouse > 0 ? $object->fk_warehouse : 'ifone'));
-    						print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'csswarehouse_'.$line->id.'_'.$i);
+    						print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300 csswarehouse_'.$line->id.'_'.$i);
     					} else {
     						print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
     					}

From a7641cdb9028c5b41aae62a2315d2e15b6cae078 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 22:02:25 +0200
Subject: [PATCH 143/144] CSS

---
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 htdocs/user/home.php                          | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index aa922c4ab0c..3dd22c9e5c3 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -765,7 +765,7 @@ class Entrepot extends CommonObject
 
         // Initialize parameters
         $this->id = 0;
-        $this->libelle = 'WAREHOUSE SPECIMEN';
+        $this->label = 'WAREHOUSE SPECIMEN';
         $this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now, 'dayhourlog');
 		$this->statut = 1;
         $this->specimen = 1;
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index da037243ed8..4bb99e4c261 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -92,7 +92,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 /*
- * Last created users
+ * Latest created users
  */
 $max = 10;
 
@@ -128,8 +128,7 @@ if ($resql)
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastUsersCreated", min($num, $max)).'</td>';
-	print '<td class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/user/list.php?sortfield=u.datec&sortorder=DESC">'.$langs->trans("FullList").'</td>';
-	print '<td></td>';
+	print '<td class="right" colspan="2"><a class="commonlink" href="'.DOL_URL_ROOT.'/user/list.php?sortfield=u.datec&sortorder=DESC">'.$langs->trans("FullList").'</td>';
 	print '</tr>';
 	$i = 0;
 
@@ -165,7 +164,7 @@ if ($resql)
 			print img_picto($langs->trans("Administrator"), 'star');
 		}
 		print "</td>";
-		print '<td class="left">'.$obj->login.'</td>';
+		print '<td>'.$obj->login.'</td>';
 		print "<td>";
 		if ($obj->fk_soc)
 		{

From b6786c515a68bc6a1ede800633b2810fee61b97e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Apr 2020 22:12:53 +0200
Subject: [PATCH 144/144] picto

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

diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 4bb99e4c261..4c46c502acc 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -61,7 +61,7 @@ $hookmanager->initHooks(array('userhome'));
 llxHeader();
 
 
-print load_fiche_titre($langs->trans("MenuUsersAndGroups"));
+print load_fiche_titre($langs->trans("MenuUsersAndGroups"), '', 'user');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';