diff --git a/htdocs/actioncomm.class.php b/htdocs/comm/action/actioncomm.class.php similarity index 100% rename from htdocs/actioncomm.class.php rename to htdocs/comm/action/actioncomm.class.php diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 389d49f7312..fe3cc3f76a0 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -31,7 +31,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 40a9e7cdbb6..756aca61c0f 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formactions.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/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 5f32cce8721..d28fd510d3d 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/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/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 cf87274a338..941b579bc3e 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); $langs->load("commercial"); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index c496bb64435..f7380ddf4b2 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/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/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 cf49db0fb9b..c4b8c283655 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/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/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 3e5fbdcf3d3..629a2c5f3c3 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/client.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 80a30e8b745..9a8fad4cb25 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -44,7 +44,7 @@ $langs->load('products'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php'); $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]; if (isset($_GET["msg"])) { $mesg=$_GET["mesg"]; } diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 5dfbbf250c2..8c3667b59c7 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); $langs->load('companies'); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 6f6ae5c5025..cc0886a0519 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formorder.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/commande/modules_commande.php"); require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/comm/action/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/project.class.php'); diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 753bf92a278..e41f589a52f 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/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); // Secrutiy check if ($user->societe_id > 0) diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 76dbdc2441e..6a456eb2d4b 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/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/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php index a6bafe14f5d..915dee42289 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."/actioncomm.class.php"); + include_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); $actionstatic=new ActionComm($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo",$max)); diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php index d4d7fe96b00..8be0280ac48 100644 --- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php +++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php @@ -439,7 +439,7 @@ class InterfaceActionsAuto // Insertion action require_once(DOL_DOCUMENT_ROOT.'/contact/contact.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/comm/action/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 be5358c5ef8..cf204835b80 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -270,7 +270,7 @@ $var=true; // Number actions to do (late) if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) { - include_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); + include_once(DOL_DOCUMENT_ROOT."/comm/action/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 58ae70e434f..9ff0799beaa 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.'/actioncomm.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php'); include_once(DOL_DOCUMENT_ROOT.'/client.class.php'); $sql = "SELECT a.id, a.label, ".$db->pdate("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 3c4f620cef7..8bd5c12ff84 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -398,7 +398,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='') if ($conf->agenda->enabled) { - require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); + require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); $actionstatic=new ActionComm($db); $userstatic=new User($db); $contactstatic = new Contact($db); @@ -617,7 +617,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') if ($conf->agenda->enabled || ($conf->mailing->enabled && $objcon->email)) { - require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); + require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index a8d33708327..eae46ff0ef5 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/fourniss if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->fichinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php"); if ($conf->deplacement->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/deplacement.class.php"); -if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); +if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php"); $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index 78f6566cc81..3369a12720e 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.'/actioncomm.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php'); // Security check if (! $conf->agenda->enabled) accessforbidden('',1,1,1);