diff --git a/include/fiche_inc.php b/include/fiche_inc.php index 3442cf58e..c27a1d715 100644 --- a/include/fiche_inc.php +++ b/include/fiche_inc.php @@ -606,6 +606,7 @@ function UpdateFiche($p_cn,$p_array) { // Change the name in TMP_PCMN // Get the new name + $f_label=FormatString($f_label); ExecSql($p_cn,"update tmp_pcmn set pcm_lib='".$f_label."' where pcm_val=".$class); diff --git a/include/form_input.php b/include/form_input.php index 95dc0916f..c4f5a789d 100644 --- a/include/form_input.php +++ b/include/form_input.php @@ -833,7 +833,7 @@ function FormAch($p_cn,$p_jrn,$p_user,$p_submit,$p_array=null,$view_only=true,$p $r.='

Articles

'; $r.=''; $r.=""; - $r.=""; + if ($view_only==false) $r.=""; $r.=""; $r.=""; $r.=""; @@ -872,14 +872,17 @@ function FormAch($p_cn,$p_jrn,$p_user,$p_submit,$p_array=null,$view_only=true,$p } // retrieve the tva label and name $a_fiche=GetFicheAttribut($p_cn, $march); + $march_label=$a_fiche['vw_name']; if ( $a_fiche != null and $march_tva_id == "" ) { $march_tva_id=$a_fiche['tva_id']; $march_tva_label=$a_fiche['tva_label']; - } + + + } - } + }//else } else { if ( $view_only ) { diff --git a/include/user_common.php b/include/user_common.php index ad794c28f..0816b6d06 100644 --- a/include/user_common.php +++ b/include/user_common.php @@ -66,6 +66,7 @@ echo_debug("ComputeVat $a_fiche $a_quant $a_price"); foreach ( $a_fiche as $t=>$el) { echo_debug("t $t e $el"); } + $r=null; // foreach goods foreach ( $a_fiche as $idx=>$element) { echo_debug ("idx $idx element $element");
codeDénominationPrix