diff --git a/include/ajax/ajax_history.php b/include/ajax/ajax_history.php index 33c1af00d..0d5f97360 100644 --- a/include/ajax/ajax_history.php +++ b/include/ajax/ajax_history.php @@ -25,9 +25,9 @@ */ if ( ! defined('ALLOWED')) die (_('Accès interdit')); +$http=new HttpInput(); $div=$http->request('div'); mb_internal_encoding("UTF-8"); -$http=new HttpInput(); /** *if $_SESSION[SESSION_KEY.'g_user'] is not set : echo a warning */ @@ -93,9 +93,9 @@ if ( isset($_GET['f_id'])) $is=$exercice->select('ex',$default,'onchange = "submit(this)"'); $old.=_("Autre exercice")." ".$is->input(); $old.=HtmlInput::hidden('div','popup'); - $old.=HtmlInput::hidden('act',$_GET['act']); - $old.=HtmlInput::hidden('f_id',$_GET['f_id']); - $old.=HtmlInput::hidden('ajax',$_GET['ajax']); + $old.=HtmlInput::hidden('act',$http->get('act')); + $old.=HtmlInput::hidden('f_id',$http->get('f_id')); + $old.=HtmlInput::hidden('ajax',$http->get('ajax')); $old.=HtmlInput::hidden('exercice',$year); $old.=dossier::hidden(); $old.=HtmlInput::hidden('op','history'); @@ -119,6 +119,7 @@ if ( isset($_GET['f_id'])) echo HtmlInput::button_close($div); } else { echo $fiche->filter_history("tb".$div); + echo $old; echo $table; echo HtmlInput::button_close($div); echo $fiche->button_csv($array['from_periode'],$array['to_periode']); @@ -185,9 +186,9 @@ if ( isset($_REQUEST['pcm_val'])) $is=$exercice->select('ex',$default,'onchange = "submit(this)"'); $old.=_("Autre exercice")." ".$is->input(); $old.=HtmlInput::hidden('div','popup'); - $old.=HtmlInput::hidden('act',$_GET['act']); - $old.=HtmlInput::hidden('pcm_val',$_GET['pcm_val']); - $old.=HtmlInput::hidden('ajax',$_GET['ajax']); + $old.=HtmlInput::hidden('act',$http->get('act')); + $old.=HtmlInput::hidden('pcm_val',$http->get('pcm_val')); + $old.=HtmlInput::hidden('ajax',$http->get('ajax')); $old.=dossier::hidden(); $old.=HtmlInput::hidden('op','history'); $old.=''; @@ -211,6 +212,7 @@ if ( isset($_REQUEST['pcm_val'])) echo HtmlInput::button_close($div); } else { echo $poste->filter_history('tb'.$div); + echo $old; echo $table; echo HtmlInput::button_close($div); echo $poste->button_csv($array['from_periode'],$array['to_periode']); diff --git a/include/class/acc_account_ledger.class.php b/include/class/acc_account_ledger.class.php index a1a06dd73..4de07021d 100644 --- a/include/class/acc_account_ledger.class.php +++ b/include/class/acc_account_ledger.class.php @@ -599,7 +599,7 @@ class Acc_Account_Ledger "".nbm(abs($diff)).$side."". td("",' class="visible_gt800" '). ""; - echo "$solde_type". + echo "$solde_type". "".nbm(abs($diff))."". ""; // take saldo from 1st day until last diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index f45588b1b..6af61e002 100644 --- a/include/class/fiche.class.php +++ b/include/class/fiche.class.php @@ -1114,7 +1114,7 @@ class Fiche $old_exercice=$op['p_exercice']; } - $solde_type=_("Année ").($sum_deb>$sum_cred)?_("solde débiteur"):_("solde créditeur"); + $solde_type=($sum_deb>$sum_cred)?_("solde débiteur"):_("solde créditeur"); $solde_side=($sum_deb>$sum_cred)?"D":"C"; $diff=abs(bcsub($sum_deb,$sum_cred)); echo '';