From e8110bffebd4a05d1a00a4e3c7895ef51db3be43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 9 Oct 2008 18:24:47 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Bug=20#24314=20:=20Rapprochement=20d'=E9?=
=?UTF-8?q?critures=20sur=20des=20comptes=20caisse/liquide?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/compta/bank/account.class.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php
index c192f43fe44..64e5d499197 100644
--- a/htdocs/compta/bank/account.class.php
+++ b/htdocs/compta/bank/account.class.php
@@ -705,8 +705,10 @@ class Account extends CommonObject
$sql = "SELECT b.rowid,".$this->db->pdate("b.datev")." as datefin";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba";
$sql.= " WHERE b.rappro=0 AND b.fk_account = ba.rowid";
- $sql.= " AND ba.rappro = 1"; // Compte rapprochable
+ $sql.= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
+
+ //print $sql;
$resql=$this->db->query($sql);
if ($resql)
{
--
GitLab