From 14704c9794ab34cd73f544c8f2354138aecef7cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 14 Jun 2009 21:09:44 +0000
Subject: [PATCH] Fix: Nb of orders to process was wrong
---
ChangeLog | 1 +
htdocs/commande/commande.class.php | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f888839413a..eb2370ddb7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ For users:
- New: Add stock in product lists.
- New: Can filter list of stock movement on date or product.
- 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
characters.
- Fix: Can update price even with "NPR" VAT rates.
diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 746b5f92f39..152cade2970 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -53,7 +53,7 @@ class Commande extends CommonObject
var $contactid;
var $projet_id;
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 $cond_reglement_id;
var $cond_reglement_code;
@@ -278,7 +278,7 @@ class Commande extends CommonObject
{
$mouvP = new MouvementStock($this->db);
// We decrement stock of product (and sub-products)
- $entrepot_id = "1"; // TODO ajouter possibilit� de choisir l'entrepot
+ $entrepot_id = "1"; // TODO ajouter possibilit� de choisir l'entrepot
// 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);
if ($result < 0) { $error++; }
@@ -1889,7 +1889,7 @@ class Commande extends CommonObject
$this->nbtodo=$this->nbtodolate=0;
$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";
if (!$user->rights->societe->client->voir && !$user->societe_id)
{
@@ -1907,7 +1907,7 @@ class Commande extends CommonObject
while ($obj=$this->db->fetch_object($resql))
{
$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;
}
--
GitLab