diff --git a/ChangeLog b/ChangeLog
index 8255f3ca5f8..4119f205369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,6 +150,8 @@ WARNING:
 
 Dolibarr 3.9 is not yet fully compatible with PHP 7.
 
+Mysql minimum version is now 5.0.3 
+
 Following changes may create regression for some external modules, but were necessary to make
 Dolibarr better:
 - Deprecated Product::setPriceExpression. Use Product::update instead
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 0500ac4a0a7..77c9a4a135e 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -27,6 +27,7 @@ require '../../main.inc.php';
 
 // Class
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -41,12 +42,24 @@ $piece_num = GETPOST("piece_num");
 
 $mesg = '';
 
-$numero_compte = GETPOST('numero_compte');
+$account_number = GETPOST('account_number');
 $code_tiers = GETPOST('code_tiers');
+if ($code_tiers==-1) {
+	$code_tiers=null;
+}
 $label_compte = GETPOST('label_compte');
 $debit = price2num(GETPOST('debit'));
 $credit = price2num(GETPOST('credit'));
 
+$save=GETPOST('save');
+if (!empty($save)) {
+	$action='add';
+}
+$update=GETPOST('update');
+if (!empty($update)) {
+	$action='confirm_update';
+}
+
 if ($action == "confirm_update") {
 
     $error = 0;
@@ -63,7 +76,7 @@ if ($action == "confirm_update") {
         if ($result < 0) {
             setEventMessages($book->error, $book->errors, 'errors');
         } else {
-            $book->numero_compte = $numero_compte;
+			$book->numero_compte = $account_number;
             $book->code_tiers = $code_tiers;
             $book->label_compte = $label_compte;
             $book->debit = $debit;
@@ -92,15 +105,15 @@ if ($action == "confirm_update") {
 else if ($action == "add") {
     $error = 0;
 
-    if ((intval($debit) != 0) && (intval($credit) != 0)) {
-        setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
-        $error ++;
-    }
+	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
+		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
+		$error ++;
+	}
 
     if (empty($error)) {
         $book = new BookKeeping($db);
 
-        $book->numero_compte = $numero_compte;
+		$book->numero_compte = $account_number;
         $book->code_tiers = $code_tiers;
         $book->label_compte = $label_compte;
         $book->debit = $debit;
@@ -113,11 +126,12 @@ else if ($action == "add") {
         $book->fk_doc = GETPOST('fk_doc');
         $book->fk_docdet = GETPOST('fk_docdet');
 
-        if (! empty($debit)) {
+		if (floatval($debit) != 0.0) {
             $book->montant = $debit;
             $book->sens = 'D';
         }
-        if (! empty($credit)) {
+		
+		if (floatval($credit) != 0.0) {
             $book->montant = $credit;
             $book->sens = 'C';
         }
@@ -179,6 +193,7 @@ else if ($action == "confirm_create") {
 llxHeader();
 
 $html = new Form($db);
+$formventilation = new FormVentilation($db);
 
 /*
  *  Confirmation to delete the command
@@ -281,9 +296,21 @@ if ($action == 'create') {
         } else {
 
             print load_fiche_titre($langs->trans("ListeMvts"));
+			
+			print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+			print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
+			print '<input type="hidden" name="doc_type" value="' . $book->doc_type . '">' . "\n";
+			print '<input type="hidden" name="doc_ref" value="' . $book->doc_ref . '">' . "\n";
+			print '<input type="hidden" name="code_journal" value="' . $book->code_journal . '">' . "\n";
+			print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
+			print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
+			
             print "<table class=\"noborder\" width=\"100%\">";
             if (count($book->linesmvt) > 0) {
 
+				$total_debit=0;
+				$total_credit=0;
+				
                 print '<tr class="liste_titre">';
 
                 print_liste_field_titre($langs->trans("Numerocompte"));
@@ -301,21 +328,26 @@ if ($action == 'create') {
                     $var = ! $var;
                     print "<tr $bc[$var]>";
 
+					$total_debit+=$line->debit;
+					$total_credit+=$line->credit;
+					
                     if ($action == 'update' && $line->id == $id) {
 
-                        print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
-                        print '<input type="hidden" name="id" value="' . $line->id . '">' . "\n";
-                        print '<input type="hidden" name="action" value="confirm_update">' . "\n";
-                        print '<td><input type="text" size="6" name="numero_compte" value="' . $line->numero_compte . '"/></td>';
-                        print '<td><input type="text" size="15" name="code_tiers" value="' . $line->code_tiers . '"/></td>';
+					
+						print '<td>';
+						print $formventilation->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1,'');
+						print '</td>';
+						print '<td>';
+						print $formventilation->select_auxaccount($line->code_tiers, 'code_tiers',1);
+						print '</td>';
                         print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
                         print '<td><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
                         print '<td><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
                         print '<td>' . $line->montant . '</td>';
                         print '<td>' . $line->sens . '</td>';
                         print '<td>';
-                        print '<input type="submit" class="button" value="' . $langs->trans("Update") . '">';
-                        print '</form>';
+						print '<input type="hidden" name="id" value="' . $line->id . '">' . "\n";
+						print '<input type="submit" class="button" name="update" value="' . $langs->trans("Update") . '">';
                         print '</td>';
                     } else {
                         print '<td>' . $line->numero_compte . '</td>';
@@ -327,10 +359,10 @@ if ($action == 'create') {
                         print '<td>' . $line->sens . '</td>';
 
                         print '<td>';
-                        print '<a href="./card.php?action=update&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
+						print '<a href="./card.php?action=update&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
                         print img_edit();
                         print '</a>&nbsp;';
-                        print '<a href="./card.php?action=delete&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
+						print '<a href="./card.php?action=delete&amp;id=' . $line->id . '&amp;piece_num=' . $line->piece_num . '">';
                         print img_delete();
                         print '</a>';
 
@@ -339,34 +371,32 @@ if ($action == 'create') {
                     print "</tr>\n";
                 }
 
+				if ($total_debit!=$total_credit) {
+					setEventMessages(null, array('MvtNotCorrectlyBalanced',$total_credit,$total_debit),'errors');
+				}
+				
                 if ($action == "" || $action == 'add') {
                     $var = ! $var;
                     print "<tr $bc[$var]>";
-
-                    print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
-                    print '<input type="hidden" name="action" value="add">' . "\n";
-                    print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
-                    print '<input type="hidden" name="doc_type" value="' . $book->doc_type . '">' . "\n";
-                    print '<input type="hidden" name="doc_ref" value="' . $book->doc_ref . '">' . "\n";
-                    print '<input type="hidden" name="code_journal" value="' . $book->code_journal . '">' . "\n";
-                    print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
-                    print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
-                    print '<td><input type="text" size="6" name="numero_compte" value="' . $numero_compte . '"/></td>';
-                    print '<td><input type="text" size="15" name="code_tiers" value="' . $code_tiers . '"/></td>';
+					print '<td>';
+					print $formventilation->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
+					print '</td>';
+					print '<td>';
+					print $formventilation->select_auxaccount($code_tiers, 'code_tiers',1);
+					print '</td>';
                     print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
                     print '<td><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
                     print '<td><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
                     print '<td></td>';
                     print '<td></td>';
-                    print '<td><input type="submit" class="button" value="' . $langs->trans("Save") . '"></td>';
+					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '"></td>';
                     print '</tr>';
                 }
                 print '</table>';
                 print '</form>';
             }
         }
-    }
-    else {
+    } else {
         print load_fiche_titre($langs->trans("NoRecords"));
     }
 }
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 26a30171677..c5fea407a12 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -19,18 +19,17 @@
  */
 
 /**
- * \file		htdocs/accountancy/bookkeeping/list.php
- * \ingroup		Accounting Expert
- * \brief		List operation of book keeping
+ * \file htdocs/accountancy/bookkeeping/list.php
+ * \ingroup Accounting Expert
+ * \brief List operation of book keeping
  */
-
 require '../../main.inc.php';
-	
+
 // Class
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -58,11 +57,11 @@ $formother = new FormOther($db);
 
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
-	$search_doc_type="";
-    $search_doc_ref="";
-	$search_account="";
-	$search_thirdparty="";
-	$search_journal="";
+	$search_piece_num = "";
+	$search_doc_ref = "";
+	$search_account = "";
+	$search_thirdparty = "";
+	$search_journal = "";
 }
 
 /*
@@ -80,8 +79,7 @@ if ($action == 'delbookkeeping') {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-elseif ($action == 'delbookkeepingyear') {
+} elseif ($action == 'delbookkeepingyear') {
 	
 	$delyear = GETPOST('delyear', 'int');
 	
@@ -93,8 +91,7 @@ elseif ($action == 'delbookkeepingyear') {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-elseif ($action == 'delbookkeepingyear') {
+} elseif ($action == 'delbookkeepingyear') {
 	
 	$delyear = GETPOST('delyear', 'int');
 	
@@ -106,7 +103,7 @@ elseif ($action == 'delbookkeepingyear') {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}// Export
+}  // Export
 else if ($action == 'export_csv') {
 	
 	header('Content-Type: text/csv');
@@ -118,19 +115,55 @@ else if ($action == 'export_csv') {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 	
-	foreach ( $object->linesexport as $line ) {
-		print $line->id . ',';
-		print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
-		print '"' . $line->code_journal . '",';
-		print '"' . $line->numero_compte . '",';
-		print '"' . substr($line->code_journal, 0, 2) . '",';
-		print '"' . substr($line->doc_ref, 0, 40) . '",';
-		print '"' . $line->num_piece . '",';
-		print '"' . $line->montant . '",';
-		print '"' . $line->sens . '",';
-		print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
-		print '"' . $conf->currency . '",';
-		print "\n";
+	// Model classic Export
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
+		
+		foreach ( $object->linesexport as $line ) {
+			print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
+			print '"' . $line->code_journal . '",';
+			print '"' . $line->numero_compte . '",';
+			print '"' . substr($line->code_journal, 0, 2) . '",';
+			print '"' . substr($line->doc_ref, 0, 40) . '",';
+			print '"' . $line->num_piece . '",';
+			print '"' . $line->debit . '",';
+			print '"' . $line->credit . '",';
+			print '"' . $conf->currency . '",';
+			print "\n";
+		}
+	}
+	// Model cegid Export
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
+		foreach ( $object->linesexport as $line ) {
+			print $line->id . ',';
+			print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
+			print '"' . $line->code_journal . '",';
+			print '"' . $line->numero_compte . '",';
+			print '"' . substr($line->code_journal, 0, 2) . '",';
+			print '"' . substr($line->doc_ref, 0, 40) . '",';
+			print '"' . $line->num_piece . '",';
+			print '"' . $line->montant . '",';
+			print '"' . $line->sens . '",';
+			print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
+			print '"' . $conf->currency . '",';
+			print "\n";
+		}
+	}
+	// Model Coala Export
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 3) {
+		foreach ( $object->linesexport as $line ) {
+			print $line->id . ',';
+			print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
+			print '"' . $line->code_journal . '",';
+			print '"' . $line->numero_compte . '",';
+			print '"' . substr($line->code_journal, 0, 2) . '",';
+			print '"' . substr($line->doc_ref, 0, 40) . '",';
+			print '"' . $line->num_piece . '",';
+			print '"' . $line->montant . '",';
+			print '"' . $line->sens . '",';
+			print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
+			print '"' . $conf->currency . '",';
+			print "\n";
+		}
 	}
 } 
 
@@ -138,16 +171,16 @@ else {
 	
 	llxHeader('', $langs->trans("Bookkeeping"));
 	
-/*
- * List
- */
+	/*
+	 * List
+	 */
 	
 	$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num ";
 	$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
 	
 	if (dol_strlen(trim($search_doc_type))) {
 		
-		$sql .= " WHERE bk.doc_type LIKE '%" . $search_doc_type . "%'";
+		$sql .= " WHERE bk.piece_num LIKE '%" . $search_piece_num . "%'";
 		
 		if (dol_strlen(trim($search_doc_ref))) {
 			$sql .= " AND bk.doc_ref LIKE '%" . $search_doc_ref . "%'";
@@ -177,20 +210,20 @@ else {
 		print_barre_liste($langs->trans("Bookkeeping"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
 		
 		/*print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-		print '<input type="hidden" name="action" value="delbookkeeping">';
-		
-		print $formventilation->select_bookkeeping_importkey('importkey', GETPOST('importkey'));
-		
-		print '<div class="inline-block divButAction"><input type="submit" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
-		
-		print '</form>';*/
+		 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+		 print '<input type="hidden" name="action" value="delbookkeeping">';
+		 
+		 print $formventilation->select_bookkeeping_importkey('importkey', GETPOST('importkey'));
+		 
+		 print '<div class="inline-block divButAction"><input type="submit" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
+		 
+		 print '</form>';*/
 		
 		print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="delbookkeepingyear">';
 		
-		print $formother->select_year(GETPOST('delyear'),'delyear');
+		print $formother->select_year(GETPOST('delyear'), 'delyear');
 		
 		print '<div class="inline-block divButAction"><input type="submit" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" /></div>';
 		
@@ -204,7 +237,7 @@ else {
 		
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans("Doctype"), $_SERVER['PHP_SELF'], "bk.doc_type", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("NumPiece"), $_SERVER['PHP_SELF'], "bk.piece_num", "", "", "", $sortfield, $sortorder);
 		print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "bk.doc_date", "", "", "", $sortfield, $sortorder);
 		print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "bk.doc_ref", "", "", "", $sortfield, $sortorder);
 		print_liste_field_titre($langs->trans("Numerocompte"), $_SERVER['PHP_SELF'], "bk.numero_compte", "", "", "", $sortfield, $sortorder);
@@ -215,12 +248,12 @@ else {
 		print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "bk.montant", "", "", 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "bk.sens", "", "", 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "bk.code_journal", "", "", "", $sortfield, $sortorder);
-		print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Action"), $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 		print "</tr>\n";
 		
 		print '<tr class="liste_titre">';
-		print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
-		print '<td><input type="text" name="search_doc_type" size="8" value="' . $search_doc_type . '"></td>';
+		print '<form action="' . $_SERVER["PHP_SELF"] . '" method="GET">';
+		print '<td><input type="text" name="search_doc_type" size="8" value="' . $search_piece_num . '"></td>';
 		print '<td>&nbsp;</td>';
 		print '<td><input type="text" name="search_doc_ref" size="8" value="' . $search_doc_ref . '"></td>';
 		print '<td><input type="text" name="search_account" size="8" value="' . $search_account . '"></td>';
@@ -232,9 +265,9 @@ else {
 		print '<td>&nbsp;</td>';
 		print '<td><input type="text" name="search_journal" size="3" value="' . $search_journal . '"></td>';
 		print '<td align="right" colspan="2" class="liste_titre">';
-		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+		print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
 		print '&nbsp;';
-		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+		print '<input type="image" class="liste_titre" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';
 		print '</td>';
 		print '</form>';
 		print '</tr>';
@@ -247,7 +280,16 @@ else {
 			
 			print "<tr $bc[$var]>";
 			
-			print '<td>' . $obj->doc_type . '</td>';
+		/*	if ($old_piecenum!=$obj->piece_num) {
+				$total_debit=0;
+				$total_credit=0;
+			} else {
+				$total_debit+=$obj->debit;
+				$total_credit+=$obj->credit;
+			}
+			*/
+			
+			print '<td>' . $obj->piece_num . '</td>';
 			print '<td align="center">' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
 			print '<td>' . $obj->doc_ref . '</td>';
 			print '<td>' . length_accountg($obj->numero_compte) . '</td>';
@@ -260,19 +302,23 @@ else {
 			print '<td>' . $obj->code_journal . '</td>';
 			print '<td align="center"><a href="./card.php?piece_num=' . $obj->piece_num . '">' . img_edit() . '</a></td>';
 			print "</tr>\n";
+			
+			//$old_piecenum= $obj->piece_num;
 			$i ++;
 		}
 		print "</table>";
-
+		
 		print '<div class="tabsAction">';
-		print '<a class="butAction" href="./card.php?action=create">'.$langs->trans("NewAccountingMvt").'</a>';
+		print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
 		print '</div>';
-
+		
 		$db->free($resql);
 	} else {
 		dol_print_error($db);
 	}
+	
+	llxFooter();
 }
 
-llxFooter();
+
 $db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
index f92f5b3ab88..5e838fb475f 100644
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -265,4 +265,81 @@ class FormVentilation extends Form
 		$this->db->free($resql);
 		return $out;
 	}
+	
+	/**
+	 * Return list of auxilary thirdparty accounts
+	 *
+	 * @param string $selectid Preselected pcg_type
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 *       
+	 * @return string String with HTML select
+	 */
+	function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $event = array()) {
+		global $conf;
+		
+		$out = '';
+		
+		$aux_account = array ();
+		
+		// Auxiliary customer account
+		$sql = "SELECT DISTINCT code_compta, nom ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "societe";
+		$sql .= " ORDER BY code_compta";
+		dol_syslog(get_class($this) . "::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ( $obj = $this->db->fetch_object($resql) ) {
+				if (! empty($obj->code_compta)) {
+					$aux_account[$obj->code_compta] = $obj->code_compta . ' (' . $obj->nom . ')';
+				}
+			}
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_pcgsubtype " . $this->error, LOG_ERR);
+			return - 1;
+		}
+		$this->db->free($resql);
+		
+		// Auxiliary supplier account
+		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "societe";
+		$sql .= " ORDER BY code_compta";
+		dol_syslog(get_class($this) . "::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ( $obj = $this->db->fetch_object($resql) ) {
+				if (! empty($obj->code_compta_fournisseur)) {
+					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur . ' (' . $obj->nom . ')';
+				}
+			}
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_pcgsubtype " . $this->error, LOG_ERR);
+			return - 1;
+		}
+		$this->db->free($resql);
+		
+		
+		//Build select
+		if (count($aux_account) > 0) {
+			
+			$out .= ajax_combobox($htmlname, $event);
+			
+			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
+			if ($showempty)
+				$out .= '<option value="-1"></option>';
+			foreach ( $aux_account as $key => $val ) {
+				if (($selectid != '') && $selectid == $key) {
+					$out .= '<option value="' . $key . '" selected>' . $val . '</option>';
+				} else {
+					$out .= '<option value="' . $key . '">' . $val . '</option>';
+				}
+			}
+			$out .= '</select>';
+		}
+		
+		return $out;
+	}
 }
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 4361e730a26..7c025c8a893 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -72,7 +72,7 @@ if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
 $offset = $limit * $page;
 
 if (! $sortfield)
-	$sortfield = "f.facnumber";
+	$sortfield = "f.datef, f.facnumber, l.rowid";
 
 if (! $sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 10dd38807a4..b33becb3f47 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -355,7 +355,7 @@ if ($action == 'writebookkeeping')
 			$bookkeeping = new BookKeeping($db);
 			$bookkeeping->doc_date = $val["date"];
 			$bookkeeping->doc_ref = $val["ref"];
-			$bookkeeping->doc_type = 'banque';
+			$bookkeeping->doc_type = 'bank';
 			$bookkeeping->fk_doc = $key;
 			$bookkeeping->fk_docdet = $val["fk_bank"];
 			$bookkeeping->label_compte = $tabcompany[$key]['name'];
@@ -675,6 +675,7 @@ else
 
 	print "</table>";
 
+	llxFooter();
 }
-llxFooter();
+
 $db->close();
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index b603c1863bb..2346df27c77 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
  * Copyright (C) 2013-2015  Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2013-2014  Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014  Florian Henry	    <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016  Florian Henry	    <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -487,7 +487,9 @@ if ($action == 'export_csv')
 	}
 
 	print "</table>";
-
+	
+	// End of page
+	llxFooter();
 }
-llxFooter();
+
 $db->close();
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 51f4766cc18..b0ebc8e8df7 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -531,6 +531,7 @@ if ($action == 'export_csv')
 
 	print "</table>";
 
+	llxFooter();
 }
-llxFooter();
+
 $db->close();
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 9007ef5ad91..2cf3a323c21 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -93,7 +93,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -107,7 +107,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                                */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index 849cbd9f485..2d03c51e34d 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -89,7 +89,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
+/* Creation of an optional field
  /*                                                                            */
 /* ************************************************************************** */
 
@@ -103,7 +103,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                                */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index 7db9a8f2526..d682f73ce6d 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -110,7 +110,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                                */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
index caddf621db5..c4d45f08ded 100644
--- a/htdocs/admin/expeditiondet_extrafields.php
+++ b/htdocs/admin/expeditiondet_extrafields.php
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -110,7 +110,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/livraison_extrafields.php b/htdocs/admin/livraison_extrafields.php
index a236e4954cf..71a34039084 100644
--- a/htdocs/admin/livraison_extrafields.php
+++ b/htdocs/admin/livraison_extrafields.php
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -110,7 +110,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/livraisondet_extrafields.php b/htdocs/admin/livraisondet_extrafields.php
index ffa00ecf2be..4679123352a 100644
--- a/htdocs/admin/livraisondet_extrafields.php
+++ b/htdocs/admin/livraisondet_extrafields.php
@@ -96,7 +96,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -110,7 +110,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index ea0f99021cf..5d7358ae051 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -93,7 +93,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -107,7 +107,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index 8a9f0e52c0a..f966af78bf3 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -108,7 +108,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index e177f7ed628..92992490ac3 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -381,7 +381,9 @@ foreach ($dirmodels as $reldir)
                     print "<td>\n";
                     require_once $dir.$file;
                     $module = new $classname($db,$specimenthirdparty);
-                    print $module->description;
+                    if (method_exists($module,'info')) print $module->info($langs);
+	            else print $module->description;
+
                     print "</td>\n";
 
                     // Active
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index e10fc9d6961..dc3db7a0036 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -392,7 +392,8 @@ foreach ($dirmodels as $reldir)
                     print "<td>\n";
                     require_once $dir.$file;
                     $module = new $classname($db,$specimenthirdparty);
-                    print $module->description;
+		    if (method_exists($module,'info')) print $module->info($langs);
+	            else print $module->description;
                     print "</td>\n";
 
                     // Active
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 315a88788c2..701362e38f4 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -97,7 +97,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -111,7 +111,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index 7e0f0f500fd..e741eb6cd75 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -97,7 +97,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -111,7 +111,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index 4dbb8f54760..00550995d19 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -93,7 +93,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -107,7 +107,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index 8518c77a8e4..f83ad1348fc 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -108,7 +108,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index 87e907c696e..2bc9f205334 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -86,8 +86,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -100,7 +100,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 5b75bbadd00..9f051b902cc 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -834,7 +834,7 @@ class ActionComm extends CommonObject
         if (! empty($elementtype))
         {
             if ($elementtype == 'project') $sql.= ' AND a.fk_project = '.$fk_element;
-            else $sql.= " AND a.fk_element = ".$fk_element." AND a.elementtype = '".$elementtype."'";
+            else $sql.= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$elementtype."'";
         }
         if (! empty($filter)) $sql.= $filter;
 		if ($sortorder && $sortfield) $sql.=$db->order($sortfield, $sortorder);
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 9c55c606e81..784512d6d1e 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -87,8 +87,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field											  */	
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -101,7 +101,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 97d4763ace3..633c4fab581 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -94,7 +94,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -108,7 +108,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index de32e30c5e6..3417419f892 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -76,9 +76,41 @@ class Commande extends CommonOrder
 
     var $brouillon;
     var $cond_reglement_code;
+
+    var $fk_account;
+
+    /**
+     * It holds the label of the payment mode. Use it in case translation cannot be found.
+     * @var string
+     */
+    var $mode_reglement;
+
+    /**
+     * Payment mode id
+     * @var int
+     */
+    var $mode_reglement_id;
+    /**
+     * Payment mode code
+     * @var string
+     */
     var $mode_reglement_code;
+    /**
+     * Availability delivery time id
+     * @var int
+     */
     var $availability_id;
+    /**
+     * Availability delivery time code
+     * @var string
+     */
     var $availability_code;
+    /**
+     * Label of availability delivery time. Use it in case translation cannot be found.
+     * @var string
+     */
+    var $availability;
+
     var $demand_reason_id;
     var $demand_reason_code;
     var $address;
@@ -1435,7 +1467,7 @@ class Commande extends CommonOrder
         $sql.= ", i.libelle as libelle_incoterms";
         $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
         $sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
-        $sql.= ', ca.code as availability_code';
+        $sql.= ', ca.code as availability_code, ca.label as availability_label';
         $sql.= ', dr.code as demand_reason_code';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'commande as c';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON (c.fk_cond_reglement = cr.rowid)';
@@ -1492,6 +1524,7 @@ class Commande extends CommonOrder
                 $this->fk_account           = $obj->fk_account;
                 $this->availability_id		= $obj->fk_availability;
                 $this->availability_code	= $obj->availability_code;
+                $this->availability	    	= $obj->availability_label;
                 $this->demand_reason_id		= $obj->fk_input_reason;
                 $this->demand_reason_code	= $obj->demand_reason_code;
                 $this->date_livraison		= $this->db->jdate($obj->date_livraison);
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 65661b3cce8..cf38669d554 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -761,11 +761,12 @@ class Account extends CommonObject
 
 
     /**
-     *    Delete bank account from database
+     *  Delete bank account from database
      *
-     *    @return      int         <0 if KO, >0 if OK
+     *	@param	User	$user	User deleting
+     *  @return int             <0 if KO, >0 if OK
      */
-    function delete()
+    function delete($user='')
     {
         global $conf;
 
@@ -1280,12 +1281,12 @@ class AccountLine extends CommonObject
             $nbko++;
         }
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid=".$this->rowid;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid=".(int) $this->rowid;
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (! $result) $nbko++;
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank WHERE rowid=".$this->rowid;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank WHERE rowid=".(int) $this->rowid;
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (! $result) $nbko++;
@@ -1322,7 +1323,7 @@ class AccountLine extends CommonObject
 
         $this->db->begin();
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank=".$this->rowid;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank=".(int) $this->rowid;
         dol_syslog(get_class($this)."::delete_urls", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (! $result) $nbko++;
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 82070a957e2..eaaf44b4e14 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -99,11 +99,14 @@ if ($action == 'rappro' && $user->rights->banque->consolidate)
 if ($action == 'del')
 {
 	$bankline=new AccountLine($db);
-	$bankline->fetch($_GET["rowid"]);
-	$result=$bankline->delete($user);
-    if ($result < 0)
-	{
-        dol_print_error($db,$bankline->error);
+
+    if ($bankline->fetch($_GET["rowid"]) > 0) {
+        $result = $bankline->delete($user);
+        if ($result < 0) {
+            dol_print_error($db, $bankline->error);
+        }
+    } else {
+        setEventMessage($langs->trans('ErrorRecordNotFound'), 'errors');
     }
 }
 
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index 627ff82ae41..ae545c695c3 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -87,9 +87,9 @@ if ($action != 'create' && $action != 'edit')
 
 
 /* ************************************************************************** */
-/* */
-/* Creation d'un champ optionnel
-/* */
+/*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -101,9 +101,9 @@ if ($action == 'create')
 }
 
 /* ************************************************************************** */
-/* */
-/* Edition d'un champ optionnel */
-/* */
+/*                                                                            */
+/* Edition of an optional field                                               */
+/*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index cc3d4200912..f8bb53cf9ed 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1040,7 +1040,7 @@ class Facture extends CommonInvoice
 			}
 			else
 			{
-				$this->error='Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql;
+				$this->error='Bill with id '.$rowid.' or ref '.$ref.' not found';
 				dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 				return 0;
 			}
diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index 4122f850723..d4639947529 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -140,7 +140,82 @@ $max=10;
 
 $langs->load("boxes");
 
-// Last trips
+
+
+// Last expense report (new module)
+if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
+{
+    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
+    $sql.= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+    $sql.= " WHERE u.rowid = x.fk_user";
+    $sql.= " AND x.entity = ".$conf->entity;
+    if (empty($user->rights->holiday->read_all)) $sql.=' AND x.fk_user IN ('.join(',',$childids).')';
+    //if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    //if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
+    $sql.= $db->order("x.tms","DESC");
+    $sql.= $db->plimit($max, 0);
+
+    $result = $db->query($sql);
+    if ($result)
+    {
+        $var=false;
+        $num = $db->num_rows($result);
+
+        $holidaystatic=new Holiday($db);
+        $userstatic=new User($db);
+        
+        $listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
+        $typeleaves=$holidaystatic->getTypes(1,-1);
+        
+        $i = 0;
+
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests",min($max,$num)).'</td>';
+        print '<td>'.$langs->trans("from").'</td>';
+        print '<td>'.$langs->trans("to").'</td>';
+        print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
+        print '<td width="16">&nbsp;</td>';
+        print '</tr>';
+        if ($num)
+        {
+            while ($i < $num && $i < $max)
+            {
+                $obj = $db->fetch_object($result);
+                $holidaystatic->id=$obj->rowid;
+                $holidaystatic->ref=$obj->ref;
+                $userstatic->id=$obj->uid;
+                $userstatic->lastname=$obj->lastname;
+                $userstatic->firstname=$obj->firstname;
+                print '<tr '.$bc[$var].'>';
+                print '<td>'.$holidaystatic->getNomUrl(1).'</td>';
+                print '<td>'.$userstatic->getNomUrl(1).'</td>';
+                print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
+                
+                $starthalfday=($obj->halfday == -1 || $obj->halfday == 2)?'afternoon':'morning';
+                $endhalfday=($obj->halfday == 1 || $obj->halfday == 2)?'morning':'afternoon';
+                
+                print '<td>'.dol_print_date($obj->date_start,'day').' '.$langs->trans($listhalfday[$endhalfday]);
+                print '<td>'.dol_print_date($obj->date_end,'day').' '.$langs->trans($listhalfday[$endhalfday]);
+                print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
+                print '<td>'.$holidaystatic->LibStatut($obj->status,3).'</td>';
+                print '</tr>';
+                $var=!$var;
+                $i++;
+            }
+
+        }
+        else
+        {
+            print '<tr '.$bc[$var].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
+        }
+        print '</table><br>';
+    }
+    else dol_print_error($db);
+}
+
+
+// Last expense report (old module)
 if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
@@ -204,6 +279,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 	else dol_print_error($db);
 }
 
+// Last expense report (new module)
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 7e94a1f5448..f9a822fdfc8 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -376,7 +376,7 @@ class Paiement extends CommonObject
 			if (! $notrigger)
 			{
 				// Appel des triggers
-				$result=$this->call_trigger('PAYMENT_DELETE', $user);
+				$result=$this->call_trigger('PAYMENT_CUSTOMER_DELETE', $user);
 				if ($result < 0)
 				{
 				    $this->db->rollback();
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index f3312761141..52f1938a857 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -108,6 +108,12 @@ if ($typeid) {
     $sql .= " AND s.fk_typepayment=".$typeid;
 }
 //$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, s.rowid, s.fk_user, s.amount, s.label, s.datev, s.fk_typepayment, s.num_payment, pst.code";
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1,$offset);
 
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index dec724c95d5..63c156609c8 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -119,6 +119,12 @@ if ($typeid) {
     $sql .= " AND cs.fk_type=".$typeid;
 }
 $sql.= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1,$offset);
 
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index b603101ad29..91140bb97ca 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -115,6 +115,12 @@ if ($filtre) {
 if ($typeid) {
     $sql .= " AND t.fk_typepayment=".$typeid;
 }
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1,$offset);
 
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 9711379f458..a5a86efaad9 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -90,8 +90,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -104,7 +104,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 22b619c599c..e8c722dcab3 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -136,17 +136,21 @@ if ($search_contract) {
 if (!empty($search_ref_supplier)) {
 	$sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
 }
-
 if ($search_sale > 0)
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
 }
-
 if ($sall) {
     $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
 $sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut, c.ref_supplier, s.nom, s.rowid";
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit + 1, $offset);
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index c59c67fe91c..b7b257ca07a 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -147,6 +147,12 @@ $filter_date1=dol_mktime(0,0,0,$op1month,$op1day,$op1year);
 $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
 if (! empty($filter_op1) && $filter_op1 != -1 && $filter_date1 != '') $sql.= " AND date_ouverture_prevue ".$filter_op1." '".$db->idate($filter_date1)."'";
 if (! empty($filter_op2) && $filter_op2 != -1 && $filter_date2 != '') $sql.= " AND date_fin_validite ".$filter_op2." '".$db->idate($filter_date2)."'";
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
 $sql .= $db->order($sortfield,$sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
 
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 384e30f8b12..d314af73cd1 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -25,6 +25,7 @@
 include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
 
+
 /**
  * Class to manage the box to show last task
  */
@@ -36,6 +37,7 @@ class box_task extends ModeleBoxes
     //var $depends = array("projet");
     var $db;
     var $param;
+    var $enabled = 0;		// Disabled because bugged.
 
     var $info_box_head = array();
     var $info_box_contents = array();
@@ -79,8 +81,8 @@ class box_task extends ModeleBoxes
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
-
-			$sql = "SELECT pt.fk_statut, count(pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
+			// FIXME fk_statut on a task is not be used. We use the percent. This means this box is useless.
+			$sql = "SELECT pt.fk_statut, count(DISTINCT pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
 			$sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
 			$sql.= " AND pt.rowid = ptt.fk_task";
diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
index fdd0fc2732c..869b26e2f75 100644
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@@ -66,7 +66,7 @@ class dolprintIPP
      */
     function list_jobs($module)
     {
-        global $conf, $db, $bc;
+        global $conf, $db, $bc, $langs;
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
         $ipp = new CupsPrintIPP();
         $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose
@@ -96,7 +96,8 @@ class dolprintIPP
         }
         catch(Exception $e)
         {
-			print $e->getMessage();
+            setEventMessage('[printipp] '.$langs->trans('CoreErrorMessage'), 'errors');
+            dol_syslog($e->getMessage(), LOG_ERR);
         }
 
         print '<table width="100%" class="noborder">';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bcdcdea6147..05c190e3bfc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1016,6 +1016,7 @@ class Form
             // Do not use textempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
             //$textifempty=' ';
             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+            if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $textifempty.=$langs->trans("NoFilter");
             if ($showempty) $out.= '<option value="-1">'.$textifempty.'</option>'."\n";
 
             $num = $this->db->num_rows($resql);
@@ -1099,7 +1100,7 @@ class Form
         $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
         $sql.= " re.description, re.fk_facture_source";
         $sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re";
-        $sql.= " WHERE fk_soc = ".$socid;
+        $sql.= " WHERE fk_soc = ".(int) $socid;
         if ($filter) $sql.= " AND ".$filter;
         $sql.= " ORDER BY re.description ASC";
 
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index cc373acc163..34a7ebdf9f5 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -38,7 +38,7 @@ class DoliDBMysql extends DoliDB
 	//! Database label
 	const LABEL='MySQL';
 	//! Version min database
-	const VERSIONMIN='4.1.0';
+	const VERSIONMIN='5.0.3';
 	/** @var resource Resultset of last query */
 	private $_results;
 
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 8b68fa921ac..04f6372055f 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -38,7 +38,7 @@ class DoliDBMysqli extends DoliDB
     //! Database label
     const LABEL='MySQL or MariaDB';
     //! Version min database
-    const VERSIONMIN='4.1.3';
+    const VERSIONMIN='5.0.3';
 	/** @var mysqli_result Resultset of last query */
 	private $_results;
 
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index b843f83e1d0..aad079d2b0e 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -1034,7 +1034,7 @@ function price2numjs(amount) {
 		print "var dec='" . $dec . "'; var thousand='" . $thousand . "';\n";    // Set var in javascript
 	?>
 
-	var main_max_dec_shown = <?php echo $conf->global->MAIN_MAX_DECIMALS_SHOWN; ?>;
+	var main_max_dec_shown = <?php echo str_replace('.', '', $conf->global->MAIN_MAX_DECIMALS_SHOWN); ?>;
 	var main_rounding_unit = <?php echo $conf->global->MAIN_MAX_DECIMALS_UNIT; ?>;
 	var main_rounding_tot = <?php echo $conf->global->MAIN_MAX_DECIMALS_TOT; ?>;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fdb8b89f0f1..0e6214560c4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2959,16 +2959,18 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
  *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
  *  @param	string	$morehtml			More html to show
  *  @param  string  $morecss            More css to the table
+ *  @param  int     $limit              Limit ofnumber of lines on each page
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='')
+function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='', $limit=0)
 {
 	global $conf,$langs;
 
 	if ($picto == 'setup') $picto='title_setup.png';
 	if (($conf->browser->name == 'ie') && $picto=='title_generic.png') $picto='title.gif';
-
-	if (($num > $conf->liste_limit) || ($num == -1))
+	if ($limit < 1) $limit = $conf->liste_limit;
+	
+	if (($num > $limit) || ($num == -1))
 	{
 		$nextpage = 1;
 	}
@@ -2997,13 +2999,13 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 	if ($sortorder) $options .= "&amp;sortorder=".$sortorder;
 	// Show navigation bar
 	$pagelist = '';
-	if ($page > 0 || $num > $conf->liste_limit)
+	if ($page > 0 || $num > $limit)
 	{
 		if ($totalnboflines)	// If we know total nb of lines
 		{
 			$maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 6 : 3);		// nb before and after selected page + ... + first or last
 
-			$nbpages=ceil($totalnboflines/$conf->liste_limit);
+			$nbpages=ceil($totalnboflines/$limit);
 			$cpt=($page-$maxnbofpage);
 			if ($cpt < 0) { $cpt=0; }
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 97d949a6e14..ad9264c304a 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -828,7 +828,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if (! empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE))
 				{
 					$langs->load("supplier");
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
 					//                  if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 				}
 			}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index b8bb8f65b95..30607201e73 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -560,7 +560,7 @@ class Expedition extends CommonObject
 			else
 			{
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
-				$this->error='Delivery with id '.$id.' not found sql='.$sql;
+				$this->error='Delivery with id '.$id.' not found';
 				return 0;
 			}
 		}
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 955b66f0beb..b7b809d277d 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -89,8 +89,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -103,7 +103,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 241b8f522b0..74edaf72099 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -123,6 +123,12 @@ if ($socid)
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
 //print $sql;
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 424f9ad65d4..4865eac6951 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -122,7 +122,9 @@ class ProductFournisseur extends Product
     function remove_product_fournisseur_price($rowid)
     {
         global $conf, $user;
-
+        
+        $error=0;
+        
         $this->db->begin();
 
         // Call trigger
@@ -289,7 +291,7 @@ class ProductFournisseur extends Product
 		                $error++;
 		            }
 
-		            if (! $error  && !empty($cong->global->PRODUCT_PRICE_SUPPLIER_NO_LOG))
+		            if (! $error  && !empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG))
 		            {
 		                // Add record into log table
 		                $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log(";
@@ -353,7 +355,7 @@ class ProductFournisseur extends Product
     function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
     {
         $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability,";
-        $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.cost_price, pfp.unitcharges, pfp.fk_supplier_price_expression, pfp.delivery_time_days"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
+        $sql.= " pfp.fk_soc, pfp.ref_fourn, pfp.fk_product, pfp.charges, pfp.unitcharges, pfp.fk_supplier_price_expression, pfp.delivery_time_days"; // , pfp.recuperableonly as fourn_tva_npr";  FIXME this field not exist in llx_product_fournisseur_price
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE pfp.rowid = ".$rowid;
 
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index df122ef1fff..bfdfea41fe4 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -251,6 +251,8 @@ class PaiementFourn extends Paiement
 	 */
 	function delete($notrigger=0)
 	{
+	    global $conf, $user, $langs;
+	    
 		$bank_line_id = $this->bank_line;
 
 		$this->db->begin();
@@ -319,6 +321,19 @@ class PaiementFourn extends Paiement
     	    		return -4;
     		    }
 			}
+			
+			if (! $notrigger)
+			{
+			    // Appel des triggers
+			    $result=$this->call_trigger('PAYMENT_SUPPLIER_DELETE', $user);
+			    if ($result < 0)
+			    {
+			        $this->db->rollback();
+			        return -1;
+			    }
+			    // Fin appel triggers
+			}
+			
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index e54f2d3329b..6a4f2255f6b 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -109,7 +109,7 @@ if ($sref)
 }
 if ($snom)
 {
-	$sql .= natural_search('s.nom', $snom);
+	$sql .= natural_search('p.label', $snom);
 }
 if($catid)
 {
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 80d06fdb446..608c2af1b24 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -84,7 +84,7 @@ if ($action == 'create')
 	    $description = trim(GETPOST('description'));
 	    $userID = GETPOST('userID');
 
-    	// If no start date
+    	// If no type
 	    if ($type <= 0)
 	    {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
@@ -136,12 +136,6 @@ if ($action == 'create')
 
 	    $result = 0;
 
-        if ($type < 1)
-	    {
-	        setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Type")), null, 'errors');
-	        $error++;
-	    }
-
 	    if (! $error)
 	    {
     	    $cp->fk_user = $userid;
@@ -769,7 +763,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
         dol_fiche_head();
 
         $out='';
-        $typeleaves=$cp->getTypes(1,1);
+        $typeleaves=$cp->getTypes(1,-1);
     	foreach($typeleaves as $key => $val)
 		{
 			$nb_type = $cp->getCPforUser($user->id, $val['rowid']);
@@ -806,7 +800,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("Type").'</td>';
         print '<td>';
-        $typeleaves=$cp->getTypes(1,1);
+        $typeleaves=$cp->getTypes(1,-1);
         $arraytypeleaves=array();
         foreach($typeleaves as $key => $val)
         {
@@ -1019,7 +1013,7 @@ else
 		        print '<tr>';
 		        print '<td>'.$langs->trans("Type").'</td>';
 		        print '<td>';
-		        $typeleaves=$cp->getTypes(1,1);
+		        $typeleaves=$cp->getTypes(1,-1);
 		        print $typeleaves[$cp->fk_type]['label'];
 		        print '</td>';
 		        print '</tr>';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 6bb253319e0..21c36574ea9 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -732,6 +732,16 @@ class Holiday extends CommonObject
 			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
 			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
 		}
+		if ($mode == 3)
+		{
+			$pictoapproved='statut6';
+			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
+			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0');
+			if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1');
+			if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved);
+			if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5');
+			if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5');
+		}
 		if ($mode == 5)
 		{
 			$pictoapproved='statut6';
@@ -1795,7 +1805,7 @@ class Holiday extends CommonObject
      *  Return array with list of types
      *
      *  @param		int		$active		Status of type
-     *  @param		int		$affect		Filter on affect
+     *  @param		int		$affect		Filter on affect (a request will change sold or not)
      *  @return     array	    		Return array with list of types
      */
     function getTypes($active=-1, $affect=-1)
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 1c82288973e..5c28894fdbf 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -39,6 +39,7 @@ $langs->load('holidays');
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
 
+$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -47,7 +48,7 @@ $page = $page == -1 ? 0 : $page;
 
 if (! $sortfield) $sortfield="cp.rowid";
 if (! $sortorder) $sortorder="DESC";
-$offset = $conf->liste_limit * $page ;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -102,6 +103,9 @@ $holiday = new Holiday($db);
 $holidaystatic=new Holiday($db);
 $fuser = new User($db);
 
+$childids = $user->getAllChildIds();
+$childids[]=$user->id;
+
 // Update sold
 $result = $holiday->updateBalance();
 
@@ -111,7 +115,7 @@ $filter='';
 
 llxHeader(array(),$langs->trans('CPTitreMenu'));
 
-$order = $db->order($sortfield,$sortorder).$db->plimit($conf->liste_limit + 1, $offset);
+$order = $db->order($sortfield,$sortorder).$db->plimit($limit + 1, $offset);
 
 // WHERE
 if(!empty($search_ref))
@@ -184,10 +188,8 @@ if (!empty($sall))
 	$filter.= natural_search(array_keys($fieldstosearchall), $sall);
 }
 
+if (empty($user->rights->holiday->read_all)) $filter.=' AND cp.fk_user IN ('.join(',',$childids).')';
 
-/*************************************
- * Fin des filtres de recherche
-*************************************/
 
 // Récupération de l'ID de l'utilisateur
 $user_id = $user->id;
@@ -200,7 +202,7 @@ if ($id > 0)
 	$user_id = $fuser->id;
 }
 // Récupération des congés payés de l'utilisateur ou de tous les users
-if (empty($user->rights->holiday->write_all) || $id > 0)
+if (empty($user->rights->holiday->read_all) || $id > 0)
 {
 	$holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);	// Load array $holiday->holiday
 }
@@ -220,7 +222,8 @@ if ($holiday_payes == '-1')
 
 // Show table of vacations
 
-$var=true; $num = count($holiday->holiday);
+$var=true;
+$num = count($holiday->holiday);
 $form = new Form($db);
 $formother = new FormOther($db);
 
@@ -242,7 +245,9 @@ if ($id > 0)
 }
 else
 {
-	print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, "", $num, 0, 'title_hrm.png');
+    //print $num;
+    //print count($holiday->holiday);
+	print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, "", $num, count($holiday->holiday), 'title_hrm.png', 0, '', '', $limit);
 
 	dol_fiche_head('');
 }
diff --git a/htdocs/includes/tcpdi/fpdf_tpl.php b/htdocs/includes/tcpdi/fpdf_tpl.php
index be03a39b5d3..0f0a6a07d96 100644
--- a/htdocs/includes/tcpdi/fpdf_tpl.php
+++ b/htdocs/includes/tcpdi/fpdf_tpl.php
@@ -29,13 +29,13 @@ class FPDF_TPL extends FPDF {
      * @var int
      */
     var $tpl = 0;
-
+    
     /**
      * "In Template"-Flag
      * @var boolean
      */
     var $_intpl = false;
-
+    
     /**
      * Nameprefix of Templates used in Resources-Dictonary
      * @var string A String defining the Prefix used as Template-Object-Names. Have to beginn with an /
@@ -47,14 +47,14 @@ class FPDF_TPL extends FPDF {
      * @var array
      */
     var $_res = array();
-
+    
     /**
      * Last used Template data
      *
      * @var array
      */
     var $lastUsedTemplateData = array();
-
+    
     /**
      * Start a Template
      *
@@ -74,11 +74,11 @@ class FPDF_TPL extends FPDF {
      * @return int The ID of new created Template
      */
     function beginTemplate($x = null, $y = null, $w = null, $h = null) {
-    	if (is_subclass_of($this, 'TCPDF')) {
-    		$this->Error('This method is only usable with FPDF. Use TCPDF methods startTemplate() instead.');
-    		return;
-    	}
-
+        if (is_subclass_of($this, 'TCPDF')) {
+            $this->Error('This method is only usable with FPDF. Use TCPDF methods startTemplate() instead.');
+            return;
+        }
+        
         if ($this->page <= 0)
             $this->error("You have to add a page to fpdf first!");
 
@@ -116,7 +116,7 @@ class FPDF_TPL extends FPDF {
         );
 
         $this->SetAutoPageBreak(false);
-
+        
         // Define own high and width to calculate possitions correct
         $this->h = $h;
         $this->w = $w;
@@ -127,14 +127,14 @@ class FPDF_TPL extends FPDF {
 
         if ($this->CurrentFont) {
             $fontkey = $this->FontFamily . $this->FontStyle;
-		    $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
-
-        	$this->_out(sprintf('BT /F%d %.2f Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
+            $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
+            
+            $this->_out(sprintf('BT /F%d %.2f Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
         }
-
+        
         return $this->tpl;
     }
-
+    
     /**
      * End Template
      *
@@ -143,13 +143,13 @@ class FPDF_TPL extends FPDF {
      * @return mixed If a template is opened, the ID is returned. If not a false is returned.
      */
     function endTemplate() {
-    	if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-        	return call_user_func_array(array($this, 'TCPDF::endTemplate'), $args);
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::endTemplate'), $args);
         }
-
+        
         if ($this->_intpl) {
-            $this->_intpl = false;
+            $this->_intpl = false; 
             $tpl =& $this->tpls[$this->tpl];
             $this->SetXY($tpl['o_x'], $tpl['o_y']);
             $this->tMargin = $tpl['o_tMargin'];
@@ -158,22 +158,22 @@ class FPDF_TPL extends FPDF {
             $this->h = $tpl['o_h'];
             $this->w = $tpl['o_w'];
             $this->SetAutoPageBreak($tpl['o_AutoPageBreak'], $tpl['o_bMargin']);
-
+            
             $this->FontFamily = $tpl['o_FontFamily'];
-			$this->FontStyle = $tpl['o_FontStyle'];
-			$this->FontSizePt = $tpl['o_FontSizePt'];
-			$this->FontSize = $tpl['o_FontSize'];
-
-			$fontkey = $this->FontFamily . $this->FontStyle;
-			if ($fontkey)
-            	$this->CurrentFont =& $this->fonts[$fontkey];
-
+            $this->FontStyle = $tpl['o_FontStyle'];
+            $this->FontSizePt = $tpl['o_FontSizePt'];
+            $this->FontSize = $tpl['o_FontSize'];
+            
+            $fontkey = $this->FontFamily . $this->FontStyle;
+            if ($fontkey)
+                $this->CurrentFont =& $this->fonts[$fontkey];
+            
             return $this->tpl;
         } else {
             return false;
         }
     }
-
+    
     /**
      * Use a Template in current Page or other Template
      *
@@ -193,31 +193,31 @@ class FPDF_TPL extends FPDF {
      */
     function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0) {
         if ($this->page <= 0)
-        	$this->error('You have to add a page first!');
-
+            $this->error('You have to add a page first!');
+        
         if (!isset($this->tpls[$tplidx]))
             $this->error('Template does not exist!');
-
+            
         if ($this->_intpl) {
             $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
         }
-
+        
         $tpl =& $this->tpls[$tplidx];
         $w = $tpl['w'];
         $h = $tpl['h'];
-
+        
         if ($_x == null)
             $_x = 0;
         if ($_y == null)
             $_y = 0;
-
+            
         $_x += $tpl['x'];
         $_y += $tpl['y'];
-
+        
         $wh = $this->getTemplateSize($tplidx, $_w, $_h);
         $_w = $wh['w'];
         $_h = $wh['h'];
-
+        
         $tData = array(
             'x' => $this->x,
             'y' => $this->y,
@@ -229,15 +229,15 @@ class FPDF_TPL extends FPDF {
             'ty' =>  ($this->h - $_y - $_h),
             'lty' => ($this->h - $_y - $_h) - ($this->h - $h) * ($_h / $h)
         );
-
-        $this->_out(sprintf('q %.4F 0 0 %.4F %.4F %.4F cm', $tData['scaleX'], $tData['scaleY'], $tData['tx'] * $this->k, $tData['ty'] * $this->k)); // Translate
+        
+        $this->_out(sprintf('q %.4F 0 0 %.4F %.4F %.4F cm', $tData['scaleX'], $tData['scaleY'], $tData['tx'] * $this->k, $tData['ty'] * $this->k)); // Translate 
         $this->_out(sprintf('%s%d Do Q', $this->tplprefix, $tplidx));
 
         $this->lastUsedTemplateData = $tData;
-
+        
         return array('w' => $_w, 'h' => $_h);
     }
-
+    
     /**
      * Get The calculated Size of a Template
      *
@@ -255,77 +255,77 @@ class FPDF_TPL extends FPDF {
         $tpl =& $this->tpls[$tplidx];
         $w = $tpl['w'];
         $h = $tpl['h'];
-
+        
         if ($_w == 0 and $_h == 0) {
             $_w = $w;
             $_h = $h;
         }
 
-    	if($_w == 0)
-    		$_w = $_h * $w / $h;
-    	if($_h == 0)
-    		$_h = $_w * $h / $w;
-
+        if($_w == 0)
+            $_w = $_h * $w / $h;
+        if($_h == 0)
+            $_h = $_w * $h / $w;
+            
         return array("w" => $_w, "h" => $_h);
     }
-
+    
     /**
      * See FPDF/TCPDF-Documentation ;-)
      */
-    public function SetFont($family, $style = '', $size = 0) {
+    public function SetFont($family, $style = '', $size = 0, $fontfile='', $subset='default', $out=true) {
         if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-        	return call_user_func_array(array($this, 'TCPDF::SetFont'), $args);
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::SetFont'), $args);
         }
-
+        
         parent::SetFont($family, $style, $size);
-
+        
         $fontkey = $this->FontFamily . $this->FontStyle;
-
+        
         if ($this->_intpl) {
             $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey];
         } else {
             $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey];
         }
     }
-
+    
     /**
      * See FPDF/TCPDF-Documentation ;-)
      */
     function Image(
-		$file, $x = '', $y = '', $w = 0, $h = 0, $type = '', $link = '', $align = '', $resize = false,
-		$dpi = 300, $palign = '', $ismask = false, $imgmask = false, $border = 0, $fitbox = false,
-		$hidden = false, $fitonpage = false, $alt = false, $altimgs = array()
+        $file, $x = '', $y = '', $w = 0, $h = 0, $type = '', $link = '', $align = '', $resize = false,
+        $dpi = 300, $palign = '', $ismask = false, $imgmask = false, $border = 0, $fitbox = false,
+        $hidden = false, $fitonpage = false, $alt = false, $altimgs = array()
     ) {
         if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-			return call_user_func_array(array($this, 'TCPDF::Image'), $args);
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::Image'), $args);
         }
-
+        
         $ret = parent::Image($file, $x, $y, $w, $h, $type, $link);
         if ($this->_intpl) {
             $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file];
         } else {
             $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file];
         }
-
+        
         return $ret;
     }
-
+    
     /**
      * See FPDF-Documentation ;-)
      *
      * AddPage is not available when you're "in" a template.
      */
     function AddPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false) {
-    	if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-        	return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
         }
-
+        
         if ($this->_intpl)
             $this->Error('Adding pages in templates isn\'t possible!');
-
+            
         parent::AddPage($orientation, $format);
     }
 
@@ -334,50 +334,50 @@ class FPDF_TPL extends FPDF {
      */
     function Link($x, $y, $w, $h, $link, $spaces = 0) {
         if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-			return call_user_func_array(array($this, 'TCPDF::Link'), $args);
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::Link'), $args);
         }
-
+        
         if ($this->_intpl)
             $this->Error('Using links in templates aren\'t possible!');
-
+            
         parent::Link($x, $y, $w, $h, $link);
     }
-
+    
     function AddLink() {
-    	if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-			return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
         }
-
+        
         if ($this->_intpl)
             $this->Error('Adding links in templates aren\'t possible!');
         return parent::AddLink();
     }
-
+    
     function SetLink($link, $y = 0, $page = -1) {
-    	if (is_subclass_of($this, 'TCPDF')) {
-        	$args = func_get_args();
-			return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
+        if (is_subclass_of($this, 'TCPDF')) {
+            $args = func_get_args();
+            return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
         }
-
+        
         if ($this->_intpl)
             $this->Error('Setting links in templates aren\'t possible!');
         parent::SetLink($link, $y, $page);
     }
-
+    
     /**
      * Private Method that writes the form xobjects
      */
     function _putformxobjects() {
         $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-	    reset($this->tpls);
+        reset($this->tpls);
         foreach($this->tpls AS $tplidx => $tpl) {
 
             $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
-    		$this->_newobj();
-    		$this->tpls[$tplidx]['n'] = $this->n;
-    		$this->_out('<<'.$filter.'/Type /XObject');
+            $this->_newobj();
+            $this->tpls[$tplidx]['n'] = $this->n;
+            $this->_out('<<'.$filter.'/Type /XObject');
             $this->_out('/Subtype /Form');
             $this->_out('/FormType 1');
             $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
@@ -390,44 +390,44 @@ class FPDF_TPL extends FPDF {
                 // ury
                 ($tpl['h'] - $tpl['y']) * $this->k
             ));
-
+            
             if ($tpl['x'] != 0 || $tpl['y'] != 0) {
                 $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]',
                      -$tpl['x'] * $this->k * 2, $tpl['y'] * $this->k * 2
                 ));
             }
-
+            
             $this->_out('/Resources ');
 
             $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-        	if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
-            	$this->_out('/Font <<');
+            if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
+                $this->_out('/Font <<');
                 foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-            		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
-            	$this->_out('>>');
+                    $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                $this->_out('>>');
             }
-        	if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
-        	   isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
-        	{
+            if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || 
+               isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
+            {
                 $this->_out('/XObject <<');
                 if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
                     foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-              			$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                          $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
                 }
                 if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
                     foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
                         $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
                 }
                 $this->_out('>>');
-        	}
-        	$this->_out('>>');
-
-        	$this->_out('/Length ' . strlen($p) . ' >>');
-    		$this->_putstream($p);
-    		$this->_out('endobj');
+            }
+            $this->_out('>>');
+            
+            $this->_out('/Length ' . strlen($p) . ' >>');
+            $this->_putstream($p);
+            $this->_out('endobj');
         }
     }
-
+    
     /**
      * Overwritten to add _putformxobjects() after _putimages()
      *
@@ -436,10 +436,10 @@ class FPDF_TPL extends FPDF {
         parent::_putimages();
         $this->_putformxobjects();
     }
-
+    
     function _putxobjectdict() {
         parent::_putxobjectdict();
-
+        
         if (count($this->tpls)) {
             foreach($this->tpls as $tplidx => $tpl) {
                 $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']));
@@ -457,4 +457,4 @@ class FPDF_TPL extends FPDF {
             parent::_out($s);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 5e53d259376..ed7eb22c21d 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -571,5 +571,7 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays
 insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4108, 'Mitarbeitervorsorgekasse',			1,1,'TAXATMVK'  ,'41');
 insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (4109, 'Familienlastenausgleichsfond',		1,1,'TAXATFLAF' ,'41');
 
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(255) NOT NULL;
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(300) NOT NULL;
 
+ALTER TABLE llx_holiday ADD COLUMN tms timestamp;
+ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index dca4b70a5d5..0f0c3d4ebf9 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -22,7 +22,7 @@ CREATE TABLE llx_accounting_bookkeeping
   rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
   doc_date			date NOT NULL,
   doc_type			varchar(30) NOT NULL,	-- facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
-  doc_ref			varchar(255) NOT NULL,	-- facture_client/reglement_client/... reference number
+  doc_ref			varchar(300) NOT NULL,	-- facture_client/reglement_client/... reference number
   fk_doc			integer NOT NULL,		-- facture_client/reglement_client/... rowid
   fk_docdet			integer NOT NULL,		-- facture_client/reglement_client/... line rowid
   code_tiers		varchar(24),			-- code tiers
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index 3f61b893bd4..0af8b35b041 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -19,6 +19,7 @@
 CREATE TABLE llx_holiday 
 (
 rowid          integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+entity         integer DEFAULT 1 NOT NULL,		-- Multi company id
 fk_user        integer NOT NULL,
 fk_user_create integer,
 fk_type        integer NOT NULL,
@@ -26,7 +27,7 @@ date_create    DATETIME NOT NULL,
 description    VARCHAR( 255 ) NOT NULL,
 date_debut     DATE NOT NULL,
 date_fin       DATE NOT NULL,
-halfday        integer DEFAULT 0,
+halfday        integer DEFAULT 0,				-- 0=start morning and end afternoon, -1=start afternoon end afternoon, 1=start morning and end morning, 2=start afternoon and end morning
 statut         integer NOT NULL DEFAULT '1',
 fk_validator   integer NOT NULL,
 date_valid     DATETIME DEFAULT NULL,
@@ -37,6 +38,7 @@ date_cancel    DATETIME DEFAULT NULL,
 fk_user_cancel integer DEFAULT NULL,
 detail_refuse  varchar( 250 ) DEFAULT NULL,
 note_private   text,
-note_public    text
+note_public    text,
+tms            timestamp
 ) 
 ENGINE=innodb;
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 3f0ae0cf48a..ffee0c7aabf 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не мо
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index e18cf03bdff..275b0250abe 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 2174ae6e843..e9b7470308e 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, no pots eliminar aquest compte comptable
 
 FicheVentilation=Desglossament de targetes
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index f70d9047b39..2b551272ad1 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -362,7 +362,7 @@ HideAnyVATInformationOnPDF=Amagar tota la informació relacionada amb l'IVA en l
 HideDescOnPDF=Amagar descripció dels productes en la generació dels PDF
 HideRefOnPDF=Amagar referència dels productes en la generació dels PDF
 HideDetailsOnPDF=Amagar detalls de les línies de productes en la generació dels PDF
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Posteà for customer address position
+PlaceCustomerAddressToIsoLocation=Utilitza la posició estàndar francesa (La Posteà per posició d'adresses de client
 Library=Llibreria
 UrlGenerationParameters=Seguretat de les URL
 SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL?
@@ -393,8 +393,8 @@ ExtrafieldLink=Enllaç a un objecte
 ExtrafieldParamHelpselect=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
 ExtrafieldParamHelpcheckbox=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
 ExtrafieldParamHelpradio=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=La llista de paràmetres ve d'una taula<br>Sintaxi : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>filtre pot ser una prova simple (p.ex, actiu=1) per mostrar només el valor actiu<br>També pots utilitzar $ID$ en filtres que son el ID actual de l'objecte seleccionat<br>Per fer un SELECT en un filtre utilitza $SEL$<br>si vols filtrar camps extra utilitza la sintaxi extra.fieldcode=... (on el codi del camp és el codi del camp extra)<br><br>Per tenir la llista en funció d'un altre:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=La llista de paràmetres ve d'una taula<br>Sintaxi : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>filtre pot ser una prova simple (p.ex, actiu=1) per mostrar només el valor actiu<br>També pots utilitzar $ID$ en filtres que son el ID actual de l'objecte seleccionat<br>Per fer un SELECT en un filtre utilitza $SEL$<br>si vols filtrar camps extra utilitza la sintaxi extra.fieldcode=... (on el codi del camp és el codi del camp extra)<br><br>Per tenir la llista en funció d'un altre:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser Nom del Objecte:Url de la Clase<br>Sintàxi: Nom Object:Url Clase<br>Exemple: Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Llibreria usada per a la creació d'arxius PDF
 WarningUsingFPDF=Atenció: El seu arxiu <b>conf.php</b> conté la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.<br> Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la <a href="http://www.tcpdf.org/" target="_blank"> llibreria TCPDF </a>, i a continuació comentar o eliminar la línia <b>$dolibarr_pdf_force_fpdf=1</b>, i afegir al seu lloc <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
@@ -1220,7 +1220,7 @@ ShippableOrderIconInList=Afegir una icona en el llistat de comandes que indica s
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Preguntar pel compte bancari a l'utilitzar la comanda
 ##### Clicktodial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+ClickToDialUrlDesc=Url executada quan es fa clic en un picto de telèfon. En la URL pots utilitzar etiquetes<br><b>__PHONETO__</b> que seran substituides amb el número de telèfon de la persona a trucar<br><b>__PHONEFROM__</b> que serà substituit pel número de telèfon de la persona que truca (el teu)<br><b>__LOGIN__</b> que serà substituit amb el teu usuari de clicktodial (definit en la teva fitxa d'usuari)<br><b>__PASS__</b> que serà substituit amb el teu password de clicktodial (definit en la teva fitxa d'usuari).
 ##### Bookmark4u #####
 Bookmark4uSetup=Configuració del mòdul Bookmark4u
 ##### Interventions #####
@@ -1562,7 +1562,7 @@ AGENDA_DEFAULT_VIEW=Establir la pestanya per defecte al seleccionar el menú Age
 ##### ClickToDial #####
 ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de telèfon de contactes Dolibarr. Un clic en aquesta icona, truca a un servidor amb un URL que s'indica a continuació. Això pot ser usat per anomenar al sistema centre de Dolibarr que pot trucar al número de telèfon en un sistema SIP, per exemple.
 ClickToDialUseTelLink=Utilitzar sols l'enllaç "tel:" als números de telèfon
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUseTelLinkDesc=Utilitza aquest mètode si els teus usuaris tenen un softphone o una interfície de software instal·lat en el mateix ordinador del navegador, i et truca quan fas clic en un enllaç del navegador que comença amb "tel:". Si necessites una solució amb un servidor complet (sense necessitat de instal·lació de programari en local), hauries de posar "No" i omplir el següent camp.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=TPV
 CashDeskSetup=Mòdul de configuració Terminal Punt de Venda
@@ -1704,4 +1704,4 @@ TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anuncia
 TitleExampleForMaintenanceRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de manteniment (ets lliure d'utilitzar-ho a les teves webs)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió principal amb un munt de noves característiques per als usuaris i desenvolupadors. Es pot descarregar des de la secció de descàrregues del portal http://www.dolibarr.org (subdirectori de versions estables). Pots llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment que només conté correcció d'errors. Recomanem a tothom que utilitzi una versió anterior que s'actualitzi a aquesta. Com qualsevol versió de manteniment, no hi ha noves característiques ni canvis d'estructures de dades en aquesta versió. Es pot descarregar des de la secció de descàrregues del portal http://www.dolibarr.org (subdirectori de versions estables). Pots llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
-MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
+MultiPriceRuleDesc=Quan l'opció "Varis nivells de preus per producte/servei" està activada, pots definir diferents preus (un preu per nivell) per cada producte. Per estalviar temps, pots entrar una regla per tenir preu per cada nivell autocalculat d'acord al preu del primer nivell, així només hauràs d'introduir el preu del primer nivell de cada producte. Aquesta pàgina està aqui per estalviar temps i pot ser útil només si els teus preus per cada nivell son relatius al primer nivell. Pots ignorar aquesta pàgina en la majoria dels casos.
diff --git a/htdocs/langs/ca_ES/receiptprinter.lang b/htdocs/langs/ca_ES/receiptprinter.lang
index 7f909c3ed18..b0a1331be94 100644
--- a/htdocs/langs/ca_ES/receiptprinter.lang
+++ b/htdocs/langs/ca_ES/receiptprinter.lang
@@ -5,8 +5,8 @@ PrinterDeleted=Impressora %s esborrada
 TestSentToPrinter=Prova enviada a la impressora %s
 ReceiptPrinterDesc=Configuració de impressores
 ReceiptPrinterTemplateDesc=Configuració de plantilles
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ReceiptPrinterTypeDesc=Descripció del tipus d'impresora de tiquets
+ReceiptPrinterProfileDesc=Descripció del perfil d'impresora de tiquets
 ListPrinters=Llista de impressores
 SetupReceiptTemplate=Configuració de plantilla
 CONNECTOR_DUMMY=Impressora de proves
@@ -22,7 +22,7 @@ PROFILE_SIMPLE=Perfil simpre
 PROFILE_EPOSTEP=Perfil Epos Tep
 PROFILE_P822D=Perfil P822D
 PROFILE_STAR=Perfil Star
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
+PROFILE_DEFAULT_HELP=Perfil per defecte per a les impresores Epson
 PROFILE_SIMPLE_HELP=Perfil simple sense gràfics
 PROFILE_EPOSTEP_HELP=Ajuda del perfil Epos Tep
 PROFILE_P822D_HELP=Perfil P822D sense gràfics
@@ -49,7 +49,7 @@ DOL_SWITCH_COLORS=Imprimeix blanc sobre negre
 /DOL_SWITCH_COLORS=Fi de imprimeix blanc sobre negre
 DOL_PRINT_BARCODE=Imprimeix codi de barres
 DOL_PRINT_BARCODE_CUSTOMER_ID=Imprimeix codi de barres del ID de client
-DOL_SET_PRINT_WIDTH_57=Ticket print width of 57mm
+DOL_SET_PRINT_WIDTH_57=Ample d'impressió del ticket de 57 mm
 DOL_CUT_PAPER_FULL=Talla el tiquet completament
 DOL_CUT_PAPER_PARTIAL=Talla el tiquet parcialment
 DOL_OPEN_DRAWER=Obrir calaix de diners
@@ -69,7 +69,7 @@ DOL_PRINT_LOGO=Imprimeix el logo emmagatzemat en la impresora. Exemple : 32|32
 DOL_PRINT_LOGO_OLD=Imprimeix el logo emmagatzemat en la impresora. Ha d'anar seguit pel codi de logo. Per impresores antigues.
 DOL_PRINT_ORDER_LINES=Imprimeix línies de comanda
 DOL_PRINT_ORDER_TAX=Imprimir impostos totals de la comanda
-DOL_PRINT_ORDER_LOCAL_TAX=Print order local tax
+DOL_PRINT_ORDER_LOCAL_TAX=Imprimir impostos locals de la comanda
 DOL_PRINT_ORDER_TOTAL=Imprimeix total de la comanda
 DOL_PRINT_ORDER_NUMBER=Imprimeix el número de comanda
 DOL_PRINT_ORDER_NUMBER_UNIQUE=Imprimeix el número de comanda després de validar
@@ -80,17 +80,17 @@ DOL_PRINT_CUSTOMER_PHONE=Imprimeix telèfon del client
 DOL_PRINT_CUSTOMER_MOBILE=Imprimeix mòbil del client
 DOL_PRINT_CUSTOMER_SKYPE=Imprimeix skype del client
 DOL_PRINT_CUSTOMER_TAX_NUMBER=Imprimeix el IVA del client
-DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Print customer account balance
-DOL_PRINT_VENDOR_LASTNAME=Print vendor name
-DOL_PRINT_VENDOR_FIRSTNAME=Print vendor firstname
-DOL_PRINT_VENDOR_MAIL=Print vendor mail
+DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Imprimir balanç contable del client
+DOL_PRINT_VENDOR_LASTNAME=Imprimir cognom del venedor
+DOL_PRINT_VENDOR_FIRSTNAME=Imprimir nom del venedor
+DOL_PRINT_VENDOR_MAIL=Imprimir email del venedor
 DOL_PRINT_CUSTOMER_POINTS=Imprimeix punts del client
 DOL_PRINT_ORDER_POINTS=Imprimeix el número de punts per aquesta comanda
-DOL_PRINT_IF_CUSTOMER=Print the line IF a customer is affected to the order
-DOL_PRINT_IF_VENDOR=Print the line IF a vendor is affected to the order
+DOL_PRINT_IF_CUSTOMER=Imprimir la línia SI un client es veu afectat la comanda
+DOL_PRINT_IF_VENDOR=Imprimir la línia SI un venedor està afectat a la comanda
 DOL_PRINT_IF_HAPPY_HOUR=Imprimeix la línia SI és Happy Hour
 DOL_PRINT_IF_NUM_ORDER_UNIQUE=Imprimeix la línia SI la comanda està validada
 DOL_PRINT_IF_CUSTOMER_POINTS=Imprimeix la línia SI els punts del client > 0
 DOL_PRINT_IF_ORDER_POINTS=Imprimeix la línia SI els punts de la comanda > 0
 DOL_PRINT_IF_CUSTOMER_TAX_NUMBER=Imprimeix la línia SI el client té IVA
-DOL_PRINT_IF_CUSTOMER_ACCOUNT_BALANCE_POSITIVE=Print the line IF customer balance > 0
+DOL_PRINT_IF_CUSTOMER_ACCOUNT_BALANCE_POSITIVE=Imprimeix la línia SI el balanç del client > 0
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 3d55a5f0253..de3daa6230c 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Chyba, nelze odstranit tento účetní účet,
 
 FicheVentilation=Karta členění
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index adc9a87cfc0..6a78d95c312 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Fejl, kan du ikke slette denne regnskabsmæssig
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/de_AT/supplier_proposal.lang b/htdocs/langs/de_AT/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/de_AT/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/de_CH/supplier_proposal.lang b/htdocs/langs/de_CH/supplier_proposal.lang
index 67386825eec..7c6270b4a0c 100644
--- a/htdocs/langs/de_CH/supplier_proposal.lang
+++ b/htdocs/langs/de_CH/supplier_proposal.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 supplier_proposalDESC=Preisanfragen Lieferant verwalten
-supplier_proposalMENU_LEFT_TITLE_NEW=Neue Anfrage
 CommRequest=Generelle Preisanfrage
 CommRequests=Generelle Preisanfragen
 SearchRequest=Anfragen finden
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 20dfb74587f..0340672345f 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchaltungskonto nic
 
 FicheVentilation=Abbau-Karte
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 09730ed000f..58aac597a50 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να δι
 
 FicheVentilation=Φόρμα ανάλυσης
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/en_AU/cron.lang b/htdocs/langs/en_AU/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/en_AU/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/en_AU/supplier_proposal.lang b/htdocs/langs/en_AU/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/en_AU/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/en_CA/cron.lang b/htdocs/langs/en_CA/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/en_CA/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/en_CA/supplier_proposal.lang b/htdocs/langs/en_CA/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/en_CA/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/en_GB/cron.lang b/htdocs/langs/en_GB/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/en_GB/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/en_GB/supplier_proposal.lang b/htdocs/langs/en_GB/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/en_GB/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/en_IN/cron.lang b/htdocs/langs/en_IN/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/en_IN/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/en_IN/supplier_proposal.lang b/htdocs/langs/en_IN/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/en_IN/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c959e141910..331a3d1a1b3 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -147,7 +147,7 @@ DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier a
 ValidateHistory=Validate Automatically
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
 
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 725336d8790..4b8c9507b92 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -82,6 +82,7 @@ UserName=Name
 Employee=Employee
 FirstDayOfHoliday=First day of vacation
 LastDayOfHoliday=Last day of vacation
+BoxTitleLastLeaveRequests=Last %s modified leave requests 
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 49d45dd154e..435dfe5f78b 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -106,6 +106,7 @@ NotePrivate=Note (private)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
 DoTest=Test
 ToFilter=Filter
+NoFilter=No filter
 WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
 yes=yes
 Yes=Yes
diff --git a/htdocs/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/es_AR/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/es_AR/supplier_proposal.lang b/htdocs/langs/es_AR/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_AR/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/es_BO/cron.lang b/htdocs/langs/es_BO/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/es_BO/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/es_BO/supplier_proposal.lang b/htdocs/langs/es_BO/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_BO/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/es_CL/cron.lang b/htdocs/langs/es_CL/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/es_CL/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/es_CL/supplier_proposal.lang b/htdocs/langs/es_CL/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_CL/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/es_CO/cron.lang b/htdocs/langs/es_CO/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/es_CO/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/es_CO/supplier_proposal.lang b/htdocs/langs/es_CO/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_CO/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/es_DO/cron.lang b/htdocs/langs/es_DO/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/es_DO/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/es_DO/supplier_proposal.lang b/htdocs/langs/es_DO/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_DO/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 1a9074f60a6..3dc5a6639da 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que est
 
 FicheVentilation=Ficha contable
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 0d1f623c046..e2ef5bb2bd8 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -394,7 +394,7 @@ ExtrafieldParamHelpselect=El listado de parámetros tiene que ser key,valor<br><
 ExtrafieldParamHelpcheckbox=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=Lista de parámetros viene de una tabla<br>Sintaxis: nombre_tabla: etiqueta_campo: identificador_campo :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar el valor sólo se activa <br> si desea filtrar un campo extra utilizar la sintáxis extra.fieldcode = ... (donde el código de campo es el código del campo extra) <br> para tener la lista en función de otra: <br> c_typent: libelle: id: parent_list_code | parent_column: filtro
-ExtrafieldParamHelpchkbxlst=Lista de parámetros viene de una tabla<br>Sintaxis: nombre_tabla: etiqueta_campo: identificador_campo :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar el valor sólo se activa <br> si desea filtrar un campo extra utilizar la sintáxis extra.fieldcode = ... (donde el código de campo es el código del campo extra) <br> para tener la lista en función de otra: <br> c_typent: libelle: id: parent_list_code | parent_column: filtro
+ExtrafieldParamHelpchkbxlst=Lista Parámetros viene de una tabla <br> Sintaxis: nombre_tabla: etiqueta_campo: identificador_campo :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar el valor sólo se activa <br> si desea filtrar un campo extra utilizar la sintáxis extra.fieldcode = ... (donde el código de campo es el código del campo extra) <br> para tener la lista en función de otra: <br> c_typent: libelle: id: parent_list_code | parent_column: filtro
 ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath<br>Sintaxis: ObjectName:Classpath<br>Ejemplo: Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Librería usada para la creación de archivos PDF
 WarningUsingFPDF=Atención: Su archivo <b>conf.php</b> contiene la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Esto hace que se use la librería FPDF para generar sus archivos PDF. Esta librería es antigua y no cubre algunas funcionalidades (Unicode, transparencia de imágenes, idiomas cirílicos, árabes o asiáticos, etc.), por lo que puede tener problemas en la generación de los PDF.<br>Para resolverlo, y disponer de un soporte completo de PDF, puede descargar la <a href="http://www.tcpdf.org/" target="_blank">librería TCPDF</a> , y a continuación comentar o eliminar la línea <b>$dolibarr_pdf_force_fpdf=1</b>, y añadir en su lugar <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
diff --git a/htdocs/langs/es_MX/cron.lang b/htdocs/langs/es_MX/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/es_MX/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/es_MX/supplier_proposal.lang b/htdocs/langs/es_MX/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_MX/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/es_PE/cron.lang b/htdocs/langs/es_PE/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/es_PE/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/es_PE/supplier_proposal.lang b/htdocs/langs/es_PE/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_PE/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/es_PY/cron.lang b/htdocs/langs/es_PY/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/es_PY/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/es_PY/supplier_proposal.lang b/htdocs/langs/es_PY/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_PY/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/es_VE/agenda.lang b/htdocs/langs/es_VE/agenda.lang
new file mode 100644
index 00000000000..54d000526be
--- /dev/null
+++ b/htdocs/langs/es_VE/agenda.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - agenda
+ListOfEvents=lista de acontecimientos (calendario interno)
diff --git a/htdocs/langs/es_VE/productbatch.lang b/htdocs/langs/es_VE/productbatch.lang
new file mode 100644
index 00000000000..11376ed6a08
--- /dev/null
+++ b/htdocs/langs/es_VE/productbatch.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - productbatch
+ProductDoesNotUseBatchSerial=Este producto no usa numeración por lotes/series
diff --git a/htdocs/langs/es_VE/supplier_proposal.lang b/htdocs/langs/es_VE/supplier_proposal.lang
new file mode 100644
index 00000000000..321dbcb4cdc
--- /dev/null
+++ b/htdocs/langs/es_VE/supplier_proposal.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposalShort=Supplier proposal
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 8cd32a019c8..d6b7fa5ab87 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -9,21 +9,21 @@ ACCOUNTING_EXPORT_DEVISE=Export the devise
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 
-Accounting=Raamatupidamine
-Globalparameters=Globaalsed parameetrid
+Accounting=Accounting
+Globalparameters=Global parameters
 Menuaccount=Accounting accounts
 Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tööriistad
+MenuTools=Tools
 
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
 JournalFinancial=Financial journals
-Exports=Eksportimised
-Export=Eksport
-Modelcsv=Eksportimise mudel
+Exports=Exports
+Export=Export
+Modelcsv=Model of export
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Vali eksportimise mudel
-Modelcsv_normal=Tavaline eksportimine
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Return chart of accounts
 Back=Return
@@ -41,8 +41,8 @@ TradeMargin=Trade margin
 Reports=Reports
 ByCustomerInvoice=By invoices customers
 NewAccount=New accounting account
-Create=Loo
-CreateMvts=Loo liikumine
+Create=Create
+CreateMvts=Create movement
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
@@ -96,10 +96,10 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
 
-Doctype=Dokumendi tüüp
-Docdate=Kuupäev
-Docref=Viide
-Numerocompte=Konto
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
 Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
@@ -107,7 +107,7 @@ Codejournal=Journal
 
 DelBookKeeping=Delete the records of the general ledger
 
-DescSellsJournal=Sells journal
+DescSellsJournal=Sales journal
 DescPurchasesJournal=Purchases journal
 BankJournal=Bank journal
 DescBankJournal=Bank journal including all the types of payments other than cash
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index d7c2083eb9e..3d1cd6e01b7 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/fr_BE/cron.lang b/htdocs/langs/fr_BE/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/fr_BE/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/fr_CA/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/fr_CH/cron.lang b/htdocs/langs/fr_CH/cron.lang
new file mode 100644
index 00000000000..e211c11dff5
--- /dev/null
+++ b/htdocs/langs/fr_CH/cron.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cron
+CronListActive=List of active/scheduled jobs
+CronDtStart=Start date
+CronDtEnd=End date
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 3501a880e55..83712273d25 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte
 
 FicheVentilation=Fiche ventilation
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index a0b9b194f96..b3b0bf9f702 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -51,7 +51,7 @@ ErrorDecimalLargerThanAreForbidden=Erreur, les précisions supérieures à <b>%s
 DictionarySetup=Dictionnaires
 Dictionary=Dictionnaires
 Chartofaccounts=Plan comptable
-Fiscalyear=Année fiscale
+Fiscalyear=Exercices fiscaux
 ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' sont réservées. Vous pouvez utiliser la valeur 'user' pour ajouter vos propres enregistrements
 ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0
 DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text).
@@ -1627,15 +1627,15 @@ UseSearchToSelectProject=Utilisez un champ avec auto-complétion pour choisir le
 ECMSetup = Configuration du module GED
 ECMAutoTree = Afficher aussi l'arborescence automatique des fichiers joints
 ##### Fiscal Year #####
-FiscalYears=Années fiscales
-FiscalYear=Année fiscale
-FiscalYearCard=Fiche année fiscale
-NewFiscalYear=Nouvelle année fiscale
-EditFiscalYear=Editer année fiscale
-OpenFiscalYear=Ouvrir année fiscale
-CloseFiscalYear=Fermer année fiscale
-DeleteFiscalYear=Effacer année fiscale
-ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cette année fiscale ?
+FiscalYears=Exercices fiscaux
+FiscalYear=Exercice fiscal
+FiscalYearCard=Fiche exercice fiscal
+NewFiscalYear=Nouvel exercice fiscal
+EditFiscalYear=Editer exercice fiscal
+OpenFiscalYear=Exercice fiscal ouvert
+CloseFiscalYear=Exercice fiscal cloturé
+DeleteFiscalYear=Effacer exercice fiscal
+ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cet exercice fiscal ?
 AlwaysEditable=Peut toujours être édité
 MAIN_APPLICATION_TITLE=Forcer la valeur visible du nom de l'application (attention : positionner ici son propre nom rendra inopérante la fonction de remplissage automatique de l'identifiant lorsque vous utilisez l'application mobile DoliDroid)
 NbMajMin=Nombre minimal de caractères majuscules
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index a3da33215da..5e7ac89f275 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -306,7 +306,7 @@ ListOfCustomersContacts=Liste des contacts clients
 ListOfSuppliersContacts=Liste des contacts fournisseurs
 ListOfCompanies=Liste des sociétés
 ListOfThirdParties=Liste des tiers
-ShowCompany=Show thirdparty
+ShowCompany=Affichier tiers
 ShowContact=Afficher contact
 ContactsAllShort=Tous (pas de filtre)
 ContactType=Type de contact
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 5e9d29fd6cf..c0f24d478a1 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 15cc044f46b..a14873d71df 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Kesalahan, Anda tidak dapat menghapus akun akun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/id_ID/dict.lang b/htdocs/langs/id_ID/dict.lang
index a662b0f7573..2877ec8dc82 100644
--- a/htdocs/langs/id_ID/dict.lang
+++ b/htdocs/langs/id_ID/dict.lang
@@ -1,329 +1,327 @@
 # Dolibarr language file - Source file is en_US - dict
-# CountryFR=France
-# CountryBE=Belgium
-# CountryIT=Italy
-# CountryES=Spain
-# CountryDE=Germany
-# CountryCH=Switzerland
-# CountryGB=Great Britain
-# CountryUK=United Kingdom
-# CountryIE=Ireland
-# CountryCN=China
-# CountryTN=Tunisia
-# CountryUS=United States
-# CountryMA=Morocco
-# CountryDZ=Algeria
-# CountryCA=Canada
-# CountryTG=Togo
-# CountryGA=Gabon
-# CountryNL=Netherlands
-# CountryHU=Hungary
-# CountryRU=Russia
-# CountrySE=Sweden
-# CountryCI=Ivoiry Coast
-# CountrySN=Senegal
-# CountryAR=Argentina
-# CountryCM=Cameroon
-# CountryPT=Portugal
-# CountrySA=Saudi Arabia
-# CountryMC=Monaco
-# CountryAU=Australia
-# CountrySG=Singapore
-# CountryAF=Afghanistan
-# CountryAX=Åland Islands
-# CountryAL=Albania
-# CountryAS=American Samoa
-# CountryAD=Andorra
-# CountryAO=Angola
-# CountryAI=Anguilla
-# CountryAQ=Antarctica
-# CountryAG=Antigua and Barbuda
-# CountryAM=Armenia
-# CountryAW=Aruba
-# CountryAT=Austria
-# CountryAZ=Azerbaijan
-# CountryBS=Bahamas
-# CountryBH=Bahrain
-# CountryBD=Bangladesh
-# CountryBB=Barbados
-# CountryBY=Belarus
-# CountryBZ=Belize
-# CountryBJ=Benin
-# CountryBM=Bermuda
-# CountryBT=Bhutan
-# CountryBO=Bolivia
-# CountryBA=Bosnia and Herzegovina
-# CountryBW=Botswana
-# CountryBV=Bouvet Island
-# CountryBR=Brazil
-# CountryIO=British Indian Ocean Territory
-# CountryBN=Brunei Darussalam
-# CountryBG=Bulgaria
-# CountryBF=Burkina Faso
-# CountryBI=Burundi
-# CountryKH=Cambodia
-# CountryCV=Cape Verde
-# CountryKY=Cayman Islands
-# CountryCF=Central African Republic
-# CountryTD=Chad
-# CountryCL=Chile
-# CountryCX=Christmas Island
-# CountryCC=Cocos (Keeling) Islands
-# CountryCO=Colombia
-# CountryKM=Comoros
-# CountryCG=Congo
-# CountryCD=Congo, The Democratic Republic of the
-# CountryCK=Cook Islands
-# CountryCR=Costa Rica
-# CountryHR=Croatia
-# CountryCU=Cuba
-# CountryCY=Cyprus
-# CountryCZ=Czech Republic
-# CountryDK=Denmark
-# CountryDJ=Djibouti
-# CountryDM=Dominica
-# CountryDO=Dominican Republic
-# CountryEC=Ecuador
-# CountryEG=Egypt
-# CountrySV=El Salvador
-# CountryGQ=Equatorial Guinea
-# CountryER=Eritrea
-# CountryEE=Estonia
-# CountryET=Ethiopia
-# CountryFK=Falkland Islands
-# CountryFO=Faroe Islands
-# CountryFJ=Fiji Islands
-# CountryFI=Finland
-# CountryGF=French Guiana
-# CountryPF=French Polynesia
-# CountryTF=French Southern Territories
-# CountryGM=Gambia
-# CountryGE=Georgia
-# CountryGH=Ghana
-# CountryGI=Gibraltar
-# CountryGR=Greece
-# CountryGL=Greenland
-# CountryGD=Grenada
-# CountryGP=Guadeloupe
-# CountryGU=Guam
-# CountryGT=Guatemala
-# CountryGN=Guinea
-# CountryGW=Guinea-Bissau
-# CountryGY=Guyana
-# CountryHT=Haïti
-# CountryHM=Heard Island and McDonald
-# CountryVA=Holy See (Vatican City State)
-# CountryHN=Honduras
-# CountryHK=Hong Kong
-# CountryIS=Icelande
-# CountryIN=India
-# CountryID=Indonesia
-# CountryIR=Iran
-# CountryIQ=Iraq
-# CountryIL=Israel
-# CountryJM=Jamaica
-# CountryJP=Japan
-# CountryJO=Jordan
-# CountryKZ=Kazakhstan
-# CountryKE=Kenya
-# CountryKI=Kiribati
-# CountryKP=North Korea
-# CountryKR=South Korea
-# CountryKW=Kuwait
-# CountryKG=Kyrghyztan
-# CountryLA=Lao
-# CountryLV=Latvia
-# CountryLB=Lebanon
-# CountryLS=Lesotho
-# CountryLR=Liberia
-# CountryLY=Libyan
-# CountryLI=Liechtenstein
-# CountryLT=Lituania
-# CountryLU=Luxembourg
-# CountryMO=Macao
-# CountryMK=Macedonia, the former Yugoslav of
-# CountryMG=Madagascar
-# CountryMW=Malawi
-# CountryMY=Malaysia
-# CountryMV=Maldives
-# CountryML=Mali
-# CountryMT=Malta
-# CountryMH=Marshall Islands
-# CountryMQ=Martinique
-# CountryMR=Mauritania
-# CountryMU=Mauritius
-# CountryYT=Mayotte
-# CountryMX=Mexico
-# CountryFM=Micronesia
-# CountryMD=Moldova
-# CountryMN=Mongolia
-# CountryMS=Monserrat
-# CountryMZ=Mozambique
-# CountryMM=Birmania (Myanmar)
-# CountryNA=Namibia
-# CountryNR=Nauru
-# CountryNP=Nepal
-# CountryAN=Netherlands Antilles
-# CountryNC=New Caledonia
-# CountryNZ=New Zealand
-# CountryNI=Nicaragua
-# CountryNE=Niger
-# CountryNG=Nigeria
-# CountryNU=Niue
-# CountryNF=Norfolk Island
-# CountryMP=Northern Mariana Islands
-# CountryNO=Norway
-# CountryOM=Oman
-# CountryPK=Pakistan
-# CountryPW=Palau
-# CountryPS=Palestinian Territory, Occupied
-# CountryPA=Panama
-# CountryPG=Papua New Guinea
-# CountryPY=Paraguay
-# CountryPE=Peru
-# CountryPH=Philippines
-# CountryPN=Pitcairn Islands
-# CountryPL=Poland
-# CountryPR=Puerto Rico
-# CountryQA=Qatar
-# CountryRE=Reunion
-# CountryRO=Romania
-# CountryRW=Rwanda
-# CountrySH=Saint Helena
-# CountryKN=Saint Kitts and Nevis
-# CountryLC=Saint Lucia
-# CountryPM=Saint Pierre and Miquelon
-# CountryVC=Saint Vincent and Grenadines
-# CountryWS=Samoa
-# CountrySM=San Marino
-# CountryST=Sao Tome and Principe
-# CountryRS=Serbia
-# CountrySC=Seychelles
-# CountrySL=Sierra Leone
-# CountrySK=Slovakia
-# CountrySI=Slovenia
-# CountrySB=Solomon Islands
-# CountrySO=Somalia
-# CountryZA=South Africa
-# CountryGS=South Georgia and the South Sandwich Islands
-# CountryLK=Sri Lanka
-# CountrySD=Sudan
-# CountrySR=Suriname
-# CountrySJ=Svalbard and Jan Mayen
-# CountrySZ=Swaziland
-# CountrySY=Syrian
-# CountryTW=Taiwan
-# CountryTJ=Tajikistan
-# CountryTZ=Tanzania
-# CountryTH=Thailand
-# CountryTL=Timor-Leste
-# CountryTK=Tokelau
-# CountryTO=Tonga
-# CountryTT=Trinidad and Tobago
-# CountryTR=Turkey
-# CountryTM=Turkmenistan
-# CountryTC=Turks and Cailos Islands
-# CountryTV=Tuvalu
-# CountryUG=Uganda
-# CountryUA=Ukraine
-# CountryAE=United Arab Emirates
-# CountryUM=United States Minor Outlying Islands
-# CountryUY=Uruguay
-# CountryUZ=Uzbekistan
-# CountryVU=Vanuatu
-# CountryVE=Venezuela
-# CountryVN=Viet Nam
-# CountryVG=Virgin Islands, British
-# CountryVI=Virgin Islands, U.S.
-# CountryWF=Wallis and Futuna
-# CountryEH=Western Sahara
-# CountryYE=Yemen
-# CountryZM=Zambia
-# CountryZW=Zimbabwe
-# CountryGG=Guernsey
-# CountryIM=Isle of Man
-# CountryJE=Jersey
-# CountryME=Montenegro
-# CountryBL=Saint Barthelemy
-# CountryMF=Saint Martin
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+CountryGB=Great Britain
+CountryUK=United Kingdom
+CountryIE=Ireland
+CountryCN=China
+CountryTN=Tunisia
+CountryUS=United States
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=Togo
+CountryGA=Gabon
+CountryNL=Netherlands
+CountryHU=Hungary
+CountryRU=Russia
+CountrySE=Sweden
+CountryCI=Ivoiry Coast
+CountrySN=Senegal
+CountryAR=Argentina
+CountryCM=Cameroon
+CountryPT=Portugal
+CountrySA=Saudi Arabia
+CountryMC=Monaco
+CountryAU=Australia
+CountrySG=Singapore
+CountryAF=Afghanistan
+CountryAX=Åland Islands
+CountryAL=Albania
+CountryAS=American Samoa
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua and Barbuda
+CountryAM=Armenia
+CountryAW=Aruba
+CountryAT=Austria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarus
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia and Herzegovina
+CountryBW=Botswana
+CountryBV=Bouvet Island
+CountryBR=Brazil
+CountryIO=British Indian Ocean Territory
+CountryBN=Brunei Darussalam
+CountryBG=Bulgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Cayman Islands
+CountryCF=Central African Republic
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Christmas Island
+CountryCC=Cocos (Keeling) Islands
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, The Democratic Republic of the
+CountryCK=Cook Islands
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Cuba
+CountryCY=Cyprus
+CountryCZ=Czech Republic
+CountryDK=Denmark
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Dominican Republic
+CountryEC=Ecuador
+CountryEG=Egypt
+CountrySV=El Salvador
+CountryGQ=Equatorial Guinea
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Falkland Islands
+CountryFO=Faroe Islands
+CountryFJ=Fiji Islands
+CountryFI=Finland
+CountryGF=French Guiana
+CountryPF=French Polynesia
+CountryTF=French Southern Territories
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Greece
+CountryGL=Greenland
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Guam
+CountryGT=Guatemala
+CountryGN=Guinea
+CountryGW=Guinea-Bissau
+CountryGY=Guyana
+CountryHT=Haïti
+CountryHM=Heard Island and McDonald
+CountryVA=Holy See (Vatican City State)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Icelande
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Iraq
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Jordan
+CountryKZ=Kazakhstan
+CountryKE=Kenya
+CountryKI=Kiribati
+CountryKP=North Korea
+CountryKR=South Korea
+CountryKW=Kuwait
+CountryKG=Kyrghyztan
+CountryLA=Lao
+CountryLV=Latvia
+CountryLB=Lebanon
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libyan
+CountryLI=Liechtenstein
+CountryLT=Lituania
+CountryLU=Luxembourg
+CountryMO=Macao
+CountryMK=Macedonia, the former Yugoslav of
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Marshall Islands
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mexico
+CountryFM=Micronesia
+CountryMD=Moldova
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Birmania (Myanmar)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Netherlands Antilles
+CountryNC=New Caledonia
+CountryNZ=New Zealand
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Norfolk Island
+CountryMP=Northern Mariana Islands
+CountryNO=Norway
+CountryOM=Oman
+CountryPK=Pakistan
+CountryPW=Palau
+CountryPS=Palestinian Territory, Occupied
+CountryPA=Panama
+CountryPG=Papua New Guinea
+CountryPY=Paraguay
+CountryPE=Peru
+CountryPH=Philippines
+CountryPN=Pitcairn Islands
+CountryPL=Poland
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Reunion
+CountryRO=Romania
+CountryRW=Rwanda
+CountrySH=Saint Helena
+CountryKN=Saint Kitts and Nevis
+CountryLC=Saint Lucia
+CountryPM=Saint Pierre and Miquelon
+CountryVC=Saint Vincent and Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome and Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slovakia
+CountrySI=Slovenia
+CountrySB=Solomon Islands
+CountrySO=Somalia
+CountryZA=South Africa
+CountryGS=South Georgia and the South Sandwich Islands
+CountryLK=Sri Lanka
+CountrySD=Sudan
+CountrySR=Suriname
+CountrySJ=Svalbard and Jan Mayen
+CountrySZ=Swaziland
+CountrySY=Syrian
+CountryTW=Taiwan
+CountryTJ=Tajikistan
+CountryTZ=Tanzania
+CountryTH=Thailand
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad and Tobago
+CountryTR=Turkey
+CountryTM=Turkmenistan
+CountryTC=Turks and Cailos Islands
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraine
+CountryAE=United Arab Emirates
+CountryUM=United States Minor Outlying Islands
+CountryUY=Uruguay
+CountryUZ=Uzbekistan
+CountryVU=Vanuatu
+CountryVE=Venezuela
+CountryVN=Viet Nam
+CountryVG=Virgin Islands, British
+CountryVI=Virgin Islands, U.S.
+CountryWF=Wallis and Futuna
+CountryEH=Western Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Saint Barthelemy
+CountryMF=Saint Martin
 
 ##### Civilities #####
-# CivilityMME=Mrs.
-# CivilityMR=Mr.
-# CivilityMLE=Ms.
-# CivilityMTRE=Master
-# CivilityDR=Doctor
-
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
 ##### Currencies #####
-# Currencyeuros=Euros
-# CurrencyAUD=AU Dollars
-# CurrencySingAUD=AU Dollar
-# CurrencyCAD=CAN Dollars
-# CurrencySingCAD=CAN Dollar
-# CurrencyCHF=Swiss Francs
-# CurrencySingCHF=Swiss Franc
-# CurrencyEUR=Euros
-# CurrencySingEUR=Euro
-# CurrencyFRF=French Francs
-# CurrencySingFRF=French Franc
-# CurrencyGBP=GB Pounds
-# CurrencySingGBP=GB Pound
-# CurrencyINR=Indian rupees
-# CurrencySingINR=Indian rupee
-# CurrencyMAD=Dirham
-# CurrencySingMAD=Dirham
-# CurrencyMGA=Ariary
-# CurrencySingMGA=Ariary
-# CurrencyMUR=Mauritius rupees
-# CurrencySingMUR=Mauritius rupee
-# CurrencyNOK=Norwegian krones
-# CurrencySingNOK=Norwegian krone
-# CurrencyTND=Tunisian dinars
-# CurrencySingTND=Tunisian dinar
-# CurrencyUSD=US Dollars
-# CurrencySingUSD=US Dollar
-# CurrencyUAH=Hryvnia
-# CurrencySingUAH=Hryvnia
-# CurrencyXAF=CFA Francs BEAC
-# CurrencySingXAF=CFA Franc BEAC
-# CurrencyXOF=CFA Francs BCEAO
-# CurrencySingXOF=CFA Franc BCEAO
-# CurrencyXPF=CFP Francs
-# CurrencySingXPF=CFP Franc
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+Currencyeuros=Euros
+CurrencyAUD=AU Dollars
+CurrencySingAUD=AU Dollar
+CurrencyCAD=CAN Dollars
+CurrencySingCAD=CAN Dollar
+CurrencyCHF=Swiss Francs
+CurrencySingCHF=Swiss Franc
+CurrencyEUR=Euros
+CurrencySingEUR=Euro
+CurrencyFRF=French Francs
+CurrencySingFRF=French Franc
+CurrencyGBP=GB Pounds
+CurrencySingGBP=GB Pound
+CurrencyINR=Indian rupees
+CurrencySingINR=Indian rupee
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Mauritius rupees
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=Norwegian krones
+CurrencySingNOK=Norwegian krone
+CurrencyTND=Tunisian dinars
+CurrencySingTND=Tunisian dinar
+CurrencyUSD=US Dollars
+CurrencySingUSD=US Dollar
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Francs BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA Franc BCEAO
+CurrencyXPF=CFP Francs
+CurrencySingXPF=CFP Franc
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=thousandth
 #### Input reasons #####
-# DemandReasonTypeSRC_INTE=Internet
-# DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-# DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-# DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-# DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-# DemandReasonTypeSRC_COMM=Commercial contact
-# DemandReasonTypeSRC_SHOP=Shop contact
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_INTE=Internet
+DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
+DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
+DemandReasonTypeSRC_CAMP_PHO=Phone campaign
+DemandReasonTypeSRC_CAMP_FAX=Fax campaign
+DemandReasonTypeSRC_COMM=Commercial contact
+DemandReasonTypeSRC_SHOP=Shop contact
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=karyawan
+DemandReasonTypeSRC_SPONSORING=Sponsorship
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canada
+PaperFormatCAP2=Format P2 Canada
+PaperFormatCAP3=Format P3 Canada
+PaperFormatCAP4=Format P4 Canada
+PaperFormatCAP5=Format P5 Canada
+PaperFormatCAP6=Format P6 Canada
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index 610ad01a0e1..3981ece3b09 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -8,7 +8,7 @@ NotActiveModCP=You must enable the module Leaves to view this page.
 NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
 NoCPforUser=You don't have any available day.
 AddCP=Make a leave request
-Employe=Employee
+Employe=karyawan
 DateDebCP=Start date
 DateFinCP=End date
 DateCreateCP=Creation date
@@ -79,7 +79,7 @@ PrevSoldeCP=Previous Balance
 NewSoldeCP=New Balance
 alreadyCPexist=A leave request has already been done on this period.
 UserName=Name
-Employee=Employee
+Employee=karyawan
 FirstDayOfHoliday=First day of vacation
 LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
diff --git a/htdocs/langs/id_ID/hrm.lang b/htdocs/langs/id_ID/hrm.lang
index 1d03a8ebbf9..7a63626fc07 100644
--- a/htdocs/langs/id_ID/hrm.lang
+++ b/htdocs/langs/id_ID/hrm.lang
@@ -9,11 +9,11 @@ ConfirmDeleteEstablishment=Are-you sure to delete this establishment ?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryDepartment=HRM - Department list
+DictionaryDepartment=HRM - Daftar Departement
 DictionaryFunction=HRM - Function list
 # Module
-ListOfEmployees=List of employees
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
-EmployeeCard=Employee card
+ListOfEmployees=Daftar Karyawan
+Employees=karyawan
+Employee=karyawan
+NewEmployee=Karyawan Baru
+EmployeeCard=Kartu Karyawan
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 2d3f19f267d..693c520d286 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - users
+# Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Kode Akuntansi untuk pembayaran gaji
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=kode akuntansi untuk pembiayaan keuangan
 Salary=Gaji
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 2d897e9c798..45e251c51c6 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index e2a03b50766..bf90a873c9f 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index a9d36407a9b..969ba51cc77 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Suskirstymo kortelė
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 531c4e3ed4f..44b4f00c0f3 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 2b6d59a0b1e..d6b7fa5ab87 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Kolonneseparator for eksportfil
-ACCOUNTING_EXPORT_DATE=Datoformat for eksportfil
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
 ACCOUNTING_EXPORT_LABEL=Export the label
@@ -9,149 +9,165 @@ ACCOUNTING_EXPORT_DEVISE=Export the devise
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 
-Accounting=Regnskap
-Globalparameters=Globale parametre
-Menuaccount=Regnskapskonti
-Menuthirdpartyaccount=Tredjepart-kontoer
-MenuTools=Verktøy
+Accounting=Accounting
+Globalparameters=Global parameters
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
 
-ConfigAccountingExpert=Oppsett av regnskapsekspert-modulen
-Journaux=Journaler
-JournalFinancial=Finansjournaler
-Exports=Eksport
-Export=Eksport
-Modelcsv=Eksportmodell
-OptionsDeactivatedForThisExportModel=Ingen opsjoner for denne eksportmodellen
-Selectmodelcsv=Velg eksportmodell
-Modelcsv_normal=Klassisk eksport
-Modelcsv_CEGID=Eksport mot CEGID ekspert
-BackToChartofaccounts=Returner kontodiagrammer
-Back=Retur
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Export=Export
+Modelcsv=Model of export
+OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
 
-Definechartofaccounts=Definer et kontodiagram
-Selectchartofaccounts=Velg et kontodiagram
-Addanaccount=Legg til regnskapskonto
-AccountAccounting=Regnskapskonto
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Fordeling
+Ventilation=Breakdown
 
-CustomersVentilation=Kundefordeling
-SuppliersVentilation=Leverandørfordeling
-TradeMargin=Handelsmargin
-Reports=Rapporter
-ByCustomerInvoice=Etter kundefakturaer
-NewAccount=Ny regnskapskonto
-Create=Opprett
-CreateMvts=Opprett bevegelse
-UpdateAccount=Endring av regnskapskonto
-UpdateMvts=Endring av bevegelse
-WriteBookKeeping=Legg til kontoer i hovedbok
-Bookkeeping=Hovedbok
-AccountBalanceByMonth=Kontobalanse etter måned
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+NewAccount=New accounting account
+Create=Create
+CreateMvts=Create movement
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
 
-AccountingVentilation=Regnskapsfordeling
-AccountingVentilationSupplier=Regnskapsfordeling leverandører
-AccountingVentilationCustomer=Regnskapsfordeling kunder
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Fakturalinjer som skal ventileres
-InvoiceLinesDone=Ventilerte fakturalinjer
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
 IntoAccount=Ventilate in the accounting account
 
-Ventilate=Ventiler
-VentilationAuto=Automatisk fordeling
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
 
-Processing=Prosesserer
-EndProcessing=Slutt på prosessering
-AnyLineVentilate=Noen linjer å ventilere?
-SelectedLines=Valgte linjer
-Lineofinvoice=Fakturalinje
-VentilatedinAccount=Vellykket ventilering i regnskapskonto
-NotVentilatedinAccount=Ikke ventilert i regnskapskontoen
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
 
-ACCOUNTING_SEPARATORCSV=Kolonneseparator i eksportfil
+ACCOUNTING_SEPARATORCSV=Column separator in export file
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antall elementer å fordele på siden (maks anbefalt er 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Start sortering av fordelingssidene "Må fordeles" etter nyeste elementer
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begynn sortering av fordelingssidene "Fordeling" etter de nyeste elementene
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
 
-AccountLength=Lengde på regnskapskontoer vist i Dolibarr
-AccountLengthDesc=Funksjon for å redusere lengden på regnskapskontoene ved å erstatte mellomrom med null. Denne funksjonen berører bare visning, det endrer ikke regnskapskontoene registrert i Dolibarr. For eksport, er denne funksjonen nødvendig for å være kompatibel med enkelte programvarer.
-ACCOUNTING_LENGTH_DESCRIPTION=Antall tegn for beskrivelse av varer og tjenester i lister (anbefalt = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Antall tegn for beskrivelse av kontoskjemaer til varer og tjenester i lister (anbefalt = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Lengde på generelle kontoer
-ACCOUNTING_LENGTH_AACCOUNT=Lengde på tredjepartskontoer
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
-ACCOUNTING_SELL_JOURNAL=Salgsjournal
-ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Diverse-journal
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsjournal
-ACCOUNTING_SOCIAL_JOURNAL=Sosial-journal
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Overføringskonto
-ACCOUNTING_ACCOUNT_SUSPENSE=Ventekonto
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard regnskapskonto for kjøpte varer (hvis den ikke er definert i vareskjemaet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard regnskapskonto for solgte varer (hvis den ikke er definert i vareskjemaet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard regnskapskonto for kjøpte tjenester (hvis den ikke er definert i vareskjemaet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard regnskapskonto for solgte tjenester (hvis den ikke er definert i vareskjemaet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
 
-Doctype=Dokumenttype
-Docdate=Dato
-Docref=Referanse
-Numerocompte=Konto
-Code_tiers=Tredjepart
-Labelcompte=Kontoetikett
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
 
-DelBookKeeping=Slett innholdet i hovedboken
+DelBookKeeping=Delete the records of the general ledger
 
-DescSellsJournal=Salgsjournal
-DescPurchasesJournal=Innkjøpsjournal
-BankJournal=Bankjournal
-DescBankJournal=Bankjournal inkludert alle typer annet enn kontantbetalinger
-CashJournal=Kontantjournal
-DescCashJournal=Kontantjournal med kontantbetalinger
+DescSellsJournal=Sales journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 
-CashPayment=Kontant Betaling
+CashPayment=Cash Payment
 
-SupplierInvoicePayment=Betaling av leverandørfaktura
-CustomerInvoicePayment=Betaling av kundefaktura
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
 
-ThirdPartyAccount=Tredjepart konto
+ThirdPartyAccount=Thirdparty account
 
-NewAccountingMvt=Ny bevegelse
-NumMvts=Bevegelsesnummer
-ListeMvts=Liste over bevegelser
-ErrorDebitCredit=Debet og Kredit kan ikke ha en verdi samtidig
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=Liste over tredjepartskontoer
-DescThirdPartyReport=Liste over kunder og leverandører og deres regnskapskontoer
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
 
-ListAccounts=Liste over regnskapskontoer
+ListAccounts=List of the accounting accounts
 
-Pcgversion=Planversjon
-Pcgtype=Kontoklasse
-Pcgsubtype=Konto underklasse
-Accountparent=Konto-base
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
 
-DescVentilCustomer=Årlig regnskapsfordelingfordeling over kundefakturaer
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
-TotalMarge=Total salgsmargin
-DescVentilDoneCustomer=Liste over linjer på kundefakturaer og deres regnskapskontoer
-DescVentilTodoCustomer=Ventiler kundefaktura-linjer med en regnskapskonto
-ChangeAccount=Endre regnskapskontoen for valgte linjer til:
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
 Vide=-
-DescVentilSupplier=Årlig regnskapsmessig fordeling av leverandørfakturaer
-DescVentilTodoSupplier=Ventiler leverandørfaktura-linjer med en regnskapskonto
-DescVentilDoneSupplier=Liste over linjer på leverandørfakturaer og deres regnskapskontoer
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Valider automatisk
+ValidateHistory=Validate Automatically
 
-ErrorAccountancyCodeIsAlreadyUse=Feil! Du kan ikke slette denne regnskapskontoen fordi den er i bruk
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 
-FicheVentilation=Fordelingskort
+FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index c4dbb8b5456..8250586497a 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index f28cce7fa68..860d776eede 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąć to konto księgowe,
 
 FicheVentilation=Karta Podział
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 5ee63247714..b5d630c3910 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -836,7 +836,7 @@ BackToModuleList=Powrót do listy modułów
 BackToDictionaryList=Powrót do listy słowników
 VATReceivedOnly=Specjalna stawka nie obciążona
 VATManagement=Zarządzanie VAT
-VATIsUsedDesc=Stawka VAT domyślnie podczas tworzenia faktur, zamówień itd. jest ustawiona zgodnie z aktywną zasadą.<br> Jeżeli sprzedający ni ejest płatnikiem VAT, wówczas VAT jest równy 0.<br> Jeżeli kraj przedaży jest taki sam jak kraj zakupu, wówczas stawka VAT jest równa domyślnie stawce dla kraju sprzedaży. <br>Jeżeli sprzedawca i kupujący mieszkają na terenie UE i dobra są transportowane samochodem, statkiem, samolotem, domyślnie stawka VAT jest równa 0 (VAT powinien być zapłacony przez kupującego w kraju, gdzie zarejestrowana jest jego firma, a nie przez sprzedającego).<br>Jeżeli sprzedający i kupujący mieszkają na terenie UE i kupujący nie jest firmą, wówczas VAT jest równy stawce VAT z kraju sprzedającego.<br>Jeżeli sprzedający i kupujący mieszkają w UE i obaj są firmami, wówczas VAT jest równy 0.<br>Dla innych przypadków VAT domyślnie jest równy 0.
+VATIsUsedDesc=Domyślna stawka VAT podczas tworzenia faktur, zamówień itd. jest ustawiona zgodnie z aktywną zasadą.<br> Jeżeli sprzedający nie jest płatnikiem VAT, wówczas VAT jest równy 0.<br> Jeżeli kraj sprzedaży jest taki sam jak kraj zakupu, wówczas stawka VAT jest równa domyślnie stawce dla kraju sprzedaży. <br>Jeżeli sprzedawca i kupujący mieszkają na terenie UE i dobra są transportowane samochodem, statkiem, samolotem, domyślnie stawka VAT jest równa 0 (VAT powinien być zapłacony przez kupującego w kraju, gdzie zarejestrowana jest jego firma, a nie przez sprzedającego).<br>Jeżeli sprzedający i kupujący mieszkają na terenie UE i kupujący nie jest firmą, wówczas VAT jest równy stawce VAT z kraju sprzedającego.<br>Jeżeli sprzedający i kupujący mieszkają w UE i obaj są firmami, wówczas VAT jest równy 0.<br>Dla innych przypadków VAT domyślnie jest równy 0.
 VATIsNotUsedDesc=Domyślnie proponowany VAT wynosi 0. Może być wykorzystany w przypadku takich stowarzyszeń, osób fizycznych lub małych firm.
 VATIsUsedExampleFR=We Francji, oznacza to, że firmy i organizacje wykorzystujące rzeczywisty system fiskalny (uproszczony rzeczywisty lub normalny rzeczywisty). System, w którym VAT jest deklarowany.
 VATIsNotUsedExampleFR=We Francji, oznacza to stowarzyszenia, które są zadeklarowane bez VAT lub przedsiębiorstwa, organizacje lub wolnych zawodów, które wybrały system podatkowy mikroprzedsiębiorstwo w serii (VAT) oraz zapłacone franczyzy VAT bez deklaracji VAT. Wybór ten będzie wyświetlany odniesienie "Nie dotyczy podatku VAT - art-293B CGI" na fakturach.
@@ -1139,7 +1139,7 @@ DocumentModelOdt=Generowanie dokumentów z szablonów OpenDocument (pliki .ODT o
 WatermarkOnDraft=Znak wodny na szkicu dokumentu
 JSOnPaimentBill=Aktywuj funkcję automatyczne wypełnianie linii płatności w formie płatności
 CompanyIdProfChecker=Profesjonalny Identyfikator unikalny
-MustBeUnique=Musi być wyjątkowa?
+MustBeUnique=Musi być unikatowy?
 MustBeMandatory=Obowiązkowe do tworzenia kontrahentów?
 MustBeInvoiceMandatory=Obowiązkowe do zatwierdzania faktur?
 Miscellaneous=Różne
@@ -1169,14 +1169,14 @@ WebCalUrlForVCalExport=Wywóz <b>link %s</b> format jest dostępny na poniższy
 WebCalCheckWebcalSetup=Może Webcal modułu konfiguracji nie jest prawidłowe.
 ##### Invoices #####
 BillsSetup=Ustawienie madułu faktur
-BillsDate=Faktury daty
+BillsDate=Data faktur
 BillsNumberingModule=Model numeracji faktur i not kredytowych
 BillsPDFModules=Modele dokumentów faktur
 CreditNoteSetup=Ustawienia modułu noty kredytowej
 CreditNotePDFModules=Modele dokumentów not kredytowych
 CreditNote=Nota kredytowa
 CreditNotes=Noty kredytowe
-ForceInvoiceDate=Wymuś zmianę daty faktury na daę zatwierdzenia tej faktury
+ForceInvoiceDate=Wymuś zmianę daty faktury na datę zatwierdzenia tej faktury
 AllowCreditNoteWithoutRelatedInvoice=Pozwól na tworzenie not kredytowych bez dowiązanej faktury
 DisableRepeatable=Wyłącz powtarzalny faktur
 SuggestedPaymentModesIfNotDefinedInInvoice=Sygerowany domyślnie sposób płatności na fakturze jeżeli nie zdefiniowano innego dla faktury
@@ -1209,12 +1209,12 @@ WatermarkOnDraftSupplierProposal=Znak wodny w sprawie projektu cenie żąda dost
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia proponowaniu ceny
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Zapytaj o magazyn źródłowy dla zamówienia
 ##### Orders #####
-OrdersSetup=Zamówienia zarządzania konfiguracją
+OrdersSetup=Konfiguracja zarządzaniem zamówieniami
 OrdersNumberingModules=Model numeracji zamówień
 OrdersModelModule=Model dokumentu zamówienia
 HideTreadedOrders=Ukryj leczonych lub anulowane zlecenia z listy
 ValidOrderAfterPropalClosed=Aby zatwierdzić wniosek, aby po bliższa, umożliwia nie krok po tymczasowym porządku
-FreeLegalTextOnOrders=Wolny tekst na zamówienie
+FreeLegalTextOnOrders=Dowolny tekst na zamówieniach
 WatermarkOnDraftOrders=Znak wodny na szkicu zamówienia (brak jeśli pusty)
 ShippableOrderIconInList=Dodaj ikonę w liście zamówień, które wskazują, czy zamówienie jest shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Zapytaj o rachunku bankowego przeznaczenia porządku
@@ -1225,7 +1225,7 @@ ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url,
 Bookmark4uSetup=Bookmark4u konfiguracji modułu
 ##### Interventions #####
 InterventionsSetup=Konfiguracja modułu interwencji
-FreeLegalTextOnInterventions=Darmowe tekst na dokumenty interwencji
+FreeLegalTextOnInterventions=Dowolny tekst na dokumentach interwencji
 FicheinterNumberingModules=Model numeracji interwencji
 TemplatePDFInterventions=Interwencja karty wzorów dokumentów
 WatermarkOnDraftInterventionCards=Znak wodny na dokumentach karty interwencji (brak jeśli pusty)
@@ -1369,7 +1369,7 @@ LDAPFieldCompanyExample=Przykład: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Przykład: objectSid
 LDAPFieldEndLastSubscription=Data zakończenia subskrypcji
-LDAPFieldTitle=Post / Funkcja
+LDAPFieldTitle=Post/Funkcja
 LDAPFieldTitleExample=Przykład: tytuł
 LDAPParametersAreStillHardCoded=Parametry LDAP nadal sztywno (w klasie kontaktowego)
 LDAPSetupNotComplete=Konfiguracja LDAP jest niekompletna (przejdź do kolejnych zakładek)
@@ -1432,7 +1432,7 @@ OnlyWindowsLOG_USER=System Windows obsługuje tylko LOG_USER
 SyslogSentryDSN=Sentry DSN
 SyslogSentryFromProject=DSN z projektu Sentry
 ##### Donations #####
-DonationsSetup=Darowizna konfiguracji modułu
+DonationsSetup=Konfiguracja modułu darowizn
 DonationsReceiptModel=Szablon otrzymania wpłaty
 ##### Barcode #####
 BarcodeSetup=Konfiguracja kodu kreskowego
@@ -1443,7 +1443,7 @@ CodeBarGenerator=Generator kodów kreskowych
 ChooseABarCode=Nie określono generatora
 FormatNotSupportedByGenerator=Format nie jest obsługiwany przez ten generator
 BarcodeDescEAN8=Kod kreskowy typu EAN8
-BarcodeDescEAN13=Kodów kreskowych typu EAN13
+BarcodeDescEAN13=Kod kreskowy typu EAN13
 BarcodeDescUPC=Kod kreskowy typu UPC
 BarcodeDescISBN=Kod kreskowy typu ISBN
 BarcodeDescC39=Kod kreskowy typu C39
@@ -1497,7 +1497,7 @@ OSCommerceTestOk=Połączenie do serwera ' %s' w bazie danych " %s" z użytkowni
 OSCommerceTestKo1=Połączenie do serwera ' %s' sukces, ale baza danych' %s' nie mógł zostać osiągnięty.
 OSCommerceTestKo2=Połączenie do serwera ' %s' z użytkownika' %s' nie powiodło się.
 ##### Stock #####
-StockSetup=Ustawianie modułu Magazyn
+StockSetup=Konfiguracja modułu magazynu
 UserWarehouse=Wykorzystanie użytkowników osobiste magazyny
 IfYouUsePointOfSaleCheckModule=W przypadku korzystania z modułu Point of Sale (POS dostarczonych przez moduł domyślnie lub innego modułu zewnętrznego), ta konfiguracja może być ignorowane przez swój punkt modułu sprzedaż. Większość punktem modułów sprzedaży są przeznaczone do tworzenia natychmiast fakturę i zmniejszyć czas, opcje są domyślnie co tutaj. Tak więc, jeśli chcesz, czy nie mieć spadek akcji podczas rejestracji sprzedać z twojego punktu sprzedaży, sprawdź również swój moduł POS skonfigurować.
 ##### Menu #####
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 6893c553354..dd2f791eaa6 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -405,7 +405,7 @@ RevenueStamp=Znaczek skarbowy
 YouMustCreateInvoiceFromThird=Ta opcja jest dostępna tylko podczas tworzenia faktury z zakładki "klienta" z thirdparty
 PDFCrabeDescription=Faktura Crabe modelu. Pełna faktura modelu (VAT Wsparcie opcji, rabaty, warunki płatności, logo, itp. ..)
 TerreNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla standardowych faktur i %srrmm-nnnn dla not kredytowych, gdzie rr oznacza rok, mm to miesiąc, a nnnn to kolejny niepowtarzalny numer rozpoczynający się od 0
-MarsNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla standardowych faktur, %srrmm-nnnn dla duplikatow faktur, %srrmm-nnnn dla faktur zaliczkowych i %srrmm-nnnn dla not kredytowych, gdzie rr to rok, mm to miesiąc, a nnnn to kolejny niepowtarzalny numer rozpoczynający się od 0
+MarsNumRefModelDesc1=Zwraca numer w formacie %srrmm-nnnn dla standardowych faktur, %srrmm-nnnn dla duplikatow faktur, %srrmm-nnnn dla faktur zaliczkowych i %srrmm-nnnn dla not kredytowych, gdzie rr to rok, mm to miesiąc, a nnnn to kolejny niepowtarzalny numer rozpoczynający się od 0
 TerreNumRefModelError=Rachunek zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł.
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Przedstawiciela w ślad za klienta faktura
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 05fd55898f3..a1fc6b823ae 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -90,16 +90,16 @@ AssignedToTheCustomer=Przypisany do klienta
 InternalCategory=Inernal kategorii
 CategoryContents=Tag / kategoria treści
 CategId=Tag / ID kategorii
-CatSupList=Lista dostawców tagów / kategorii
+CatSupList=Lista tagów/kategorii dostawcy
 CatCusList=Lista klientów / perspektywa tagów / kategorii
-CatProdList=Lista produktów tagów / kategorii
-CatMemberList=Lista członków tagów / kategorii
+CatProdList=Lista tagów/kategorii produktów
+CatMemberList=Lista tagów/kategorii członków
 CatContactList=Lista tagów/kategorii kontaktu
 CatSupLinks=Powiązania między dostawcami i tagów / kategorii
 CatCusLinks=Powiązania między klientami / perspektyw i tagów / kategorii
 CatProdLinks=Powiązania między produktów / usług oraz tagów / kategorii
 CatMemberLinks=Związki między członkami i tagów / kategorii
-DeleteFromCat=Usuń z tagów / kategorii
+DeleteFromCat=Usuń z tagów/kategorii
 DeletePicture=Usuń obraz
 ConfirmDeletePicture=Potwierdź usunięcie obrazu?
 ExtraFieldsCategories=Atrybuty uzupełniające
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 35da3798c0b..b9626f5fc59 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -61,7 +61,7 @@ ErrorSizeTooLongForVarcharType=Rozmiar zbyt długo typu string (%s znaków maksy
 ErrorNoValueForSelectType=Proszę wypełnić wartości listy wyboru
 ErrorNoValueForCheckBoxType=Proszę wypełnić pole wyboru wartości dla listy
 ErrorNoValueForRadioType=Proszę wypełnić wartość liście radiowej
-ErrorBadFormatValueList=Wartość lista nie może mieć więcej niż jeden <u>przecinek:% s,</u> ale trzeba przynajmniej jeden: klucz, wartość
+ErrorBadFormatValueList=Wartość na tej liście nie może mieć więcej niż jeden <u>przecinek: %s,</u> ale wymagany jest przynajmniej jeden: klucz, wartość
 ErrorFieldCanNotContainSpecialCharacters=<b>Pole %s</b> nie zawiera znaki specjalne.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>Pole% s nie</b> może zawierać znaków specjalnych, ani wielkich liter i nie może zawierać tylko liczby.
 ErrorNoAccountancyModuleLoaded=Nr rachunkowych moduł aktywowany
diff --git a/htdocs/langs/pl_PL/ftp.lang b/htdocs/langs/pl_PL/ftp.lang
index aaabc159ea3..ffaa22e553b 100644
--- a/htdocs/langs/pl_PL/ftp.lang
+++ b/htdocs/langs/pl_PL/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Moduł konfiguracji klienta FTP
+FTPClientSetup=Konfiguracja modułu klienta FTP
 NewFTPClient=Konfiguracja nowego połączenia FTP
-FTPArea=FTP okolicy
+FTPArea=Obszar FTP
 FTPAreaDesc=Ten ekran pokazuje zawartość serwera FTP w celu
-SetupOfFTPClientModuleNotComplete=Konfiguracji modułu klienta FTP, nie wydaje się być pełne
+SetupOfFTPClientModuleNotComplete=Konfiguracja modułu klienta FTP wydaje się być niekompletna
 FTPFeatureNotSupportedByYourPHP=PHP nie obsługuje funkcji FTP
 FailedToConnectToFTPServer=Nie udało się połączyć z serwerem FTP (%s serwera, %s port)
-FailedToConnectToFTPServerWithCredentials=Nie udało się zalogować do serwera FTP z definicją login / hasło
+FailedToConnectToFTPServerWithCredentials=Nie udało się zalogować do serwera FTP ze zdefiniowanym użytkownikiem/hasłem
 FTPFailedToRemoveFile=Nie udało się usunąć pliku <b>%s.</b>
-FTPFailedToRemoveDir=Nie udało się usunąć <b>%s</b> katalogu (Sprawdź uprawnienia i że katalog jest pusty).
+FTPFailedToRemoveDir=Nie udało się usunąć katalogu  <b>%s</b> (Sprawdź uprawnienia i czy katalog jest pusty)
 FTPPassiveMode=Tryb pasywny
 ChooseAFTPEntryIntoMenu=Wybierz pozycję FTP w menu...
-FailedToGetFile=Nie można pobrac plików %s
+FailedToGetFile=Nie można pobrać plików %s
diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang
index c898744d48a..8a4d8bc8a80 100644
--- a/htdocs/langs/pl_PL/interventions.lang
+++ b/htdocs/langs/pl_PL/interventions.lang
@@ -1,47 +1,47 @@
 # Dolibarr language file - Source file is en_US - interventions
 Intervention=Interwencja
 Interventions=Interwencje
-InterventionCard=Interwencja karty
+InterventionCard=Karta interwencji
 NewIntervention=Nowa interwencja
 AddIntervention=Tworzenie interwencji
 ListOfInterventions=Wykaz interwencji
-EditIntervention=Editer interwencji
+EditIntervention=Edytuj interwencję
 ActionsOnFicheInter=Działania w zakresie interwencji
-LastInterventions=Ostatnia %s interwencji
+LastInterventions=Ostatnie %s interwencji
 AllInterventions=Wszystkie interwencje
 CreateDraftIntervention=Tworzenie projektu
 CustomerDoesNotHavePrefix=Klient nie ma prefiks
 InterventionContact=Interwencja kontakt
-DeleteIntervention=Usuń interwencji
-ValidateIntervention=Validate interwencji
-ModifyIntervention=Modyfikuj interwencji
-DeleteInterventionLine=Usuń interwencyjnej linii
+DeleteIntervention=Usuń interwencję
+ValidateIntervention=Zatwierdź interwencję
+ModifyIntervention=Modyfikuj interwencję
+DeleteInterventionLine=Usuń linię interwencji
 ConfirmDeleteIntervention=Czy na pewno chcesz usunąć tę interwencję?
 ConfirmValidateIntervention=Czy na pewno chcesz, aby potwierdzić tej interwencji?
-ConfirmModifyIntervention=Czy na pewno chcesz modyfikować tej interwencji?
+ConfirmModifyIntervention=Czy na pewno chcesz modyfikować tą interwencję?
 ConfirmDeleteInterventionLine=Czy na pewno chcesz usunąć tę linię interwencji?
 NameAndSignatureOfInternalContact=Nazwisko i podpis interwencji:
 NameAndSignatureOfExternalContact=Nazwisko i podpis klienta:
-DocumentModelStandard=Model standardowy dokument dla interwencji
+DocumentModelStandard=Standardowy model dokumentu dla interwencji
 InterventionCardsAndInterventionLines=Interwencje i kierunki interwencji
 InterventionClassifyBilled=Sklasyfikować "Rozlicz"
 InterventionClassifyUnBilled=Sklasyfikować "Unbilled"
 StatusInterInvoiced=Zapowiadane
 RelatedInterventions=Podobne interwencje
-ShowIntervention=Pokaż interwencji
+ShowIntervention=Pokaż interwencję
 SendInterventionRef=Złożenie interwencyjnego% s
-SendInterventionByMail=Wyślij interwencji przez e-mail
-InterventionCreatedInDolibarr=% S tworzone interwencji
-InterventionValidatedInDolibarr=% Interwencja s zatwierdzone
-InterventionModifiedInDolibarr=% S zmodyfikowano interwencji
+SendInterventionByMail=Wyślij interwencję przez e-mail
+InterventionCreatedInDolibarr=Interwencja %s stworzona
+InterventionValidatedInDolibarr=Interwencja %s zatwierdzona
+InterventionModifiedInDolibarr=Interwencja %s zmodyfikowana
 InterventionClassifiedBilledInDolibarr=% Interwencyjnej s zestaw jako rozliczane
 InterventionClassifiedUnbilledInDolibarr=% Interwencyjnej s zestaw jako weryfikowane
-InterventionSentByEMail=% Interwencja y wysyłane e-mailem
-InterventionDeletedInDolibarr=% Interwencja s usunięte
+InterventionSentByEMail=Interwencja %s wysłana emailem
+InterventionDeletedInDolibarr=Interwencja %s usunięta
 SearchAnIntervention=Szukaj interwencji
 InterventionsArea=Obszar interwencji
 DraftFichinter=Szkic interwencji
-LastModifiedInterventions=Ostatnie %s modyfikowane interwencje
+LastModifiedInterventions=Ostatnie %s zmodyfikowanych interwencji
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Przedstawiciela w ślad za interwencję
 TypeContact_fichinter_internal_INTERVENING=Interwencja
@@ -50,9 +50,9 @@ TypeContact_fichinter_external_CUSTOMER=W ślad za kontakt z klientem
 # Modele numérotation
 ArcticNumRefModelDesc1=Generic numer modelu
 ArcticNumRefModelError=Nie można włączyć
-PacificNumRefModelDesc1=Wróć NUMERO z formatu %syymm rr-nnnn gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0
-PacificNumRefModelError=Interwencja karty zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł.
-PrintProductsOnFichinter=Drukarnie na karcie interwencyjną
+PacificNumRefModelDesc1=Zwróć numer w formacie %syymm-nnnn, gdzie yy to rok, mm to miesiąc a nnnn to ciąg liczb bez przerwy i nie zwracający 0
+PacificNumRefModelError=karta interwencji rozpoczynająca się od $syymm już istnieje i nie jest zgodna z wzorem numerowania. Usuń ją lub zmień nazwę, aby aktywować ten moduł.
+PrintProductsOnFichinter=Drukuj produkty na karcie interwencji
 PrintProductsOnFichinterDetails=Interwencje generowane z zamówień
 ##### Exports #####
 InterId=ID interwencji
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index b4a0b110cc7..f130dbed0d6 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -2,7 +2,7 @@
 
 Language_ar_AR=Arabski
 Language_ar_SA=Arabski
-Language_bn_BD=bengalski
+Language_bn_BD=Bengalski
 Language_bg_BG=Bułgarski
 Language_bs_BA=Bośniacki
 Language_ca_ES=Kataloński
@@ -41,7 +41,7 @@ Language_fr_CA=Francuski (Kanada)
 Language_fr_CH=Francuski (Szwajcaria)
 Language_fr_FR=Francuski
 Language_fr_NC=Francuski (Nowa Kaledonia)
-Language_fy_NL=fryzyjski
+Language_fy_NL=Fryzyjski
 Language_he_IL=Hebrajski
 Language_hr_HR=Chorwacki
 Language_hu_HU=Węgierski
@@ -49,10 +49,10 @@ Language_id_ID=Indonezyjski
 Language_is_IS=Islandzki
 Language_it_IT=Włoski
 Language_ja_JP=Japoński
-Language_ka_GE=gruziński
-Language_kn_IN=kannara
+Language_ka_GE=Gruziński
+Language_kn_IN=Kannara
 Language_ko_KR=Koreański
-Language_lo_LA=laotański
+Language_lo_LA=Laotański
 Language_lt_LT=Litewski
 Language_lv_LV=Łotewski
 Language_mk_MK=Macedoński
diff --git a/htdocs/langs/pl_PL/loan.lang b/htdocs/langs/pl_PL/loan.lang
index cdd9bdba731..ca893134fcb 100644
--- a/htdocs/langs/pl_PL/loan.lang
+++ b/htdocs/langs/pl_PL/loan.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Pożyczka
+Loan=Kredyt
 Loans=Kredyty
-NewLoan=Nowa pożyczka
-ShowLoan=Pokaż Pożyczka
+NewLoan=Nowy kredyt
+ShowLoan=Pokaż kredyt
 PaymentLoan=Spłata kredytu
-ShowLoanPayment=Pokaż Pożyczka Płatność
+ShowLoanPayment=Pokaż spłatę kredytu
 Capital=Kapitał
 Insurance=Ubezpieczenie
 Interest=Odsetki
@@ -17,19 +17,19 @@ ConfirmDeleteLoan=Potwierdź usunięcie tego kredytu
 LoanDeleted=Pożyczka została usunięta
 ConfirmPayLoan=Potwierdź sklasyfikować wypłacane pożyczka
 LoanPaid=Pożyczka Płatny
-ErrorLoanCapital=Kwota kredytu musi być numeryczny i większa od zera.
-ErrorLoanLength=Długość pożyczka musi być numeryczne, a większy od zera.
-ErrorLoanInterest=Roczne odsetki musi być numeryczne, a większy od zera.
+ErrorLoanCapital=Kwota kredytu musi być liczbą większą od zera.
+ErrorLoanLength=Długość kredytu musi być lczbą większą od 0.
+ErrorLoanInterest=Roczne odsetki musi być liczbą większą od zera.
 # Calc
-LoanCalc=Kredyty bankowe Kalkulator
+LoanCalc=Kalkulator kredytu bankowego
 PurchaseFinanceInfo=Zakup i Finansowanie informacji
 SalePriceOfAsset=Cena sprzedaży aktywów
 PercentageDown=Procent w dół
-LengthOfMortgage=Długość hipoteczny
+LengthOfMortgage=Długość kredytu hipotecznego
 AnnualInterestRate=Roczna stopa procentowa
 ExplainCalculations=Wyjaśnij Obliczenia
 ShowMeCalculationsAndAmortization=Pokaż mi obliczenia i amortyzację
-MortgagePaymentInformation=Informacje hipoteczny Płatność
+MortgagePaymentInformation=Informacje o płatności za kredyt hipoteczny
 DownPayment=Zaliczka
 DownPaymentDesc=<b>Zaliczka</b> = cena domu pomnożona przez procent w dół, podzielona przez 100 (dla 5% w dół staje 5/100 lub 0,05)
 InterestRateDesc=<b>Oprocentowanie</b> = Roczna wartość procentowa odsetek podzielony przez 100
@@ -47,7 +47,7 @@ GoToInterest=% s zostanie przeznaczona INTERESÓW
 GoToPrincipal=% s zostanie przeznaczona PODSTAWOWA
 YouWillSpend=Spędzisz% s na dom w rok% s
 # Admin
-ConfigLoan=Konfiguracja modułu pożyczki
+ConfigLoan=Konfiguracja modułu kredytu
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Kapitał Kod domyślnie Rachunkowości
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Zainteresowanie Kod domyślnie Rachunkowości
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Ubezpieczenie Kod domyślnie Rachunkowości
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 13f6d731eb2..b457de15c8c 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -99,7 +99,7 @@ DolibarrHasDetectedError=Dolibarr wykrył błąd techniczny
 InformationToHelpDiagnose=Informacje, które mogą pomóc w diagnozowaniu
 MoreInformation=Więcej informacji
 TechnicalInformation=Informację techniczne
-TechnicalID=Identyfikator techniczny
+TechnicalID=Techniczne ID
 NotePublic=Uwaga (publiczna)
 NotePrivate=Uwaga (prywatna)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr ustawił ograniczenia dokładności cen jednostkowych <b>do %s</b> miejsc po przecinku.
@@ -672,7 +672,7 @@ NewAttribute=Nowy atrybut
 AttributeCode=Kod atrybut
 OptionalFieldsSetup=Dodatkowa konfiguracja atrybutów
 URLPhoto=Url ze zdjęciem / logo
-SetLinkToAnotherThirdParty=Link do innej strony trzeciej
+SetLinkToAnotherThirdParty=Link do innego kontrahenta
 CreateDraft=Utwórz Szic
 SetToDraft=Wróć do szkicu
 ClickToEdit=Kliknij by edytować
@@ -757,10 +757,10 @@ ShortFriday=Pi
 ShortSaturday=So
 ShortSunday=Ni
 SelectMailModel=Wybierz szablon email
-SetRef=Ustaw ref
+SetRef=Ustaw referencję
 Select2ResultFoundUseArrows=
 Select2NotFound=Nie znaleziono wyników
-Select2Enter=Wchodzić
+Select2Enter=Enter
 Select2MoreCharacters=lub więcej znaków
 Select2LoadingMoreResults=Ładuję więcej wyników...
 Select2SearchInProgress=Wyszukiwanie w trakcie...
@@ -774,8 +774,8 @@ SearchIntoCustomerInvoices=Faktury klienta
 SearchIntoSupplierInvoices=Faktury dostawców
 SearchIntoCustomerOrders=Zamówienia klienta
 SearchIntoSupplierOrders=Zamówienia dostwców
-SearchIntoCustomerProposals=Propozycje klientów
-SearchIntoSupplierProposals=Oferta dostawcy
+SearchIntoCustomerProposals=Oferty klientów
+SearchIntoSupplierProposals=Oferty dostawcy
 SearchIntoInterventions=Interwencje
 SearchIntoContracts=Kontrakty
 SearchIntoExpenseReports=Zestawienia wydatków
diff --git a/htdocs/langs/pl_PL/opensurvey.lang b/htdocs/langs/pl_PL/opensurvey.lang
index e0bc3eeaa4c..5da011e2cbf 100644
--- a/htdocs/langs/pl_PL/opensurvey.lang
+++ b/htdocs/langs/pl_PL/opensurvey.lang
@@ -22,7 +22,7 @@ TheBestChoices=Najlepszym wyborem są obecnie
 with=z
 OpenSurveyHowTo=Jeśli zgadzasz się głosować w tej ankiecie musisz podać swoje imię, wybrać wartości, które pasują najlepiej dla Ciebie i zatwierdź przyciskiem powiększonej na końcu linii.
 CommentsOfVoters=Komentarze wyborców
-ConfirmRemovalOfPoll=Czy na pewno chcesz usunąć tę ankietę (i wszystkich głosów)
+ConfirmRemovalOfPoll=Jesteś pewny, że chcesz usunąc to głosowanie (i wszystkie glosy)?
 RemovePoll=Usuń ankieta
 UrlForSurvey=Adres URL do komunikowania się, aby uzyskać bezpośredni dostęp do sondowania
 PollOnChoice=Tworzysz ankietę zrobić testowych na ankiecie. Wprowadź wszystkie możliwe opcje do ankiety:
diff --git a/htdocs/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang
index 24faad114e6..6c87c8d0c53 100644
--- a/htdocs/langs/pl_PL/resource.lang
+++ b/htdocs/langs/pl_PL/resource.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Zasoby
 MenuResourceAdd=Nowe zasoby
-MenuResourcePlanning=Planowane Zasoby
+MenuResourcePlanning=Planowanie zasobów
 DeleteResource=Usuń zasoby
 ConfirmDeleteResourceElement=Potwierdz usunięcie zasobów dla tego elementu
 NoResourceInDatabase=Brak zasobów w bazie danych
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 56b3e322a82..be672d3ce42 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - users
 HRMArea=Obszaru HRM
-UserCard=Użytkownik karty
-ContactCard=Kontakt karty
-GroupCard=Grupa karty
+UserCard=Karta użytkownika
+ContactCard=Karta kontaktu
+GroupCard=Karta grupy
 NoContactCard=Nr karty kontaktów między
-Permission=Zezwolenie
+Permission=Uprawnienie
 Permissions=Uprawnienia
 EditPassword=Edytuj hasło
 SendNewPassword=Wyślij nowe hasło
@@ -12,24 +12,24 @@ ReinitPassword=Wygeneruj nowe hasło
 PasswordChangedTo=Hasło zmieniono na: %s
 SubjectNewPassword=Twoje nowe hasło Dolibarr
 AvailableRights=Dostępne uprawnienia
-OwnedRights=Posiadanych uprawnień
-GroupRights=Grupa uprawnienia
-UserRights=Użytkownik uprawnienia
+OwnedRights=Posiadane uprawnienia
+GroupRights=Uprawnienia grupy
+UserRights=Uprawnienia użytkownika
 UserGUISetup=Użytkownik Display Setup
-DisableUser=Wyłączyć
+DisableUser=Wyłączone
 DisableAUser=Wyłącz użytkownika
-DeleteUser=Usunąć
+DeleteUser=Usuń
 DeleteAUser=Usuń użytkownika
-DisableGroup=Wyłączyć
-DisableAGroup=Wyłącz grupy
+DisableGroup=Wyłącz
+DisableAGroup=Wyłącz grupę
 EnableAUser=Włącz użytkownika
-EnableAGroup=Włącz grupy
-DeleteGroup=Usunąć
+EnableAGroup=Włącz grupę
+DeleteGroup=Usuń
 DeleteAGroup=Usuń grupę
-ConfirmDisableUser=Czy na pewno chcesz wyłączyć <b>użytkownik %s?</b>
-ConfirmDisableGroup=Czy na pewno chcesz wyłączyć <b>grupie %s?</b>
-ConfirmDeleteUser=Czy na pewno chcesz usunąć <b>użytkownika %s?</b>
-ConfirmDeleteGroup=Czy na pewno chcesz usunąć <b>grupę %s?</b>
+ConfirmDisableUser=Czy na pewno chcesz wyłączyć użytkownika <b>%s</b>?
+ConfirmDisableGroup=Czy na pewno chcesz wyłączyć grupę <b>%s</b>?
+ConfirmDeleteUser=Czy na pewno chcesz usunąć użytkownika <b>%s</b>?
+ConfirmDeleteGroup=Czy na pewno chcesz usunąć grupę <b>%s</b>?
 ConfirmEnableUser=Czy na pewno chcesz, aby umożliwić <b>użytkownikowi %s?</b>
 ConfirmEnableGroup=Czy na pewno chcesz, aby umożliwić <b>grupie %s?</b>
 ConfirmReinitPassword=Czy na pewno chcesz, aby wygenerować nowe hasło dla <b>użytkownika %s?</b>
@@ -38,8 +38,8 @@ NewUser=Nowy użytkownik
 CreateUser=Utwórz użytkownika
 SearchAGroup=Szukaj grupy
 SearchAUser=Szukaj użytkownika
-LoginNotDefined=Logowanie nie zostało zdefiniowane.
-NameNotDefined=Nazwa nie jest zdefiniowane.
+LoginNotDefined=Login niezdefiniowany.
+NameNotDefined=Nazwa nie jest zdefiniowana.
 ListOfUsers=Lista użytkowników
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Administrator ze wszystkich praw
@@ -47,39 +47,39 @@ AdministratorDesc=Administrator
 AdministratorDescEntity=Administrator (dla spółki)
 DefaultRights=Domyślne uprawnienia
 DefaultRightsDesc=Określ tutaj domyślne uprawnienia, które są przyznawane automatycznie utworzony nowy użytkownik.
-DolibarrUsers=Dolibarr użytkowników
+DolibarrUsers=Użytkownicy Dolibarr
 LastName=Nazwisko
 FirstName=Imię
 ListOfGroups=Lista grup
 NewGroup=Nowa grupa
 CreateGroup=Tworzenie grupy
 RemoveFromGroup=Usuń z grupy
-PasswordChangedAndSentTo=Hasło zmieniło i wysyłane <b>do %s.</b>
-PasswordChangeRequestSent=Wniosek o zmianę hasła <b>dla %s</b> wysłane <b>do %s.</b>
+PasswordChangedAndSentTo=Hasło zmienione i wysyłane do <b>%s.</b>
+PasswordChangeRequestSent=Wniosek o zmianę hasła dla <b>%s</b> wysłany do <b>%s</b>.
 MenuUsersAndGroups=Użytkownicy i grupy
 MenuMyUserCard=Moja karta użytkownika
-LastGroupsCreated=Ostatnia %s utworzonych grup
-LastUsersCreated=Ostatnia %s użytkowników utworzonych
-ShowGroup=Pokaż grupy
+LastGroupsCreated=Ostatnie %s utworzonych grup
+LastUsersCreated=Ostatnie %s utworzonych użytkowników
+ShowGroup=Pokaż grupę
 ShowUser=Pokaż użytkownika
-NonAffectedUsers=Brak wpływu na użytkowników
-UserModified=Użytkownik zmodyfikowano pomyślnie
+NonAffectedUsers=Brak przypisanych użytkowników
+UserModified=Użytkownik zmodyfikowany pomyślnie
 PhotoFile=Plików ze zdjęciami
 UserWithDolibarrAccess=Użytkownik z Dolibarr dostępu
 ListOfUsersInGroup=Lista użytkowników w tej grupie
 ListOfGroupsForUser=Lista grup dla tego użytkownika
-UsersToAdd=Użytkownicy będą mogli dodać do tej grupy
-GroupsToAdd=Grupy, które można dodać do tego użytkownika
+UsersToAdd=Użytkownicy do dodania do tej grupy
+GroupsToAdd=Grupy do dodania do tego użytkownika
 NoLogin=Brak logowania
-LinkToCompanyContact=Link do strony trzeciej / kontakt
+LinkToCompanyContact=Link do kontahenta/kontaktu
 LinkedToDolibarrMember=Link do członka
-LinkedToDolibarrUser=Link do Dolibarr użytkownika
+LinkedToDolibarrUser=Link do użytkownika Dolibarr
 LinkedToDolibarrThirdParty=Link do Dolibarr trzeciej
-CreateDolibarrLogin=Utwórz konto Dolibarr
-CreateDolibarrThirdParty=Tworzenie stron trzecich
-LoginAccountDisable=Konto wyłączone, położyć nowy login uaktywnić.
+CreateDolibarrLogin=Utwórz użytkownika
+CreateDolibarrThirdParty=Utwórz kontrahenta
+LoginAccountDisable=Konto wyłączone, podaj nowy login aby uaktywnić.
 LoginAccountDisableInDolibarr=Konto wyłączone w Dolibarr.
-LoginAccountDisableInLdap=Wyłączone konto w domenie.
+LoginAccountDisableInLdap=Konto wyłączone w domenie.
 UsePersonalValue=Użyj wartości osobowych
 GuiLanguage=Język interfejsu
 InternalUser=Wewnętrzny użytkownik
@@ -102,17 +102,17 @@ EventUserModified=Użytkownik %s zmodyfikowane
 UserDisabled=Użytkownik %s osób niepełnosprawnych
 UserEnabled=Użytkownik %s aktywowany
 UserDeleted=Użytkownik %s usunięto
-NewGroupCreated=Grupa %s tworzone
+NewGroupCreated=Grupa %s utworzona
 GroupModified=Grupa% s zmodyfikowano
-GroupDeleted=Grupa %s usunięto
-ConfirmCreateContact=Czy na pewno chcesz yu Dolibarr utworzyć konto dla tego kontaktu?
-ConfirmCreateLogin=Czy na pewno chcesz, aby utworzyć konto dla tego Dolibarr członkiem?
-ConfirmCreateThirdParty=Czy na pewno chcesz, aby utworzyć trzecią dla tego członka?
+GroupDeleted=Grupa %s usunięta
+ConfirmCreateContact=Czy na pewno chcesz utworzyć konto Dolibarr dla tego kontaktu?
+ConfirmCreateLogin=Czy na pewno chcesz utworzyć konto Dolibarr dla tego członka?
+ConfirmCreateThirdParty=Czy na pewno chcesz utworzyć kontrahenta dla tego członka?
 LoginToCreate=Zaloguj się, aby utworzyć
-NameToCreate=Nazwisko osoby trzeciej w celu stworzenia
-YourRole=Swoje role
+NameToCreate=Nazwa kontrahenta do utworzenia
+YourRole=Twoje role
 YourQuotaOfUsersIsReached=Limitu aktywnych użytkowników został osiągnięty!
-NbOfUsers=Nb użytkowników
+NbOfUsers=Ilośc użytkowników
 DontDowngradeSuperAdmin=Tylko superadmin niższej wersji superadmin
 HierarchicalResponsible=Kierownik
 HierarchicView=Hierarchiczny widok
diff --git a/htdocs/langs/pt_BR/supplier_proposal.lang b/htdocs/langs/pt_BR/supplier_proposal.lang
index 3703f330b50..cb919375150 100644
--- a/htdocs/langs/pt_BR/supplier_proposal.lang
+++ b/htdocs/langs/pt_BR/supplier_proposal.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-supplier_proposalMENU_LEFT_TITLE_NEW=Novo pedido
-supplier_proposalMENU_LEFT_TITLE_LIST=Lista
 NewAsk=Novo pedido
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 21c4014abfd..666f652889b 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Erro, Não pode apagar uma conta em uso
 
 FicheVentilation=Carta de desagregação
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 24173a385b7..ad2faab3edf 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil,
 
 FicheVentilation=Fişă Ventilare
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index bb7b153e56e..4cee55d6493 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -99,7 +99,7 @@ AccountToCredit=Cont de credit
 AccountToDebit=Cont de debit
 DisableConciliation=Dezactivaţi reconcilierea pentru acest cont
 ConciliationDisabled=Reconciliere dezactivată
-StatusAccountOpened=Open
+StatusAccountOpened=Deschis
 StatusAccountClosed=Închis
 AccountIdShort=Cod
 EditBankRecord=Editare înregistrare
diff --git a/htdocs/langs/ro_RO/hrm.lang b/htdocs/langs/ro_RO/hrm.lang
index 1d03a8ebbf9..36c24d8e6f8 100644
--- a/htdocs/langs/ro_RO/hrm.lang
+++ b/htdocs/langs/ro_RO/hrm.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are-you sure to delete this establishment ?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=E-mail pentru a preveni serviciu extern HRM
+Establishments=Sedii
+Establishment=Sediu
+NewEstablishment=Sediu nou
+DeleteEstablishment=Sterge Sediu
+ConfirmDeleteEstablishment=Sigur doriți să ștergeți aceast sediu ?
+OpenEtablishment=Deschide Sediu
+CloseEtablishment=Inchide Sediu
 # Dictionary
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Function list
+DictionaryDepartment=HRM - Lista Departamente
+DictionaryFunction=HRM - Lista Functiuni
 # Module
-ListOfEmployees=List of employees
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
-EmployeeCard=Employee card
+ListOfEmployees=Lista angajati
+Employees=Angajati
+Employee=Angajat
+NewEmployee=Angajat nou
+EmployeeCard=Fisa Angajat
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index a75365d3361..d41271d5698 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -422,7 +422,7 @@ ChangedBy=Modificat de
 ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
 Approved=Approved
-Refused=Refused
+Refused=Refuzat
 ReCalculate=Recalculează
 ResultOk=Succes
 ResultKo=Eşec
@@ -431,7 +431,7 @@ Reportings=Rapoarte
 Draft=Schiţă
 Drafts=Schiţe
 Validated=Validat
-Opened=Open
+Opened=Deschis
 New=Nou
 Discount=Discount
 Unknown=Necunoscut
@@ -775,7 +775,7 @@ SearchIntoSupplierInvoices=Supplier invoices
 SearchIntoCustomerOrders=Customer orders
 SearchIntoSupplierOrders=Supplier orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Oferte Furnizori
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoExpenseReports=Expense reports
diff --git a/htdocs/langs/ro_RO/oauth.lang b/htdocs/langs/ro_RO/oauth.lang
index 4cc08b058c6..558980fd50e 100644
--- a/htdocs/langs/ro_RO/oauth.lang
+++ b/htdocs/langs/ro_RO/oauth.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Oauth Configuration
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received ans saved
+ConfigOAuth=Configurare Autentificare
+NoAccessToken=Nicun token de acces salvat în baza de date locală
+HasAccessToken=Un token a fost generat și salvat în baza de date locală
+NewTokenStored=Token primit si salvat
 ToCheckDeleteTokenOnProvider=To check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
+TokenDeleted=Token sters
 RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
+DeleteAccess=Click aici pentru a șterge token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules than need OAuth2 authentication.
 OAUTH_GOOGLE_NAME=Api Google
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 72fd01ab74f..1bc7d6dbace 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -36,7 +36,7 @@ StatusOrderToBillShort=Livrate
 StatusOrderToBill2Short=De facturat
 StatusOrderApprovedShort=Aprobată
 StatusOrderRefusedShort=Refuzată
-StatusOrderBilledShort=Billed
+StatusOrderBilledShort=Facturat
 StatusOrderToProcessShort=De procesat
 StatusOrderReceivedPartiallyShort=Parţial recepţionată
 StatusOrderReceivedAllShort=Integral recepţionată
@@ -50,7 +50,7 @@ StatusOrderToBill=Livrată
 StatusOrderToBill2=De facturat
 StatusOrderApproved=Aprobată
 StatusOrderRefused=Refuzată
-StatusOrderBilled=Billed
+StatusOrderBilled=Facturat
 StatusOrderReceivedPartially=Parţial recepţionată
 StatusOrderReceivedAll=Integral recepţionată
 ShippingExist=O expediţie există
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index 68c670ac9fb..b88a010af72 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Valoarea pe luni (netă)
 NbOfProposals=Număr oferte comerciale
 ShowPropal=Afişează oferta
 PropalsDraft=Schiţe
-PropalsOpened=Open
+PropalsOpened=Deschis
 PropalsNotBilled=Închise nefacturate
 PropalStatusDraft=Schiţă (de validat)
 PropalStatusValidated=Validată (oferta e deschisă)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Nesemnată (inchisă)
 PropalStatusBilled=Facturată
 PropalStatusDraftShort=Schiţă
 PropalStatusValidatedShort=Validată
-PropalStatusOpenedShort=Open
+PropalStatusOpenedShort=Deschis
 PropalStatusClosedShort=Închisă
 PropalStatusSignedShort=Semnată
 PropalStatusNotSignedShort=Nesemnată
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 6239df53839..9433321ad93 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - users
+# Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cont  contabil pentru plata salariilor
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cont contabil pentru cheltuieli financiare
 Salary=Salariu
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
index c90b7abeba2..f3662dfcf5e 100644
--- a/htdocs/langs/ro_RO/supplier_proposal.lang
+++ b/htdocs/langs/ro_RO/supplier_proposal.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Supplier commercial proposals
 supplier_proposalDESC=Manage price requests to suppliers
-supplier_proposalMENU_LEFT_TITLE=Supplier proposals
-supplier_proposalMENU_LEFT_TITLE_NEW=New request
-supplier_proposalMENU_LEFT_TITLE_LIST=List
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
+supplier_proposalMENU_LEFT_TITLE=Oferte Furnizori
+supplier_proposalMENU_LEFT_TITLE_NEW=Cerere noua
+supplier_proposalMENU_LEFT_TITLE_LIST=Lista
+CommRequest=Cerere Preţ 
+CommRequests=Cereri Preţ 
+SearchRequest=Cauta o cerere
+DraftRequests=Cereri schiţă
 LastModifiedRequests=Last %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
+SupplierProposals=Oferte Furnizori
 NewAskPrice=New price request
-NewAsk=New request
+NewAsk=Cerere noua
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
 SupplierProposalRefFourn=Supplier ref
@@ -22,38 +22,38 @@ SupplierProposalDate=Delivery date
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
 RelatedSupplierProposal=Related price requests suppliers
 ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b> ?
-DateAsk=Date of request
-DeleteAsk=Delete request
-ValidateAsk=Validate request
-AddAsk=Create a request
+DateAsk=Data cererii
+DeleteAsk=Şterge cerere
+ValidateAsk=Validează cererre
+AddAsk=Crează o cerere
 SupplierProposalDraft=Drafts
-SupplierProposalOpened=Open
+SupplierProposalOpened=Deschis
 SupplierProposalStatusDraft=Draft (needs to be validated)
 SupplierProposalStatusValidated=Validated (request is open)
 SupplierProposalStatusOpened=Validated (request is open)
-SupplierProposalStatusClosed=Closed
-SupplierProposalStatusSigned=Accepted
-SupplierProposalStatusNotSigned=Refused
-SupplierProposalStatusBilled=Billed
+SupplierProposalStatusClosed=Închis
+SupplierProposalStatusSigned=Acceptat
+SupplierProposalStatusNotSigned=Refuzat
+SupplierProposalStatusBilled=Facturat
 SupplierProposalStatusDraftShort=Draft
 SupplierProposalStatusValidatedShort=Validated
-SupplierProposalStatusOpenedShort=Open
-SupplierProposalStatusClosedShort=Closed
-SupplierProposalStatusSignedShort=Accepted
-SupplierProposalStatusNotSignedShort=Refused
-SupplierProposalStatusBilledShort=Billed
+SupplierProposalStatusOpenedShort=Deschis
+SupplierProposalStatusClosedShort=Închis
+SupplierProposalStatusSignedShort=Acceptat
+SupplierProposalStatusNotSignedShort=Refuzat
+SupplierProposalStatusBilledShort=Facturat
 CopyAskFrom=Create price request by copying existing a request
-CreateEmptyAsk=Create blank request
-CloneAsk=Clone price request
+CreateEmptyAsk=Crează o cerere goala
+CloneAsk=Cloneaza Cerere pret 
 ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b> ?
 ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b> ?
 SendAskByMail=Send price request by mail
 SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
+SupplierProposalCard=Fişă Cerere
 ConfirmDeleteAsk=Are you sure you want to delete this price request ?
 ActionsOnSupplierProposal=Events on price request
 DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
+CommercialAsk=Cerere Preţ 
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 92ccd01bff2..13abb0b6750 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 4a05badb0a1..daf49f13257 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 74195f95e4e..e851b1bc42a 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko ra
 
 FicheVentilation=Kartica pregleda
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 0e362394cd2..6b7d65b5ae0 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -276,13 +276,13 @@ MAIN_SMS_SENDMODE=Uporabljen način pošiljanja SMS
 MAIN_MAIL_SMS_FROM=Privzeta pošiljateljeva telefonska številka za pošiljanje SMS
 FeatureNotAvailableOnLinux=Funkcija ni na voljo pri Unix sistemih. Preverite program za pošiljanje pošte lokalno.
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslation=Če prevod v ta jezik ni narejen v celoti ali če ste v prevodu našli napake, lahko popravite datoteke v mapi <b>langs/%s</b> in pošljete vaše spremembe na www.transifex.com/dolibarr-association/dolibarr/
 ModuleSetup=Nastavitve modula
 ModulesSetup=Nastavitve modulov
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Upravljanje odnosov s strankami (CRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProducts=Upravljanje proizvodov (Products Management - PM)
+ModuleFamilyHr=Upravljanje s človeškimi viri (Human Resource Management - HR)
 ModuleFamilyProjects=Delo na projektih/sodelovanje
 ModuleFamilyOther=Ostalo
 ModuleFamilyTechnic=Orodja za različne module
@@ -329,7 +329,7 @@ UMaskExplanation=Ta parameter omogoča definicijo privzetih dovoljenj za datotek
 SeeWikiForAllTeam=Za celoten seznam vseh udeležencev in njihove organizacije poglejte na wiki stran
 UseACacheDelay= Zakasnitev predpomnilnika za izvozni odziv v sekundah (0 ali prazno pomeni, da ni predpomnilnika)
 DisableLinkToHelpCenter=Skrij link "<b>Potrebujete pomoč ali podporo</b>" na prijavni strani
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelp=Skrij povezavo do on-line pomoči "<b>%s</b>"
 AddCRIfTooLong=Ni avtomatskega prelamljanja besedila, zato morate v predolgo vrstico, ki sega preko robu strani, vstaviti znak za novo vrstico.
 ModuleDisabled=Modul je onemogočen
 ModuleDisabledSoNoEvent=Modul je onemogočen, zato dogodek ni bil kreiran
@@ -338,7 +338,7 @@ MinLength=Minimalna dolžina
 LanguageFilesCachedIntoShmopSharedMemory=Datoteke .lang naložene v spomin v skupni rabi
 ExamplesWithCurrentSetup=Primeri pri trenutno veljavnih nastavitvah
 ListOfDirectories=Seznam map z OpenDocument predlogami
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+ListOfDirectoriesForModelGenODT=Seznam map, ki vsebujejo predloge v OpenDocument formatu.<br><br>Tukaj navedite celotno pot do mape.<br>Med mapami vstavite CR.<br>Mapo GED modula dodajte tukaj <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Datoteke v tej mapi morajo imeti končnico <b>.odt</b> ali <b>.ods</b>.
 NumberOfModelFilesFound=Število ODT/ODS predlog v teh mapah
 ExampleOfDirectoriesForModelGen=Primeri sintakse:<br>c:\\mydir<br>/home/mydir <br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Z dodatkom takih oznak v predlogo, boste ob kreiranju dokumenta dobili personalizirane vrednosti:
@@ -352,7 +352,7 @@ ThemeDir=Mapa s preoblekami
 ConnectionTimeout=Časovna omejitev povezave
 ResponseTimeout=Časovna omejitev odziva
 SmsTestMessage=Testno sporočilo od __PHONEFROM__ za __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ModuleMustBeEnabledFirst=Če potrebujete to funkcijo, morate najprej omogočiti Modul <b>%s</b>.
 SecurityToken=Ključ za šifriranje url
 NoSmsEngine=Na voljo ni nobenega upravljalnika SMS pošiljanja. Upravljalniki SMS pošiljanja niso nameščeni z običajno distribucijo (ker so odvisni od zunanjih dobaviteljev), vendar nekatere lahko najdete na http://www.dolistore.com
 PDF=PDF
@@ -393,8 +393,8 @@ ExtrafieldLink=Poveži z objektom
 ExtrafieldParamHelpselect=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...<br><br>Če želite imeti seznam odvisen od drugega :<br>1,vrednost1|parent_list_code:parent_key<br>2,vrednost2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...
 ExtrafieldParamHelpradio=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Seznam parametrov je določen v tabeli<br>Syntax : table_name:label_field:id_field::filter<br>Primer : c_typent:libelle:id::filter<br><br>filter je lahko enostaven test (npr. active=1) za prikaz samo aktivnih vrednosti<br>V filtru lahko tudi uporabite $ID$ , ki je trenutni id trenutnega objekta<br>Če želite izbrati SELECT v filtru, uporabite $SEL$<br>če želite filter v posebnih poljih, uporabite  extra.fieldcode=... (kjer je koda polja koda posebnega polja)<br><br>Če želite odvisen seznam :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Seznam parametrov je določen v tabeli<br>Syntax : table_name:label_field:id_field::filter<br>Primer : c_typent:libelle:id::filter<br><br>filter je lahko enostaven test (npr. active=1) za prikaz samo aktivnih vrednosti<br>V filtru lahko tudi uporabite $ID$ , ki je trenutni id trenutnega objekta<br>Če želite izbrati SELECT v filtru, uporabite $SEL$<br>če želite filter v posebnih poljih, uporabite  extra.fieldcode=... (kjer je koda polja koda posebnega polja)<br><br>Če želite odvisen seznam :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Uporabljena knjižnica za ustvarjanje PDF
 WarningUsingFPDF=Pozor: vaš <b>conf.php</b> vsebuje direktivo <b>dolibarr_pdf_force_fpdf=1</b>. To pomeni, da uporabljate knjižnico FPDF za generiranje PDF datotek. Ta knjižnica je stara in ne podpira številnih značilnosti (Unicode, transparentnost slike, cirilico, arabske in azijske jezike, ...), zado lahko med generiranjem PDF pride do napak.<br>Za rešitev tega problema in polno podporo PDF generiranja, prosimo da naložite <a href="http://www.tcpdf.org/" target="_blank">TCPDF knjižnico</a>, nato označite kot komentar ali odstranite vrstico <b>$dolibarr_pdf_force_fpdf=1</b>, in namesto nje dodajte <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 820b0db0453..f00423bff48 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 14f1767bc18..c3654d944ac 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskont
 
 FicheVentilation=Uppdelning kort
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 8595b990e19..c8504d7a8af 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=ข้อผิดพลาดที่คุ
 
 FicheVentilation=บัตรพังทลาย
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 5c447d5f0d6..50c3f00d632 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesab
 
 FicheVentilation=Analiz kartı
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 9bcb85af9b8..e5caddd3404 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản k
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 562fc26153b..5fcad4c1ff7 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，
 
 FicheVentilation=击穿卡
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index e9858b6c69e..5ee7e8de9f5 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -155,3 +155,19 @@ ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting accoun
 
 FicheVentilation=Breakdown card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+
+##Export Journal Feature
+ExportFormat=Format of Export
+Prefixname=Prefix of export File
+Separate=Export separator
+Textframe=Frame of text value
+Headercol=Colname in header of file
+Fieldname=Name of Field
+Headername=Name in header
+Type=Type of fields
+Param=Additionnal parameters
+EnabledProduct=In Product
+EnabledTiers=In Tiers
+EnabledVat=In Vat
+
+MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index 7b4ef12559a..eca05f79d32 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=休假
+CPTitreMenu=休假
 MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+MenuAddCP=新的請假單
+NotActiveModCP=您必須要啟用排休模組才能看到此頁面
+NotConfigModCP=若要啟用 <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> 前往此頁面</ a>.
+NoCPforUser=你的休假日已經全部用完
+AddCP=提出假單
 Employe=Employee
 DateDebCP=開始日期
 DateFinCP=結束日期
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index 44102958651..58087fefed4 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -14,7 +14,7 @@ Language_de_AT=德語（奧地利）
 Language_de_CH=German (Switzerland)
 Language_el_GR=希臘語
 Language_en_AU=英語（Australie）
-Language_en_CA=English (Canada)
+Language_en_CA=英語(加拿大)
 Language_en_GB=英語（英國）
 Language_en_IN=英國（印度）
 Language_en_NZ=英語（新西蘭）
@@ -35,7 +35,7 @@ Language_es_PR=西班牙語（波多黎各）
 Language_et_EE=爱沙尼亚语
 Language_eu_ES=巴斯克
 Language_fa_IR=波斯語
-Language_fi_FI=Finnish
+Language_fi_FI=芬蘭嶼
 Language_fr_BE=法語（比利時）
 Language_fr_CA=法語（加拿大）
 Language_fr_CH=法語（瑞士）
@@ -63,7 +63,7 @@ Language_pl_PL=波蘭語
 Language_pt_BR=葡萄牙語（巴西）
 Language_pt_PT=葡萄牙
 Language_ro_RO=羅馬尼亞
-Language_ru_RU=俄
+Language_ru_RU=俄語
 Language_ru_UA=俄語（烏克蘭）
 Language_tr_TR=土耳其
 Language_sl_SI=斯洛文尼亞
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 5fc22782a18..bcc4e2f577b 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -29,11 +29,11 @@ ProductsAndServicesOnSell=Products and Services for sale or for purchase
 ProductsAndServicesNotOnSell=Products and Services not for sale
 ProductsAndServicesStatistics=產品與服務的統計數字
 ProductsStatistics=產品統計
-ProductsOnSell=Product for sale or for purchase
-ProductsNotOnSell=Product not for sale and not for purchase
+ProductsOnSell=可銷售或購買之產品
+ProductsNotOnSell=不可銷售或購買之產品
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services not for sale
+ServicesOnSell=可銷售或購買之服務
+ServicesNotOnSell=不可銷售之服務
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=內部參考
 LastRecorded=最新產品/服務的銷售記錄
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 890027c9d30..1c35968790c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -829,7 +829,7 @@ $bcnd=array(0=>'class="impair nodrag nodrop nohover"',1=>'class="pair nodrag nod
 
 // Define messages variables
 $mesg=''; $warning=''; $error=0;
-// deprecated, see setEventMessage() and dol_htmloutput_events()
+// deprecated, see setEventMessages() and dol_htmloutput_events()
 $mesgs=array(); $warnings=array(); $errors=array();
 
 // Constants used to defined number of lines in textarea
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 147afc124fc..32c39b63b4f 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -49,6 +49,21 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.datef";
 
+$object = new Societe($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('thirdpartymargins','globalcard'));
+
+
+/*
+ * Actions
+ */
+
+$parameters=array('id'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
 
 /*
  * View
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index 3c7cc30b7a3..d0e42276880 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -101,8 +101,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -115,7 +115,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 5924a89956b..e222e77ee81 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -79,6 +79,8 @@ $extrafields = new ExtraFields($db);
 $extralabels = $extrafields->fetch_name_optionals_label('product');
 $search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
+if (empty($action)) $action='list';
+
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas=GETPOST("canvas");
 $objcanvas=null;
@@ -165,8 +167,8 @@ $form=new Form($db);
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
-	$objcanvas->assign_values('list');       // This must contains code to load data (must call LoadListDatas($limit, $offset, $sortfield, $sortorder))
-    $objcanvas->display_canvas('list');  	 // This is code to show template
+	$objcanvas->assign_values($action);       // This must contains code to load data (must call LoadListDatas($limit, $offset, $sortfield, $sortorder))
+    $objcanvas->display_canvas($action);  	  // This is code to show template
 }
 else
 {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index a7dde67013a..833e285f608 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -68,6 +68,12 @@ if ($search_label) $sql.= natural_search("e.lieu", $search_label);		// label
 if ($search_status != '' && $search_status >= 0) $sql.= " AND e.statut = ".$search_status;
 if ($sall) $sql.= natural_search(array('e.label','e.description','e.lieu','e.address','e.town'), $sall);
 $sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
+$totalnboflines=0;
+$result=$db->query($sql);
+if ($result)
+{
+    $totalnboflines = $db->num_rows($result);
+}
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
 
@@ -81,7 +87,7 @@ if ($result)
 	$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 	llxHeader("",$langs->trans("ListOfWarehouses"),$help_url);
 
-	print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder,'',$num);
+	print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $totalnboflines);
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -168,20 +174,23 @@ if ($result)
             $i++;
 		}
 
-		print '<tr class="liste_total">';
-        print '<td colspan="2" align="right">'.$langs->trans("Total").'</td>';
-        print '<td align="right">'.price(price2num($total,'MT'),1,$langs,0,0,-1,$conf->currency).'</td>';
-        print '<td align="right">';
-		if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalsell,'MT'),1,$langs,0,0,-1,$conf->currency);
-        else
+		if ($totalnboflines <= $limit)
 		{
-			$htmltext=$langs->trans("OptionMULTIPRICESIsOn");
-           	print $form->textwithtooltip($langs->trans("Variable"),$htmltext);
+    		print '<tr class="liste_total">';
+            print '<td colspan="2" align="right">'.$langs->trans("Total").'</td>';
+            print '<td align="right">'.price(price2num($total,'MT'),1,$langs,0,0,-1,$conf->currency).'</td>';
+            print '<td align="right">';
+    		if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($totalsell,'MT'),1,$langs,0,0,-1,$conf->currency);
+            else
+    		{
+    			$htmltext=$langs->trans("OptionMULTIPRICESIsOn");
+               	print $form->textwithtooltip($langs->trans("Variable"),$htmltext);
+    		}
+            print '</td>';
+            print '<td></td>';
+            print '<td></td>';
+            print "</tr>\n";
 		}
-        print '</td>';
-        print '<td></td>';
-        print '<td></td>';
-        print "</tr>\n";
 	}
 
 	$db->free($result);
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index db450a09f6e..303180c2cb7 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -92,7 +92,7 @@ $sql.= ' AND cf.entity = ' . $conf->entity;
 if ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) {
     $sql .= ' AND cf.fk_statut < 3';
 } elseif ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) {
-    $sql .= ' AND cf.fk_statut < 6';	// We want alos status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
+    $sql .= ' AND cf.fk_statut < 6';	// We want also status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
 } else {
     $sql .= ' AND cf.fk_statut < 5';
 }
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index 39786f5ad71..e3e070a3473 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -88,7 +88,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -102,7 +102,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index e9dc8be64e1..3d6e1d78fe8 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -87,7 +87,7 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel											  */
+/* Creation of an optional field											  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -101,7 +101,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 56bf58cf61d..37db7d02e4c 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -88,8 +88,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -102,7 +102,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 6a6fb7ab1df..cfbf3529bba 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -56,65 +56,78 @@ if (! $sortfield) $sortfield="c.lastname";
 
 $now=dol_now();
 
+$object = new Societe($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('thirdpartynotification','globalcard'));
+
+
 
 /*
  * Actions
  */
 
-// Add a notification
-if ($action == 'add')
+$parameters=array('id'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
 {
     $error=0;
 
-    if (empty($contactid))
+    // Add a notification
+    if ($action == 'add')
     {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
-        $error++;
-    }
-    if ($actionid <= 0)
-    {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
-        $error++;
-    }
-
-    if (! $error)
-    {
-        $db->begin();
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-        $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
-        if ($db->query($sql))
+        if (empty($contactid))
         {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
-            $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
-
-            if (! $db->query($sql))
-            {
-                $error++;
-                dol_print_error($db);
-            }
+    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
+            $error++;
         }
-        else
+        if ($actionid <= 0)
         {
-            dol_print_error($db);
+    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
+            $error++;
         }
-
+    
         if (! $error)
         {
-            $db->commit();
-        }
-        else
-        {
-            $db->rollback();
+            $db->begin();
+            
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+            $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
+            if ($db->query($sql))
+            {
+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
+                $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
+    
+                if (! $db->query($sql))
+                {
+                    $error++;
+                    dol_print_error($db);
+                }
+            }
+            else
+            {
+                dol_print_error($db);
+            }
+    
+            if (! $error)
+            {
+                $db->commit();
+            }
+            else
+            {
+                $db->rollback();
+            }
         }
     }
-}
-
-// Remove a notification
-if ($action == 'delete')
-{
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"];
-    $db->query($sql);
+    
+    // Remove a notification
+    if ($action == 'delete')
+    {
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"];
+        $db->query($sql);
+    }
 }
 
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index a7356010185..589c102c8a3 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -49,78 +49,82 @@ if ($user->societe_id)
 	$socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
+$object = new Societe($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('thirdpartycustomerprice','globalcard'));
+
+
 
 /*
  * Actions
  */
 
-if ($action == 'add_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+$parameters=array('id'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-	$update_child_soc = GETPOST('updatechildprice');
-
-	// add price by customer
-	$prodcustprice->fk_soc = $socid;
-	$prodcustprice->fk_product = GETPOST('prodid', 'int');
-	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
-
-	$result = $prodcustprice->create($user, 0, $update_child_soc);
-
-	if ($result < 0) 
-	{
-		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-	} 
-	else 
-	{
-		setEventMessages($langs->trans('Save'), null, 'mesgs');
-	}
-
-	$action = '';
-}
-
-if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
-	// Delete price by customer
-	$prodcustprice->id = GETPOST('lineid');
-	$result = $prodcustprice->delete($user);
-
-	if ($result < 0) 
-	{
-		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-	} 
-	else 
-	{
-		setEventMessages($langs->trans('Delete'), null, 'mesgs');
-	}
-	$action = '';
-}
-
-if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
-
-	$prodcustprice->fetch(GETPOST('lineid', 'int'));
-
-	$update_child_soc = GETPOST('updatechildprice');
-
-	// update price by customer
-	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
-
-	$result = $prodcustprice->update($user, 0, $update_child_soc);
-	if ($result < 0) 
-	{
-		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-	} 
-	else 
-	{
-		setEventMessages($langs->trans('Save'), null, 'mesgs');
-	}
-
-	$action = '';
+if (empty($reshook))
+{
+    if ($action == 'add_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+    
+    	$update_child_soc = GETPOST('updatechildprice');
+    
+    	// add price by customer
+    	$prodcustprice->fk_soc = $socid;
+    	$prodcustprice->fk_product = GETPOST('prodid', 'int');
+    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
+    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+    	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
+    	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
+    
+    	$result = $prodcustprice->create($user, 0, $update_child_soc);
+    
+    	if ($result < 0) {
+    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+    	} else {
+    		setEventMessages($langs->trans('Save'), null, 'mesgs');
+    	}
+    
+    	$action = '';
+    }
+    
+    if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
+    	// Delete price by customer
+    	$prodcustprice->id = GETPOST('lineid');
+    	$result = $prodcustprice->delete($user);
+    
+    	if ($result < 0) {
+    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
+    	} else {
+    		setEventMessages($langs->trans('Delete'), null, 'errors');
+    	}
+    	$action = '';
+    }
+    
+    if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+    
+    	$prodcustprice->fetch(GETPOST('lineid', 'int'));
+    
+    	$update_child_soc = GETPOST('updatechildprice');
+    
+    	// update price by customer
+    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
+    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+    	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
+    	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
+    
+    	$result = $prodcustprice->update($user, 0, $update_child_soc);
+    	if ($result < 0) {
+    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+    	} else {
+    		setEventMessages($langs->trans('Save'), null, 'mesgs');
+    	}
+    
+    	$action = '';
+    }
 }
 
 
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index a7589566175..ceb86d102bd 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -121,8 +121,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -135,7 +135,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 2301f109282..99eab0e3a88 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -89,8 +89,8 @@ if ($action != 'create' && $action != 'edit')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Creation d'un champ optionnel
- /*                                                                            */
+/* Creation of an optional field											  */
+/*                                                                            */
 /* ************************************************************************** */
 
 if ($action == 'create')
@@ -103,7 +103,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Edition d'un champ optionnel                                               */
+/* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index f75c60c6c45..5d21c97ce5f 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -46,12 +46,12 @@ if ($actionsave)
     if ($i >= 1)
     {
         $db->commit();
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
         $db->rollback();
-        setEventMessage($langs->trans("Error"), 'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }