From af89a794a04846903e7d60d56c330bbf84a96463 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Tue, 10 Sep 2013 11:04:36 +0200
Subject: [PATCH] Fix: [ bug #1061 ] Bad info shipped products

---
 ChangeLog                                | 2 ++
 htdocs/commande/class/commande.class.php | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e3cb1c15bb..2910fd07178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -123,8 +123,10 @@ Fix: Intervention box links to contracts id
 Fix: Compatiblity with multicompany module
 Fix: Edit propal line was losing product supplier price id
 Fix: Delete linked element to supplier invoice when deleted 
+Fix: [ bug #1061 ] Bad info shipped products
 Qual: Add travis-ci integration
 
+
 ***** ChangeLog for 3.4 compared to 3.3.* *****
 For users:
 - New: Can use ODS templates as document templates.
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5a4ba72be04..841dc619659 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3,10 +3,10 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011      Jean Heimburger      <jean@tiaris.info>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
- * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU  *General Public License as published by
@@ -1602,7 +1602,7 @@ class Commande extends CommonOrder
         if ($filtre_statut >= 0) $sql.= ' ed.fk_expedition = e.rowid AND';
         $sql.= ' ed.fk_origin_line = cd.rowid';
         $sql.= ' AND cd.fk_commande =' .$this->id;
-        if ($filtre_statut >= 0) $sql.=' AND e.fk_statut = '.$filtre_statut;
+        if ($filtre_statut >= 0) $sql.=' AND e.fk_statut >= '.$filtre_statut;
         $sql.= ' GROUP BY cd.rowid, cd.fk_product';
         //print $sql;