diff --git a/include/form_input.php b/include/form_input.php index 2597cb99e..e3016d6b1 100644 --- a/include/form_input.php +++ b/include/form_input.php @@ -924,6 +924,7 @@ function FormAch($p_cn,$p_jrn,$p_user,$p_submit,$p_array=null,$view_only=true,$p $total=0; $r.=""; $r.=""; + $r.=""; $r.=""; 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.=""; - $r.=""; - // $r.=""; - $r.=""; - $total+=$total_row; + $r.=""; + $r.=""; + // $r.=""; + $r.=""; + $r.=""; + $r.=""; + $total+=$total_row; } - } + }// for ($i=0 $r.=""; $r.="
NomTvatotal
".$a_fiche['vw_name']."".$a_fiche['tva_label'].""; - $r.="
".$a_fiche['vw_name']."".$a_fiche['tva_label']." ".$vat_row." ".$total_row."
Total =".$total."
"; diff --git a/include/user_menu.php b/include/user_menu.php index 1b4a28925..1840449cf 100644 --- a/include/user_menu.php +++ b/include/user_menu.php @@ -146,8 +146,8 @@ function u_ShowMenuCompta($p_dossier) echo "

$l_name

"; $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é"),