diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index c71d4c84967..2004f90091d 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -809,16 +809,16 @@ class Form { global $langs; print ''; - $options = array("oui","non"); - foreach($options as $value) + $options = array(0=>"non",1=>"oui"); + foreach($options as $id => $value) { - if ($selected == $value) + if ($selected == $id) { - print ''.$value; + print ''.$value; } else { - print ''.$value; + print ''.$value; } print ''; } @@ -1266,6 +1266,7 @@ class Form function form_assujetti_tva($page, $selected='', $htmlname='') { global $langs; + $options = array(0=>"non",1=>"oui"); if ($htmlname != "none") { print ''; @@ -1281,7 +1282,7 @@ class Form { if ($selected) { - print $selected; + print $options[$selected]; } else { print " "; } diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php index 6fe6ca4837b..f1392820f7c 100644 --- a/htdocs/societe.class.php +++ b/htdocs/societe.class.php @@ -439,7 +439,7 @@ class Societe { $sql .= ', s.fk_effectif as effectif_id, e.libelle as effectif'; $sql .= ', s.fk_forme_juridique as forme_juridique_code, fj.libelle as forme_juridique'; $sql .= ', s.code_client, s.code_compta, s.code_fournisseur, s.parent'; - $sql .= ', s.fk_departement, s.fk_pays, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement'; + $sql .= ', s.fk_departement, s.fk_pays, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.tva_assuj'; $sql .= ', p.code as pays_code, p.libelle as pays'; $sql .= ', d.code_departement as departement_code, d.nom as departement'; $sql .= ', st.libelle as stcomm'; @@ -524,7 +524,7 @@ class Societe { $this->remise_client = $obj->remise_client; $this->mode_reglement = $obj->mode_reglement; $this->cond_reglement = $obj->cond_reglement; - + $this->tva_assuj = $obj->tva_assuj; $this->client = $obj->client; $this->fournisseur = $obj->fournisseur;