Merge remote-tracking branch 'origin/3.4' into 3.5

Dolibarr · Dec 14, 2013 · 42f032d · 42f032d
2 parents 5cd6c05 + b83f664
commit 42f032d
Show file tree

Hide file tree

Showing 16 changed files with 64 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -35,6 +35,7 @@
 $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 @@
 // 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.