From 1137b69a0335d6fc55b0fe2a352804fc1fe3436c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 27 Oct 2011 18:17:27 +0200
Subject: [PATCH] Fix: use loadurl just for textarea and numeric

---
 htdocs/compta/deplacement/fiche.php   | 6 +++---
 htdocs/core/class/html.form.class.php | 1 +
 htdocs/core/js/editinplace.js         | 7 -------
 htdocs/fichinter/fiche.php            | 4 ++--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 657b2eb46a0..b704fa5a016 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -361,7 +361,7 @@ else if ($id)
 
 			// Km/Price
 			print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td>';
-			print '<td>'.$form->editInPlace($object->km, 'km', $object->element, 'text').'</td></tr>';
+			print '<td>'.$form->editInPlace($object->km, 'km', $object->element, 'numeric').'</td></tr>';
 			
 			// Where
 			print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
@@ -405,7 +405,7 @@ else if ($id)
 			// Public note
 			print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
 			print '<td valign="top" colspan="3">';
-			print $form->editInPlace(($object->note_public ? dol_nl2br($object->note_public) : "&nbsp;"), 'note_public', $user->rights->deplacement->creer);
+			print $form->editInPlace(dol_nl2br($object->note_public), 'note_public', $user->rights->deplacement->creer);
 			print "</td></tr>";
 			
 			// Private note
@@ -413,7 +413,7 @@ else if ($id)
 			{
 				print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
 				print '<td valign="top" colspan="3">';
-				print $form->editInPlace(($object->note_private ? dol_nl2br($object->note_private) : "&nbsp;"), 'note', $user->rights->deplacement->creer);
+				print $form->editInPlace(dol_nl2br($object->note_private), 'note', $user->rights->deplacement->creer);
 				print "</td></tr>";
 			}
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f1efc7b0cdf..ad387968520 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -156,6 +156,7 @@ class Form
     	global $user;
     	
     	$out='';
+    	$value = ($value ? $value : "&nbsp;");
     	
     	if ($condition)
     	{
diff --git a/htdocs/core/js/editinplace.js b/htdocs/core/js/editinplace.js
index a09e97049fa..e3db88f3d50 100644
--- a/htdocs/core/js/editinplace.js
+++ b/htdocs/core/js/editinplace.js
@@ -42,13 +42,6 @@ $(document).ready(function() {
 			cancel		: cancelInPlace,
 			submit		: submitInPlace,
 			indicator	: indicatorInPlace,
-			loadurl		: urlLoadInPlace,
-			loaddata	: {
-				type: 'text',
-				element: element,
-				table_element: table_element,
-				fk_element: fk_element
-			},
 			submitdata	: {
 				type: 'text',
 				element: element,
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 37622508641..b066871fe55 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -870,7 +870,7 @@ else if ($id > 0 || ! empty($ref))
     // Public note
     print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
     print '<td valign="top" colspan="3">';
-    print $form->editInPlace(($object->note_public ? dol_nl2br($object->note_public) : "&nbsp;"), 'note_public', $user->rights->ficheinter->creer);
+    print $form->editInPlace(dol_nl2br($object->note_public), 'note_public', $user->rights->ficheinter->creer);
     print "</td></tr>";
     	
     // Private note
@@ -878,7 +878,7 @@ else if ($id > 0 || ! empty($ref))
     {
     	print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
     	print '<td valign="top" colspan="3">';
-    	print $form->editInPlace(($object->note_private ? dol_nl2br($object->note_private) : "&nbsp;"), 'note_private', $user->rights->ficheinter->creer);
+    	print $form->editInPlace(dol_nl2br($object->note_private), 'note_private', $user->rights->ficheinter->creer);
     	print "</td></tr>";
     }