lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganize class files.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-05 15:20:09 +00:00
parent 5375b3fc81
commit 6dc8d0e390
29 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
htdocs/comm/action/actioncomm.class.php → htdocs/comm/action/class/actioncomm.class.php
View File

0
htdocs/comm/action/cactioncomm.class.php → htdocs/comm/action/class/cactioncomm.class.php
View File

4
htdocs/comm/action/document.php
View File

@ -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");

4
htdocs/comm/action/fiche.php
View File

@ -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");

2
htdocs/comm/action/index.php
View File

@ -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");

4
htdocs/comm/action/info.php
View File

@ -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");

2
htdocs/comm/action/listactions.php
View File

@ -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");

2
htdocs/comm/action/rapport/index.php
View File

@ -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"];

2
htdocs/comm/index.php
View File

@ -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");

2
htdocs/comm/propal.php
View File

@ -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");

0
htdocs/comm/propal/stats/propalestats.class.php → htdocs/comm/propal/class/propalestats.class.php
View File

2
htdocs/comm/propal/stats/index.php
View File

@ -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;

2
htdocs/comm/propal/stats/month.php
View File

@ -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;

0
htdocs/comm/prospect/prospect.class.php → htdocs/comm/prospect/class/prospect.class.php
View File

4
htdocs/comm/prospect/fiche.php
View File

@ -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');

2
htdocs/comm/prospect/prospects.php
View File

@ -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");

2
htdocs/commande/fiche.php
View File

@ -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');

28
htdocs/commande/stats/commandestats.class.php
View File

@ -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);
}
}
}
?>

2
htdocs/compta/clients.php
View File

@ -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)

2
htdocs/contact/fiche.php
View File

@ -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");

2
htdocs/core/class/html.formactions.class.php
View File

@ -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);

2
htdocs/includes/boxes/box_actions.php
View File

@ -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));

2
htdocs/includes/boxes/box_prospect.php
View File

@ -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 {

2
htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
View File

@ -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;

11
htdocs/index.php
View File

@ -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()."<br>";
@ -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;

2
htdocs/lib/agenda.lib.php
View File

@ -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,";

4
htdocs/lib/company.lib.php
View File

@ -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");

2
htdocs/projet/element.php
View File

@ -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");

2
htdocs/public/agenda/agendaexport.php
View File

@ -31,7 +31,7 @@ function llxHeaderVierge() { print '<html><title>Export agenda cal</title><body>
function llxFooterVierge() { print '</body></html>'; }
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);