diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index ab6c072b1be..94b7d0f1a2d 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1740,7 +1740,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
 				{
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-					$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_usage_opportunity=1&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
+					$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 					$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
 				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
 					$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index facd5ee1d14..6a800e6bd84 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1535,7 +1535,7 @@ if ($action == 'create')
 						$srcLine = new OrderLine($db);
 						$srcLine->id = $line->id;
 						$srcLine->fetch_optionals(); // fetch extrafields also available in orderline
-						$line->array_options = array_merge($line->array_options, $srcLine->array_options);
+						$expLine->array_options = array_merge($expLine->array_options, $srcLine->array_options);
 
 						print $expLine->showOptionals($extrafields, 'edit', array('style'=>'class="drag drop oddeven"', 'colspan'=>$colspan), $indiceAsked, '', 1);
 					}
diff --git a/htdocs/install/mysql/data/llx_accounting_account_fr.sql b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
index 34e8882609d..d49e509a5be 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@@ -468,7 +468,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  413,'PCG99-BASE','INCOME',    '754', '409', 'Ristournes perçues des coopératives (provenant des excédents)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  414,'PCG99-BASE','INCOME',    '755', '409', 'Quotes-parts de résultat sur opérations faites en commun', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  415,'PCG99-BASE','INCOME',    '758', '409', 'Produits divers de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  416,'PCG99-BASE','INCOME',     'FIN',   '76','1507', 'Produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  416,'PCG99-BASE','INCOME',     '76','1507', 'Produits financiers', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  417,'PCG99-BASE','INCOME',    '761', '416', 'Produits de participations', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  418,'PCG99-BASE','INCOME',    '762', '416', 'Produits des autres immobilisations financières', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  419,'PCG99-BASE','INCOME',    '763', '416', 'Revenus des autres créances', 1);
@@ -476,7 +476,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  421,'PCG99-BASE','INCOME',    '765', '416', 'Escomptes obtenus', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  422,'PCG99-BASE','INCOME',    '766', '416', 'Gains de change', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  423,'PCG99-BASE','INCOME',    '767', '416', 'Produits nets sur cessions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  424,'PCG99-BASE','INCOME',     'FIN',  '768', '416', 'Autres produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  424,'PCG99-BASE','INCOME',    '768', '416', 'Autres produits financiers', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  425,'PCG99-BASE','INCOME',     '77','1507', 'Produits exceptionnels', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  426,'PCG99-BASE','INCOME',    '771', '425', 'Produits exceptionnels sur opérations de gestion', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__,  427,'PCG99-BASE','INCOME',    '772', '425', '(Compte à la disposition des entités pour enregistrer, en cours d''exercice, les produits sur exercices antérieurs)', 1);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 135de158bd4..63bb21527e5 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -419,28 +419,29 @@ $help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
 llxHeader("", $title, $help_url);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($search_all != '') 			$param .= '&search_all='.$search_all;
-if ($search_sday)              		    $param .= '&search_sday='.$search_sday;
-if ($search_smonth)              		$param .= '&search_smonth='.$search_smonth;
-if ($search_syear)               		$param .= '&search_syear='.$search_syear;
-if ($search_eday)               		$param .= '&search_eday='.$search_eday;
-if ($search_emonth)              		$param .= '&search_emonth='.$search_emonth;
-if ($search_eyear)               		$param .= '&search_eyear='.$search_eyear;
-if ($socid)				        $param .= '&socid='.$socid;
-if ($search_ref != '') 			$param .= '&search_ref='.$search_ref;
-if ($search_label != '') 		$param .= '&search_label='.$search_label;
-if ($search_societe != '') 		$param .= '&search_societe='.$search_societe;
-if ($search_status >= 0) 		$param .= '&search_status='.$search_status;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_all != '') 			$param .= '&search_all='.urlencode($search_all);
+if ($search_sday)              		    $param .= '&search_sday='.urlencode($search_sday);
+if ($search_smonth)              		$param .= '&search_smonth='.urlencode($search_smonth);
+if ($search_syear)               		$param .= '&search_syear='.urlencode($search_syear);
+if ($search_eday)               		$param .= '&search_eday='.urlencode($search_eday);
+if ($search_emonth)              		$param .= '&search_emonth='.urlencode($search_emonth);
+if ($search_eyear)               		$param .= '&search_eyear='.urlencode($search_eyear);
+if ($socid)				        $param .= '&socid='.urlencode($socid);
+if ($search_categ)              $param .= '&search_categ='.urlencode($search_categ);
+if ($search_ref != '') 			$param .= '&search_ref='.urlencode($search_ref);
+if ($search_label != '') 		$param .= '&search_label='.urlencode($search_label);
+if ($search_societe != '') 		$param .= '&search_societe='.urlencode($search_societe);
+if ($search_status >= 0) 		$param .= '&search_status='.urlencode($search_status);
 if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'openedopp', 'notopenedopp', 'none'))) 	    $param .= '&search_opp_status='.urlencode($search_opp_status);
 if ($search_opp_percent != '') 	$param .= '&search_opp_percent='.urlencode($search_opp_percent);
-if ($search_public != '') 		$param .= '&search_public='.$search_public;
-if ($search_project_user != '')   $param .= '&search_project_user='.$search_project_user;
-if ($search_sale > 0)    		$param .= '&search_sale='.$search_sale;
-if ($search_opp_amount != '')    $param .= '&search_opp_amount='.$search_opp_amount;
-if ($search_budget_amount != '') $param .= '&search_budget_amount='.$search_budget_amount;
-if ($optioncss != '') $param .= '&optioncss='.$optioncss;
+if ($search_public != '') 		$param .= '&search_public='.urlencode($search_public);
+if ($search_project_user != '')   $param .= '&search_project_user='.urlencode($search_project_user);
+if ($search_sale > 0)    		$param .= '&search_sale='.urlencode($search_sale);
+if ($search_opp_amount != '')    $param .= '&search_opp_amount='.urlencode($search_opp_amount);
+if ($search_budget_amount != '') $param .= '&search_budget_amount='.urlencode($search_budget_amount);
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';