diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index d234eed3ffc..6b294125ca0 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -43,4 +43,5 @@ DeStockReStockOnValidateOrder=Decrease/increase stocks on orders notes DeStockReStockOnShipment=Decrease/increase stocks on shipment StockAvailable=Available stock StockInstant=Real stock -StockLimit=Limit +StockLimitShort=Limit +StockLimit=Stock limit diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index 1aaf5f2f349..9fbf18f7955 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -43,4 +43,5 @@ DeStockReStockOnValidateOrder=D DeStockReStockOnShipment=Décrémente/Incrémente les stocks sur les expéditions StockAvailable=Stock disponible StockInstant=Stock actuel -StockLimit=Seuil \ No newline at end of file +StockLimitShort=Seuil +StockLimit=Seuil stock \ No newline at end of file diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 66209fded45..29e1b4b325f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -493,10 +493,11 @@ if ($_POST["action"] == 'addinfacture' && $user->rights->facture->creer) '', '', '', + '', $price_base_type, $pu_ttc ); - + if ($result > 0) { Header("Location: ".DOL_URL_ROOT."/compta/facture.php?facid=".$facture->id); @@ -609,7 +610,7 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer) // Stock min level if ($_GET["type"] != 1 && $conf->stock->enabled) { - print '