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

Fix: register_globals=off

Browse Source 
New: Test de la cl RIB galement en modif.
This commit is contained in:
Laurent Destailleur 2004-08-03 21:17:01 +00:00
parent 6518fad4b2
commit 012fe67120
2 changed files with 85 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
htdocs/compta/bank/account.class.php
View File

@ -42,10 +42,12 @@ class Account
{ {
global $config; global $config;
$this->clos = 0;
$this->db = $DB; $this->db = $DB;
$this->rowid = $rowid; $this->rowid = $rowid;
$this->clos = 0;
$this->solde = 0; $this->solde = 0;
return 1; return 1;
} }
@ -169,7 +171,7 @@ class Account
} }
else else
{ {
print $this->db->error().' in '.$sql; dolibarr_print_error($this->db);
return ''; return '';
} }
} }
@ -186,7 +188,7 @@ class Account
if (! verif_rib($this->code_banque,$this->code_guichet,$this->number,$this->cle_rib)) { if (! verif_rib($this->code_banque,$this->code_guichet,$this->number,$this->cle_rib)) {
$this->error="Le contrôle de la clé indique que les informations de votre compte bancaire sont incorrectes."; $this->error="Le contrôle de la clé indique que les informations de votre compte bancaire sont incorrectes.";
return false; return 0;
} }
if (! $pcgnumber) { if (! $pcgnumber) {
@ -213,7 +215,8 @@ class Account
} }
else else
{ {
print $this->db->error(); dolibarr_print_error($this->db);
return 0;
} }
} }
@ -221,19 +224,17 @@ class Account
* *
* *
*/ */
Function error() Function update($user='')
{ {
return $this->error; // Chargement librairie pour acces fonction controle RIB
} require_once DOL_DOCUMENT_ROOT . '/compta/bank/bank.lib.php';
/* if (! verif_rib($this->code_banque,$this->code_guichet,$this->number,$this->cle_rib)) {
* $this->error="Le contrôle de la clé indique que les informations de votre compte bancaire sont incorrectes.";
* return 0;
*/ }
Function update()
{ if (! $this->label) $this->label = "???";
if (strlen($this->label)==0)
$this->label = "???";
$sql = "UPDATE ".MAIN_DB_PREFIX."bank_account SET "; $sql = "UPDATE ".MAIN_DB_PREFIX."bank_account SET ";
@ -252,24 +253,21 @@ class Account
$sql .= ",courant = ".$this->courant; $sql .= ",courant = ".$this->courant;
$sql .= ",clos = ".$this->clos; $sql .= ",clos = ".$this->clos;
$sql .= " WHERE rowid = $this->id"; $sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
if ($this->db->affected_rows()) return 1;
{
return 1;
}
} }
else else
{ {
print $this->db->error(); dolibarr_print_error($this->db);
print "<p>$sql</p>";
return 0; return 0;
} }
} }
/* /*
* *
* *
@ -306,9 +304,19 @@ class Account
} }
else else
{ {
print $this->db->error(); dolibarr_print_error($this->db);
} }
} }
/*
*
*
*/
Function error()
{
return $this->error;
}
/* /*
* *
* *

99
htdocs/compta/bank/fiche.php
View File

@ -22,22 +22,24 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
$user->getrights('compta'); $user->getrights('banque');
if (!$user->admin && !$user->rights->compta->bank) if (!$user->admin && !$user->rights->banque)
accessforbidden(); accessforbidden();
llxHeader(); llxHeader();
if ($_POST["action"] == 'add') if ($_POST["action"] == 'add')
{ {
// Creation compte
$account = new Account($db,0); $account = new Account($db,0);
$account->bank = $_POST["bank"]; $account->bank = $_POST["bank"];
$account->label = $_POST["label"]; $account->label = $_POST["label"];
$account->courant = $_POST["courant"]=='yes'?1:0; $account->courant = $_POST["courant"];
$account->clos = $_POST["clos"]; $account->clos = $_POST["clos"];
$account->code_banque = $_POST["code_banque"]; $account->code_banque = $_POST["code_banque"];
@ -57,17 +59,18 @@ if ($_POST["action"] == 'add')
$id = $account->create($user->id); $id = $account->create($user->id);
if (! $id) { if (! $id) {
$message=$account->error(); $message=$account->error();
$_GET["action"]='create'; // Force chargement page creation $_GET["action"]='create'; // Force chargement page en mode creation
} }
else { else {
$_GET["id"]=$id; // Force chargement page en mode edition $_GET["id"]=$id; // Force chargement page en mode visu
} }
} }
if ($_POST["action"] == 'update') if ($_POST["action"] == 'update' && ! $_POST["cancel"])
{ {
$account = new Account($db, $_GET["id"]); // Modification
$account->fetch($_GET["id"]); $account = new Account($db, $_POST["id"]);
$account->fetch($_POST["id"]);
$account->bank = $_POST["bank"]; $account->bank = $_POST["bank"];
$account->label = $_POST["label"]; $account->label = $_POST["label"];
@ -83,7 +86,15 @@ if ($_POST["action"] == 'update')
$account->proprio = $_POST["proprio"]; $account->proprio = $_POST["proprio"];
$account->adresse_proprio = $_POST["adresse_proprio"]; $account->adresse_proprio = $_POST["adresse_proprio"];
$account->update($_GET["id"], $user); $result = $account->update($user);
if (! $result) {
$message=$account->error();
$_GET["action"]='edit'; // Force chargement page edition
}
else {
$_GET["id"]=$_POST["id"]; // Force chargement page en mode visu
}
} }
@ -127,7 +138,7 @@ if ($_GET["action"] == 'create')
print '<tr><td valign="top">Compte Courant</td>'; print '<tr><td valign="top">Compte Courant</td>';
print '<td colspan="3">'; print '<td colspan="3">';
$form=new Form($db); $form=new Form($db);
print $form->selectyesno("courant",isset($_POST["courant"])?$_POST["courant"]:1); print $form->selectyesnonum("courant",isset($_POST["courant"])?$_POST["courant"]:1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top">Domiciliation</td><td colspan="3">'; print '<tr><td valign="top">Domiciliation</td><td colspan="3">';
@ -198,33 +209,28 @@ else
print '<tr><td valign="top">Identifiant BIC</td>'; print '<tr><td valign="top">Identifiant BIC</td>';
print '<td colspan="3">'.$account->bic.'</td></tr>'; print '<td colspan="3">'.$account->bic.'</td></tr>';
/* print '<tr><td valign="top">Compte Courant</td>';
print '<tr><td valign="top">Domiciliation</td>'; print '<td colspan="3">'.yn($account->courant).'</td></tr>';
print '<td colspan="3">'.$account->domiciliation.'</td></tr>';
*/ print '<tr><td valign="top">Compte Clos</td>';
print '<td colspan="3">'.yn($account->clos).'</td></tr>';
print '<tr><td valign="top">Compte Courant</td>';
print '<td colspan="3">'.$yn[$account->courant].'</td></tr>'; print '<tr><td valign="top">Domiciliation</td><td colspan="3">';
print $account->domiciliation;
print '<tr><td valign="top">Compte Clos</td>'; print "</td></tr>\n";
print '<td colspan="3">'.$yn[$account->clos].'</td></tr>';
print '<tr><td valign="top">Nom propriétaire du compte</td><td colspan="3">';
print '<tr><td valign="top">Domiciliation</td><td colspan="3">'; print $account->proprio;
print $account->domiciliation; print "</td></tr>\n";
print "</td></tr>\n";
print '<tr><td valign="top">Adresse propriétaire du compte</td><td colspan="3">';
print '<tr><td valign="top">Nom propriétaire du compte</td><td colspan="3">'; print $account->adresse_proprio;
print $account->proprio; print "</td></tr>\n";
print "</td></tr>\n";
print '</table>';
print '<tr><td valign="top">Adresse propriétaire du compte</td><td colspan="3">'; print '<br>';
print $account->adresse_proprio;
print "</td></tr>\n"; print '</div>';
print '</table>';
print '<br>';
print '</div>';
/* /*
* Barre d'actions * Barre d'actions
@ -232,7 +238,7 @@ else
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->admin) if ($user->rights->banque->configurer)
{ {
print '<a class="tabAction" href="fiche.php?action=edit&id='.$account->id.'">'.$langs->trans("Edit").'</a>'; print '<a class="tabAction" href="fiche.php?action=edit&id='.$account->id.'">'.$langs->trans("Edit").'</a>';
} }
@ -247,7 +253,7 @@ else
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
if ($_GET["id"] && $_GET["action"] == 'edit' && $user->admin) if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configurer)
{ {
$account = new Account($db, $_GET["id"]); $account = new Account($db, $_GET["id"]);
@ -255,10 +261,14 @@ else
$form = new Form($db); $form = new Form($db);
print '<div class="titre">Compte bancaire</div><br>'; print_titre("Edition compte bancaire");
print "<br>";
if ($message) { print "$message<br><br>\n"; }
print '<form action="fiche.php?id='.$account->id.'" method="post">'; print '<form action="fiche.php?id='.$account->id.'" method="post">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="id" value="'.$_GET["id"].'">';
print '<table class="border" cellpadding="3" cellspacing="0">'; print '<table class="border" cellpadding="3" cellspacing="0">';
@ -280,11 +290,6 @@ else
print '<tr><td valign="top">Identifiant BIC</td>'; print '<tr><td valign="top">Identifiant BIC</td>';
print '<td colspan="3"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>'; print '<td colspan="3"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
/*
print '<tr><td valign="top">Domiciliation</td>';
print '<td colspan="3"><input size="20" type="text" name="domiciliation" value="'.$account->domiciliation.'"></td></tr>';
*/
print '<tr><td valign="top">Compte Courant</td>'; print '<tr><td valign="top">Compte Courant</td>';
print '<td colspan="3">'; print '<td colspan="3">';
$form->selectyesnonum("courant",$account->courant); $form->selectyesnonum("courant",$account->courant);
@ -309,7 +314,9 @@ else
print $account->adresse_proprio; print $account->adresse_proprio;
print "</textarea></td></tr>"; print "</textarea></td></tr>";
print '<tr><td align="center" colspan="4"><input value="Enregistrer" type="submit"></td></tr>'; print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Modify").'" type="submit">';
print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
print '</td></tr>';
print '</form>'; print '</form>';
print '</table>'; print '</table>';
} }