diff --git a/html/js/scripts.js b/html/js/scripts.js
index 7c70e1942..a6ca1f258 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -815,6 +815,10 @@ function show_ledger_choice(json_obj)
var y=posY;
if (json_obj.div != '')obj.cssclass="";
obj.style="top:"+y+obj.style;
+ if ( json_obj.class )
+ {
+ obj.cssclass=json_obj.class;
+ }
add_div(obj);
diff --git a/include/ac_common.php b/include/ac_common.php
index 73381c5d4..56d80b545 100644
--- a/include/ac_common.php
+++ b/include/ac_common.php
@@ -1094,4 +1094,16 @@ function display_dashboard_operation($p_array,$p_title,$p_div)
diff --git a/include/balance.inc.php b/include/balance.inc.php
index ac95c58b1..debda93a9 100644
--- a/include/balance.inc.php
+++ b/include/balance.inc.php
@@ -91,7 +91,8 @@ echo ' jusque :'.$input_to->input();
echo 'Filtre ';
$rad=new IRadio();
$array_ledger=$g_user->get_ledger('ALL',3);
-$selected=(isset($_GET['r_jrn']))?$_GET['r_jrn']:null;
+$array=get_array_column($array_ledger,'jrn_def_id');
+$selected=(isset($_GET['balr_jrn']))?$_GET['balr_jrn']:null;
$select_cat=(isset($_GET['r_cat']))?$_GET['r_cat']:null;
$array_cat=Acc_Ledger::array_cat();
@@ -101,7 +102,9 @@ else $rad->selected=false;
echo '
'.$rad->input('p_filter',0).'Aucun filtre, tous les journaux'.'';
if ( isset($_GET['p_filter']) && $_GET['p_filter']==1) $rad->selected='t';
else $rad->selected=false;
-echo ''.$rad->input('p_filter',1).'Filtré par journal'.HtmlInput::select_ledger($array_ledger,$selected).'';
+echo ''.$rad->input('p_filter',1).'Filtré par journal ';
+echo HtmlInput::button_choice_ledger(array('div'=>'bal','type'=>'ALL','all_type'=>1));
+echo '';
if ( isset($_GET['p_filter']) && $_GET['p_filter']==2) $rad->selected='t';
else $rad->selected=false;
echo ''.$rad->input('p_filter',2).'Filtré par catégorie'.HtmlInput::select_cat($array_cat).'';
@@ -194,9 +197,9 @@ if ( isset ($_GET['view'] ) )
HtmlInput::hidden("from_periode",$_GET['from_periode']).
HtmlInput::hidden("to_periode",$_GET['to_periode']);
echo HtmlInput::hidden('p_filter',$_GET['p_filter']);
- for ($e=0;$ejrn[]=$array_ledger[$e]['jrn_def_id'];
+ for ($e=0;$ejrn[]=$selected[$e];
}
if ( $_GET['p_filter'] == 0 )
{
diff --git a/include/class_html_input.php b/include/class_html_input.php
index 80780db66..7f315f500 100755
--- a/include/class_html_input.php
+++ b/include/class_html_input.php
@@ -777,5 +777,47 @@ class HtmlInput
$button->javascript="calendar_zoom($obj)";
return $button->input();
}
+ /**
+ *
+ * @param type $p_array indice
+ * - div div name
+ * - type ALL, VEN, ACH or ODS
+ * - all_type 1 yes 0 no
+ *
+ */
+ static function button_choice_ledger($p_array)
+ {
+ extract ($p_array);
+ $bledger_param = json_encode(array(
+ 'dossier' => $_REQUEST['gDossier'],
+ 'type' => $type,
+ 'all_type' => $all_type,
+ 'div' => $div,
+ 'class'=>'inner_box'
+ ));
-}
\ No newline at end of file
+ $bledger_param = str_replace('"', "'", $bledger_param);
+ $bledger = new ISmallButton('l');
+ $bledger->label = "choix des journaux";
+ $bledger->javascript = " show_ledger_choice($bledger_param)";
+ $f_ledger = $bledger->input();
+ $hid_jrn = "";
+ if (isset($_REQUEST[$div . 'nb_jrn']))
+ {
+ for ($i = 0; $i < $_REQUEST[$div . 'nb_jrn']; $i++)
+ {
+ if (isset($_REQUEST[$div . "r_jrn"][$i]))
+ $hid_jrn.=HtmlInput::hidden($div . 'r_jrn[' . $i . ']', $_REQUEST[$div . "r_jrn"][$i]);
+ }
+ $hid_jrn.=HtmlInput::hidden($div . 'nb_jrn', $_REQUEST[$div . 'nb_jrn']);
+ } else
+ {
+ $hid_jrn = HtmlInput::hidden($div . 'nb_jrn', 0);
+ }
+ echo $f_ledger;
+ echo '';
+ echo $hid_jrn;
+ echo '';
+ }
+
+}
diff --git a/include/export_balance_csv.php b/include/export_balance_csv.php
index 9274a2da9..636911cb3 100644
--- a/include/export_balance_csv.php
+++ b/include/export_balance_csv.php
@@ -49,10 +49,11 @@ case 1:
{
$selected=$_GET['r_jrn'];
$array_ledger=$g_user->get_ledger('ALL',3);
- for ($e=0;$ejrn[]=$array_ledger[$e]['jrn_def_id'];
+ if (isset ($selected[$e]) && in_array ($selected[$e],$array) )
+ $bal->jrn[]=$selected[$e];
}
}
break;
diff --git a/include/export_balance_pdf.php b/include/export_balance_pdf.php
index 1e5f051f1..9006f0054 100644
--- a/include/export_balance_pdf.php
+++ b/include/export_balance_pdf.php
@@ -58,10 +58,11 @@ case 1:
{
$selected=$_GET['r_jrn'];
$array_ledger=$g_user->get_ledger('ALL',3);
- for ($e=0;$ejrn[]=$array_ledger[$e]['jrn_def_id'];
+ if (isset ($selected[$e]) && in_array ($selected[$e],$array))
+ $bal->jrn[]=$selected[$e];
}
}
break;
diff --git a/include/impress_rec.inc.php b/include/impress_rec.inc.php
index b90a5975b..8b3bf6549 100644
--- a/include/impress_rec.inc.php
+++ b/include/impress_rec.inc.php
@@ -40,7 +40,8 @@ $choice=(isset($_GET['choice']))?$_GET['choice']:0;
$r_jrn=(isset($_GET['r_jrn']))?$_GET['r_jrn']:'';
echo '