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

Bug cosmetic

Browse source
This commit is contained in:
sparkyx 2004-04-10 16:41:39 +00:00
parent 9aa2816a39
commit d1aac9ee7e
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/form_input.php
View file

@ -924,6 +924,7 @@ function FormAch($p_cn,$p_jrn,$p_user,$p_submit,$p_array=null,$view_only=true,$p
$total=0;
$r.="<TABLE>";
$r.="<th>Nom</th>";
$r.="<th>Tva</th>";
$r.="<th>total</th>";
for ( $i = 0; $i < $p_article;$i++) {
if ( $view_only == true and ! isset (${"e_march$i"}) ) continue;
@ -940,17 +941,18 @@ function FormAch($p_cn,$p_jrn,$p_user,$p_submit,$p_array=null,$view_only=true,$p
} else {
$tva=(isNumber($a_fiche['tva_rate'])==1)?$a_fiche['tva_rate']:0;
}
$total_row=${"e_march$i"."_buy"}*${"e_quant$i"}+${"e_march$i"."_buy"}*${"e_quant$i"}*$tva;
$vat_row=${"e_march$i"."_buy"}*${"e_quant$i"}*$tva;
$total_row=${"e_march$i"."_buy"}*${"e_quant$i"}+$vat_row;
$r.="<TR>";
$r.="<TD>".$a_fiche['vw_name']."</td>";
// $r.="<TD>".$a_fiche['tva_label']."</td>";
$r.="<TD ".$total_row."</TD>";
$r.="</TR>";
$total+=$total_row;
$r.="<TR>";
$r.="<TD>".$a_fiche['vw_name']."</td>";
// $r.="<TD>".$a_fiche['tva_label']."</td>";
$r.="<TD> ".$vat_row."</TD>";
$r.="<TD> ".$total_row."</TD>";
$r.="</TR>";
$total+=$total_row;
}
}
}// for ($i=0
$r.="<TR> <TD colspan=\"3\" align=\"center\"> Total =".$total."</TD></TR>";
$r.="</TABLE>";

4
include/user_menu.php
View file

@ -146,8 +146,8 @@ function u_ShowMenuCompta($p_dossier)
echo "<P> <H2 class=\"info2\"> $l_name </H2></P>";
$p_array=array(array("user_jrn.php?JRN_TYPE=VEN" ,"Vente"),
array("user_jrn.php?JRN_TYPE=ACH","Achat"),
array("user_jrn.php?JRN_TYPE=FIN","Banque"),
array("user_jrn.php?JRN_TYPE=ACH","Dépense"),
array("user_jrn.php?JRN_TYPE=FIN","Financier"),
array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"),
array("fiche.php?p_dossier=$p_dossier","Fiche"),
array("user_advanced.php","Avancé"),