From 0d8933dd083338253e7182e6cb4df5b71397e3fd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 28 Dec 2010 22:40:10 +0000 Subject: [PATCH] Fix: The warning for not reconciliated records was not visible --- htdocs/compta/bank/account.php | 12 ++++++++++-- htdocs/compta/bank/class/account.class.php | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 3c58896ac6b..acb03a8d8d2 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -507,9 +507,10 @@ if ($account || $_GET["ref"]) print ""; - print "".dol_print_date($db->jdate($objp->do),"day")."\n"; + print ''.dol_print_date($db->jdate($objp->do),"day")."\n"; - print "".dol_print_date($db->jdate($objp->dv),"day")."\n"; + print ''.dol_print_date($db->jdate($objp->dv),"day"); + print "\n"; // Payment type print ""; @@ -672,6 +673,13 @@ if ($account || $_GET["ref"]) print img_view(); print ''; } + if ($acct->rappro && empty($objp->rappro)) + { + if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay)) + { + print ' '.img_warning($langs->trans("Late")); + } + } print ' '; if ($user->rights->banque->modifier) { diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 54e5ed54032..01f00c6bb51 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -804,7 +804,7 @@ class Account extends CommonObject if ($user->societe_id) return -1; // protection pour eviter appel par utilisateur externe - $now=gmmktime(); + $now=dol_now(); $this->nbtodo=$this->nbtodolate=0;