[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 171/323: History based on the date of the ope
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 171/323: History based on the date of the operation which it comes from |
Date: |
Wed, 14 Mar 2018 17:38:44 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 7469eb7044df658bfa3381304e0e51af1a1f2a99
Author: Dany De Bontridder <address@hidden>
Date: Sat Feb 10 09:45:06 2018 +0100
History based on the date of the operation which it comes from
---
html/popup.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/html/popup.php b/html/popup.php
index 5bed031..8118411 100644
--- a/html/popup.php
+++ b/html/popup.php
@@ -24,10 +24,11 @@ require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
require_once NOALYSS_INCLUDE.'/class/user.class.php';
require_once NOALYSS_INCLUDE.'/class/periode.class.php';
-
+$http=new HttpInput();
/*
* Check if the user is still connected
*/
@@ -66,8 +67,13 @@ $g_user->check_dossier(Dossier::id());
if ( basename($_GET['op']) == 'history' )
{
$href=dossier::get();
+
+ $exercice=$http->get("exercice","number",0);
+
/* current year */
- $exercice=$g_user->get_exercice();
+ if ($exercice == 0 ) {
+ $exercice=$g_user->get_exercice();
+ }
/* get date limit */
$periode=new Periode($cn);
- [Noalyss-commit] [noalyss] 151/323: CSS : improve classic7, (continued)
- [Noalyss-commit] [noalyss] 151/323: CSS : improve classic7, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 156/323: Improve : Exercice suivit par mois puis année, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 147/323: Logo : install / index, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 65/323: Task #0001530: Réécriture PRINTJRN, Base + Sale, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 155/323: Improve : last exercice in first place, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 157/323: typo, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 146/323: Ergonomy : ask exercice and periode separately in preference, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 160/323: bug: error js missing quote in ajax_input, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 145/323: merge rel6919.9, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 159/323: bug: error js in Icon_Action::close, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 171/323: History based on the date of the operation which it comes from,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 162/323: esthetic : improve title2, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 158/323: bug: cannot create user, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 167/323: Suppress obsolete files, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 174/323: Improve Documentation, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 172/323: History accounting / card : first column is date, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 176/323: Manage_Table_SQL : Add tips for some col, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 164/323: Periode : change with exercice, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 166/323: PRINTBAL : add opening , correct, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 177/323: PRINTBAL : correct bug , exercice not get, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 173/323: Esthetic : put the anchor at a better place, Dany De Bontridder, 2018/03/14