diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index bb36fc7af21..00000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-index.php
-*.htaccess
-*.settings
-*.buildpath
-*.project
-*.cache
-*.log
-*.DS_Store
-document
-documents
-DEBIAN
-install.lock
-*.patch
-default.properties
diff --git a/build/.cvsignore b/build/.cvsignore
deleted file mode 100644
index 53dd6ee2abd..00000000000
--- a/build/.cvsignore
+++ /dev/null
@@ -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
diff --git a/build/exe/doliwamp/.cvsignore b/build/exe/doliwamp/.cvsignore
deleted file mode 100644
index b0ebc4e224b..00000000000
--- a/build/exe/doliwamp/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.db
-ca_dolibarr.key
-doliwamptest.iss
diff --git a/dev/.cvsignore b/dev/.cvsignore
deleted file mode 100644
index 79c6997b865..00000000000
--- a/dev/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-spec
diff --git a/dev/phpunit/.cvsignore b/dev/phpunit/.cvsignore
deleted file mode 100644
index 085e8baf0c8..00000000000
--- a/dev/phpunit/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/dev/skeletons/.cvsignore b/dev/skeletons/.cvsignore
deleted file mode 100644
index 2dda6229d24..00000000000
--- a/dev/skeletons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-out.*
-socpeople*
diff --git a/dev/test/.cvsignore b/dev/test/.cvsignore
deleted file mode 100755
index ea7f2ddf499..00000000000
--- a/dev/test/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-example*.pdf
diff --git a/dev/xdebug/.cvsignore b/dev/xdebug/.cvsignore
deleted file mode 100644
index 085e8baf0c8..00000000000
--- a/dev/xdebug/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/doc/images/.cvsignore b/doc/images/.cvsignore
deleted file mode 100644
index 98e6ef67fad..00000000000
--- a/doc/images/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/htdocs/.cvsignore b/htdocs/.cvsignore
deleted file mode 100644
index 3ae525b6634..00000000000
--- a/htdocs/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-google
-.htaccess
-.DS_Store
-.documents
-dolibarr_mail
-demo_pwc
-phpsane
-test.php
-custom
-custom2
diff --git a/htdocs/admin/.cvsignore b/htdocs/admin/.cvsignore
deleted file mode 100644
index 284446f4393..00000000000
--- a/htdocs/admin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.php
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index 347723f2404..7c72d94b83a 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -356,8 +356,7 @@ else if ($id)
// Date
print '| '.$langs->trans("Date").' | ';
- 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 ' |
';
// Km/Price
diff --git a/htdocs/conf/.cvsignore b/htdocs/conf/.cvsignore
deleted file mode 100644
index ff44c5dfae4..00000000000
--- a/htdocs/conf/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-conf.php*.sav
-*.php
-conf.php.mysql
-conf.php.postgres
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 449cc27d93c..f710797c8fd 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -37,7 +37,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php");
top_httphead();
//print ''."\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;
}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c6477a55c26..d4583a02d7e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/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);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 592c4bf6f4d..53e69f414cc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/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.= '';
+
$out.= '';
$out.= $value;
$out.= '
';
diff --git a/htdocs/core/js/editinplace.js b/htdocs/core/js/editinplace.js
index da4e351d10b..9e905f43cc8 100644
--- a/htdocs/core/js/editinplace.js
+++ b/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);
diff --git a/htdocs/core/modules/.cvsignore b/htdocs/core/modules/.cvsignore
deleted file mode 100644
index 6c3a451f7c8..00000000000
--- a/htdocs/core/modules/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-modGoogle.class.php
-modPHPSane.class.php
diff --git a/htdocs/core/modules/mailings/.cvsignore b/htdocs/core/modules/mailings/.cvsignore
deleted file mode 100644
index 91cc9955acd..00000000000
--- a/htdocs/core/modules/mailings/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-mailinglist_chatsderace.modules.php
-mailinglist_chiensderace.modules.php
diff --git a/htdocs/includes/.cvsignore b/htdocs/includes/.cvsignore
deleted file mode 100644
index ee6265250e2..00000000000
--- a/htdocs/includes/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-jpgraph2
-phpsane
-php_excelreader
-.DS_Store
-ckfinder
diff --git a/htdocs/includes/jquery/plugins/flot/.cvsignore b/htdocs/includes/jquery/plugins/flot/.cvsignore
deleted file mode 100755
index 1e107f52e47..00000000000
--- a/htdocs/includes/jquery/plugins/flot/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-examples
diff --git a/htdocs/includes/jquery/plugins/jcrop/.cvsignore b/htdocs/includes/jquery/plugins/jcrop/.cvsignore
deleted file mode 100755
index 7f27eaa98d0..00000000000
--- a/htdocs/includes/jquery/plugins/jcrop/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-aaa.txt
-demos
diff --git a/htdocs/includes/nusoap/.cvsignore b/htdocs/includes/nusoap/.cvsignore
deleted file mode 100644
index 81154dd4d19..00000000000
--- a/htdocs/includes/nusoap/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-samples
diff --git a/htdocs/install/.cvsignore b/htdocs/install/.cvsignore
deleted file mode 100644
index ba9d2cb1f4a..00000000000
--- a/htdocs/install/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-install.forced.php
diff --git a/htdocs/langs/ca_ES/.cvsignore b/htdocs/langs/ca_ES/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/ca_ES/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/en_AU/.cvsignore b/htdocs/langs/en_AU/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/en_AU/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/en_IN/.cvsignore b/htdocs/langs/en_IN/.cvsignore
deleted file mode 100755
index 1fd02e68d65..00000000000
--- a/htdocs/langs/en_IN/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/en_NZ/.cvsignore b/htdocs/langs/en_NZ/.cvsignore
deleted file mode 100755
index 1fd02e68d65..00000000000
--- a/htdocs/langs/en_NZ/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/en_US/.cvsignore b/htdocs/langs/en_US/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/en_US/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/es_ES/.cvsignore b/htdocs/langs/es_ES/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/es_ES/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/es_PR/.cvsignore b/htdocs/langs/es_PR/.cvsignore
deleted file mode 100755
index 1fd02e68d65..00000000000
--- a/htdocs/langs/es_PR/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/fr_BE/.cvsignore b/htdocs/langs/fr_BE/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/fr_BE/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/fr_FR/.cvsignore b/htdocs/langs/fr_FR/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/fr_FR/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js b/htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js
index 7e793639f5f..24d0248832e 100644
--- a/htdocs/langs/fr_FR/js/jquery.ui.datepicker-fr_FR.js
+++ b/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,
diff --git a/htdocs/langs/it_IT/.cvsignore b/htdocs/langs/it_IT/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/it_IT/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/nl_BE/.cvsignore b/htdocs/langs/nl_BE/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/nl_BE/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/pl_PL/.cvsignore b/htdocs/langs/pl_PL/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/pl_PL/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/langs/pt_PT/.cvsignore b/htdocs/langs/pt_PT/.cvsignore
deleted file mode 100644
index 1fd02e68d65..00000000000
--- a/htdocs/langs/pt_PT/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-google.lang
diff --git a/htdocs/paypal/img/.cvsignore b/htdocs/paypal/img/.cvsignore
deleted file mode 100644
index 085e8baf0c8..00000000000
--- a/htdocs/paypal/img/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/htdocs/public/donations/.cvsignore b/htdocs/public/donations/.cvsignore
deleted file mode 100644
index d162d9e3319..00000000000
--- a/htdocs/public/donations/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-don.php
-merci.php
-valid.php
-erreur.php
-navigation.fr.xsl
-fsfe-fr.xsl
-eucd.css
-donateurs.php
-graph.php
diff --git a/htdocs/support/.cvsignore b/htdocs/support/.cvsignore
deleted file mode 100644
index 085e8baf0c8..00000000000
--- a/htdocs/support/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/htdocs/theme/.cvsignore b/htdocs/theme/.cvsignore
deleted file mode 100644
index 2a5b5c641fc..00000000000
--- a/htdocs/theme/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.db
-clear
-bureau2crea?-?ancien
diff --git a/htdocs/theme/auguria/.cvsignore b/htdocs/theme/auguria/.cvsignore
deleted file mode 100644
index a92ea3e3f61..00000000000
--- a/htdocs/theme/auguria/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/htdocs/theme/auguria/fckeditor/.cvsignore b/htdocs/theme/auguria/fckeditor/.cvsignore
deleted file mode 100644
index 085e8baf0c8..00000000000
--- a/htdocs/theme/auguria/fckeditor/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/htdocs/theme/auguria/fckeditor/images/.cvsignore b/htdocs/theme/auguria/fckeditor/images/.cvsignore
deleted file mode 100644
index 78d24c23930..00000000000
--- a/htdocs/theme/auguria/fckeditor/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.db
-*.db
diff --git a/htdocs/theme/auguria/img/.cvsignore b/htdocs/theme/auguria/img/.cvsignore
deleted file mode 100644
index 98e6ef67fad..00000000000
--- a/htdocs/theme/auguria/img/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/htdocs/theme/auguria/img/menus/.cvsignore b/htdocs/theme/auguria/img/menus/.cvsignore
deleted file mode 100644
index fe283d71a09..00000000000
--- a/htdocs/theme/auguria/img/menus/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tango-icon-theme*
diff --git a/htdocs/theme/bureau2crea/.cvsignore b/htdocs/theme/bureau2crea/.cvsignore
deleted file mode 100644
index 77883ba2a3e..00000000000
--- a/htdocs/theme/bureau2crea/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.db
-style.css?-?Copie.php
diff --git a/htdocs/theme/bureau2crea/fckeditor/.cvsignore b/htdocs/theme/bureau2crea/fckeditor/.cvsignore
deleted file mode 100644
index 085e8baf0c8..00000000000
--- a/htdocs/theme/bureau2crea/fckeditor/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/htdocs/theme/bureau2crea/fckeditor/images/.cvsignore b/htdocs/theme/bureau2crea/fckeditor/images/.cvsignore
deleted file mode 100644
index 78d24c23930..00000000000
--- a/htdocs/theme/bureau2crea/fckeditor/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.db
-*.db
diff --git a/htdocs/theme/bureau2crea/img/.cvsignore b/htdocs/theme/bureau2crea/img/.cvsignore
deleted file mode 100644
index 98e6ef67fad..00000000000
--- a/htdocs/theme/bureau2crea/img/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/htdocs/theme/bureau2crea/img/menus/.cvsignore b/htdocs/theme/bureau2crea/img/menus/.cvsignore
deleted file mode 100644
index fe283d71a09..00000000000
--- a/htdocs/theme/bureau2crea/img/menus/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tango-icon-theme*
diff --git a/htdocs/theme/common/.cvsignore b/htdocs/theme/common/.cvsignore
deleted file mode 100644
index a92ea3e3f61..00000000000
--- a/htdocs/theme/common/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/htdocs/theme/common/flags/.cvsignore b/htdocs/theme/common/flags/.cvsignore
deleted file mode 100644
index 085e8baf0c8..00000000000
--- a/htdocs/theme/common/flags/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/htdocs/theme/common/mime/.cvsignore b/htdocs/theme/common/mime/.cvsignore
deleted file mode 100644
index a92ea3e3f61..00000000000
--- a/htdocs/theme/common/mime/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/htdocs/theme/common/treemenu/.cvsignore b/htdocs/theme/common/treemenu/.cvsignore
deleted file mode 100644
index 020f3864407..00000000000
--- a/htdocs/theme/common/treemenu/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.db
-*.db
diff --git a/htdocs/theme/eldy/.cvsignore b/htdocs/theme/eldy/.cvsignore
deleted file mode 100644
index 98e6ef67fad..00000000000
--- a/htdocs/theme/eldy/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/htdocs/theme/eldy/fckeditor/.cvsignore b/htdocs/theme/eldy/fckeditor/.cvsignore
deleted file mode 100644
index 085e8baf0c8..00000000000
--- a/htdocs/theme/eldy/fckeditor/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/htdocs/theme/eldy/fckeditor/images/.cvsignore b/htdocs/theme/eldy/fckeditor/images/.cvsignore
deleted file mode 100644
index 020f3864407..00000000000
--- a/htdocs/theme/eldy/fckeditor/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.db
-*.db
diff --git a/htdocs/theme/eldy/img/.cvsignore b/htdocs/theme/eldy/img/.cvsignore
deleted file mode 100644
index a92ea3e3f61..00000000000
--- a/htdocs/theme/eldy/img/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.db
diff --git a/htdocs/theme/eldy/img/menus/.cvsignore b/htdocs/theme/eldy/img/menus/.cvsignore
deleted file mode 100644
index fe283d71a09..00000000000
--- a/htdocs/theme/eldy/img/menus/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tango-icon-theme*
diff --git a/test/.cvsignore b/test/.cvsignore
deleted file mode 100644
index 05c31926438..00000000000
--- a/test/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-report
diff --git a/test/phpunit/.cvsignore b/test/phpunit/.cvsignore
deleted file mode 100644
index 05c31926438..00000000000
--- a/test/phpunit/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-report