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

bug 8531 - improve saldo present

Browse source
This commit is contained in:
sparkyx 2004-04-10 19:48:28 +00:00
parent e7ce293c82
commit ca0b1fb526
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/form_input.php
View file

@ -1099,7 +1099,7 @@ function RecordAchat($p_cn,$p_array,$p_user,$p_jrn)
* -
* return: string with the form
*/
function FormFin($p_cn,$p_jrn,$p_user,$p_submit,$p_array=null,$view_only=true,$p_item=4)
function FormFin($p_cn,$p_jrn,$p_user,$p_submit,$p_array=null,$view_only=true,$p_item=4,$p_save=false)
{
include_once("poste.php");
if ( $p_array != null ) {
@ -1237,7 +1237,10 @@ function FormFin($p_cn,$p_jrn,$p_user,$p_submit,$p_array=null,$view_only=true,$p
${"e_concerned".$i}=(isset(${"e_concerned".$i}))?${"e_concerned".$i}:"";
$r.=InputType("","js_concerned","e_concerned".$i,${"e_concerned".$i},$view_only);
$r.='</TR>';
if ( $view_only == true ) $new_solde+=$tiers_amount;
// if not recorded the new amount must be recalculate
// if recorded the old amount is recalculated
if ( $view_only == true)
$new_solde=($p_save==false)?$new_solde+$tiers_amount:$new_solde-$tiers_amount;
}
$r.="</TABLE>";
@ -1248,8 +1251,16 @@ $r.="</FORM>";
// if view_only is true
//Put the new saldo here (old saldo - operation)
if ( $view_only==true) {
$r.=" <b> Ancien Solde = ".$solde." </b><br>";
$r.=" <b> Nouveau Solde = ".$new_solde." </b><br>";
// if not recorded the new amount must be recalculate
if ( $p_save == false) {
$r.=" <b> Ancien Solde = ".$solde." </b><br>";
$r.=" <b> Nouveau Solde = ".$new_solde." </b><br>";
}
// if recorded the old amount is recalculated
if ($p_save == true ) {
$r.=" <b> Ancien Solde = ".$new_solde." </b><br>";
$r.=" <b> Nouveau Solde = ".$solde." </b><br>";
}
}
return $r;

2
include/user_action_fin.php
View file

@ -111,7 +111,7 @@ if ( $action == 'new' ) {
// submit button in the form
$submit='<h2 class="info">Recorded</h2>';
$r.=FormFin($cn,$g_jrn,$g_user,$submit,$HTTP_POST_VARS,true, $nb_number);
$r.=FormFin($cn,$g_jrn,$g_user,$submit,$HTTP_POST_VARS,true, $nb_number,true);
echo '<div class="u_redcontent">';
echo $r;
echo "</div>";