diff --git a/htdocs/fourn/index.php3 b/htdocs/fourn/index.php3 index ed362269d49..14c78777901 100644 --- a/htdocs/fourn/index.php3 +++ b/htdocs/fourn/index.php3 @@ -1,8 +1,5 @@ - * - * $Id$ - * $Source$ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ + * $Source$ + * */ require("./pre.inc.php3"); require("../contact.class.php3"); diff --git a/htdocs/fourn/pre.inc.php3 b/htdocs/fourn/pre.inc.php3 index d8b543ce4a2..1a9691ff5d8 100644 --- a/htdocs/fourn/pre.inc.php3 +++ b/htdocs/fourn/pre.inc.php3 @@ -1,8 +1,5 @@ - * - * $Id$ - * $Source$ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ + * $Source$ + * */ require("../main.inc.php3"); @@ -33,7 +33,7 @@ function llxHeader($head = "", $urlp = "") { $menu = new Menu(); - $menu->add("/comm/index.php3", "Clients"); + $menu->add("/comm/clients.php3", "Clients"); $menu->add("/fourn/index.php3", "Fournisseurs"); diff --git a/htdocs/soc.php3 b/htdocs/soc.php3 index 50ecc6d4f5f..08cfc1f69b0 100644 --- a/htdocs/soc.php3 +++ b/htdocs/soc.php3 @@ -1,9 +1,6 @@ * - * $Id$ - * $Source$ - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ + * $Source$ + * */ require("pre.inc.php3"); @@ -135,11 +135,12 @@ if ($action == 'create') { print ''; print ''; print ''; + } else { $soc = new Societe($db); $soc->id = $socid; - $soc->fetch(); + $soc->fetch($socid); print "[Editer]"; print ''; print ''; @@ -152,13 +153,9 @@ if ($action == 'create') { print ''; - print ''; + print ''; - print ''; print '
Nom'.$soc->nom.'
Siren'.$soc->siren.'
Type'; + print '
Client'.$soc->client.'
Fournisseur'.$soc->fournisseur.'
Effectif'; - - print '
'; diff --git a/htdocs/societe.class.php3 b/htdocs/societe.class.php3 index bbb1e65eaf7..48ece9cdf3d 100644 --- a/htdocs/societe.class.php3 +++ b/htdocs/societe.class.php3 @@ -92,7 +92,7 @@ class Societe { $sql = "SELECT s.idp, s.nom, s.address,".$this->db->pdate("s.datec")." as dc,"; - $sql .= " s.tel, s.fax, s.url,s.cp,s.ville, s.note, s.siren"; + $sql .= " s.tel, s.fax, s.url,s.cp,s.ville, s.note, s.siren, client, fournisseur"; $sql .= " FROM societe as s"; $sql .= " WHERE s.idp = ".$this->id; @@ -114,6 +114,10 @@ class Societe { $this->ville = $obj->ville; $this->siren = $obj->siren; + + $this->client = $obj->client; + $this->fournisseur = $obj->fournisseur; + $this->note = $obj->note; }