diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 61a216fe5b0..794c9019c86 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -62,8 +62,12 @@ ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is do RelatedShippings=Related shipments ShipmentLine=Shipment line CarrierList=List of transporters -SendingRunning=Product from customer order already sent -SuppliersReceiptRunning=Product from supplier order already received +SendingRunning=Product from ordered customer orders +SuppliersReceiptRunning=Product from ordered supplier orders +ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders +ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders +ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent +ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received # Sending methods SendingMethodCATCH=Catch by customer diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index f49fe2344d7..a1dcd7bc4ef 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -508,24 +508,25 @@ if ($id > 0 || $ref) if (! empty($conf->commande->enabled)) { if ($found) print '
'; else $found=1; - print $langs->trans("CustomersOrdersRunning").': '.$product->stats_commande['qty']; + 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'].')'; } // Number of product from customer order already sent (partial shipping) - if (! empty($conf->expedition->enabled)) { + if (! empty($conf->expedition->enabled)) + { if ($found) print '
'; else $found=1; $result=$product->load_stats_sending(0,'2'); - print $langs->trans("SendingRunning").': '.$product->stats_expedition['qty']; + print $langs->trans("ProductQtyInShipmentAlreadySent").': '.$product->stats_expedition['qty']; } // Number of supplier order running if (! empty($conf->fournisseur->enabled)) { if ($found) print '
'; else $found=1; $result=$product->load_stats_commande_fournisseur(0,'3,4'); - print $langs->trans("SuppliersOrdersRunning").': '.$product->stats_commande_fournisseur['qty']; + 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'].')'; @@ -534,7 +535,7 @@ if ($id > 0 || $ref) // Number of product from supplier order already received (partial receipt) if (! empty($conf->fournisseur->enabled)) { if ($found) print '
'; else $found=1; - print $langs->trans("SuppliersReceiptRunning").': '.$product->stats_reception['qty']; + print $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$product->stats_reception['qty']; } print ''; @@ -599,7 +600,7 @@ if ($id > 0 || $ref) print ''; print ''.$langs->trans("Warehouse").''; print ''; - print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOT("dwid",'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot','int'):'ifone')),'id_entrepot','',1); + print $formproduct->selectWarehouses((GETPOST("dwid")?GETPOST("dwid",'int'):(GETPOST('id_entrepot')?GETPOST('id_entrepot','int'):'ifone')),'id_entrepot','',1); print ''; print ''; print ''; print ''; - print ''; - print ''; print ''; @@ -888,16 +889,17 @@ if ($resql) print '
'; + print ''; $form->select_date($pdluo->eatby,'eatby','','',1,""); print ''; + print ''; $form->select_date($pdluo->sellby,'sellby','','',1,""); print ''.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'
'; } else - { + { print "\n".''; - print 'id.'">'.$langs->trans("StockMovement").''; + print img_picto($langs->trans("Tranfer"),'uparrow','class="hideonsmartphone"').' '; + print 'id.'">'.$langs->trans("StockMovement").''; // Disabled, because edition of stock content must use the "Correct stock menu". // Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ... //print 'id.'#'.$pdluo->id.'">'; //print img_edit().''; print ''.$pdluo->batch.''; - print ''. dol_print_date($pdluo->eatby,'day') .''; - print ''. dol_print_date($pdluo->sellby,'day') .''; + print ''. dol_print_date($pdluo->eatby,'day') .''; + print ''. dol_print_date($pdluo->sellby,'day') .''; print ''.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').''; print ''; }