From b554d81314dd82ca5abab8d318cd9c4f100af63f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 May 2015 10:47:26 +0200
Subject: [PATCH] Better translation

---
 htdocs/langs/en_US/stocks.lang |  3 ++-
 htdocs/user/index.php          | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 924878973bb..69b0027139b 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -95,7 +95,8 @@ SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
 LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
+DesiredStock=Desired minimum stock
+DesiredMaxStock=Desired maximum stock
 StockToBuy=To order
 Replenishment=Replenishment
 ReplenishmentOrders=Replenishment orders
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 57c65cbe893..4054c7d369a 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -41,6 +41,9 @@ if ($user->societe_id > 0)
 
 $sall=GETPOST('sall','alpha');
 $search_user=GETPOST('search_user','alpha');
+$search_login=GETPOST('search_login','alpha');
+$search_lastname=GETPOST('search_lastname','alpha');
+$search_firstname=GETPOST('search_firstname','alpha');
 $search_statut=GETPOST('search_statut','alpha');
 
 $sortfield = GETPOST('sortfield','alpha');
@@ -90,6 +93,9 @@ if (! empty($search_user))
 {
     $sql.= " AND (u.login LIKE '%".$db->escape($search_user)."%' OR u.lastname LIKE '%".$db->escape($search_user)."%' OR u.firstname LIKE '%".$db->escape($search_user)."%')";
 }
+if ($search_login != '') $sql.= natural_search("u.login", $search_login);
+if ($search_lastname != '') $sql.= natural_search("u.lastname", $search_lastname);
+if ($search_firstname != '') $sql.= natural_search("u.firstname", $search_firstname);
 if ($search_statut != '' && $search_statut >= 0)
 {
 	$sql.= " AND (u.statut=".$search_statut.")";
@@ -122,13 +128,16 @@ if ($result)
     print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="center"',$sortfield,$sortorder);
-    print '<td width="1%">&nbsp;</td>';
+    print_liste_field_titre('');
     print "</tr>\n";
 
     // SearchBar
-    $colspan=7;
+    $colspan=4;
     if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) $colspan++;
     print '<tr class="liste_titre">';
+    print '<td><input type="text" name="search_login" size="6" value="'.$search_login.'"></td>';
+    print '<td><input type="text" name="search_lastname" size="6" value="'.$search_lastname.'"></td>';
+    print '<td><input type="text" name="search_firstname" size="6" value="'.$search_firstname.'"></td>';
     print '<td colspan="'.$colspan.'">&nbsp;</td>';
 
 	// Status