Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

htdocs/core/class/html.form.class.php

@@ -242,8 +242,6 @@ class Form
             $savemethod		= false;
             $ext_element	= false;
             $button_only	= false;
-            //$ext_table_element = false;
-            //$ext_fk_element = false;
 
             if (is_object($object))
             {
@@ -255,8 +253,6 @@ class Form
             if (is_object($extObject))
             {
                 $ext_element = $extObject->element;
-                //$ext_table_element = $extObject->table_element;
-                //$ext_fk_element = $extObject->id;
             }
 
             if (preg_match('/^(string|email|numeric)/',$inputType))
@@ -273,7 +269,7 @@ class Form
 
                 $out.= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
             }
-            else if (preg_match('/^select/',$inputType))
+            else if (preg_match('/^(select|autocomplete)/',$inputType))
             {
                 $tmp=explode(':',$inputType);
                 $inputType=$tmp[0]; $loadmethod=$tmp[1];
@@ -302,11 +298,9 @@ class Form
             $out.= '<input id="table_element_'.$htmlname.'" value="'.$table_element.'" type="hidden"/>'."\n";
             $out.= '<input id="fk_element_'.$htmlname.'" value="'.$fk_element.'" type="hidden"/>'."\n";
             $out.= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";
-            $out.= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
+            if (! empty($savemethod))	$out.= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
-            $out.= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
+            if (! empty($ext_element))	$out.= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
             if (! empty($success))		$out.= '<input id="success_'.$htmlname.'" value="'.$success.'" type="hidden"/>'."\n";
-            //$out.= '<input id="ext_table_element_'.$htmlname.'" value="'.$ext_table_element.'" type="hidden"/>'."\n";
-            //$out.= '<input id="ext_fk_element_'.$htmlname.'" value="'.$ext_fk_element.'" type="hidden"/>'."\n";
 
             $out.= '<div id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</div>'."\n";
             $out.= '<div id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(! empty($editvalue) ? $editvalue : $value).'</div>'."\n";

htdocs/core/js/editinplace.js

@@ -37,12 +37,10 @@ $(document).ready(function() {
 		indicator	: indicatorInPlace,
 		loadurl		: urlLoadInPlace,
 		loaddata	: function(result, settings) {
-			var htmlname = $(this).attr('id').substr(8);
+			return getParameters(this, 'textarea');
-			return getParameters('textarea', htmlname);
 		},
 		submitdata	: function(result, settings) {
-			var htmlname = $(this).attr('id').substr(8);
+			return getParameters(this, 'textarea');
-			return getParameters('textarea', htmlname);
 		},
 		callback	: function(result, settings) {
 			getResult(this, result);
@@ -85,8 +83,7 @@ $(document).ready(function() {
 			toolbar: $('#ckeditor_toolbar').val()
 		},
 		submitdata	: function(result, settings) {
-			var htmlname = $(this).attr('id').substr(8);
+			return getParameters(this, 'ckeditor');
-			return getParameters('ckeditor', htmlname);
 		},
 		callback	: function(result, settings) {
 			getResult(this, result);
@@ -125,8 +122,7 @@ $(document).ready(function() {
 		submit		: submitInPlace,
 		indicator	: indicatorInPlace,
 		submitdata	: function(result, settings) {
-			var htmlname = $(this).attr('id').substr(8);
+			return getParameters(this, 'string');
-			return getParameters('string', htmlname);
 		},
 		callback	: function(result, settings) {
 			getResult(this, result);
@@ -165,8 +161,7 @@ $(document).ready(function() {
 		submit		: submitInPlace,
 		indicator	: indicatorInPlace,
 		submitdata	: function(result, settings) {
-			var htmlname = $(this).attr('id').substr(8);
+			return getParameters(this, 'numeric');
-			return getParameters('numeric', htmlname);
 		},
 		callback	: function(result, settings) {
 			getResult(this, result);
@@ -205,8 +200,7 @@ $(document).ready(function() {
 		submit		: submitInPlace,
 		indicator	: indicatorInPlace,
 		submitdata	: function(result, settings) {
-			var htmlname = $(this).attr('id').substr(8);
+			return getParameters(this, 'datepicker');
-			return getParameters('datepicker', htmlname);
 		},
 		callback	: function(result, settings) {
 			getResult(this, result);
@@ -244,12 +238,10 @@ $(document).ready(function() {
 		indicator	: indicatorInPlace,
 		loadurl		: urlLoadInPlace,
 		loaddata	: function(result, settings) {
-			var htmlname = $(this).attr('id').substr(8);
+			return getParameters(this, 'select');
-			return getParameters('select', htmlname);
 		},
 		submitdata	: function(result, settings) {
-			var htmlname = $(this).attr('id').substr(8);
+			return getParameters(this, 'select');
-			return getParameters('select', htmlname);
 		},
 		callback	: function(result, settings) {
 			getResult(this, result);
@@ -275,7 +267,52 @@ $(document).ready(function() {
 		$('#editval_' + $(this).attr('id')).show().click();
 	});
 	
-	function getParameters(type, htmlname) {
+	// for test only (not stable)
+	$('.editval_autocomplete').editable(urlSaveInPlace, {
+		type		: 'autocomplete',
+		id			: 'field',
+		width		: 300,
+		onblur		: 'ignore',
+		tooltip		: tooltipInPlace,
+		placeholder	: ' ',
+		cancel		: cancelInPlace,
+		submit		: submitInPlace,
+		indicator	: indicatorInPlace,
+		autocomplete : {
+			source : urlLoadInPlace,
+			data : function(result, settings) {
+				return getParameters(this, 'select');
+			}
+		},
+		submitdata	: function(result, settings) {
+			return getParameters(this, 'select');
+		},
+		callback	: function(result, settings) {
+			getResult(this, result);
+		},
+		onreset		: function(result, settings) {
+			getDefault(settings);
+		}
+	});
+	$('.editkey_autocomplete').hover(
+			function () {
+				$('#viewval_' + $(this).attr('id')).addClass("viewval_hover");
+			},
+			function () {
+				$('#viewval_' + $(this).attr('id')).removeClass("viewval_hover");
+			}
+	);
+	$('.viewval_autocomplete.active').click(function() {
+		$('#viewval_' + $(this).attr('id').substr(8)).hide();
+		$('#editval_' + $(this).attr('id').substr(8)).show().click();
+	});
+	$('.editkey_autocomplete').click(function() {
+		$('#viewval_' + $(this).attr('id')).hide();
+		$('#editval_' + $(this).attr('id')).show().click();
+	});
+	
+	function getParameters(obj, type) {
+		var htmlname		= $(obj).attr('id').substr(8);
 		var element			= $('#element_' + htmlname).val();
 		var table_element	= $('#table_element_' + htmlname).val();
 		var fk_element		= $('#fk_element_' + htmlname).val();
@@ -283,8 +320,6 @@ $(document).ready(function() {
 		var savemethod		= $('#savemethod_' + htmlname).val();
 		var ext_element		= $('#ext_element_' + htmlname).val();
 		var timestamp		= $('#timestamp').val();
-		//var ext_table_element = $( '#ext_table_element_' + htmlname ).val();
-		//var ext_fk_element = $( '#ext_fk_element_' + htmlname ).val();
 		
 		return {
 			type: type,
@@ -294,9 +329,7 @@ $(document).ready(function() {
 			loadmethod: loadmethod,
 			savemethod: savemethod,
 			timestamp: timestamp,
-			ext_element: ext_element,
+			ext_element: ext_element
-			//ext_table_element: ext_table_element,
-			//ext_fk_element: ext_fk_element
 		};
 	}
 	
@@ -323,15 +356,4 @@ $(document).ready(function() {
 		$('#editval_' + htmlname).hide();
 		$('#viewval_' + htmlname).show();
 	}
-	
-	$('.edit_autocomplete').editable(urlSaveInPlace, {
-		type		: 'autocomplete',
-		id			: 'field',
-		onblur		: 'submit',
-		tooltip		: tooltipInPlace,
-		indicator	: indicatorInPlace,
-		autocomplete : {
-			data : ["Aberdeen", "Ada", "Adamsville", "Addyston", "Adelphi", "Adena", "Adrian", "Akron"]
-		}
-	});
 });

htdocs/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js

@@ -4,6 +4,6 @@
 $.editable.addInputType('autocomplete', {
 	element	: $.editable.types.text.element,
 	plugin	: function(settings, original) {
-		$('input', this).autocomplete(settings.autocomplete.data);
+		$('input', this).autocomplete(settings.autocomplete);
 	}
 });

htdocs/paypal/lib/paypal.lib.php

@@ -763,4 +763,26 @@ function deformatNVP($nvpstr)
     return $nvpArray;
 }
 
+/**
+ * 	Get API errors
+ */
+function getApiError()
+{
+	$errors=array();
+
+	$resArray=$_SESSION['reshash'];
+
+	if(isset($_SESSION['curl_error_no']))
+	{
+		$errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
+	}
+
+	foreach($resArray as $key => $value)
+	{
+		$errors[] = $key.'-'.$value;
+	}
+
+	return $errors;
+}
+
 ?>

htdocs/theme/auguria/style.css.php

@@ -1670,7 +1670,7 @@ table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?
 /*  jQuery - jeditable                                                            */
 /* ============================================================================== */
 
-.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select {
+.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
 	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/edit.png',1) ?>) right top no-repeat;
 	cursor: pointer;
 }
@@ -1680,12 +1680,12 @@ table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?
 	cursor: pointer;
 }
 
-.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_datepicker.active:hover {
+.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover {
 	background: white;
 	cursor: pointer;
 }
 
-.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_datepicker.active:hover {
+.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_autocomplete.active:hover, .viewval_datepicker.active:hover {
 	background: white;
 	cursor: pointer;
 }

htdocs/theme/bureau2crea/style.css.php

@@ -1870,7 +1870,7 @@ table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?
 /*  jQuery - jeditable                                                            */
 /* ============================================================================== */
 
-.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select {
+.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
 	background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/edit.png',1) ?>) right top no-repeat;
 	cursor: pointer;
 }
@@ -1880,12 +1880,12 @@ table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?
 	cursor: pointer;
 }
 
-.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_datepicker.active:hover {
+.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover {
 	background: white;
 	cursor: pointer;
 }
 
-.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_datepicker.active:hover {
+.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_autocomplete.active:hover, .viewval_datepicker.active:hover {
 	background: white;
 	cursor: pointer;
 }

htdocs/theme/cameleo/style.css.php

@@ -1805,7 +1805,7 @@ table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?
 /*  jQuery - jeditable                                                            */
 /* ============================================================================== */
 
-.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select {
+.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
 	background: url(<?php echo dol_buildpath($path.'/theme/cameleo/img/edit.png',1) ?>) right top no-repeat;
 	cursor: pointer;
 }
@@ -1815,12 +1815,12 @@ table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?
 	cursor: pointer;
 }
 
-.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_datepicker.active:hover {
+.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover {
 	background: white;
 	cursor: pointer;
 }
 
-.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_datepicker.active:hover {
+.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_autocomplete.active:hover, .viewval_datepicker.active:hover {
 	background: white;
 	cursor: pointer;
 }

htdocs/theme/eldy/style.css.php

@@ -1980,7 +1980,7 @@ table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?
 /*  jQuery - jeditable                                                            */
 /* ============================================================================== */
 
-.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select {
+.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
 	background: url(<?php echo dol_buildpath($path.'/theme/eldy/img/edit.png',1) ?>) right top no-repeat;
 	cursor: pointer;
 }
@@ -1990,12 +1990,12 @@ table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?
 	cursor: pointer;
 }
 
-.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_datepicker.active:hover {
+.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover {
 	background: white;
 	cursor: pointer;
 }
 
-.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_datepicker.active:hover {
+.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_autocomplete.active:hover, .viewval_datepicker.active:hover {
 	background: white;
 	cursor: pointer;
 }