Fix lost search value in list if come from thirdparty card

Dolibarr · Jul 17, 2017 · 885fc3c · 885fc3c
1 parent 4e45c7f
commit 885fc3c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
@@ -353,6 +353,7 @@
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfProposals') . ' - '.$soc->name;
+		if (empty($search_societe)) $search_societe = $soc->name;
 	}
 	else
 	{

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
@@ -578,6 +578,7 @@
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfOrders') . ' - '.$soc->name;
+		if (empty($search_company)) $search_company = $soc->name;
 	}
 	else
 	{

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
@@ -423,6 +423,7 @@
     {
         $soc = new Societe($db);
         $soc->fetch($socid);
+		if (empty($search_societe)) $search_societe = $soc->name;
     }
 
     $param='&socid='.$socid;

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
@@ -306,6 +306,13 @@
 
     $arrayofselected=is_array($toselect)?$toselect:array();
 
+	if ($socid)
+	{
+		$soc = new Societe($db);
+		$soc->fetch($socid);
+		if (empty($search_name)) $search_name = $soc->name;
+	}
+
     $param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
     if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
@@ -211,7 +211,14 @@
 if ($result)
 {
 	$num = $db->num_rows($result);
-
+
+	if ($socid)
+	{
+		$soc = new Societe($db);
+		$soc->fetch($socid);
+		if (empty($search_company)) $search_company = $soc->name;
+	}
+
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
@@ -394,6 +394,7 @@
 	{
 		$soc = new Societe($db);
 		$soc->fetch($socid);
+		if (empty($search_societe)) $search_societe = $soc->name;
 	}
 
 	$param='&socid='.$socid;