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

Fix: Amlioration gestion code erreur derniere requete excute

Browse Source
This commit is contained in:
Laurent Destailleur
2006-04-02 02:18:06 +00:00
parent 0c18b66975
commit fa2c01e736
2 changed files with 88 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
htdocs/compta/bank/virement.php
View File

@@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -18,14 +18,13 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
\file htdocs/compta/bank/virement.php \file htdocs/compta/bank/virement.php
\ingroup banque \ingroup banque
\brief Page de saisie d'un virement \brief Page de saisie d'un virement
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@@ -36,53 +35,68 @@ $user->getrights('banque');
if (!$user->rights->banque->modifier) if (!$user->rights->banque->modifier)
accessforbidden(); accessforbidden();
llxHeader();
$html=new Form($db);
/* /*
* Action ajout d'un virement * Action ajout d'un virement
*/ */
if ($_POST["action"] == 'add') if ($_POST["action"] == 'add')
{ {
$mesg=''; $mesg='';
$dateo = $_POST["reyear"]."-".$_POST["remonth"]."-".$_POST["reday"]; $dateo = $_POST["reyear"]."-".$_POST["remonth"]."-".$_POST["reday"];
$label = $_POST["label"]; $label = $_POST["label"];
$amount= $_POST["amount"]; $amount= $_POST["amount"];
if ($label && $amount) { if ($label && $amount)
{
$db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, datev, dateo, label, amount, fk_user_author,fk_account, fk_type)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, datev, dateo, label, amount, fk_user_author,fk_account, fk_type)";
$sql .= " VALUES (now(), '$dateo', '$dateo', '$label', (0 - $amount),$user->id, ".$_POST["account_from"].", 'VIR')"; $sql .= " VALUES (now(), '$dateo', '$dateo', '".addslashes($label)."', (0 - $amount),$user->id, ".$_POST["account_from"].", 'VIR')";
$result = $db->query($sql); $result = $db->query($sql);
if (!$result) if (!$result)
{ {
dolibarr_print_error($db); $db->rollback();
} dolibarr_print_error($db);
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, datev, dateo, label, amount, fk_user_author,fk_account, fk_type)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, datev, dateo, label, amount, fk_user_author,fk_account, fk_type)";
$sql .= " VALUES (now(), '$dateo', '$dateo', '$label', $amount,$user->id, ".$_POST["account_to"].", 'VIR')"; $sql .= " VALUES (now(), '$dateo', '$dateo', '".addslashes($label)."', $amount,$user->id, ".$_POST["account_to"].", 'VIR')";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$accountfrom=new Account($db); $accountfrom=new Account($db);
$accountfrom->fetch($_POST["account_from"]); $accountfrom->fetch($_POST["account_from"]);
$accountto=new Account($db); $accountto=new Account($db);
$accountto->fetch($_POST["account_to"]); $accountto->fetch($_POST["account_to"]);
$mesg.="<div class=\"ok\"><b>Le virement depuis <20>&nbsp;<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>&nbsp;<3B> vers <20>&nbsp;<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>&nbsp;<3B> de ".$amount." ".$langs->trans("Currency".$conf->monnaie)." a <20>t<EFBFBD> cr<63><72>.</b></div>"; $mesg.="<div class=\"ok\">Le virement depuis <20>&nbsp;<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>&nbsp;<3B> vers <20>&nbsp;<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>&nbsp;<3B> de ".$amount." ".$langs->trans("Currency".$conf->monnaie)." a <20>t<EFBFBD> cr<63><72>.</div>";
} $db->commit();
else { }
dolibarr_print_error($db); else
} {
} else { $mesg.="<div class=\"error\">".$db->lasterror()."</div>";
$mesg.="<div class=\"error\"><b>Un libell<6C> de virement et un montant non nul sont obligatoires.</b></div>"; $db->rollback();
} }
}
else
{
$mesg.="<div class=\"error\"><b>Un libell<6C> de virement et un montant non nul sont obligatoires.</b></div>";
}
} }
/*
* Affichage
*/
llxHeader();
$html=new Form($db);
print_titre("Virement inter-compte"); print_titre("Virement inter-compte");
print '<br>'; print '<br>';
@@ -105,7 +119,7 @@ $var=false;
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print "<select class=\"flat\" name=\"account_from\">"; print "<select class=\"flat\" name=\"account_from\">";
$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_account"; $sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_account";
$sql .= " WHERE clos = 0"; $sql.= " WHERE clos = 0";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {

36
htdocs/lib/mysql.lib.php
View File

@@ -48,8 +48,10 @@ class DoliDb
var $database_selected; // 1 si base s<>lectionn<6E>, 0 sinon var $database_selected; // 1 si base s<>lectionn<6E>, 0 sinon
var $database_name; // Nom base s<>lectionn<6E>e var $database_name; // Nom base s<>lectionn<6E>e
var $transaction_opened; // 1 si une transaction est en cours, 0 sinon var $transaction_opened; // 1 si une transaction est en cours, 0 sinon
var $lastquery; var $lastquery; // Derniere requete ex<65>cut<75>e
var $lastqueryerror; // Ajout d'une variable en cas d'erreur var $lastqueryerror; // Derniere requete ex<65>cut<75>e avec echec
var $lasterror; // Message erreur mysql
var $lasterrno; // Message erreur mysql
var $ok; var $ok;
var $error; var $error;
@@ -456,7 +458,12 @@ class DoliDb
if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query)) if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query))
{ {
// Si requete utilisateur, on la sauvegarde ainsi que son resultset // Si requete utilisateur, on la sauvegarde ainsi que son resultset
if (! $ret) $this->lastqueryerror = $query; if (! $ret)
{
$this->lastqueryerror = $query;
$this->lasterror = $this->error();
$this->lasterrno = $this->errno();
}
$this->lastquery=$query; $this->lastquery=$query;
$this->results = $ret; $this->results = $ret;
} }
@@ -660,14 +667,32 @@ class DoliDb
} }
/** /**
\brief Renvoie la derniere requete en erreur() \brief Renvoie la derniere requete en erreur
\return lastqueryerror \return string lastqueryerror
*/ */
function lastqueryerror() function lastqueryerror()
{ {
return $this->lastqueryerror; return $this->lastqueryerror;
} }
/**
\brief Renvoie le libelle derniere erreur
\return string lasterror
*/
function lasterror()
{
return $this->lasterror;
}
/**
\brief Renvoie le code derniere erreur
\return string lasterrno
*/
function lasterrno()
{
return $this->lasterrno;
}
/** /**
\brief Renvoie le code erreur generique de l'operation precedente. \brief Renvoie le code erreur generique de l'operation precedente.
\return error_num (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...) \return error_num (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
@@ -691,7 +716,6 @@ class DoliDb
\brief Renvoie le texte de l'erreur mysql de l'operation precedente. \brief Renvoie le texte de l'erreur mysql de l'operation precedente.
\return error_text \return error_text
*/ */
function error() function error()
{ {
if (! $this->connected) { if (! $this->connected) {