diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 4e834c5d112d259ed93d599e1a994a38dc60d405..6f9122cf0467df4c6d146358681fbdb09afe3eb2 100755 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -92,11 +92,13 @@ ActionsOnOrder=Actions on order NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order OrderMode=Order method AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process + Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' -UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address # Sources OrderSource0=Commercial proposal diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index b4a4cda3225ab4143bc6aa1503242a8036578713..b59c74ae46ab43f6143f80c8846f8d35d8d1ba26 100755 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -92,11 +92,13 @@ ActionsOnOrder=Actions sur la commande NoArticleOfTypeProduct=Pas d'article de type 'produit' et donc exp�diable dans cette commande OrderMode=M�thode de commande AuthorRequest=Auteur/Demandeur +UseCustomerContactAsOrderRecipientIfExist=Utiliser adresse contact suivi client si d�fini plutot que adresse tiers comme destinataire des commandes +RunningOrders=Commandes en cours + Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON non d�finie Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON non d�finie Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Echec chargement du fichier module '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Echec chargement du fichier module '%s' -UseCustomerContactAsOrderRecipientIfExist=Utiliser adresse contact suivi client si d�fini plutot que adresse tiers comme destinataire des commandes # Sources OrderSource0=Proposition commerciale diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 3338e5bd1b804fcb802747af2df99eff334ddbd7..fcfa18ccdfd931850bb5f5cea88ba70c264233ae 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -21,10 +21,10 @@ */ /** - \file htdocs/product/stock/product.php - \ingroup product - \brief Page de la fiche stock d'un produit - \version $Id$ + * \file htdocs/product/stock/product.php + * \ingroup product + * \brief Page de la fiche stock d'un produit + * \version $Id$ */ require("./pre.inc.php"); @@ -178,33 +178,34 @@ if ($_GET["id"] || $_GET["ref"]) print '</td>'; print '</tr>'; - if ($product->stock_theorique != $product->stock_reel) - { - print '<tr><td>'.$langs->trans("StockDiffPhysicTeoric").'</td>'; - print '<td>'; - $found=0; + print '<tr><td>'; + if ($product->stock_theorique != $product->stock_reel) print $langs->trans("StockDiffPhysicTeoric"); + else print $langs->trans("RunningOrders"); + print '</td>'; + print '<td>'; + + $found=0; - // Nbre de commande clients en cours - if ($conf->commande->enabled) - { - if ($found) print '<br>'; else $found=1; - print $langs->trans("CustomersOrdersRunning").': '.$stock_commande_client; - $result=$product->load_stats_commande(0,'0,1'); - if ($result < 0) dolibarr_print_error($db,$product->error); - print ' ('.$langs->trans("DraftOrWaitingShipped").': '.$product->stats_commande['qty'].')'; - } - - // Nbre de commande fournisseurs en cours - if ($conf->fournisseur->enabled) - { - if ($found) print '<br>'; else $found=1; - print $langs->trans("SuppliersOrdersRunning").': '.$stock_commande_fournisseur; - $result=$product->load_stats_commande_fournisseur(0,'0,1,2'); - if ($result < 0) dolibarr_print_error($db,$product->error); - print ' ('.$langs->trans("DraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')'; - } - print '</td></tr>'; + // Nbre de commande clients en cours + if ($conf->commande->enabled) + { + if ($found) print '<br>'; else $found=1; + print $langs->trans("CustomersOrdersRunning").': '.$stock_commande_client; + $result=$product->load_stats_commande(0,'0,1'); + if ($result < 0) dolibarr_print_error($db,$product->error); + print ' ('.$langs->trans("DraftOrWaitingShipped").': '.$product->stats_commande['qty'].')'; + } + + // Nbre de commande fournisseurs en cours + if ($conf->fournisseur->enabled) + { + if ($found) print '<br>'; else $found=1; + print $langs->trans("SuppliersOrdersRunning").': '.$stock_commande_fournisseur; + $result=$product->load_stats_commande_fournisseur(0,'0,1,2'); + if ($result < 0) dolibarr_print_error($db,$product->error); + print ' ('.$langs->trans("DraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')'; } + print '</td></tr>'; } // Stock