From dd15884f830beeba51f0743049bf00a0635f34cc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 12 Oct 2017 01:35:04 +0200 Subject: [PATCH] Fix recur - rcur --- htdocs/compta/prelevement/class/bonprelevement.class.php | 2 +- htdocs/compta/prelevement/create.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 54990330135..e4156db8a5d 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -857,7 +857,7 @@ class BonPrelevement extends CommonObject $bac->fetch(0, $soc->id); if ($format == 'FRST' && $bac->frstrecur != 'FRST') continue; - if ($format == 'RCUR' && $bac->frstrecur != 'RCUR') continue; + if ($format == 'RCUR' && ($bac->frstrecur != 'RCUR' && $bac->frstrecur != 'RECUR')) continue; if ($bac->verif() >= 1) { diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 700e587a6a6..380132058fd 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -46,7 +46,7 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons'); // Get supervariables $action = GETPOST('action','alpha'); $mode = GETPOST('mode','alpha')?GETPOST('mode','alpha'):'real'; -$format = GETPOST('format','alpha'); +$format = GETPOST('format','aZ09'); /*