From a233f2446cdce515e0fcff85bd816bffac8fc5ea Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Thu, 11 Jan 2018 18:11:00 +0100
Subject: [PATCH] Bug : search cannot select ledger

---
 html/js/scripts.js                        |  7 +++++--
 include/class/acc_ledger_search.class.php |  4 ++--
 include/class/user.class.php              | 12 +++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index b09ebdd6c..95f4bc132 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -913,7 +913,10 @@ function hide_ledger_choice(p_frm_search)
     try
     {
         var nb = $(p_frm_search).nb_jrn.value;
-        var div = $(p_frm_search).div.value;
+        var div = "";
+        if ( $(p_frm_search).div ) {
+            div = $(p_frm_search).div.value;
+        }
         var i = 0;
         var str = "";
         var name = "";
@@ -922,7 +925,7 @@ function hide_ledger_choice(p_frm_search)
         for (i = 0; i < nb; i++) {
             n_name = div + "r_jrn[" + sel + "]";
             name = div + "r_jrn" + i;
-            if ($(name).checked) {
+            if ( $(name).checked) {
                 str += '<input type="hidden" id="' + n_name + '" name="' + n_name + '" value="' + $(name).value + '">';
                 sel++;
             }
diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index e9b0cd2a6..40c3ae7cf 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -1057,7 +1057,7 @@ class Acc_Ledger_Search
         global $g_user;
 	$r = '';
 	/* security : filter ledger on user */
-	$p_array = $g_user->get_ledger($this->type, 3);
+	$p_array = $g_user->get_ledger($this->type, 3,FALSE);
         
         ob_start();
         
@@ -1094,7 +1094,7 @@ class Acc_Ledger_Search
         for ($e=0;$e<count($p_array);$e++)
         {
             $row=$p_array[$e];
-            if ( $row['jrn_enable']==0) continue;
+//            if ( $row['jrn_enable']==0) continue;
             $r=new ICheckBox($p_div.'r_jrn'.$e,$row['jrn_def_id']);
             $r->set_attribute("ledger_type", $row['jrn_def_type']);
             $idx=$row['jrn_def_id'];
diff --git a/include/class/user.class.php b/include/class/user.class.php
index 256b5e330..05c5da09d 100644
--- a/include/class/user.class.php
+++ b/include/class/user.class.php
@@ -296,6 +296,7 @@ class User
 	 * \brief get all the available ledgers for the current user
 	 * \param $p_type = ALL or the type of the ledger (ACH,VEN,FIN,ODS)
 	 * \param $p_access =3 for Read or WRITE, 2  write, 1 for readonly
+         * \param (boolean) $all if true show also inactive
 	 *  \return a double array of available ledgers
 	  @verbatim
 	  [0] => [jrn_def_id]
@@ -309,8 +310,13 @@ class User
 	  @endverbatim
 	 */
 
-	function get_ledger($p_type = 'ALL', $p_access = 3)
+	function get_ledger($p_type = 'ALL', $p_access = 3,$disable=TRUE)
 	{
+            if ($disable==TRUE) {
+                $sql_enable="";
+            } else {
+                $sql_enable="and jrn_enable=1";
+            }
 		if ($this->admin != 1 && $this->is_local_admin() != 1 && $this->get_status_security_ledger() == 1)
 		{
 			$sql_type = ($p_type == 'ALL') ? '' : "and jrn_def_type=upper('" . sql_string($p_type) . "')";
@@ -335,12 +341,12 @@ class User
                  join user_sec_jrn on uj_jrn_id=jrn_def_id,jrn_enable
                  where
                  uj_login='" . $this->login . "'" .
-					$sql_type . $sql_access .
+					$sql_type . $sql_access .$sql_enable.
 					" order by jrn_Def_name";
 		}
 		else
 		{
-			$sql_type = ($p_type == 'ALL') ? '  ' : "where jrn_def_type=upper('" . sql_string($p_type) . "') ";
+			$sql_type = ($p_type == 'ALL') ? '  '.$sql_enable : "where jrn_def_type=upper('" . sql_string($p_type) . "')  ".$sql_enable;
 			$sql = "select jrn_def_id,jrn_def_type,jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_deb_max_line,jrn_cred_max_line,
                  jrn_type_id,jrn_desc,'W' as uj_priv,jrn_def_description,jrn_enable
                  from jrn_def join jrn_type on jrn_def_type=jrn_type_id