[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 171/238: Mantis #0001666: Export CSV depuis h
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 171/238: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal |
Date: |
Sat, 26 Oct 2019 04:40:58 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 18cb87d9bf51786199a047a7f63eb18c4186fa80
Author: Dany De Bontridder <address@hidden>
Date: 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] 139/238: Translation, (continued)
- [Noalyss-commit] [noalyss] 139/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 133/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 142/238: Currency : Precision 6, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 156/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 143/238: Currency : precision 6, display default currency , protect used currency against delete, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 134/238: use of httpInput, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 135/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 151/238: Task #1660 : place the button for the inventory on the top, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 155/238: Task #0001309: Association d'une opération avec elle-même., Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 163/238: PHP 7.2 mistyped command, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 171/238: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 169/238: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 184/238: CSS : cosmetic, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 172/238: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, add action CSV:Analytic_Axis, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 186/238: Fix Inappropriate merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 194/238: TEST : fix some little bugs, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 187/238: Wrong merge broke fiche.class.php, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 178/238: Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 183/238: Fix bug from merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 181/238: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 185/238: Merge issue : inappropriate rollback, Dany De Bontridder, 2019/10/26