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

Minor fix

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-23 18:12:29 +00:00
parent 24c6197ab0
commit c7ce0f1c3f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/contact/class/contact.class.php
View File

@ -216,6 +216,8 @@ class Contact extends CommonObject
} }
else else
{ {
$this->error=join(',',$this->errors);
dol_syslog("Contact::update Error ".$this->error,LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -$error; return -$error;
} }
@ -430,14 +432,14 @@ class Contact extends CommonObject
$this->nom = $obj->name; $this->nom = $obj->name;
$this->prenom = $obj->firstname; $this->prenom = $obj->firstname;
$this->address = $obj->address?$obj->address:$obj->socaddress; $this->address = $obj->address;
$this->adresse = $obj->address?$obj->address:$obj->socaddress; // TODO obsolete $this->adresse = $obj->address; // TODO obsolete
$this->cp = $obj->cp?$obj->cp:$obj->soccp; $this->cp = $obj->cp;
$this->ville = $obj->ville?$obj->ville:$obj->soccity; $this->ville = $obj->ville;
$this->fk_departement = $obj->fk_departement; $this->fk_departement = $obj->fk_departement;
$this->departement_code = $obj->fk_departement?$obj->departement_code:''; $this->departement_code = $obj->fk_departement;
$this->departement = $obj->fk_departement?$obj->departement:''; $this->departement = $obj->fk_departement;
$this->fk_pays = $obj->fk_pays; $this->fk_pays = $obj->fk_pays;
$this->pays_code = $obj->fk_pays?$obj->pays_code:''; $this->pays_code = $obj->fk_pays?$obj->pays_code:'';

4
htdocs/contact/fiche.php
View File

@ -616,7 +616,9 @@ if ($_REQUEST["id"] && $_REQUEST["action"] != 'edit')
print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($contact->address).'</td></tr>'; print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($contact->address).'</td></tr>';
// Zip Town // Zip Town
print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$contact->cp.'&nbsp;'; print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">';
print $contact->cp;
if ($contact->cp) print '&nbsp;';
print $contact->ville.'</td></tr>'; print $contact->ville.'</td></tr>';
// Country // Country