lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modif pour assuj tva ou non

Browse Source
This commit is contained in:
Andre Cianfarani 2006-02-20 16:29:55 +00:00
parent da6eeba48f
commit fb2b73ec5d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/html.form.class.php
View File

@ -809,16 +809,16 @@ class Form
{ {
global $langs; global $langs;
print '<select class="flat" name="'.$htmlname.'">'; print '<select class="flat" name="'.$htmlname.'">';
$options = array("oui","non"); $options = array(0=>"non",1=>"oui");
foreach($options as $value) foreach($options as $id => $value)
{ {
if ($selected == $value) if ($selected == $id)
{ {
print '<option value="'.$value.'" selected="true">'.$value; print '<option value="'.$id.'" selected="true">'.$value;
} }
else else
{ {
print '<option value="'.$value.'">'.$value; print '<option value="'.$id.'">'.$value;
} }
print '</option>'; print '</option>';
} }
@ -1266,6 +1266,7 @@ class Form
function form_assujetti_tva($page, $selected='', $htmlname='') function form_assujetti_tva($page, $selected='', $htmlname='')
{ {
global $langs; global $langs;
$options = array(0=>"non",1=>"oui");
if ($htmlname != "none") if ($htmlname != "none")
{ {
print '<form method="post" action="'.$page.'">'; print '<form method="post" action="'.$page.'">';
@ -1281,7 +1282,7 @@ class Form
{ {
if ($selected) if ($selected)
{ {
print $selected; print $options[$selected];
} else { } else {
print "&nbsp;"; print "&nbsp;";
} }

4
htdocs/societe.class.php
View File

@ -439,7 +439,7 @@ class Societe {
$sql .= ', s.fk_effectif as effectif_id, e.libelle as effectif'; $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.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.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 .= ', p.code as pays_code, p.libelle as pays';
$sql .= ', d.code_departement as departement_code, d.nom as departement'; $sql .= ', d.code_departement as departement_code, d.nom as departement';
$sql .= ', st.libelle as stcomm'; $sql .= ', st.libelle as stcomm';
@ -524,7 +524,7 @@ class Societe {
$this->remise_client = $obj->remise_client; $this->remise_client = $obj->remise_client;
$this->mode_reglement = $obj->mode_reglement; $this->mode_reglement = $obj->mode_reglement;
$this->cond_reglement = $obj->cond_reglement; $this->cond_reglement = $obj->cond_reglement;
$this->tva_assuj = $obj->tva_assuj;
$this->client = $obj->client; $this->client = $obj->client;
$this->fournisseur = $obj->fournisseur; $this->fournisseur = $obj->fournisseur;