diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 70737fd80ba..28250e20359 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -31,24 +31,28 @@ llxHeader(); /* * Action rapprochement */ -if ($action == 'rappro') +if ($_POST["action"] == 'rappro') { - if ($num_releve > 0) { - $sql = "UPDATE ".MAIN_DB_PREFIX."bank set rappro=$rappro, num_releve=$num_releve"; - if ($rappro) { + if ($_POST["num_releve"] > 0) { + + $valrappro=$_POST["rappro"]=='yes'?1:0; + + $sql = "UPDATE ".MAIN_DB_PREFIX."bank set rappro=$valrappro, num_releve=".$_POST["num_releve"]; + if ($_POST["rappro"]) { # Si on fait un rapprochement, le user de rapprochement est inclus dans l'update $sql .= ", fk_user_rappro=".$user->id; } - $sql .= " WHERE rowid=$rowid"; + $sql .= " WHERE rowid=".$_POST["rowid"]; + $result = $db->query($sql); + if ($result) { - if ($cat1 && $rappro) { + if ($cat1 && $_POST["action"]) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES ($rowid, $cat1)"; $result = $db->query($sql); } } else { - print $db->error(); - print "
$sql"; + print dolibarr_print_error($db,$sql); } } } @@ -56,15 +60,15 @@ if ($action == 'rappro') /* * Action suppression ecriture */ -if ($action == 'del') { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank WHERE rowid=$rowid"; +if ($_GET["action"] == 'del') { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank WHERE rowid=".$_GET["rowid"]; $result = $db->query($sql); if (!$result) { - print $db->error(); - print "
$sql";
+ print dolibarr_print_error($db,$sql);
}
}
-$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ ORDER BY label;";
+
+$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ ORDER BY label";
$result = $db->query($sql);
$options="";
if ($result) {
@@ -83,7 +87,7 @@ if ($result) {
/*
* Affichage page
*/
-$sql = "SELECT max(num_releve) FROM ".MAIN_DB_PREFIX."bank WHERE fk_account=$account";
+$sql = "SELECT max(num_releve) FROM ".MAIN_DB_PREFIX."bank WHERE fk_account=".$_GET["account"];
if ( $db->query($sql) )
{
if ( $db->num_rows() )
@@ -98,11 +102,11 @@ else
}
$acct = new Account($db);
-$acct->fetch($account);
+$acct->fetch($_GET["account"]);
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type";
-$sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE rappro=0 AND fk_account=$account";
+$sql .= " FROM ".MAIN_DB_PREFIX."bank as b WHERE rappro=0 AND fk_account=".$_GET["account"];
$sql .= " ORDER BY dateo ASC LIMIT 10";
@@ -119,15 +123,15 @@ if ($result)
}
else {
- print_titre('Rapprochement bancaire compte : '.$acct->label.'');
+ print_titre('Rapprochement compte bancaire: '.$acct->label.'');
print '
';
- print '
| Date | Description | "; - print "Debit | "; - print "Credit | "; - print "Releve | "; + print "Date | Description | "; + print "Debit | "; + print "Credit | "; + print "Releve | "; print 'Rappro | '; print ''; print " | |