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

Fix: on inclus les commandes clients valides pas encore expdies dans l'onglet stock

Browse Source
This commit is contained in:
Regis Houssin 2007-12-08 22:35:30 +00:00
parent bda79cba8f
commit 5564915254
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ StatusOrderRefused=Refused
StatusOrderReceivedPartially=Partially received StatusOrderReceivedPartially=Partially received
StatusOrderReceivedAll=Everything received StatusOrderReceivedAll=Everything received
DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingApproved=Draft or approved not yet ordered
DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders to bill MenuOrdersToBill=Orders to bill
SearchOrder=Search order SearchOrder=Search order
Sending=Sending Sending=Sending

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

@ -40,6 +40,7 @@ StatusOrderRefused=Refus
StatusOrderReceivedPartially=Reçu partiellement StatusOrderReceivedPartially=Reçu partiellement
StatusOrderReceivedAll=Reçu complètement StatusOrderReceivedAll=Reçu complètement
DraftOrWaitingApproved=Brouillon ou approuvée pas encore commandée DraftOrWaitingApproved=Brouillon ou approuvée pas encore commandée
DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
SearchOrder=Rechercher une commande SearchOrder=Rechercher une commande
MenuOrdersToBill=Commandes à facturer MenuOrdersToBill=Commandes à facturer
Sending=Expédition Sending=Expédition

2
htdocs/product.class.php
View File

@ -1059,7 +1059,7 @@ class Product extends CommonObject
if ($filtrestatut <> '') if ($filtrestatut <> '')
{ {
$sql.= " AND c.fk_statut = ".$filtrestatut; $sql.= " AND c.fk_statut in (".$filtrestatut.")";
} }
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;

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

@ -164,9 +164,9 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("CustomersOrdersRunning").'</td>'; print '<tr><td>'.$langs->trans("CustomersOrdersRunning").'</td>';
print '<td>'; print '<td>';
print $product->stats_commande['qty']; print $product->stats_commande['qty'];
$result=$product->load_stats_commande(0,'0'); $result=$product->load_stats_commande(0,'0,1');
if ($result < 0) dolibarr_print_error($db,$product->error); if ($result < 0) dolibarr_print_error($db,$product->error);
print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')'; print ' ('.$langs->trans("DraftOrWaitingShipped").': '.$product->stats_commande['qty'].')';
print '</td></tr>'; print '</td></tr>';
} }