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

Fix: Nb of orders to process was wrong

Browse Source
This commit is contained in:
Laurent Destailleur 2009-06-14 21:09:44 +00:00
parent cf474fb2cc
commit 14704c9794
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -18,6 +18,7 @@ For users:
- New: Add stock in product lists. - New: Add stock in product lists.
- New: Can filter list of stock movement on date or product. - New: Can filter list of stock movement on date or product.
- New: Added a link from product list to their stock movements. - New: Added a link from product list to their stock movements.
- Fix: Nb of orders to process was wrong.
- Fix: Customer code was not correct on PDF it if contains special - Fix: Customer code was not correct on PDF it if contains special
characters. characters.
- Fix: Can update price even with "NPR" VAT rates. - Fix: Can update price even with "NPR" VAT rates.

8
htdocs/commande/commande.class.php
View File

@ -53,7 +53,7 @@ class Commande extends CommonObject
var $contactid; var $contactid;
var $projet_id; var $projet_id;
var $statut; // -1=Annulee, 0=Brouillon, 1=Validee, 2=Acceptee, 3=Envoyee/Recue (facturee ou non) var $statut; // -1=Annulee, 0=Brouillon, 1=Validee, 2=Acceptee, 3=Envoyee/Recue (facturee ou non)
var $facturee; var $facturee; // Facturee ou non
var $brouillon; var $brouillon;
var $cond_reglement_id; var $cond_reglement_id;
var $cond_reglement_code; var $cond_reglement_code;
@ -278,7 +278,7 @@ class Commande extends CommonObject
{ {
$mouvP = new MouvementStock($this->db); $mouvP = new MouvementStock($this->db);
// We decrement stock of product (and sub-products) // We decrement stock of product (and sub-products)
$entrepot_id = "1"; // TODO ajouter possibilité de choisir l'entrepot $entrepot_id = "1"; // TODO ajouter possibilit<EFBFBD> de choisir l'entrepot
// TODO Add price of product in method or '' to update PMP // TODO Add price of product in method or '' to update PMP
$result=$mouvP->livraison($user, $this->lignes[$i]->fk_product, $entrepot_id, $this->lignes[$i]->qty); $result=$mouvP->livraison($user, $this->lignes[$i]->fk_product, $entrepot_id, $this->lignes[$i]->qty);
if ($result < 0) { $error++; } if ($result < 0) { $error++; }
@ -1889,7 +1889,7 @@ class Commande extends CommonObject
$this->nbtodo=$this->nbtodolate=0; $this->nbtodo=$this->nbtodolate=0;
$clause = " WHERE"; $clause = " WHERE";
$sql = "SELECT c.rowid, c.date_creation as datec"; $sql = "SELECT c.rowid, c.date_creation as datec, c.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
if (!$user->rights->societe->client->voir && !$user->societe_id) if (!$user->rights->societe->client->voir && !$user->societe_id)
{ {
@ -1907,7 +1907,7 @@ class Commande extends CommonObject
while ($obj=$this->db->fetch_object($resql)) while ($obj=$this->db->fetch_object($resql))
{ {
$this->nbtodo++; $this->nbtodo++;
if ($this->db->jdate($obj->datec) < ($now - $conf->commande->traitement->warning_delay)) $this->nbtodolate++; if ($obj->fk_statut != 3 && $this->db->jdate($obj->datec) < ($now - $conf->commande->traitement->warning_delay)) $this->nbtodolate++;
} }
return 1; return 1;
} }