From 32232bb795c26c33b3ca115ab85429465b51eab0 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Thu, 26 Feb 2004 16:55:52 +0000
Subject: [PATCH] Ajout gestion du statut commercial

---
 htdocs/societe.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php
index 0accb9c877b..a95ae3bb5ec 100644
--- a/htdocs/societe.class.php
+++ b/htdocs/societe.class.php
@@ -132,14 +132,16 @@ class Societe {
       $sql .= ", s.siret, s.capital, s.ape, s.tva_intra, s.rubrique, s.fk_effectif";
       $sql .= ", e.libelle as effectif, e.id as effectif_id";
       $sql .= ", s.fk_forme_juridique as forme_juridique_id, fj.libelle as forme_juridique";
-      $sql .= ", s.fk_departement, s.fk_pays";
+      $sql .= ", s.fk_departement, s.fk_pays, s.fk_stcomm";
       $sql .= ", p.libelle as pays";
+      $sql .= ", st.libelle as stcomm";
       $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
       $sql .= ", ".MAIN_DB_PREFIX."c_effectif as e";
       $sql .= ", ".MAIN_DB_PREFIX."c_pays as p";
+      $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
       $sql .= ", ".MAIN_DB_PREFIX."c_forme_juridique as fj";
-
-      $sql .= " WHERE s.idp = '".$this->id . "'";
+      $sql .= " WHERE s.idp = ".$this->id;
+      $sql .= " AND s.fk_stcomm = st.id";
       $sql .= " AND s.fk_effectif = e.id";
       $sql .= " AND s.fk_pays = p.rowid";
       $sql .= " AND s.fk_forme_juridique = fj.code";
@@ -163,6 +165,9 @@ class Societe {
 	      $this->departement_id = $obj->fk_departement;
 	      $this->pays_id = $obj->fk_pays;
 
+	      $this->stcomm_id = $obj->fk_stcomm; // statut commercial
+	      $this->statut_commercial = $obj->stcomm; // statut commercial
+
 	      $this->pays = $obj->pays;
 
 	      $this->url = $obj->url;