[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 51/173: Mantis #0001666: Export CSV depuis hi
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 51/173: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal |
Date: |
Mon, 22 Mar 2021 12:58:38 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 18cb87d9bf51786199a047a7f63eb18c4186fa80
Author: Dany De Bontridder <dany@alchimerys.be>
AuthorDate: Thu Jan 24 17:27:21 2019 +0100
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 20113ba..3a0ceb7 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='<h2 class="info2">'._("Période ").$date_start._(" au
").$date_end.'</h2>';
+ $msg='<h2 class="info2">'.sprintf(_("Période %s au %s
"),$date_start,$date_end).'</h2>';
}
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 '</form>';
$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)
- [Noalyss-commit] [noalyss] 23/173: Currency : precision 6, display default currency , protect used currency against delete, (continued)
- [Noalyss-commit] [noalyss] 23/173: Currency : precision 6, display default currency , protect used currency against delete, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 27/173: Currency : detail operation Purchase , the amount in currency were wrong in the summary, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 37/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 38/173: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 39/173: Currency : because of Misc Operation, the tiers must also be saved into operation_currency. Fix also PRINTJRN for currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 44/173: Currency Show currency info for MISC, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 46/173: Typo, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 48/173: translation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 49/173: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 50/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 51/173: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 54/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 55/173: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Use base64_decode to protect the string in serialize, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 57/173: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 60/173: Mantis #0001614: Problème bilans , changement pour bilan ASBL, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 61/173: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 62/173: Bug : CARD misplace of "Search Card", Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 63/173: Fix bug from merge, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 65/173: Merge issue : inappropriate rollback, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 66/173: Fix Inappropriate merge, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 69/173: Fiche.clasS.php fix broken merge, Dany De Bontridder, 2021/03/22