From dc79f8d26b6f3bbd618c914ffa6b7129d9767845 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 16:52:36 +0200
Subject: [PATCH 01/21] Code comment

---
 htdocs/core/ajax/extraparams.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index 7ef25e62b8b..e039529eef7 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -17,7 +17,7 @@
 
 /**
  *	\file       /htdocs/core/ajax/extraparams.php
- *	\brief      File to return Ajax response on set extra parameters of elements
+ *	\brief      File to make Ajax action on setting extra parameters of elements
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal

From 89a5a8188fd5df83f1a55e095b4d241e79017393 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 17:12:03 +0200
Subject: [PATCH 02/21] Fix A file for a hidden feature provides a service
 without security checks.

---
 htdocs/core/ajax/objectonoff.php | 26 ++++++++++++++++++++++++--
 htdocs/core/ajax/security.php    |  2 +-
 htdocs/core/lib/ajax.lib.php     |  5 +++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 6b06cccd50c..987a59ec3fb 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -15,8 +15,9 @@
  */
 
 /**
- *       \file       htdocs/core/ajax/productonoff.php
- *       \brief      File to set tosell and tobuy for product
+ *       \file       htdocs/core/ajax/objectonoff.php
+ *       \brief      File to set status for an object
+ *       			 This Ajax service is called when option MAIN_DIRECT_STATUS_UPDATE is set.
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
@@ -36,6 +37,13 @@ $field=GETPOST('field', 'alpha');
 $element=GETPOST('element', 'alpha');
 
 $object = new GenericObject($db);
+
+// Security check
+if (! empty($user->societe_id))
+	$socid = $user->societe_id;
+
+
+
 /*
  * View
  */
@@ -44,6 +52,20 @@ top_httphead();
 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
+if ($element == 'societe' && in_array($field, array('status')))
+{
+	$result = restrictedArea($user, 'societe', $id);
+}
+elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch')))
+{
+	$result = restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
+}
+else
+{
+	accessforbidden("Bad value for combination of parameters element/field.", 0, 0, 1);
+	exit;
+}
+
 // Registering new values
 if (($action == 'set') && ! empty($id))
     $object->setValueFrom($field, $value, $element, $id);
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 9e7dea2ef95..faaddd31b23 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -17,7 +17,7 @@
 
 /**
  *       \file       htdocs/core/ajax/security.php
- *       \brief      This ajax component is used to generated has keys for security purposes
+ *       \brief      This ajax component is used to generated hash keys for security purposes
  *                   like key to use into URL to protect them.
  */
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index a96e63a4f43..43f4723d695 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -538,11 +538,12 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 }
 
 /**
- *  On/off button for object
+ *  On/off button to change status of an object
+ *  This is called when MAIN_DIRECT_STATUS_UPDATE is set and it use tha ajax service objectonoff.php
  *
  *  @param  Object  $object     Object to set
  *  @param  string  $code       Name of constant : status or status_buy for product by example
- *  @param  string  $field      Name of database field : tosell or tobuy for product by example
+ *  @param  string  $field      Name of database field : 'tosell' or 'tobuy' for product by example
  *  @param  string  $text_on    Text if on
  *  @param  string  $text_off   Text if off
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))

From b9ee95314ad89591be18b3aeff1615170615e2b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 17:12:59 +0200
Subject: [PATCH 03/21] SEC restrictedArea protects also the 'update' action

---
 htdocs/core/lib/security.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 051f3a5392a..2ee5a45c010 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -279,7 +279,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
 	$createok=1; $nbko=0;
-	if (GETPOST('action', 'aZ09')  == 'create' || ((GETPOST("action", "aZ09")  == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09")  == 'delete'))
+	if (GETPOST('action', 'aZ09')  == 'create' || GETPOST('action', 'aZ09')  == 'update' || ((GETPOST("action", "aZ09")  == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09")  == 'delete'))
 	{
 		foreach ($featuresarray as $feature)
 		{
@@ -329,7 +329,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		// If a or and at least one ok
 		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
 
-		if (GETPOST('action', 'aZ09') == 'create' && ! $createok) accessforbidden();
+		if ((GETPOST('action', 'aZ09') == 'create' || GETPOST('action', 'aZ09') == 'update') && ! $createok) accessforbidden();
 		//print "Write access is ok";
 	}
 

From 4fb8f6663a74b9d6268199e4ce0ed543986fd67a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 17:16:13 +0200
Subject: [PATCH 04/21] Fix code comment

---
 htdocs/core/class/fileupload.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index ee090fed65d..2f0ae34b529 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *       \file       htdocs/core/ajax/fileupload.php
+ *       \file       htdocs/core/ajax/fileupload.class.php
  *       \brief      File to return Ajax response on file upload
  */
 

From 55e8aca47ec955ab18ed57e2716e2053df23021e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 19:06:40 +0200
Subject: [PATCH 05/21] Fix skeleton of module

---
 htdocs/modulebuilder/template/class/myobject.class.php | 2 +-
 htdocs/modulebuilder/template/myobject_list.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f6020882502..3c68b0472e2 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -60,7 +60,7 @@ class MyObject extends CommonObject
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
-	const STATUS_DISABLED = 9;
+	const STATUS_CANCELED = 9;
 
 
 	/**
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 5e6388d55f9..25279be4f03 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -493,7 +493,7 @@ while ($i < min($num, $limit))
 	    if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
 	    elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
 
-	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price'))) $cssforfield.=($cssforfield?' ':'').'right';
+	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield.=($cssforfield?' ':'').'right';
 
 	    if (! empty($arrayfields['t.'.$key]['checked']))
 		{

From 76b7aa2e0fe954bd01bc7cdcbe711bc05cd72c84 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 19:20:19 +0200
Subject: [PATCH 06/21] Fix fields with visible = 3 must not be visible into
 list

---
 htdocs/modulebuilder/template/myobject_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 25279be4f03..11fafd59ab5 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -135,7 +135,7 @@ $arrayfields=array();
 foreach($object->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
 }
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)

From 5ee9a88181094c2d4cc4f5eadf05a214a3abec31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 19:21:25 +0200
Subject: [PATCH 07/21] NEW Add anonymous telemetry

---
 htdocs/core/ajax/pingresult.php | 72 +++++++++++++++++++++++++++++++++
 htdocs/main.inc.php             | 49 ++++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 htdocs/core/ajax/pingresult.php

diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
new file mode 100644
index 00000000000..9b46546f5c3
--- /dev/null
+++ b/htdocs/core/ajax/pingresult.php
@@ -0,0 +1,72 @@
+<?php
+/* Copyright (C) 2019		Laurent Destailleur	<eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/core/ajax/pingresult.php
+ *       \brief      File to save result of anonymous ping
+ *       			 Example:  captureserver/public/index.php?action=dolibarrping
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$action=GETPOST('action', 'alpha');
+$hash_unique_id=GETPOST('hash_unique_id', 'alpha');
+$hash_algo=GETPOST('hash', 'alpha');
+
+
+// Security check
+if (! empty($user->societe_id))
+	$socid = $user->societe_id;
+
+$now = dol_now();
+
+
+/*
+ * View
+ */
+
+top_httphead();
+
+print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
+
+// If ok
+if ($action == 'firstpingok')
+{
+	// Note: pings are by entities
+	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_DATE', dol_print_date($now, 'dayhourlog', 'gmt'));
+	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_ID', $hash_unique_id);
+
+	print 'First ping OK saved for entity '.$conf->entity;
+}
+// If ko
+elseif ($action == 'firstpingko')
+{
+	// Note: pings are by entities
+	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt');
+	print 'First ping KO saved for entity '.$conf->entity;
+}
+else {
+	print 'Error action='.$action.' not supported';
+}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bf4c40a4176..96ddd9696a7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1124,6 +1124,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 
 	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
 	else header("Content-Type: ".$contenttype);
+
 	// Security options
 	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
 	if (! defined('XFRAMEOPTIONS_ALLOWALL')) header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
@@ -2319,6 +2320,54 @@ if (! function_exists("llxFooter"))
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
+		// Add code for the fist asynchronous anonymous ping
+		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || GETPOST('forceping', 'alpha'))
+		{
+			if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
+			|| (! empty($conf->file->instance_unique_id) && $conf->file->instance_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID)
+			|| GETPOST('forceping', 'alpha'))
+			{
+				print "\n".'<!-- Includes JS for Ping of Dolibarr -->'."\n";
+				print "\n<!-- JS CODE TO ENABLE the First anonymous Ping -->\n";
+				?>
+	    			<script>
+	    			jQuery(document).ready(function (tmp) {
+	    				$.ajax({
+	    					  method: "POST",
+	    					  url: "https://ping.dolibarr.org/",
+	    					  timeout: 500,     // timeout milliseconds
+	    					  cache: false,
+	    					  xhrFields: {
+	    					      withCredentials: true
+	    					  },
+	    					  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "dolibarrping", entity: <?php echo (int) $conf->entity; ?> },
+	    					  success: function (data,status,xhr) {   // success callback function
+	      					    	console.log("Ping ok: " + data);
+	        	    				$.ajax({
+	      	    					  method: "GET",
+	      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+	      	    					  timeout: 500,     // timeout milliseconds
+	      	    					  cache: false,
+	      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "firstpingok" },
+	    					  		});
+	    					  },
+	    					  error: function (data,status,xhr) {   // success callback function
+	        					    console.log("Ping ko: " + data);
+	        	    				$.ajax({
+	        	    					  method: "GET",
+	        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+	        	    					  timeout: 500,     // timeout milliseconds
+	        	    					  cache: false,
+	        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "firstpingko" },
+	      					  		});
+	    					  }
+	    				});
+	    			});
+	    			</script>
+				<?php
+			}
+		}
+
 		print "</body>\n";
 		print "</html>\n";
 

From c34739ab3fb6c84b8f0d569f30e20e984e3b173c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 17:12:03 +0200
Subject: [PATCH 08/21] Fix A file for a hidden feature provides a service
 without security checks.

---
 htdocs/core/ajax/objectonoff.php | 26 ++++++++++++++++++++++++--
 htdocs/core/ajax/security.php    |  2 +-
 htdocs/core/lib/ajax.lib.php     |  5 +++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 6b06cccd50c..987a59ec3fb 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -15,8 +15,9 @@
  */
 
 /**
- *       \file       htdocs/core/ajax/productonoff.php
- *       \brief      File to set tosell and tobuy for product
+ *       \file       htdocs/core/ajax/objectonoff.php
+ *       \brief      File to set status for an object
+ *       			 This Ajax service is called when option MAIN_DIRECT_STATUS_UPDATE is set.
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
@@ -36,6 +37,13 @@ $field=GETPOST('field', 'alpha');
 $element=GETPOST('element', 'alpha');
 
 $object = new GenericObject($db);
+
+// Security check
+if (! empty($user->societe_id))
+	$socid = $user->societe_id;
+
+
+
 /*
  * View
  */
@@ -44,6 +52,20 @@ top_httphead();
 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
+if ($element == 'societe' && in_array($field, array('status')))
+{
+	$result = restrictedArea($user, 'societe', $id);
+}
+elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch')))
+{
+	$result = restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
+}
+else
+{
+	accessforbidden("Bad value for combination of parameters element/field.", 0, 0, 1);
+	exit;
+}
+
 // Registering new values
 if (($action == 'set') && ! empty($id))
     $object->setValueFrom($field, $value, $element, $id);
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 9e7dea2ef95..faaddd31b23 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -17,7 +17,7 @@
 
 /**
  *       \file       htdocs/core/ajax/security.php
- *       \brief      This ajax component is used to generated has keys for security purposes
+ *       \brief      This ajax component is used to generated hash keys for security purposes
  *                   like key to use into URL to protect them.
  */
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index a96e63a4f43..43f4723d695 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -538,11 +538,12 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 }
 
 /**
- *  On/off button for object
+ *  On/off button to change status of an object
+ *  This is called when MAIN_DIRECT_STATUS_UPDATE is set and it use tha ajax service objectonoff.php
  *
  *  @param  Object  $object     Object to set
  *  @param  string  $code       Name of constant : status or status_buy for product by example
- *  @param  string  $field      Name of database field : tosell or tobuy for product by example
+ *  @param  string  $field      Name of database field : 'tosell' or 'tobuy' for product by example
  *  @param  string  $text_on    Text if on
  *  @param  string  $text_off   Text if off
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))

From 55e9335cd2a9814b8d5462fe8546252918ebde34 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 17:16:13 +0200
Subject: [PATCH 09/21] Fix code comment

---
 htdocs/core/class/fileupload.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index bd36dba199b..40dd4783a60 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *       \file       htdocs/core/ajax/fileupload.php
+ *       \file       htdocs/core/ajax/fileupload.class.php
  *       \brief      File to return Ajax response on file upload
  */
 

From a6fdec5713e8f06f3b72dca0fe15e997eee4915b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Aug 2019 20:11:55 +0200
Subject: [PATCH 10/21] Fix ping

---
 htdocs/main.inc.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 96ddd9696a7..ff599f7567f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2320,15 +2320,15 @@ if (! function_exists("llxFooter"))
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
-		// Add code for the fist asynchronous anonymous ping
+		// Add code for the asynchronous anonymous first ping (for telemetry)
 		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || GETPOST('forceping', 'alpha'))
 		{
 			if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
-			|| (! empty($conf->file->instance_unique_id) && $conf->file->instance_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID)
+			|| (! empty($conf->file->instance_unique_id) && (md5($conf->file->instance_unique_id) != $conf->global->MAIN_FIRST_PING_OK_ID))
 			|| GETPOST('forceping', 'alpha'))
 			{
-				print "\n".'<!-- Includes JS for Ping of Dolibarr -->'."\n";
-				print "\n<!-- JS CODE TO ENABLE the First anonymous Ping -->\n";
+				print "\n".'<!-- Includes JS for Ping of Dolibarr MAIN_FIRST_PING_OK_DATE = '.$conf->global->MAIN_FIRST_PING_OK_DATE.' MAIN_FIRST_PING_OK_ID = '.$conf->global->MAIN_FIRST_PING_OK_ID.' -->'."\n";
+				print "\n<!-- JS CODE TO ENABLE the anonymous Ontime Ping -->\n";
 				?>
 	    			<script>
 	    			jQuery(document).ready(function (tmp) {
@@ -2337,12 +2337,9 @@ if (! function_exists("llxFooter"))
 	    					  url: "https://ping.dolibarr.org/",
 	    					  timeout: 500,     // timeout milliseconds
 	    					  cache: false,
-	    					  xhrFields: {
-	    					      withCredentials: true
-	    					  },
 	    					  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "dolibarrping", entity: <?php echo (int) $conf->entity; ?> },
-	    					  success: function (data,status,xhr) {   // success callback function
-	      					    	console.log("Ping ok: " + data);
+	    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
+	      					    	console.log("Ping ok");
 	        	    				$.ajax({
 	      	    					  method: "GET",
 	      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",

From f4dd345c7a26456c47f25705cff88448a9246823 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Aug 2019 11:32:12 +0200
Subject: [PATCH 11/21] Add version to telemetry

---
 htdocs/main.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ff599f7567f..7b983ca05eb 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2337,7 +2337,7 @@ if (! function_exists("llxFooter"))
 	    					  url: "https://ping.dolibarr.org/",
 	    					  timeout: 500,     // timeout milliseconds
 	    					  cache: false,
-	    					  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "dolibarrping", entity: <?php echo (int) $conf->entity; ?> },
+	    					  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "dolibarrping", version: "<?php echo (float) DOL_VERSION; ?>", entity: <?php echo (int) $conf->entity; ?> },
 	    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
 	      					    	console.log("Ping ok");
 	        	    				$.ajax({
@@ -2355,7 +2355,7 @@ if (! function_exists("llxFooter"))
 	        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
 	        	    					  timeout: 500,     // timeout milliseconds
 	        	    					  cache: false,
-	        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "firstpingko" },
+	        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "firstpingko", version: "<?php echo (float) DOL_VERSION; ?>" },
 	      					  		});
 	    					  }
 	    				});

From acf83149356631ed8199e773dd979cc6f7b38fe3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Aug 2019 16:32:35 +0200
Subject: [PATCH 12/21] FIX Missing where on entity

---
 htdocs/core/class/commonobject.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f69b4db68c1..442b50c27cf 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2053,7 +2053,7 @@ abstract class CommonObject
 			return -2;
 		}
 	}
-	
+
 	/**
 	 *  Change the retained warranty payments terms
 	 *
@@ -2066,11 +2066,11 @@ abstract class CommonObject
 	    if ($this->statut >= 0 || $this->element == 'societe')
 	    {
 	        $fieldname = 'retained_warranty_fk_cond_reglement';
-	        
+
 	        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 	        $sql .= ' SET '.$fieldname.' = '.$id;
 	        $sql .= ' WHERE rowid='.$this->id;
-	        
+
 	        if ($this->db->query($sql))
 	        {
 	            $this->retained_warranty_fk_cond_reglement = $id;
@@ -5064,7 +5064,7 @@ abstract class CommonObject
 
 				//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
 				//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
-				
+
 				if (!empty($attrfieldcomputed))
 				{
 					if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))
@@ -7390,6 +7390,7 @@ abstract class CommonObject
 		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
 		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
 		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
+		if (empty($id) && $this->ismultientitymanaged == 1) $sql.=' AND entity IN ('.getEntity($this->table_element).')';
 		if ($morewhere)   $sql.= $morewhere;
 		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
 

From 25ee539f920cab0ac1b7bcca1101485bf655f9d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Aug 2019 16:32:35 +0200
Subject: [PATCH 13/21] FIX Missing where on entity

Conflicts:
	htdocs/core/class/commonobject.class.php
---
 htdocs/core/class/commonobject.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1490e36c3ed..e607e8f214a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2054,6 +2054,7 @@ abstract class CommonObject
 		}
 	}
 
+
 	/**
 	 *	Define delivery address
 	 *  @deprecated
@@ -7319,6 +7320,7 @@ abstract class CommonObject
 		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
 		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
 		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.=' AND entity IN ('.getEntity($this->table_element).')';
 		if ($morewhere)   $sql.= $morewhere;
 		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
 

From 83412e3c90692961c3f2ce5aaaad85147d2b5e12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Aug 2019 16:38:57 +0200
Subject: [PATCH 14/21] Fix warning

---
 htdocs/modulebuilder/template/class/myobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 3c68b0472e2..173fb975438 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -388,7 +388,7 @@ class MyObject extends CommonObject
 		$sql = 'SELECT ';
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-		if ($this->ismultientitymanaged) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
 		else $sql .= ' WHERE 1 = 1';
 		// Manage filter
 		$sqlwhere = array();

From b40f2cbcce1c633e646a2f1ce58afefcc890e656 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Aug 2019 20:20:09 +0200
Subject: [PATCH 15/21] Fix responsive

---
 htdocs/expensereport/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index a764e2df47c..f76e96e78a1 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1679,7 +1679,7 @@ else
 
 				if ($action == 'cancel')
 				{
-					$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text",'label'=>'<strong>'.$langs->trans("Comment").'</strong>','name'=>"detail_cancel",'size'=>"50",'value'=>""));
+					$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text",'label'=>'<strong>'.$langs->trans("Comment").'</strong>','name'=>"detail_cancel",'value'=>""));
 					$formconfirm=$form->formconfirm($_SEVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
 				}
 
@@ -1690,7 +1690,7 @@ else
 
 				if ($action == 'refuse')		// Deny
 				{
-					$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text",'label'=>$langs->trans("Comment"),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
+					$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text",'label'=>$langs->trans("Comment"),'name'=>"detail_refuse",'value'=>""));
 					$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
 				}
 

From f3e38f4b09ebcd7e41372cd7f40da9de9010f7a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Aug 2019 20:53:18 +0200
Subject: [PATCH 16/21] FIX Fatal situation if payment removed on expense
 report. Action set_unpaid was not available.

---
 htdocs/expensereport/card.php                 | 40 +++++++++++++++++--
 .../class/expensereport.class.php             |  4 +-
 htdocs/langs/en_US/bills.lang                 |  1 +
 htdocs/langs/fr_FR/bills.lang                 |  1 +
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index f76e96e78a1..c7cb9776aeb 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -996,6 +996,34 @@ if (empty($reshook))
     	}
     }
 
+    if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
+    {
+    	$object = new ExpenseReport($db);
+    	$object->fetch($id);
+
+    	$result = $object->set_unpaid($user);
+
+    	if ($result > 0)
+    	{
+    		// Define output language
+    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    		{
+    			$outputlangs = $langs;
+    			$newlang = '';
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    			if (! empty($newlang)) {
+    				$outputlangs = new Translate("", $conf);
+    				$outputlangs->setDefaultLang($newlang);
+    			}
+    			$model=$object->modelpdf;
+    			$ret = $object->fetch($id); // Reload to get new records
+
+    			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    		}
+    	}
+    }
+
     if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
     {
     	$object = new ExpenseReport($db);
@@ -2662,8 +2690,8 @@ if ($action != 'create' && $action != 'edit')
 	}
 
 
-	// If status is Appoved
-	// --------------------
+	// If status is Approved
+	// ---------------------
 
 	if ($user->rights->expensereport->approve && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
 	{
@@ -2707,9 +2735,15 @@ if ($action != 'create' && $action != 'edit')
 	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
 	}
 
+	if ($user->rights->expensereport->to_paid && $object->paid && $object->fk_statut == ExpenseReport::STATUS_CLOSED)
+	{
+		// Set unpaid
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=set_unpaid&id='.$object->id.'">'.$langs->trans('ClassifyUnPaid').'</a></div>';
+	}
+
 	// Clone
 	if ($user->rights->expensereport->creer) {
-	    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=clone">' . $langs->trans("ToClone") . '</a></div>';
+	    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=clone">' . $langs->trans("ToClone") . '</a></div>';
 	}
 
 	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 1160a6dcb94..dceb31c89fb 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1397,12 +1397,12 @@ class ExpenseReport extends CommonObject
         // phpcs:enable
 		$error = 0;
 
-        if ($this->fk_c_deplacement_statuts != 5)
+		if ($this->paid)
         {
 			$this->db->begin();
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " SET fk_statut = 5";
+            $sql.= " SET paid = 0";
             $sql.= ' WHERE rowid = '.$this->id;
 
             dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 4b67ced59c9..ab4d9096df2 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 41f5aca717c..ca251ed0d93 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -96,6 +96,7 @@ HelpPaymentHigherThanReminderToPay=Attention, le montant de paiement pour une ou
 HelpPaymentHigherThanReminderToPaySupplier=Attention, le montant de paiement pour une ou plusieurs factures est supérieur au reste à payer.<br>Corrigez votre saisie, sinon, confirmez et pensez à créer un avoir pour l'excédent pour chaque facture surpayée.
 ClassifyPaid=Classer 'Payée'
 ClassifyPaidPartially=Classer 'Payée partiellement'
+ClassifyUnPaid=Classer 'Non payée'
 ClassifyCanceled=Classer 'Abandonnée'
 ClassifyClosed=Classer 'Fermée'
 ClassifyUnBilled=Classer 'Non facturée'

From f210e286bd6cc927fca6d2d5970113f78f0b2dcc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Aug 2019 20:53:28 +0200
Subject: [PATCH 17/21] Fix balance of div

---
 htdocs/expensereport/payment/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 73da11f4619..890884b2e37 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -286,7 +286,6 @@ else
 	dol_print_error($db);
 }
 
-print '</div>';
 
 
 /*

From 31648f856c35448cc4b23fc62df99fcd9b2d3a92 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Aug 2019 13:04:37 +0200
Subject: [PATCH 18/21] FIX format of field with type timestamp

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 10e80bbadf9..e6d47c53d5f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6112,7 +6112,7 @@ abstract class CommonObject
 			{
 				$morecss = 'minwidth100imp';
 			}
-			elseif ($type == 'datetime')
+			elseif ($type == 'datetime' || $type == 'timestamp')
 			{
 				$morecss = 'minwidth200imp';
 			}
@@ -6156,7 +6156,7 @@ abstract class CommonObject
 				$value='';
 			}
 		}
-		elseif ($type == 'datetime')
+		elseif ($type == 'datetime' || $type == 'timestamp')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value, 'dayhour');

From 7b30066b814b80a789ff1c8610e8c4b99885a188 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Aug 2019 13:04:59 +0200
Subject: [PATCH 19/21] Add image

---
 doc/images/dolibarr_512x512.png | Bin 0 -> 9520 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/images/dolibarr_512x512.png

diff --git a/doc/images/dolibarr_512x512.png b/doc/images/dolibarr_512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd8d7ac3bfd32616c1231e0fc626ae9d5a7d5cae
GIT binary patch
literal 9520
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
UE87BY2_cAvs<ujzl2zFM0eIT+$p8QV

literal 0
HcmV?d00001


From d663657f15fc813523566af00c77493e41436734 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Aug 2019 13:04:37 +0200
Subject: [PATCH 20/21] FIX format of field with type timestamp

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e607e8f214a..4e88348c6d0 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6056,7 +6056,7 @@ abstract class CommonObject
 			{
 				$morecss = 'minwidth100imp';
 			}
-			elseif ($type == 'datetime')
+			elseif ($type == 'datetime' || $type == 'timestamp')
 			{
 				$morecss = 'minwidth200imp';
 			}
@@ -6100,7 +6100,7 @@ abstract class CommonObject
 				$value='';
 			}
 		}
-		elseif ($type == 'datetime')
+		elseif ($type == 'datetime' || $type == 'timestamp')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value, 'dayhour');

From 22575bb6e72c294e5999e3c15f6ea64140794b32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Aug 2019 13:08:38 +0200
Subject: [PATCH 21/21] Fix travis

---
 htdocs/accountancy/class/accountancyexport.class.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index b4f420b262c..9845502321a 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1016,14 +1016,13 @@ class AccountancyExport
 	 * Export format : Charlemagne
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
-	public function exportCharlemagne($objectLines) 
+	public function exportCharlemagne($objectLines)
 	{
 		global $langs;
 		$langs->load('compta');
-		
+
 		$separator = "\t";
 		$end_line = "\n";
 
@@ -1045,9 +1044,9 @@ class AccountancyExport
 		print self::trunc($langs->transnoentitiesnoconv('Analytic') . ' 3', 15) . $separator;
 		print self::trunc($langs->transnoentitiesnoconv('AnalyticLabel') . ' 3', 60) . $separator;
 		print $end_line;
-		
+
 		foreach($objectLines as $line) {
-			
+
 			$date = dol_print_date($line->doc_date, '%Y%m%d');
 			print $date . $separator; //Date
 
@@ -1069,7 +1068,6 @@ class AccountancyExport
 			print $separator;//Analytic
 			print $separator;//Analytic
 			print $end_line;
-			
 		}
 	}