/[dolibarr]/dolibarr/htdocs/societe.class.php
ViewVC logotype

Diff of /dolibarr/htdocs/societe.class.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.95 by eldy, Wed Sep 14 22:46:33 2005 UTC revision 1.96 by eldy, Wed Sep 14 22:58:49 2005 UTC
# Line 455  class Societe { Line 455  class Societe {
455          $sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.parent";          $sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.parent";
456          $sql .= ", s.fk_departement, s.fk_pays, s.fk_stcomm, s.remise_client";          $sql .= ", s.fk_departement, s.fk_pays, s.fk_stcomm, s.remise_client";
457          $sql .= ", p.code as pays_code, p.libelle as pays";          $sql .= ", p.code as pays_code, p.libelle as pays";
458            $sql .= ", d.code_departement as departement_code, d.nom as departement";
459          $sql .= ", st.libelle as stcomm";          $sql .= ", st.libelle as stcomm";
460          $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";          $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
461          $sql .= ", ".MAIN_DB_PREFIX."c_effectif as e";          $sql .= ", ".MAIN_DB_PREFIX."c_effectif as e";
462          $sql .= ", ".MAIN_DB_PREFIX."c_pays as p";          $sql .= ", ".MAIN_DB_PREFIX."c_pays as p";
463            $sql .= ", ".MAIN_DB_PREFIX."c_departements as d";
464          $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";          $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
465          $sql .= ", ".MAIN_DB_PREFIX."c_forme_juridique as fj";          $sql .= ", ".MAIN_DB_PREFIX."c_forme_juridique as fj";
466          $sql .= " WHERE s.idp = ".$socid;          $sql .= " WHERE s.idp = ".$socid;
467          $sql .= " AND s.fk_stcomm = st.id";          $sql .= " AND s.fk_stcomm = st.id";
468          $sql .= " AND s.fk_effectif = e.id";          $sql .= " AND s.fk_effectif = e.id";
469          $sql .= " AND s.fk_pays = p.rowid";          $sql .= " AND s.fk_pays = p.rowid";
470            $sql .= " AND s.fk_departement = d.rowid";
471          $sql .= " AND s.fk_forme_juridique = fj.code";          $sql .= " AND s.fk_forme_juridique = fj.code";
472            
473          $resql=$this->db->query($sql);          $resql=$this->db->query($sql);
# Line 486  class Societe { Line 489  class Societe {
489            
490                  $this->adresse_full =  stripslashes($obj->address) . "\n". $obj->cp . " ". stripslashes($obj->ville);                  $this->adresse_full =  stripslashes($obj->address) . "\n". $obj->cp . " ". stripslashes($obj->ville);
491            
                 $this->departement_id = $obj->fk_departement;  
492                  $this->pays_id = $obj->fk_pays;                  $this->pays_id = $obj->fk_pays;
493                  $this->pays_code = $obj->fk_pays?$obj->pays_code:'';                  $this->pays_code = $obj->fk_pays?$obj->pays_code:'';
494                  $this->pays = $obj->fk_pays?($langs->trans("Country".$obj->pays_code)!="Country".$obj->pays_code?$langs->trans("Country".$obj->pays_code):$obj->pays):'';                  $this->pays = $obj->fk_pays?($langs->trans("Country".$obj->pays_code)!="Country".$obj->pays_code?$langs->trans("Country".$obj->pays_code):$obj->pays):'';
495            
496                    $this->departement_id = $obj->fk_departement;
497                    $this->departement= $obj->fk_departement?$obj->departement:'';
498    
499                  $transcode=$langs->trans("StatusProspect".$obj->fk_stcomm);                  $transcode=$langs->trans("StatusProspect".$obj->fk_stcomm);
500                  $libelle=($transcode!="StatusProspect".$obj->fk_stcomm?$transcode:$obj->stcomm);                  $libelle=($transcode!="StatusProspect".$obj->fk_stcomm?$transcode:$obj->stcomm);
501                  $this->stcomm_id = $obj->fk_stcomm;     // id statut commercial                  $this->stcomm_id = $obj->fk_stcomm;     // id statut commercial

Legend:
Removed from v.1.95  
changed lines
  Added in v.1.96

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26