From 6c2d7c07a2c04d745e37b22b6b63e9c0ad593016 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 15 Nov 2008 21:18:40 +0000
Subject: [PATCH] Fix: Visited company not saved

---
 htdocs/compta/deplacement/deplacement.class.php | 14 +++++++++-----
 htdocs/compta/deplacement/fiche.php             | 12 ++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/deplacement/deplacement.class.php b/htdocs/compta/deplacement/deplacement.class.php
index 7b9374b0065..b07b8a9987d 100644
--- a/htdocs/compta/deplacement/deplacement.class.php
+++ b/htdocs/compta/deplacement/deplacement.class.php
@@ -40,9 +40,11 @@ class Deplacement extends CommonObject
 	var $fk_user;
 	var $km;
 	var $note;
-
+	var $socid;
+	
+	
 	/*
-	* Initialistation automatique de la classe
+	* Constructor
 	*/
 	function Deplacement($DB)
 	{
@@ -104,9 +106,10 @@ class Deplacement extends CommonObject
 		
 	}
 
-	/*
-	*
-	*/
+	/**
+	 * 
+	 *
+	 */
 	function update($user)
 	{
 		global $langs;
@@ -164,6 +167,7 @@ class Deplacement extends CommonObject
 			$obj = $this->db->fetch_object($result);
 
 			$this->id       = $obj->rowid;
+			$this->ref      = $obj->rowid;
 			$this->date     = $obj->dated;
 			$this->fk_user  = $obj->fk_user;
 			$this->socid    = $obj->fk_soc;
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 4929641cec6..4c22a2d0487 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -197,13 +197,13 @@ else
 				print '</td></tr>';
 
 				print "<tr>";
-				print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-				print $html->select_societes($soc->id,'socid','',1);
+				print '<td>'.$langs->trans("Type").'</td><td>';
+				print $html->select_type_fees($deplacement->type,'type',1);
 				print '</td></tr>';
 
 				print "<tr>";
-				print '<td>'.$langs->trans("Type").'</td><td>';
-				print $html->select_type_fees($deplacement->type,'type',1);
+				print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+				print $html->select_societes($soc->id,'socid','',1);
 				print '</td></tr>';
 
 				print "<tr>";
@@ -254,13 +254,13 @@ else
 				print $deplacement->ref;
 				print '</td></tr>';
 				
+				print '<tr><td>'.$langs->trans("Type").'</td><td>'.$langs->trans($deplacement->type).'</td></tr>';
+				
 				print '<tr><td width="20%">'.$langs->trans("CompanyVisited").'</td>';
 				print '<td>';
 				if ($soc->id) print $soc->getNomUrl(1);
 				print '</td></tr>';
 
-				print '<tr><td>'.$langs->trans("Type").'</td><td>'.$langs->trans($deplacement->type).'</td></tr>';
-				
 				print '<tr><td>'.$langs->trans("Person").'</td><td>';
 				$userfee=new User($db,$deplacement->fk_user);
 				$userfee->fetch();