Fix: edit in place datepicker more stable

.cvsignore

@@ -1,14 +0,0 @@
-index.php
-*.htaccess
-*.settings
-*.buildpath
-*.project
-*.cache
-*.log
-*.DS_Store
-document
-documents
-DEBIAN
-install.lock
-*.patch
-default.properties

build/.cvsignore

@@ -1,19 +0,0 @@
-dolibarr-*.exe
-dolibarr-*.tgz
-dolibarr-*.zip
-dolibarr-*.rpm
-dolibarr-*.deb
-makepack-google.conf
-module_google-*.tgz
-module_pibarcode-1.0.tgz
-*.exe
-*.tgz
-*.torrent
-*.zip
-version-phpsane.txt
-makepack-phpsane.conf
-html
-*.deb
-*.dsc
-*.tar.gz
-*.changes

build/exe/doliwamp/.cvsignore

@@ -1,3 +0,0 @@
-*.db
-ca_dolibarr.key
-doliwamptest.iss

dev/.cvsignore

@@ -1 +0,0 @@
-spec

dev/phpunit/.cvsignore

@@ -1 +0,0 @@
-Thumbs.db

dev/skeletons/.cvsignore

@@ -1,2 +0,0 @@
-out.*
-socpeople*

dev/test/.cvsignore

@@ -1 +0,0 @@
-example*.pdf

dev/xdebug/.cvsignore

@@ -1 +0,0 @@
-Thumbs.db

doc/images/.cvsignore

@@ -1 +0,0 @@
-*.db

htdocs/.cvsignore

@@ -1,10 +0,0 @@
-google
-.htaccess
-.DS_Store
-.documents
-dolibarr_mail
-demo_pwc
-phpsane
-test.php
-custom
-custom2

htdocs/admin/.cvsignore

@@ -1 +0,0 @@
-google.php

htdocs/compta/deplacement/fiche.php

@@ -356,8 +356,7 @@ else if ($id)
 
 			// Date
 			print '<tr><td>'.$langs->trans("Date").'</td><td>';
-			print $form->editInPlace($object->date, 'date', $user->rights->deplacement->creer, 'datepicker');
-			//print dol_print_date($object->date,'day');
+			print $form->editInPlace($object->date, 'dated', $user->rights->deplacement->creer, 'datepicker');
 			print '</td></tr>';
 
 			// Km/Price

htdocs/conf/.cvsignore

@@ -1,4 +0,0 @@
-conf.php*.sav
-*.php
-conf.php.mysql
-conf.php.postgres

htdocs/core/ajax/saveinplace.php

@@ -37,7 +37,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php");
 top_httphead();
 
 //print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
-print_r($_POST);
+//print_r($_POST);
 
 // Load original field value
 if((isset($_POST['field']) && ! empty($_POST['field']))
@@ -51,7 +51,9 @@ if((isset($_POST['field']) && ! empty($_POST['field']))
 	$fk_element		= GETPOST('fk_element');
 	$value			= GETPOST('value');
 	$type			= GETPOST('type');
+	$timestamp		= GETPOST('timestamp');
 	
+	$format='text';
 	$return=array();
 	$error=0;
 	
@@ -62,26 +64,31 @@ if((isset($_POST['field']) && ! empty($_POST['field']))
 		$object = new GenericObject($db);
 		
 		// Clean parameters
-		$value = trim($value);
+		$newvalue = trim($value);
 		if ($type == 'numeric')
 		{
-			$value = price2num($value);
+			$newvalue = price2num($newvalue);
 		
 			// Check parameters
-			if (! is_numeric($value))
+			if (! is_numeric($newvalue))
 			{
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
 		}
+		else if ($type == 'datepicker')
+		{
+			$format = 'date';
+			$newvalue = ($timestamp / 1000);
+		}
 		
 		if (! $error)
 		{
-			$ret=$object->setValueFrom($table_element, $fk_element, $field, $value);
+			$ret=$object->setValueFrom($table_element, $fk_element, $field, $newvalue, $format);
 			if ($ret > 0)
 			{
-				if ($type == 'numeric') $value = price($value);
-				else if ($type == 'textarea') $value = dol_nl2br($value);
+				if ($type == 'numeric') $value = price($newvalue);
+				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
 				
 				$return['value'] = $value;
 			}

htdocs/core/class/commonobject.class.php

@@ -622,16 +622,18 @@ abstract class CommonObject
 	 *	@param	int		$id			Object id
 	 *	@param	string	$field		Field to update
 	 *	@param	mixte	$value		New value
+	 *	@param	string	$format		Data format
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-	function setValueFrom($table, $id, $field, $value)
+	function setValueFrom($table, $id, $field, $value, $format='text')
 	{
 		global $conf;
 		
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
-		$sql.= $field." = '".$this->db->escape($value)."'";
+		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
+		else if ($format == 'date') $sql.= $field." = '".$this->db->idate($value)."'";
 		$sql.= " WHERE rowid = ".$id;
 
 		dol_syslog(get_class($this)."::setValueFrom sql=".$sql, LOG_DEBUG);

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

@@ -164,6 +164,9 @@ class Form
     	
     	if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && $condition)
     	{
+    		// Use for timestamp format
+    		if ($type == 'datepicker') $out.= '<input id="timeStamp" type="hidden"/>';
+    		
     		$out.= '<div class="edit_'.$type.'" id="'.$htmlname.'">';
     		$out.= $value;
     		$out.= '</div>';

htdocs/core/js/editinplace.js

@@ -105,11 +105,14 @@ $(document).ready(function() {
 		cancel		: cancelInPlace,
 		submit		: submitInPlace,
 		indicator	: indicatorInPlace,
-		submitdata	: {
-			type: 'datepicker',
-			element: element,
-			table_element: table_element,
-			fk_element: fk_element
+		submitdata	: function(value, settings) {
+			return {
+				type: 'datepicker',
+				element: element,
+				table_element: table_element,
+				fk_element: fk_element,
+				timestamp: $('#timeStamp').val()
+			};
 		},
 		callback : function(result, settings) {
 			var obj = $.parseJSON(result);

htdocs/core/modules/.cvsignore

@@ -1,2 +0,0 @@
-modGoogle.class.php
-modPHPSane.class.php

htdocs/core/modules/mailings/.cvsignore

@@ -1,2 +0,0 @@
-mailinglist_chatsderace.modules.php
-mailinglist_chiensderace.modules.php

htdocs/includes/.cvsignore

@@ -1,5 +0,0 @@
-jpgraph2
-phpsane
-php_excelreader
-.DS_Store
-ckfinder

htdocs/includes/jquery/plugins/flot/.cvsignore

@@ -1 +0,0 @@
-examples

htdocs/includes/jquery/plugins/jcrop/.cvsignore

@@ -1,2 +0,0 @@
-aaa.txt
-demos

htdocs/includes/nusoap/.cvsignore

@@ -1 +0,0 @@
-samples

htdocs/install/.cvsignore

@@ -1 +0,0 @@
-install.forced.php

htdocs/langs/ca_ES/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/en_AU/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/en_IN/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/en_NZ/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/en_US/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/es_ES/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/es_PR/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/fr_BE/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/fr_FR/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js

@@ -16,6 +16,8 @@ jQuery(function($){
 		dayNamesShort: ['Dim.','Lun.','Mar.','Mer.','Jeu.','Ven.','Sam.'],
 		dayNamesMin: ['D','L','M','M','J','V','S'],
 		weekHeader: 'Sem.',
+		altField: '#timeStamp',
+        altFormat: '@',        // Gives a timestamp dateformat
 		dateFormat: 'dd/mm/yy',
 		firstDay: 1,
 		isRTL: false,

htdocs/langs/it_IT/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/nl_BE/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/pl_PL/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/langs/pt_PT/.cvsignore

@@ -1 +0,0 @@
-google.lang

htdocs/paypal/img/.cvsignore

@@ -1 +0,0 @@
-Thumbs.db

htdocs/public/donations/.cvsignore

@@ -1,9 +0,0 @@
-don.php
-merci.php
-valid.php
-erreur.php
-navigation.fr.xsl
-fsfe-fr.xsl
-eucd.css
-donateurs.php
-graph.php

htdocs/support/.cvsignore

@@ -1 +0,0 @@
-Thumbs.db

htdocs/theme/.cvsignore

@@ -1,3 +0,0 @@
-*.db
-clear
-bureau2crea?-?ancien

htdocs/theme/auguria/.cvsignore

@@ -1 +0,0 @@
-*.db

htdocs/theme/auguria/fckeditor/.cvsignore

@@ -1 +0,0 @@
-Thumbs.db

htdocs/theme/auguria/fckeditor/images/.cvsignore

@@ -1,2 +0,0 @@
-*.db
-*.db

htdocs/theme/auguria/img/.cvsignore

@@ -1 +0,0 @@
-*.db

htdocs/theme/auguria/img/menus/.cvsignore

@@ -1 +0,0 @@
-tango-icon-theme*

htdocs/theme/bureau2crea/.cvsignore

@@ -1,2 +0,0 @@
-*.db
-style.css?-?Copie.php

htdocs/theme/bureau2crea/fckeditor/.cvsignore

@@ -1 +0,0 @@
-Thumbs.db

htdocs/theme/bureau2crea/fckeditor/images/.cvsignore

@@ -1,2 +0,0 @@
-*.db
-*.db

htdocs/theme/bureau2crea/img/.cvsignore

@@ -1 +0,0 @@
-*.db

htdocs/theme/bureau2crea/img/menus/.cvsignore

@@ -1 +0,0 @@
-tango-icon-theme*

htdocs/theme/common/.cvsignore

@@ -1 +0,0 @@
-*.db

htdocs/theme/common/flags/.cvsignore

@@ -1 +0,0 @@
-Thumbs.db

htdocs/theme/common/mime/.cvsignore

@@ -1 +0,0 @@
-*.db

htdocs/theme/common/treemenu/.cvsignore

@@ -1,2 +0,0 @@
-*.db
-*.db

htdocs/theme/eldy/.cvsignore

@@ -1 +0,0 @@
-*.db

htdocs/theme/eldy/fckeditor/.cvsignore

@@ -1 +0,0 @@
-Thumbs.db

htdocs/theme/eldy/fckeditor/images/.cvsignore

@@ -1,2 +0,0 @@
-*.db
-*.db

htdocs/theme/eldy/img/.cvsignore

@@ -1 +0,0 @@
-*.db

htdocs/theme/eldy/img/menus/.cvsignore

@@ -1 +0,0 @@
-tango-icon-theme*

test/.cvsignore

@@ -1 +0,0 @@
-report

test/phpunit/.cvsignore

@@ -1 +0,0 @@
-report