From c7ce0f1c3f93fde9266d35844ed875e4bf32832f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 23 Jun 2010 18:12:29 +0000
Subject: [PATCH] Minor fix

---
 htdocs/contact/class/contact.class.php | 14 ++++++++------
 htdocs/contact/fiche.php               |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 56c663a9d4f..9cae4ad0175 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -216,6 +216,8 @@ class Contact extends CommonObject
 			}
 			else
 			{
+				$this->error=join(',',$this->errors);
+				dol_syslog("Contact::update Error ".$this->error,LOG_ERR);
 				$this->db->rollback();
 				return -$error;
 			}
@@ -430,14 +432,14 @@ class Contact extends CommonObject
 				$this->nom            = $obj->name;
 				$this->prenom         = $obj->firstname;
 
-				$this->address        = $obj->address?$obj->address:$obj->socaddress;
-				$this->adresse        = $obj->address?$obj->address:$obj->socaddress; // TODO obsolete
-				$this->cp             = $obj->cp?$obj->cp:$obj->soccp;
-				$this->ville          = $obj->ville?$obj->ville:$obj->soccity;
+				$this->address        = $obj->address;
+				$this->adresse        = $obj->address; // TODO obsolete
+				$this->cp             = $obj->cp;
+				$this->ville          = $obj->ville;
 
 				$this->fk_departement = $obj->fk_departement;
-				$this->departement_code = $obj->fk_departement?$obj->departement_code:'';
-				$this->departement	  = $obj->fk_departement?$obj->departement:'';
+				$this->departement_code = $obj->fk_departement;
+				$this->departement	  = $obj->fk_departement;
 
 				$this->fk_pays        = $obj->fk_pays;
 				$this->pays_code      = $obj->fk_pays?$obj->pays_code:'';
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 891dc23efac..039181c6b3e 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -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>';
 
 	// 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>';
 
 	// Country