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

Fix: On ne pouvait plus modifier la date de livraison d'une commande

Browse Source
This commit is contained in:
Laurent Destailleur 2006-06-05 23:04:13 +00:00
parent f5debc59da
commit 8ec2c44f3a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1343,10 +1343,11 @@ class Commande
if ($user->rights->commande->creer) if ($user->rights->commande->creer)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."commande"; $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
$sql.= " SET date_livraison = ".' '.($this->date_livraison?$this->db->idate($this->date_livraison):'null'); $sql.= " SET date_livraison = ".($date_livraison ? $this->db->idate($date_livraison) : 'null');
$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
if ($this->db->query($sql) ) $resql=$this->db->query($sql);
if ($resql)
{ {
$this->date_livraison = $date_livraison; $this->date_livraison = $date_livraison;
return 1; return 1;
@ -1354,10 +1355,14 @@ class Commande
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dolibarr_syslog("Commande::set_date_livraison Erreur SQL"); dolibarr_syslog("Commande::set_date_livraison Erreur SQL sql=$sql");
return -1; return -1;
} }
} }
else
{
return -2;
}
} }
/** /**

9
htdocs/commande/fiche.php
View File

@ -85,7 +85,7 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer)
$datecommande=''; $datecommande='';
$datecommande = @mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $datecommande = @mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$datelivraison = @mktime(12, 0, 0, $_POST['liv_month'],$_POST['liv_day'],$_POST['liv_year']); $datelivraison = @mktime(12, 0, 0, $_POST['liv_month'],$_POST['liv_day'],$_POST['liv_year']);
$commande = new Commande($db); $commande = new Commande($db);
$commande->soc_id = $_POST['soc_id']; $commande->soc_id = $_POST['soc_id'];
@ -143,9 +143,14 @@ if ($_POST['action'] == 'setremise' && $user->rights->commande->creer)
if ($_POST['action'] == 'setdate_livraison' && $user->rights->commande->creer) if ($_POST['action'] == 'setdate_livraison' && $user->rights->commande->creer)
{ {
$datelivraison=@mktime(0, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']);
$commande = new Commande($db); $commande = new Commande($db);
$commande->fetch($_GET['id']); $commande->fetch($_GET['id']);
$commande->set_date_livraison($user,mktime(0, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year'])); $result=$commande->set_date_livraison($user,$datelivraison);
if ($result < 0)
{
$mesg='<div class="error">'.$commande->error.'</div>';
}
} }
if ($_POST['action'] == 'setdeliveryadress' && $user->rights->commande->creer) if ($_POST['action'] == 'setdeliveryadress' && $user->rights->commande->creer)