admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug : side of balance in history of a a card and replace direct access to superglobal and fix bug

Browse source
This commit is contained in:
sparkyx 2025-09-20 09:31:57 +02:00
parent c36ddd19d1
commit 71d1fd4d6e
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/ajax/ajax_history.php
View file

@ -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.='</form>';
@ -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']);

2
include/class/acc_account_ledger.class.php
View file

@ -599,7 +599,7 @@ class Acc_Account_Ledger
"<TD style=\"text-align:right\">".nbm(abs($diff)).$side."</TD>".
td("",' class="visible_gt800" ').
"</TR>";
echo "<tr><TD>$solde_type</TD><td></td>".
echo "<tr style=\"font-weight:bold\"><TD>$solde_type</TD><td></td>".
"<TD style=\"text-align:right\">".nbm(abs($diff))."</TD>".
"</TR>";
// take saldo from 1st day until last

2
include/class/fiche.class.php
View file

@ -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 '<tfoot>';