diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 0a2e0ac0a7e1a06eed3d2dc2e958b53cb669574e..8476a1508cd275a440613ac4e84b1226faa6b7e5 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/admin/agenda.php
+ * \file htdocs/admin/agenda_other.php
* \ingroup agenda
* \brief Autocreate actions for agenda module setup page
*/
diff --git a/htdocs/cashdesk/deconnexion.php b/htdocs/cashdesk/deconnexion.php
index a10518c983b20c506788b3c6dbef4d6d195536eb..50417b1972794a9431ca7cc7f8e53a60633ba8c4 100644
--- a/htdocs/cashdesk/deconnexion.php
+++ b/htdocs/cashdesk/deconnexion.php
@@ -15,6 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file htdocs/cashdesk/deconnexion.php
+ * \ingroup cashdesk
+ * \brief Manage deconnexion for point of sale module
+ */
+
//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Uncomment creates pb to relogon after a disconnect
if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 16fc6e8793a9c47b1668c0a2855c33a04afb2952..e903e716afb083a1fe783642a3583a37c0e93858 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -17,8 +17,9 @@
*/
/**
- * This page is called each time we press a key in the code
- * search form to show product combo list.
+ * \file htdocs/cashdesk/facturation_dhtml.php
+ * \ingroup cashdesk
+ * \brief This page is called each time we press a key in the code search form to show product combo list.
*/
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 3a93713ab68c9784ea0820243710e0d7d9424314..3b65d7dd132ab8f5d6afe339d61a66e7b0293d85 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -16,6 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file htdocs/cashdesk/facturation_verif.php
+ * \ingroup cashdesk
+ * \brief facturation_verif.php
+ */
+
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php';
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 7ceabf13308d949604eb719efe987234876e3e0f..94ec87edea014eb408bb23acf0f3f8aa24c14e72 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -20,6 +20,12 @@
* We set here login choices into session.
*/
+/**
+ * \file htdocs/cashdesk/index_verif.php
+ * \ingroup cashdesk
+ * \brief index_verif.php
+ */
+
include '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Auth.class.php';
diff --git a/htdocs/cashdesk/validation.php b/htdocs/cashdesk/validation.php
index 2c5ad6839d86cc8249a71d0458a3c87eaaabd491..fc4172f3d2dbf00de8bf8c58aced3be4cab02e17 100644
--- a/htdocs/cashdesk/validation.php
+++ b/htdocs/cashdesk/validation.php
@@ -15,6 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file htdocs/cashdesk/validation.php
+ * \ingroup cashdesk
+ * \brief validation.php
+ */
+
// Affichage des templates
require ('tpl/validation1.tpl.php');
diff --git a/htdocs/cashdesk/validation_ok.php b/htdocs/cashdesk/validation_ok.php
index 3a3f9ba887804a933ab744d6b06ed1cd5b1a1ee1..1066af6b4ce2af6d873ecdeb0d7d24afa14afc23 100644
--- a/htdocs/cashdesk/validation_ok.php
+++ b/htdocs/cashdesk/validation_ok.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2007-2008 J�r�mie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.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
@@ -15,7 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
- // Affichage des templates
- require ('tpl/validation2.tpl.php');
+/**
+ * \file htdocs/cashdesk/validation_ok.php
+ * \ingroup cashdesk
+ * \brief validation_ok.php
+ */
+
+// Affichage des templates
+require ('tpl/validation2.tpl.php');
?>
diff --git a/htdocs/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php
index cd09bc71a0308b50721449a51d59ba61490c5b9d..fe50fa680090c5344f779660d3a9a04b46db5d54 100644
--- a/htdocs/cashdesk/validation_ticket.php
+++ b/htdocs/cashdesk/validation_ticket.php
@@ -15,6 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file htdocs/cashdesk/validation_ticket.php
+ * \ingroup cashdesk
+ * \brief validation_ticket.php
+ */
+
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php';
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 3cd7784d59d40e90e1c8c3b10b7a1f19767e0f3d..d2b55deccde7bb8afabf4ef581800caf3614ebba 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -17,6 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/**
+ * \file htdocs/cashdesk/validation_verif.php
+ * \ingroup cashdesk
+ * \brief validation_verif.php
+ */
+
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php';
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 75e994d281a7169b8b88c6dfd51fed9594ecd0f2..974c42c95bb24df2ce699b7d36547305a7b650fd 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -19,8 +19,8 @@
*/
/**
- * \file htdocs/societe/admin/societe_extrafields.php
- * \ingroup societe
+ * \file htdocs/comm/admin/propal_extrafields.php
+ * \ingroup propal
* \brief Page to setup extra fields of third party
*/
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 123e42696acd6aed74a78e50daca4f8f55b27273..50bc205d9f5da291448133bece473f21fdc2eee0 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/comm/propal/document.php
- * \ingroup propale
+ * \ingroup propal
* \brief Management page of documents attached to a business proposal
*/
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index ea0af0f0634c07163a969e7529c7ecde75e5386f..433dbdbf12fca3bc138feec3f6fc39e5da3948fc 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -19,7 +19,7 @@
/**
* \file htdocs/comm/propal/info.php
- * \ingroup propale
+ * \ingroup propal
* \brief Page d'affichage des infos d'une proposition commerciale
*/
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 2c23db317a72ed7a3a419b7f62d1da6edd438486..280da52f6c5d2638f5b15d5b578995823489ab84 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -25,8 +25,8 @@
*/
/**
- * \file htdocs/comm/propal.php
- * \ingroup propale
+ * \file htdocs/comm/propal/list.php
+ * \ingroup propal
* \brief Page of commercial proposals card and list
*/
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index a9ee5b6a839de062182673304b649189519febf2..2855a296010fe6853c749e3175b7b38c64886246 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/comm/propal/note.php
- * \ingroup propale
+ * \ingroup propal
* \brief Fiche d'information sur une proposition commerciale
*/
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index e9ad176a86d9a63862e5cf05fd5f78bfa873f299..632dee6396547a33d146d44ee2c4503f4467c18b 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -14,7 +14,12 @@
*
* 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/comm/propal/tpl/linkedobjectblock.tpl.php
+ * \ingroup propal
+ * \brief Template to show objects linked to proposals
*/
?>
diff --git a/htdocs/core/filemanagerdol/connectors/php/config.php b/htdocs/core/filemanagerdol/connectors/php/config.php
index 196a3eefbb896e1a00548dec288221572e7b3b6b..b50cea8a482d4af7dcd3d3508ac9fb166af24e2a 100644
--- a/htdocs/core/filemanagerdol/connectors/php/config.php
+++ b/htdocs/core/filemanagerdol/connectors/php/config.php
@@ -35,6 +35,7 @@ $uri=preg_replace('/^http(s?):\/\//i','',$dolibarr_main_url_root);
$pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine
if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a ''
define('DOL_URL_ROOT', $pos);
+$entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null);
// SECURITY: You must explicitly enable this "connector". (Set it to "true").
// WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only
@@ -49,7 +50,7 @@ $Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=fckeditor&fil
// user files directory. Useful if you are using a virtual directory, symbolic
// link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
// Attention: The above 'UserFilesPath' must point to the same directory.
-$Config['UserFilesAbsolutePath'] = $dolibarr_main_data_root.'/fckeditor/';
+$Config['UserFilesAbsolutePath'] = $dolibarr_main_data_root . (!empty($entity) ? '/' . $entity : '') . '/fckeditor/';
// Due to security issues with Apache modules, it is recommended to leave the
// following setting enabled.