Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Error in deleting customer order

Browse Source
This commit is contained in:
Laurent Destailleur
2010-02-20 18:43:33 +00:00
parent 770055cd26
commit 1f8e2aa660
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1866,29 +1866,35 @@ class Commande extends CommonObject
*/
function delete($user)
{
global $conf, $lang;
global $conf, $langs;
$err = 0;
$this->db->begin();
$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
dol_syslog("Commande::delete sql=".$sql);
if (! $this->db->query($sql) )
{
dol_syslog("Commande::delete error", LOG_ERR);
$err++;
}
$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
dol_syslog("Commande::delete sql=".$sql);
if (! $this->db->query($sql) )
{
dol_syslog("Commande::delete error", LOG_ERR);
$err++;
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
$sql.= " WHERE fk_target = ".$this->id;
$sql.= " AND targettype = '".$this->element."'";
dol_syslog("Commande::delete sql=".$sql);
if (! $this->db->query($sql) )
{
dol_syslog("Commande::delete error", LOG_ERR);
$err++;
}

17
htdocs/commande/fiche.php
View File

@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
@@ -23,7 +23,7 @@
/**
* \file htdocs/commande/fiche.php
* \ingroup commande
* \brief Fiche commande client
* \brief Page to show customer order
* \version $Id$
*/
@@ -93,14 +93,21 @@ if ($_REQUEST["action"] == 'confirm_clone' && $_REQUEST['confirm'] == 'yes')
// Suppression de la commande
if ($_REQUEST['action'] == 'confirm_delete' && $_REQUEST['confirm'] == 'yes')
{
if ($user->rights->commande->supprimer )
if ($user->rights->commande->supprimer)
{
$commande = new Commande($db);
$commande->fetch($_GET['id']);
$commande->delete($user);
$result=$commande->delete($user);
if ($result > 0)
{
Header('Location: index.php');
exit;
}
else
{
$mesg=$commande->error;
}
}
}
/*
@@ -140,7 +147,7 @@ if ($_POST['action'] == 'classin')
$commande->setProject($_POST['projetid']);
}
// Ajout commande
// Add order
if ($_POST['action'] == 'add' && $user->rights->commande->creer)
{
$datecommande='';