From 5f526fd84a232eb766d6cafcd41d306c14861346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Salvador?= Date: Mon, 10 Jun 2013 17:20:49 +0200 Subject: [PATCH] separated replenishment configuration --- htdocs/admin/stock.php | 32 +++++++++++++++++++------------- htdocs/langs/en_US/stocks.lang | 1 + htdocs/langs/fr_FR/stocks.lang | 1 + 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index cbd7e46fd05..54221551469 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -142,19 +142,6 @@ print '' print ''; print "\n"; print "\n"; - -print ""; -print ''.$langs->trans("UseVirtualStock").''; -print ''; -print "
"; -print ''; -print ""; -print $form->selectyesno("USE_VIRTUAL_STOCK",$conf->global->USE_VIRTUAL_STOCK,1); -print ''; -print '
'; -print "\n"; -print "\n"; - print '
'; print ''; print '
'; @@ -262,6 +249,25 @@ if (! empty($conf->fournisseur->enabled)) print ''; +print '
'; +print ''; +print ''; +print " \n"; +print " \n"; +print ''."\n"; +print ""; +print ''; +print '\n"; +print "\n"; +print '
".$langs->trans("RuleForStockReplenishment")." 
'.$langs->trans("UseVirtualStock").''; +print "
"; +print ''; +print ""; +print $form->selectyesno("USE_VIRTUAL_STOCK",$conf->global->USE_VIRTUAL_STOCK,1); +print ''; +print '
'; +print "
'; + dol_htmloutput_mesg($mesg); $db->close(); diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index d36fe6d9121..a178c416fb3 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -93,3 +93,4 @@ StockToBuy=Stock to buy Replenishment=Replenishment ReplenishmentOrders=Replenishment orders UseVirtualStock=Use virtual stock instead of physical stock +RuleForStockReplenishment=Rule for stocks replenishment diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index e7859b0fd52..b7cbf9344ae 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -93,3 +93,4 @@ StockToBuy=Stock à acheter Replenishment=Réapprovisionnement ReplenishmentOrders=Commandes de réapprovisionnement UseVirtualStock=Utiliser le stock théorique à la place du stock physique +RuleForStockReplenishment=Règle de gestion du réapprovisionnement des stocks