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

Fix: Le champ adresse ne s'affichait pas sur les fiche socit et client

Browse Source 
Fix: Le pays est mis  blanc  l'affichage si il vaut "-".
This commit is contained in:
Laurent Destailleur 2004-05-20 11:37:41 +00:00
parent 53d13ed12a
commit e66076284a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/fiche.php
View File

@ -200,7 +200,7 @@ if ($socid > 0)
print '<tr><td width="20%">Nom</td><td width="80%" colspan="3">'; print '<tr><td width="20%">Nom</td><td width="80%" colspan="3">';
print $objsoc->nom; print $objsoc->nom;
print '</td></tr>'; print '</td></tr>';
print "<tr><td valign=\"top\">Adresse</td><td colspan=\"3\">".nl2br($objsoc->address)."<br>".$objsoc->cp." ".$objsoc->ville." ".$objsoc->pays."</td></tr>"; print "<tr><td valign=\"top\">Adresse</td><td colspan=\"3\">".nl2br($objsoc->adresse)."<br>".$objsoc->cp." ".$objsoc->ville." ".$objsoc->pays."</td></tr>";
print "<tr><td>Téléphone</td><td> $objsoc->tel&nbsp;</td><td>Fax</td><td>$objsoc->fax&nbsp;</td></tr>"; print "<tr><td>Téléphone</td><td> $objsoc->tel&nbsp;</td><td>Fax</td><td>$objsoc->fax&nbsp;</td></tr>";
print "<tr><td>Web</td><td colspan=\"3\"><a href=\"http://$objsoc->url\">$objsoc->url</a>&nbsp;</td></tr>"; print "<tr><td>Web</td><td colspan=\"3\"><a href=\"http://$objsoc->url\">$objsoc->url</a>&nbsp;</td></tr>";

2
htdocs/soc.php
View File

@ -286,7 +286,7 @@ else
print '<table class="border" cellpadding="3" cellspacing="0" width="100%">'; print '<table class="border" cellpadding="3" cellspacing="0" width="100%">';
print '<tr><td width="20%">Nom</td><td width="80%" colspan="3">'.$soc->nom.'</td></tr>'; print '<tr><td width="20%">Nom</td><td width="80%" colspan="3">'.$soc->nom.'</td></tr>';
print "<tr><td valign=\"top\">Adresse</td><td colspan=\"3\">".nl2br($soc->address)."<br>".$soc->cp." ".$soc->ville." ".$soc->pays."</td></tr>"; print "<tr><td valign=\"top\">Adresse</td><td colspan=\"3\">".nl2br($soc->adresse)."<br>".$soc->cp." ".$soc->ville." ".$soc->pays."</td></tr>";
print '<tr><td>Téléphone</td><td>'.dolibarr_print_phone($soc->tel).'</td>'; print '<tr><td>Téléphone</td><td>'.dolibarr_print_phone($soc->tel).'</td>';
print '<td>Fax</td><td>'.dolibarr_print_phone($soc->fax).'</td></tr>'; print '<td>Fax</td><td>'.dolibarr_print_phone($soc->fax).'</td></tr>';

8
htdocs/societe.class.php
View File

@ -1,7 +1,8 @@
<?PHP <?PHP
/* Copyright (C) 2003 Brian Fraval <brian@fraval.org> /* Copyright (C) 2003 Brian Fraval <brian@fraval.org>
* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -164,12 +165,11 @@ class Societe {
$this->departement_id = $obj->fk_departement; $this->departement_id = $obj->fk_departement;
$this->pays_id = $obj->fk_pays; $this->pays_id = $obj->fk_pays;
$this->pays = $obj->fk_pays?$obj->pays:'';
$this->stcomm_id = $obj->fk_stcomm; // statut commercial $this->stcomm_id = $obj->fk_stcomm; // statut commercial
$this->statut_commercial = $obj->stcomm; // statut commercial $this->statut_commercial = $obj->stcomm; // statut commercial
$this->pays = $obj->pays;
$this->url = $obj->url; $this->url = $obj->url;
$this->tel = $obj->tel; $this->tel = $obj->tel;