diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index eca8a4bdca004444dc614751992c3c5c316a113f..a3912aebc895a692625574101442c74849c1a122 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -134,6 +134,7 @@ $elementList = array();
 			'2' => $langs->trans('AccountingJournalType2'),
 			'3' => $langs->trans('AccountingJournalType3'),
 			'4' => $langs->trans('AccountingJournalType4'),
+			'5' => $langs->trans('AccountingJournalType5'),
 			'9' => $langs->trans('AccountingJournalType9')
 	);
 
diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php
index 39c6d27be4ff625bda0cfb94301ab044aec2ba31..6594bacea7fed0124d3df709a4a177e3fe590589 100644
--- a/htdocs/compta/bank/various_payment/index.php
+++ b/htdocs/compta/bank/various_payment/index.php
@@ -16,9 +16,9 @@
  */
 
 /**
- *	    \file       htdocs/compta/bank/various_payment/index.php
- *      \ingroup    bank
- *		\brief     	List of various payments
+ *		\file	   htdocs/compta/bank/various_payment/index.php
+ *	  \ingroup	bank
+ *		\brief	 	List of various payments
  */
 
 require '../../../main.inc.php';
@@ -44,7 +44,7 @@ $search_account = GETPOST('search_account','int');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) { $page = 0; }	 // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -75,7 +75,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_label="";
 	$search_amount="";
 	$search_account='';
-    $typeid="";
+	$typeid="";
 }
 
 /*
@@ -103,11 +103,11 @@ if ($search_label) 	$sql.=natural_search(array('v.label'), $search_label);
 if ($search_amount) $sql.=natural_search("v.amount", $search_amount, 1);
 if ($search_account > 0) $sql .=" AND b.fk_account=".$search_account;
 if ($filtre) {
-    $filtre=str_replace(":","=",$filtre);
-    $sql .= " AND ".$filtre;
+	$filtre=str_replace(":","=",$filtre);
+	$sql .= " AND ".$filtre;
 }
 if ($typeid) {
-    $sql .= " AND v.fk_typepayment=".$typeid;
+	$sql .= " AND v.fk_typepayment=".$typeid;
 }
 $sql.= $db->order($sortfield,$sortorder);
 
@@ -116,48 +116,48 @@ $totalnboflines=0;
 $result=$db->query($sql);
 if ($result)
 {
-    $totalnboflines = $db->num_rows($result);
+	$totalnboflines = $db->num_rows($result);
 }
 $sql.= $db->plimit($limit+1,$offset);
 
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $total = 0 ;
+	$num = $db->num_rows($result);
+	$i = 0;
+	$total = 0 ;
 	$var=true;
 
 	$param='';
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($typeid) $param.='&typeid='.$typeid;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+
 	print_barre_liste($langs->trans("VariousPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
-	
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"v.rowid","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"v.label","",$param,'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"v.datep","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
-    if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
+	if (! empty($conf->banque->enabled)) print_liste_field_titre($langs->trans("BankAccount"),$_SERVER["PHP_SELF"],"ba.label","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"v.amount","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Sens"),$_SERVER["PHP_SELF"],"v.sens","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-    print "</tr>\n";
+	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
 	// Ref
@@ -174,85 +174,85 @@ if ($result)
 	print '</td>';
 	// Account
 	if (! empty($conf->banque->enabled))
-    {
-	    print '<td class="liste_titre">';
-	    $form->select_comptes($search_account,'search_account',0,'',1);
-	    print '</td>';
-    }
+	{
+		print '<td class="liste_titre">';
+		$form->select_comptes($search_account,'search_account',0,'',1);
+		print '</td>';
+	}
 	// Amount
 	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
 	// Sens
 	print '<td class="liste_titre">&nbsp;</td>';
 
-    print '<td class="liste_titre" align="right">';
-    $searchpicto=$form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    
+	print '<td class="liste_titre" align="right">';
+	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+
 	print "</tr>\n";
 
-    while ($i < min($num,$limit))
-    {
-        $obj = $db->fetch_object($result);
-        
-        print '<tr class="oddeven">';
+	while ($i < min($num,$limit))
+	{
+		$obj = $db->fetch_object($result);
 
-        $variousstatic->id=$obj->rowid;
+		print '<tr class="oddeven">';
+
+		$variousstatic->id=$obj->rowid;
 		$variousstatic->ref=$obj->rowid;
-        // Ref
+		// Ref
 		print "<td>".$variousstatic->getNomUrl(1)."</td>\n";
 		// Label payment
-        print "<td>".dol_trunc($obj->label,40)."</td>\n";
+		print "<td>".dol_trunc($obj->label,40)."</td>\n";
 		// Date payment
-        print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
-        // Type
-        print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+		print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day')."</td>\n";
+		// Type
+		print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
 		// Account
-    	if (! empty($conf->banque->enabled))
-	    {
-	        print '<td>';
-	        if ($obj->fk_bank > 0)
-	        {
-	        	//$accountstatic->fetch($obj->fk_bank);
-	            $accountstatic->id=$obj->bid;
-	            $accountstatic->ref=$obj->bref;
-	            $accountstatic->number=$obj->bnumber;
-	            $accountstatic->accountancy_number=$obj->account_number;
-	            $accountstatic->fk_accountancy_journal=$obj->fk_accountancy_journal;
-	            $accountstatic->label=$obj->blabel;
-	        	print $accountstatic->getNomUrl(1);
-	        }
-	        else print '&nbsp;';
-	        print '</td>';
-	    }
-        // Amount
-        print "<td align=\"right\">".price($obj->amount)."</td>";
-        // Sens
+		if (! empty($conf->banque->enabled))
+		{
+			print '<td>';
+			if ($obj->fk_bank > 0)
+			{
+				//$accountstatic->fetch($obj->fk_bank);
+				$accountstatic->id=$obj->bid;
+				$accountstatic->ref=$obj->bref;
+				$accountstatic->number=$obj->bnumber;
+				$accountstatic->accountancy_number=$obj->account_number;
+				$accountstatic->fk_accountancy_journal=$obj->fk_accountancy_journal;
+				$accountstatic->label=$obj->blabel;
+				print $accountstatic->getNomUrl(1);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
+		// Amount
+		print "<td align=\"right\">".price($obj->amount)."</td>";
+		// Sens
 		if ($obj->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
-        print "<td align=\"right\">".$sens."</td>";
-        print "<td></td>";
-        print "</tr>\n";
+		print "<td align=\"right\">".$sens."</td>";
+		print "<td></td>";
+		print "</tr>\n";
 
-        $total = $total + $obj->amount;
+		$total = $total + $obj->amount;
 
-        $i++;
-    }
+		$i++;
+	}
 
-    $colspan=4;
-    if (! empty($conf->banque->enabled)) $colspan++;
-    print '<tr class="liste_total"><td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
-    print '<td class="liste_total" align="right">'.price($total)."</td>";
+	$colspan=4;
+	if (! empty($conf->banque->enabled)) $colspan++;
+	print '<tr class="liste_total"><td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
+	print '<td class="liste_total" align="right">'.price($total)."</td>";
 	print "<td></td></tr>";
 
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 	print '</form>';
 
-    $db->free($result);
+	$db->free($result);
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 6b42e7ad5009809798bae73d521566caf0a4b9b4..fd4d2a4e7f787dce1bd1d545b421a037eb544799 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -357,6 +357,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		$sql = "SELECT rowid, code, label, nature";
 		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 		$sql.= " WHERE entity = ".$conf->entity;
+		$sql.= " active = 1";
 		$sql.= " ORDER BY label";
 
 		$resql = $db->query($sql);
@@ -373,10 +374,10 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 
 					$nature='';
 					// Must match array $sourceList defined into journals_list.php
-					if ($objp->nature == 2) $nature="sells";
-					if ($objp->nature == 3) $nature="purchases";
-					if ($objp->nature == 4) $nature="bank";
-					if ($objp->nature == 5) $nature="expensereports";
+					if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";
+					if ($objp->nature == 3 && ! empty($conf->fournisseur->enabled)) $nature="purchases";
+					if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
+					if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
 					if ($objp->nature == 1) $nature="various";
 					if ($objp->nature == 9) $nature="hasnew";
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 66bfdcbce87839a616adcf003c5506276dd0219e..d1a26d2de1ca4ef3eff7747d700e77696307df91 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -992,6 +992,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$sql = "SELECT rowid, code, label, nature";
 					$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 					$sql.= " WHERE entity = ".$conf->entity;
+					$sql.= " AND active = 1";
 					$sql.= " ORDER BY label";
 
 					$resql = $db->query($sql);
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 5706307a16c727a6be335dc47f0bb6dc150414d2..c9147419650fd073d1abe41b6f67b628abdb14f0 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -20,7 +20,7 @@
 /**
  *   	\file       htdocs/holiday/list.php
  *		\ingroup    holiday
- *		\brief      List of holiday.
+ *		\brief      List of holiday
  */
 
 require('../main.inc.php');
@@ -63,10 +63,10 @@ $month_start     = GETPOST('month_start');
 $year_start      = GETPOST('year_start');
 $month_end       = GETPOST('month_end');
 $year_end        = GETPOST('year_end');
-$search_employe  = GETPOST('search_employe');
+$search_employee = GETPOST('search_employee');
 $search_valideur = GETPOST('search_valideur');
 $search_statut   = GETPOST('select_statut');
-$type            = GETPOST('type','int');
+$search_type     = GETPOST('search_type','int');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -91,10 +91,10 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$year_start="";
 	$month_end="";
 	$year_end="";
-	$search_employe="";
+	$search_employee="";
 	$search_valideur="";
 	$search_statut="";
-	$type='';
+	$search_type='';
 }
 
 
@@ -121,13 +121,13 @@ llxHeader('', $langs->trans('CPTitreMenu'));
 
 $order = $db->order($sortfield,$sortorder).$db->plimit($limit + 1, $offset);
 
-// WHERE
+// Ref
 if(!empty($search_ref))
 {
     $filter.= " AND cp.rowid LIKE '%".$db->escape($search_ref)."%'\n";
 }
 
-// DATE START
+// Start date
 if($year_start > 0) {
     if($month_start > 0) {
     	$filter .= " AND (cp.date_debut BETWEEN '".$db->idate(dol_get_first_day($year_start,$month_start,1))."' AND '".$db->idate(dol_get_last_day($year_start,$month_start,1))."')";
@@ -142,7 +142,7 @@ if($year_start > 0) {
     }
 }
 
-// DATE FIN
+// End date
 if($year_end > 0) {
     if($month_end > 0) {
     	$filter .= " AND (cp.date_fin BETWEEN '".$db->idate(dol_get_first_day($year_end,$month_end,1))."' AND '".$db->idate(dol_get_last_day($year_end,$month_end,1))."')";
@@ -157,7 +157,7 @@ if($year_end > 0) {
     }
 }
 
-// DATE CREATE
+// Create date
 if($year_create > 0) {
     if($month_create > 0) {
     	$filter .= " AND (cp.date_create BETWEEN '".$db->idate(dol_get_first_day($year_create,$month_create,1))."' AND '".$db->idate(dol_get_last_day($year_create,$month_create,1))."')";
@@ -172,17 +172,22 @@ if($year_create > 0) {
     }
 }
 
-// EMPLOYE
-if(!empty($search_employe) && $search_employe != -1) {
-    $filter.= " AND cp.fk_user = '".$db->escape($search_employe)."'\n";
+// Employee
+if(!empty($search_employee) && $search_employee != -1) {
+    $filter.= " AND cp.fk_user = '".$db->escape($search_employee)."'\n";
 }
 
-// VALIDEUR
+// Validator
 if(!empty($search_valideur) && $search_valideur != -1) {
     $filter.= " AND cp.fk_validator = '".$db->escape($search_valideur)."'\n";
 }
 
-// STATUT
+// Type
+if (!empty($search_type) && $search_type != -1) {
+	$filter.= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
+}
+
+// Status
 if(!empty($search_statut) && $search_statut != -1) {
     $filter.= " AND cp.statut = '".$db->escape($search_statut)."'\n";
 }
@@ -194,7 +199,6 @@ if (!empty($sall))
 
 if (empty($user->rights->holiday->read_all)) $filter.=' AND cp.fk_user IN ('.join(',',$childids).')';
 
-if ($type > 0) $filter.=' AND cp.fk_type IN ('.$db->escape($type).')';
 
 // Récupération de l'ID de l'utilisateur
 $user_id = $user->id;
@@ -297,34 +301,34 @@ if ($sall)
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-// FILTRES
+// Filters
 print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre" align="left">';
 print '<input class="flat" size="4" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 print '</td>';
 
-// DATE CREATE
+// Create date
 print '<td class="liste_titre" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_create" value="'.dol_escape_htmltag($month_create).'">';
 $formother->select_year($year_create,'year_create',1, $min_year, 0);
 print '</td>';
 
-// UTILISATEUR
+// User
 if ($user->rights->holiday->write_all)
 {
     print '<td class="liste_titre maxwidthonsmartphone" align="left">';
-    print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,0,0,'',0,'','maxwidth200');
+    print $form->select_dolusers($search_employee,"search_employee",1,"",0,'','',0,0,0,'',0,'','maxwidth200');
     print '</td>';
 }
 else
 {
     //print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre maxwidthonsmartphone" align="left">';
-    print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,0,0,'',0,'','maxwidth200');
+    print $form->select_dolusers($user->id,"search_employee",1,"",1,'','',0,0,0,'',0,'','maxwidth200');
     print '</td>';
 }
 
-// APPROVER
+// Approve
 if($user->rights->holiday->write_all)
 {
     print '<td class="liste_titre maxwidthonsmartphone" align="left">';
@@ -352,30 +356,30 @@ foreach($typeleaves as $key => $val)
     //$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
     $arraytypeleaves[$val['rowid']]=$labeltoshow;
 }
-print $form->selectarray('type', $arraytypeleaves, (GETPOST('type')?GETPOST('type'):''), 1);
+print $form->selectarray('search_type', $arraytypeleaves, (GETPOST('search_type')?GETPOST('search_type'):''), 1);
 print '</td>';
 
-// DUREE
+// Duration
 print '<td class="liste_titre">&nbsp;</td>';
 
-// DATE DEBUT
+// Start date
 print '<td class="liste_titre" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_start" value="'.dol_escape_htmltag($month_start).'">';
 $formother->select_year($year_start,'year_start',1, $min_year, $max_year);
 print '</td>';
 
-// DATE FIN
+// End date
 print '<td class="liste_titre" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.dol_escape_htmltag($month_end).'">';
 $formother->select_year($year_end,'year_end',1, $min_year, $max_year);
 print '</td>';
 
-// STATUT
+// Status
 print '<td class="liste_titre maxwidthonsmartphone maxwidth200" align="right">';
 $holiday->selectStatutCP($search_statut);
 print '</td>';
 
-// ACTION
+// Actions
 print '<td class="liste_titre" align="right">';
 $searchpicto=$form->showFilterAndCheckAddButtons(0);
 print $searchpicto;
@@ -404,7 +408,7 @@ if (! empty($holiday->holiday))
 
 	foreach($holiday->holiday as $infos_CP)
 	{
-		// Utilisateur
+		// User
 		$userstatic->id=$infos_CP['fk_user'];
 		$userstatic->lastname=$infos_CP['user_lastname'];
 		$userstatic->firstname=$infos_CP['user_firstname'];
@@ -412,7 +416,7 @@ if (! empty($holiday->holiday))
 		$userstatic->statut=$infos_CP['user_statut'];
 		$userstatic->photo=$infos_CP['user_photo'];
 
-		// Valideur
+		// Validator
 		$approbatorstatic->id=$infos_CP['fk_validator'];
 		$approbatorstatic->lastname=$infos_CP['validator_lastname'];
 		$approbatorstatic->firstname=$infos_CP['validator_firstname'];