From 18cb87d9bf51786199a047a7f63eb18c4186fa80 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 24 Jan 2019 17:27:21 +0100 Subject: [PATCH] Mantis #0001666: Export CSV depuis histo ne filtre pas par journal --- include/history_operation.inc.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php index 20113ba9f..3a0ceb77d 100644 --- a/include/history_operation.inc.php +++ b/include/history_operation.inc.php @@ -94,7 +94,7 @@ if (!isset($p_array['date_start'])) list($date_start, $date_end) = $per->get_date_limit(); $p_array['date_start'] = $date_start; $p_array['date_end'] = $date_end; - $msg='

'._("Période ").$date_start._(" au ").$date_end.'

'; + $msg='

'.sprintf(_("Période %s au %s "),$date_start,$date_end).'

'; } else { @@ -138,11 +138,17 @@ $r = HtmlInput::get_to_hidden(array('search_opnb_jrn', 'unpaid', 'gDossier', 'ledger_type', - 'p_action')); + 'p_action', + 'search_opr_jrn')); if (isset($_GET['r_jrn'])) { - foreach ($_GET['r_jrn'] as $k => $v) - $r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v); + foreach ($_GET['r_jrn'] as $k => $v) + $r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v); +} +if (isset($_GET['search_opr_jrn'])) +{ + foreach ($_GET['search_opr_jrn'] as $k => $v) + $r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v); } echo $r; @@ -156,6 +162,11 @@ echo ''; $r = HtmlInput::get_to_hidden(array('l', 'date_paid_start','date_paid_end', 'date_start', 'date_end', 'desc', 'amount_min', 'amount_max', 'qcode', 'accounting', 'unpaid', 'gDossier', 'ledger_type', 'p_action')); +if (isset($_GET['search_opr_jrn'])) +{ + foreach ($_GET['search_opr_jrn'] as $k => $v) + $r.=HtmlInput::hidden('r_jrn[' . $k . ']', $v); +} if (isset($_GET['r_jrn'])) { foreach ($_GET['r_jrn'] as $k => $v)