diff --git a/html/export.php b/html/export.php index a5d375945..9dc4a8356 100644 --- a/html/export.php +++ b/html/export.php @@ -22,7 +22,7 @@ /*!\file * \brief manage all the export to CSV or PDF - * act can be + * act can be * */ @@ -46,7 +46,7 @@ if ( $act=='X' || ! isset($_GET['act']) ) exit(); } -switch( $_GET['act']) +switch( $_GET['act']) { case 'CSV/histo': $user->can_request(IMPJRN,0); @@ -168,7 +168,11 @@ switch( $_GET['act']) require_once('export_anc_balance_group_csv.php'); exit(); break; - + case 'OTH/Bilan': + $user->can_request(IMPBIL); + require_once 'export_bilan_oth.php'; + exit(); + break; default: alert('Action inconnue '.$_GET['act']); exit(); diff --git a/include/ac_common.php b/include/ac_common.php index 2ce9585c1..7bc273ee4 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -886,7 +886,10 @@ function put_global($array) function compute_variable($p_string) { $array=array(); + if ($p_string == '') return $array; + $var=explode("&",$p_string); + if (empty ($var)) return $array; for ($i=0;$i < count($var);$i++) { $var2=explode('=',$var[$i]); diff --git a/html/bilan.php b/include/export_bilan_oth.php similarity index 100% rename from html/bilan.php rename to include/export_bilan_oth.php diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php index 52df34a3d..2962a727f 100644 --- a/include/impress_bilan.inc.php +++ b/include/impress_bilan.inc.php @@ -74,10 +74,11 @@ if ( isset($_GET['verif'])) $bilan->get_request_get(); $bilan->verify(); - echo '
'; + echo ''; echo dossier::hidden(); echo HtmlInput::get_to_hidden(array('exercice')); echo HtmlInput::hidden('b_id',$_GET['b_id']); + echo HtmlInput::hidden('act','OTH/Bilan'); echo HtmlInput::hidden('from_periode',$bilan->from); echo HtmlInput::hidden('to_periode',$bilan->to);