lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show orders on process even if physical stock differs from theorical stock

Browse Source
This commit is contained in:
Laurent Destailleur 2008-08-27 17:45:41 +00:00
parent 76ba8b29a2
commit a0f5d2fa8b
3 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/langs/en_US/orders.lang
View File

@ -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

4
htdocs/langs/fr_FR/orders.lang
View File

@ -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

59
htdocs/product/stock/product.php
View File

@ -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