diff --git a/htdocs/comm/action/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
similarity index 100%
rename from htdocs/comm/action/actioncomm.class.php
rename to htdocs/comm/action/class/actioncomm.class.php
diff --git a/htdocs/comm/action/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
similarity index 100%
rename from htdocs/comm/action/cactioncomm.class.php
rename to htdocs/comm/action/class/cactioncomm.class.php
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index c7b7a76ef31..bca18b5712e 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -30,8 +30,8 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/cactioncomm.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 87c79b65877..1a0da3bd5ab 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -30,8 +30,8 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/cactioncomm.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formactions.class.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index c466fc5d8b2..342ef97ef69 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -28,7 +28,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index d80adc650de..a5291e132a3 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -28,8 +28,8 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/cactioncomm.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
$langs->load("commercial");
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index b51fa9d8b32..2ac3dec5ad7 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -28,7 +28,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 68d48dd9208..48f5f892883 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -29,7 +29,7 @@
require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php");
$page = $_GET["page"];
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index c482c20c0e1..776a8aee47f 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -28,7 +28,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/client.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index bb8492894e4..9f9a65f8fcb 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -32,7 +32,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
-require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
diff --git a/htdocs/comm/propal/stats/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
similarity index 100%
rename from htdocs/comm/propal/stats/propalestats.class.php
rename to htdocs/comm/propal/class/propalestats.class.php
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index e760137b34e..ba355164110 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -26,7 +26,7 @@
*/
require("../../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propalestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$WIDTH=500;
diff --git a/htdocs/comm/propal/stats/month.php b/htdocs/comm/propal/stats/month.php
index 1e429f127e7..34e215d23d9 100644
--- a/htdocs/comm/propal/stats/month.php
+++ b/htdocs/comm/propal/stats/month.php
@@ -25,7 +25,7 @@
*/
require("../../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propalestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$GRAPHWIDTH=500;
diff --git a/htdocs/comm/prospect/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php
similarity index 100%
rename from htdocs/comm/prospect/prospect.class.php
rename to htdocs/comm/prospect/class/prospect.class.php
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index b3eaa68c9d1..890d4872776 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -27,10 +27,10 @@
require_once("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
$langs->load('companies');
diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php
index c6192a26410..e63b336e554 100644
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -26,7 +26,7 @@
*/
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
$langs->load("propal");
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 5dc4e65c069..37533ed67e8 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php");
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
-require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
diff --git a/htdocs/commande/stats/commandestats.class.php b/htdocs/commande/stats/commandestats.class.php
index 97ebc468f70..8741ba4089a 100644
--- a/htdocs/commande/stats/commandestats.class.php
+++ b/htdocs/commande/stats/commandestats.class.php
@@ -43,23 +43,23 @@ class CommandeStats extends Stats
var $table_element;
var $field;
-
+
/**
* Constructor
*
* @param $DB Database handler
* @param $socid Id third party
* @param $mode Option
- * @return PropaleStats
+ * @return CommandeStats
*/
function CommandeStats($DB, $socid=0, $mode)
{
global $user, $conf;
-
+
$this->db = $DB;
-
+
$this->socid = $socid;
-
+
if ($mode == 'customer')
{
$object=new Commande($this->db);
@@ -77,13 +77,13 @@ class CommandeStats extends Stats
$this->where.= " c.fk_statut >= 3 AND c.date_commande IS NOT NULL";
}
$this->where.= " AND c.fk_soc = s.rowid AND s.entity = ".$conf->entity;
-
+
if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
if($this->socid)
{
$this->where .= " AND c.fk_soc = ".$this->socid;
}
-
+
}
/**
@@ -94,7 +94,7 @@ class CommandeStats extends Stats
{
global $conf;
global $user;
-
+
$sql = "SELECT date_format(c.date_commande,'%m') as dm, count(*) nb";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -113,7 +113,7 @@ class CommandeStats extends Stats
{
global $conf;
global $user;
-
+
$sql = "SELECT date_format(c.date_commande,'%Y') as dm, count(*), sum(c.".$this->field.")";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -131,7 +131,7 @@ class CommandeStats extends Stats
{
global $conf;
global $user;
-
+
$sql = "SELECT date_format(c.date_commande,'%m') as dm, sum(c.".$this->field.")";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -150,7 +150,7 @@ class CommandeStats extends Stats
{
global $conf;
global $user;
-
+
$sql = "SELECT date_format(c.date_commande,'%m') as dm, avg(c.".$this->field.")";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -160,7 +160,7 @@ class CommandeStats extends Stats
return $this->_getAverageByMonth($year, $sql);
}
-
+
/**
* \brief Return nb, total and average
@@ -169,7 +169,7 @@ class CommandeStats extends Stats
function getAllByYear()
{
global $user;
-
+
$sql = "SELECT date_format(c.date_commande,'%Y') as year, count(*) as nb, sum(c.".$this->field.") as total, avg(".$this->field.") as avg";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -177,7 +177,7 @@ class CommandeStats extends Stats
$sql.= " GROUP BY year DESC";
return $this->_getAllByYear($sql);
- }
+ }
}
?>
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 1ccd60285de..9dfb79ec921 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -27,7 +27,7 @@
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
// Secrutiy check
if ($user->societe_id > 0)
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index d591246b10b..335d901aeef 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -28,7 +28,7 @@
*/
require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 35bd5742a90..c13878863e4 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -165,7 +165,7 @@ class FormActions
{
global $langs,$user;
- require_once(DOL_DOCUMENT_ROOT."/comm/action/cactioncomm.class.php");
+ require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.form.class.php");
$caction=new CActionComm($this->db);
$form=new Form($this->db);
diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php
index 01309383f4e..bfa8b7e7956 100644
--- a/htdocs/includes/boxes/box_actions.php
+++ b/htdocs/includes/boxes/box_actions.php
@@ -63,7 +63,7 @@ class box_actions extends ModeleBoxes {
$this->max=$max;
- include_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+ include_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
$actionstatic=new ActionComm($db);
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo",$max));
diff --git a/htdocs/includes/boxes/box_prospect.php b/htdocs/includes/boxes/box_prospect.php
index 9d58b863b61..9eaf7ab817e 100644
--- a/htdocs/includes/boxes/box_prospect.php
+++ b/htdocs/includes/boxes/box_prospect.php
@@ -27,7 +27,7 @@
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
-include_once(DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php");
+include_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php");
class box_prospect extends ModeleBoxes {
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index 197da4bb31f..ae649f053d8 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -484,7 +484,7 @@ class InterfaceActionsAuto
// Insertion action
require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
- require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
+ require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
$actioncomm = new ActionComm($this->db);
$actioncomm->type_code = $object->actiontypecode;
$actioncomm->label = $object->actionmsg2;
diff --git a/htdocs/index.php b/htdocs/index.php
index 02137b3a288..fd5ad69e3e8 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -127,7 +127,7 @@ if ($user->societe_id == 0)
! empty($conf->societe->enabled) && $user->rights->contrat->activer);
// Class file containing the method load_state_board for each line
$includes=array(DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
- DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php",
+ DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php",
DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
DOL_DOCUMENT_ROOT."/product/class/product.class.php",
@@ -135,7 +135,6 @@ if ($user->societe_id == 0)
DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
- DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php",
DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
// Name class containing the method load_state_board for each line
$classes=array('Client',
@@ -147,7 +146,6 @@ if ($user->societe_id == 0)
'Propal',
'Commande',
'Facture',
- 'LigneTel',
'Contrat');
// Cle array returned by the method load_state_board for each line
$keys=array('customers',
@@ -159,7 +157,6 @@ if ($user->societe_id == 0)
'proposals',
'orders',
'invoices',
- 'sign',
'Contracts');
// Dashboard Icon lines
$icons=array('company',
@@ -171,7 +168,6 @@ if ($user->societe_id == 0)
'propal',
'order',
'bill',
- 'phoning',
'order');
// Translation keyword
$titres=array("Customers",
@@ -183,7 +179,6 @@ if ($user->societe_id == 0)
"CommercialProposals",
"CustomersOrders",
"BillsCustomers",
- "Lignes de telephonie suivis",
"Contracts");
// Dashboard Link lines
$links=array(DOL_URL_ROOT.'/comm/clients.php',
@@ -195,7 +190,6 @@ if ($user->societe_id == 0)
DOL_URL_ROOT.'/comm/propal.php?mainmenu=commercial',
DOL_URL_ROOT.'/commande/liste.php?mainmenu=commercial',
DOL_URL_ROOT.'/compta/facture.php?mainmenu=accountancy',
- DOL_URL_ROOT.'/telephonie/ligne/index.php',
DOL_URL_ROOT.'/contrat/liste.php');
// Translation lang files
$langfile=array("bills",
@@ -207,7 +201,6 @@ if ($user->societe_id == 0)
"propal",
"orders",
"bills",
- "",
"Contracts");
//print memory_get_usage()."
";
@@ -269,7 +262,7 @@ $var=true;
// Number actions to do (late)
if ($conf->agenda->enabled && $user->rights->agenda->myactions->read)
{
- include_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+ include_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
$board=new ActionComm($db);
$board->load_board($user);
$board->warning_delay=$conf->actions->warning_delay/60/60/24;
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index 194a5a34552..3c98ad615d3 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -124,7 +124,7 @@ function show_array_actions_to_do($max=5)
{
global $langs, $conf, $user, $db, $bc, $socid;
- include_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
+ include_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
include_once(DOL_DOCUMENT_ROOT.'/societe/class/client.class.php');
$sql = "SELECT a.id, a.label, a.datep as dp, a.fk_user_author, a.percent,";
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index ff5ed758c87..a7f2c722cb7 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -495,7 +495,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='')
if ($conf->agenda->enabled)
{
- require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+ require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
$actionstatic=new ActionComm($db);
$userstatic=new User($db);
$contactstatic = new Contact($db);
@@ -716,7 +716,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
if ($conf->agenda->enabled || ($conf->mailing->enabled && $objcon->email))
{
- require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+ require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index a653eb7d8a4..873b9672415 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -37,7 +37,7 @@ if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/class/fo
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
if ($conf->ficheinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
if ($conf->deplacement->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
-if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
+if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
$langs->load("projects");
$langs->load("companies");
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index e0cff8fa2f5..43d7ff85740 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -31,7 +31,7 @@ function llxHeaderVierge() { print 'Export agenda cal
function llxFooterVierge() { print ''; }
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
// Security check
if (! $conf->agenda->enabled) accessforbidden('',1,1,1);