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

Fix: Le type de societe etait mal charg

Browse Source
This commit is contained in:
Laurent Destailleur 2007-07-23 22:57:21 +00:00
parent 03867d5d7c
commit be068e4f23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/soc.php
View File

@ -1021,8 +1021,8 @@ else
print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">'.$soc->forme_juridique.'</td></tr>'; print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">'.$soc->forme_juridique.'</td></tr>';
// Type + Staff // Type + Staff
$arr = $soc->typent_array($soc->typent_id); $arr = $soc->typent_array(1);
$soc->typent= $arr[$soc->typent_id]; $soc->typent= $arr[$soc->typent_code];
print '<tr><td>'.$langs->trans("Type").'</td><td>'.$soc->typent.'</td><td>'.$langs->trans("Staff").'</td><td>'.$soc->effectif.'</td></tr>'; print '<tr><td>'.$langs->trans("Type").'</td><td>'.$soc->typent.'</td><td>'.$langs->trans("Staff").'</td><td>'.$soc->effectif.'</td></tr>';
// RIB // RIB

6
htdocs/societe.class.php
View File

@ -515,12 +515,14 @@ class Societe
$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';
$sql .= ', te.code as typent_code';
$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
$sql .= ' WHERE s.rowid = '.$socid; $sql .= ' WHERE s.rowid = '.$socid;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -577,8 +579,8 @@ class Societe
$this->tva_intra_num = substr($obj->tva_intra,2); $this->tva_intra_num = substr($obj->tva_intra,2);
$this->typent_id = $obj->typent_id; $this->typent_id = $obj->typent_id;
//$this->typent = $obj->fk_typent?$obj->typeent:''; $this->typent_code = $obj->typent_code;
$this->effectif_id = $obj->effectif_id; $this->effectif_id = $obj->effectif_id;
$this->effectif = $obj->effectif_id?$obj->effectif:''; $this->effectif = $obj->effectif_id?$obj->effectif:'';