From 206a453ce281f8d5c9f0deeac660d4cda010ef4c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 12 Feb 2015 15:40:06 +0100 Subject: [PATCH] Solve confusion into number of order or qty into order. --- htdocs/langs/en_US/orders.lang | 2 ++ htdocs/product/stock/product.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index e8c0556d550..27b6cda3a3e 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -50,6 +50,8 @@ StatusOrderRefused=Refused StatusOrderReceivedPartially=Partially received StatusOrderReceivedAll=Everything received ShippingExist=A shipment exists +ProductQtyInDraft=Product quantity into draft orders +ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Orders delivered diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 06e48bd610a..d94c2f994d7 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -438,7 +438,7 @@ if ($id > 0 || $ref) print $langs->trans("ProductQtyInCustomersOrdersRunning").': '.$product->stats_commande['qty']; $result=$product->load_stats_commande(0,'0'); if ($result < 0) dol_print_error($db,$product->error); - print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')'; + print ' ('.$langs->trans("ProductQtyInDraft").': '.$product->stats_commande['qty'].')'; } // Number of product from customer order already sent (partial shipping) @@ -456,7 +456,7 @@ if ($id > 0 || $ref) print $langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$product->stats_commande_fournisseur['qty']; $result=$product->load_stats_commande_fournisseur(0,'0,1,2'); if ($result < 0) dol_print_error($db,$product->error); - print ' ('.$langs->trans("DraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')'; + print ' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')'; } // Number of product from supplier order already received (partial receipt)