diff --git a/include/form_input.php b/include/form_input.php index 4bf49d8ca..43ef10844 100644 --- a/include/form_input.php +++ b/include/form_input.php @@ -397,12 +397,58 @@ function FormVente($p_cn,$p_jrn,$p_user,$p_array=null,$view_only=true,$p_article $r.=""; - $r.=''; - $r.=''; - $r.=""; - $r.=""; + if ($view_only == false ) { + $r.=''; + $r.=''; + $r.=""; + $r.=""; + $r.=JS_CALC_LINE; + } else { +// // show summary +// $total=0; +// $r.='
| Description | "; +// $r.="Base TVA | "; +// $r.="Tva | "; +// $r.="Total | "; +// for ( $i = 0; $i < $p_article;$i++) { +// if ( $view_only == true and ! isset (${"e_march$i"}) ) continue; +// $march=${"e_march$i"}; +// if ( isNumber($march) ==1 and +// isFicheOfJrn($p_cn,$p_jrn,$march,'cred')){ +// $a_fiche=GetFicheAttribut($p_cn, $march); +// // compute some data +// // $tva=(isNumber($a_fiche['tva_rate']) == 0 )?0:$a_fiche['tva_rate']; +// if ( isNumber(${"e_march$i"."_tva_id"}) ==1 ) { + +// $a_tva=GetTvaRate($p_cn,${"e_march$i"."_tva_id"}); +// $tva=$a_tva['tva_rate']; +// } else { +// $tva=(isNumber($a_fiche['tva_rate'])==1)?$a_fiche['tva_rate']:0; +// } +// $vat_row=${"e_march$i"."_sell"}*${"e_quant$i"}*$tva; +// $total_row_no_vat=${"e_march$i"."_sell"}*${"e_quant$i"}; +// $total_row=${"e_march$i"."_sell"}*${"e_quant$i"}+$vat_row; + +// $r.="|
|---|---|---|---|---|
| ".$a_fiche['vw_name']." | "; +// // $r.="".$a_fiche['tva_label']." | "; +// $r.="".round($total_row_no_vat,2)." | "; +// $r.="".$vat_row." | "; +// $r.="".round($total_row,2)." | "; +// $r.="