From d7024eeee82da709150847e3c1f922e4d2214f9e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 9 Dec 2007 00:18:32 +0000 Subject: [PATCH] =?UTF-8?q?D=E9but=20changement=20d=E9finition=20du=20stoc?= =?UTF-8?q?k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/langs/en_US/stocks.lang | 6 +++++- htdocs/langs/fr_FR/stocks.lang | 6 +++++- htdocs/product/reassort.php | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index ddc2da14ff6..8771568d981 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -45,4 +45,8 @@ StockLimitShort=Limit StockLimit=Stock limit PhysicalStock=Physical stock RealStock=Real Stock -TheoreticalStock=Stock théorique \ No newline at end of file +TheoreticalStock=Stock théorique +MininumStock=Minimum stock +StockUp=Stock up +MininumStockShort=Stock min +StockUpShort=Stock up \ No newline at end of file diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index b8c926d8dbb..560d6baee60 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -45,4 +45,8 @@ StockLimitShort=Seuil StockLimit=Seuil stock PhysicalStock=Stock physique RealStock=Stock réel -TheoreticalStock=Stock théorique \ No newline at end of file +TheoreticalStock=Stock théorique +MininumStock=Stock minimum +StockUp=Stock maximum +MininumStockShort=Stock min +StockUpShort=Stock max \ No newline at end of file diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index bb61714d265..a2607421b7a 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -51,7 +51,7 @@ $type=trim($type); $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; -if (! $sortfield) $sortfield="stock_real"; +if (! $sortfield) $sortfield="stock_theorique"; if (! $sortorder) $sortorder="ASC"; $page = $_GET["page"]; $limit = $conf->liste_limit; @@ -192,7 +192,7 @@ if ($resql) print_liste_field_titre($langs->trans("TheoreticalStock"),"reassort.php", "stock_theorique","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); if ($conf->service->enabled && $type == 1) print_liste_field_titre($langs->trans("Duration"),"reassort.php", "p.duration","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("PhysicalStock"),"reassort.php", "stock_physique","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("StockLimit"),"reassort.php", "p.seuil_stock_alerte","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("MininumStockShort"),"reassort.php", "p.seuil_stock_alerte","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),"reassort.php", "p.envente","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield,$sortorder); print "\n";