From 6806e2b36bbff889c4987b89157e83492118a6a7 Mon Sep 17 00:00:00 2001 From: Florian HENRY <florian.henry@open-concept.pro> Date: Thu, 13 Aug 2015 10:27:35 +0200 Subject: [PATCH] FIX : Accountancy expert module filter on column must not launch ventil ventil --- htdocs/accountancy/customer/list.php | 5 +++-- htdocs/accountancy/journal/sellsjournal.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 6d82c324fd6..31df2c38899 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -53,6 +53,7 @@ $search_desc = GETPOST('search_desc', 'alpha'); $search_amount = GETPOST('search_amount', 'alpha'); $search_account = GETPOST('search_account', 'alpha'); $search_vat = GETPOST('search_vat', 'alpha'); +$btn_ventil = GETPOST('ventil', 'alpha'); // Getpost Order and column and limit page $sortfield = GETPOST('sortfield', 'alpha'); @@ -129,7 +130,7 @@ print '<script type="text/javascript"> * Action */ -if ($action == 'ventil') { +if ($action == 'ventil' && !empty($btn_ventil)) { print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>'; if (! empty($codeventil) && ! empty($mesCasesCochees)) { print '<div><font color="red">' . count($mesCasesCochees) . ' ' . $langs->trans("SelectedLines") . '</font></div>'; @@ -337,7 +338,7 @@ if ($result) { } print '</table>'; - print '<br><div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></div>'; + print '<br><div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>'; print '</form>'; } else { print $db->error(); diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index a0bd51fbbf8..79eabc3c272 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -111,7 +111,7 @@ if ($date_start && $date_end) $sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'"; $sql .= " ORDER BY f.datef"; -dol_syslog('accountancy/journal/sellsjournal.php:: $sql=' . $sql); +dol_syslog('accountancy/journal/sellsjournal.php', LOG_DEBUG); $result = $db->query($sql); if ($result) { $tabfac = array (); -- GitLab