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

Fix: In board we show all status different of "processed".

Browse Source
This commit is contained in:
Laurent Destailleur 2008-08-07 20:29:46 +00:00
parent d00f32710b
commit bf45b7340a
2 changed files with 1281 additions and 1282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,10 @@
*/ */
/** /**
\file htdocs/commande/commande.class.php * \file htdocs/commande/commande.class.php
\ingroup commande * \ingroup commande
\brief Fichier des classes de commandes * \brief Fichier des classes de commandes
\version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
@ -31,8 +31,8 @@ require_once(DOL_DOCUMENT_ROOT."/product.class.php");
/** /**
\class Commande * \class Commande
\brief Class to manage orders * \brief Class to manage orders
*/ */
class Commande extends CommonObject class Commande extends CommonObject
{ {
@ -96,8 +96,8 @@ class Commande extends CommonObject
/** \brief Cree la commande depuis une propale existante /** \brief Cree la commande depuis une propale existante
\param user Utilisateur qui cree * \param user Utilisateur qui cree
\param propale_id id de la propale qui sert de modele * \param propale_id id de la propale qui sert de modele
*/ */
function create_from_propale($user, $propale_id) function create_from_propale($user, $propale_id)
{ {
@ -1776,7 +1776,7 @@ class Commande extends CommonObject
$sql.= " WHERE sc.fk_user = " .$user->id; $sql.= " WHERE sc.fk_user = " .$user->id;
$clause = "AND"; $clause = "AND";
} }
$sql.= ' '.$clause.' c.fk_statut BETWEEN 1 AND 2'; $sql.= ' '.$clause.' (c.fk_statut BETWEEN 1 AND 2 or (c.fk_statut = 3 AND c.facture = 0))';
if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id; if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)

11
htdocs/includes/modules/modCommande.class.php
View File

@ -19,12 +19,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** \defgroup commande Module commande /** \defgroup commande Module commande
\brief Module pour g<EFBFBD>rer le suivi des commandes \brief Module pour gerer le suivi des commandes
\version $Id$
*/ */
/** /**
@ -35,10 +34,10 @@
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** \class modCommande /** \class modCommande
\brief Classe de description et activation du module Commande \brief Classe de description et activation du module Commande
*/ */
class modCommande extends DolibarrModules class modCommande extends DolibarrModules
{ {
@ -105,7 +104,7 @@ class modCommande extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 82; $this->rights[$r][0] = 82;
$this->rights[$r][1] = 'Cr<EFBFBD>er modifier les commandes clients'; $this->rights[$r][1] = 'Creer/modifier les commandes clients';
$this->rights[$r][2] = 'w'; $this->rights[$r][2] = 'w';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'creer'; $this->rights[$r][4] = 'creer';
@ -126,7 +125,7 @@ class modCommande extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 87; $this->rights[$r][0] = 87;
$this->rights[$r][1] = 'Cl<EFBFBD>turer les commandes clients'; $this->rights[$r][1] = 'Cloturer les commandes clients';
$this->rights[$r][2] = 'd'; $this->rights[$r][2] = 'd';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'cloturer'; $this->rights[$r][4] = 'cloturer';