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

Fix: Delivery date was set to '' instead of null when creating an order

Browse Source
This commit is contained in:
Laurent Destailleur 2008-02-24 15:00:07 +00:00
parent 4c96e42021
commit 8ce7d5193f
4 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
*
@ -17,15 +17,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/
/**
\file htdocs/commande/commande.class.php
\ingroup commande
\brief Fichier des classes de commandes
\version $Revision$
\version $Id$
*/
require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
@ -34,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/product.class.php");
/**
\class Commande
\brief Classe de gestion de commande
\brief Class to manage orders
*/
class Commande extends CommonObject
{
@ -104,7 +102,7 @@ class Commande extends CommonObject
*/
function create_from_propale($user, $propale_id)
{
dolibarr_syslog("Commande.class.php::create_from_propale propale_id=$propale_id");
dolibarr_syslog("Commande.class::create_from_propale propale_id=$propale_id");
$propal = new Propal($this->db);
$propal->fetch($propale_id);
@ -476,13 +474,13 @@ class Commande extends CommonObject
// Nettoyage parametres
$this->brouillon = 1; // On positionne en mode brouillon la commande
dolibarr_syslog("Commande.class.php::create");
dolibarr_syslog("Commande.class::create");
// Vérification paramètres
if ($this->source < 0)
{
$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Source"));
dolibarr_syslog("Commande.class.php::create ".$this->error, LOG_ERR);
dolibarr_syslog("Commande.class::create ".$this->error, LOG_ERR);
return -1;
}
if (! $remise) $remise=0;
@ -493,7 +491,7 @@ class Commande extends CommonObject
if ($result < 0)
{
$this->error="Failed to fetch company";
dolibarr_syslog("Commande.class.php::create ".$this->error, LOG_ERR);
dolibarr_syslog("Commande.class::create ".$this->error, LOG_ERR);
return -2;
}
@ -509,13 +507,12 @@ class Commande extends CommonObject
$sql.= " '".addslashes($this->note)."', ";
$sql.= " '".addslashes($this->note_public)."', ";
$sql.= " '".addslashes($this->ref_client)."', '".$this->modelpdf."', '".$this->cond_reglement_id."', '".$this->mode_reglement_id."',";
$sql.= " '".($this->date_livraison?$this->db->idate($this->date_livraison):'')."',";
$sql.= " ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null").",";
$sql.= " '".$this->adresse_livraison_id."',";
$sql.= " '".$this->remise_absolue."',";
$sql.= " '".$this->remise_percent."')";
dolibarr_syslog("Commande.class.php::create sql=".$sql);
dolibarr_syslog("Commande::create sql=".$sql);
$resql=$this->db->query($sql);
if ($resql)
{
@ -2389,8 +2386,8 @@ class CommandeLigne
}
/**
* \brief Recupére l'objet ligne de commande
* \param rowid id de la ligne de commande
* \brief Load line order
* \param rowid id line order
*/
function fetch($rowid)
{

2
htdocs/commonobject.class.php
View File

@ -527,7 +527,9 @@ class CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
$sql.= " WHERE ".$fieldid." > '".addslashes($this->ref)."'";
if (isset($filter)) $sql.=" AND ".$filter;
// Rem: Bug in some mysql version: SELECT rowid FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
//print $sql;
$result = $this->db->query($sql) ;
if (! $result)
{

6
htdocs/compta/commande/fiche.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -16,15 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/
/**
\file htdocs/compta/commande/fiche.php
\ingroup commande
\brief Fiche commande
\version $Revision$
\version $Id$
*/
require("./pre.inc.php");

11
htdocs/contact/fiche.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
@ -18,15 +18,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/
/**
\file htdocs/contact/fiche.php
\ingroup societe
\brief Onglet général d'un contact
\version $Revision$
\version $Id$
*/
require("./pre.inc.php");
@ -206,9 +204,8 @@ if ($user->rights->societe->contact->creer)
/*
*
*
*/
* View
*/
llxHeader();