diff --git a/include/class/print_ledger.class.php b/include/class/print_ledger.class.php index a8bcec27d..ac3bf4a4a 100644 --- a/include/class/print_ledger.class.php +++ b/include/class/print_ledger.class.php @@ -199,10 +199,10 @@ class Print_Ledger { where uj_login=$1 and uj_priv in ('R','W') - order by jrn_def_name and ( jrn_enable=1 or - exists (select 1 from jrn where jr_tech_per in (select p_id from parm_periode where p_exercice=$2)) + exists (select 1 from jrn where jr_def_id=jrn_def_id and jr_tech_per in (select p_id from parm_periode where p_exercice=$2))) + order by jrn_def_name "; $a_jrn=$cn->get_array($sql, array($g_user->login, $exercice)); } @@ -211,7 +211,7 @@ class Print_Ledger { $a_jrn=$cn->get_array("select jrn_def_id from jrn_def join jrn_type on jrn_def_type=jrn_type_id where - jrn_enable=1 or exists(select 1 from jrn where jr_tech_per in (select p_id from parm_periode where p_exercice=$1)) + jrn_enable=1 or exists(select 1 from jrn where jr_def_id=jrn_def_id and jr_tech_per in (select p_id from parm_periode where p_exercice=$1)) order by jrn_def_name ", [$exercice]); } diff --git a/include/export/export_ledger_pdf.php b/include/export/export_ledger_pdf.php index 2ac0a29cd..cab3413e1 100644 --- a/include/export/export_ledger_pdf.php +++ b/include/export/export_ledger_pdf.php @@ -65,7 +65,7 @@ $g_user->Check(); $g_user->check_dossier($gDossier); // Security -if ($g_user->check_jrn($jrn_id) == 'X') { +if ($jrn_id != 0 && $g_user->check_jrn($jrn_id) == 'X') { /* Cannot Access */ NoAccess(); } diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index 9098511a3..587a59056 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -50,10 +50,10 @@ if ($g_user->Admin() == 0 && $g_user->is_local_admin() == 0 && $g_user->get_sta where uj_login=$1 and uj_priv in ('R','W') - order by jrn_def_name and ( jrn_enable=1 or - exists (select 1 from jrn where jr_tech_per in (select p_id from parm_periode where p_exercice=$2)) + exists (select 1 from jrn where jr_tech_per in (select p_id from parm_periode where p_exercice=$2))) + order by jrn_def_name "; $ret = $cn->make_array($sql,0,array($g_user->login,$exercice)); }