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:32:18 +00:00
parent 6dc8d0e390
commit 10f86aa217
16 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/action/class/actioncomm.class.php
View File

@ -19,12 +19,12 @@
*/
/**
* \file htdocs/actioncomm.class.php
* \file htdocs/comm/action/class/actioncomm.class.php
* \ingroup commercial
* \brief Fichier de la classe des actions commerciales
* \version $Id$
*/
require_once(DOL_DOCUMENT_ROOT.'/comm/action/cactioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php');
/** \class ActionComm

4
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -18,14 +18,14 @@
*/
/**
* \file htdocs/cactioncomm.class.php
* \file htdocs/comm/action/class/cactioncomm.class.php
* \ingroup commercial
* \brief Fichier de la classe des types d'actions commerciales
* \version $Id$
*/
/**
/**
* \class CActionComm
* \brief Class to manage different types of events
*/

2
htdocs/comm/mailing/cibles.php
View File

@ -26,7 +26,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");

2
htdocs/comm/mailing/mailing.class.php → htdocs/comm/mailing/class/mailing.class.php
View File

@ -19,7 +19,7 @@
*/
/**
* \file htdocs/comm/mailing/mailing.class.php
* \file htdocs/comm/mailing/class/mailing.class.php
* \ingroup mailing
* \brief Fichier de la classe de gestion des mailings
* \version $Id$

2
htdocs/comm/mailing/fiche.php
View File

@ -29,7 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
$langs->load("mails");

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

@ -26,7 +26,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
$langs->load("commercial");

2
htdocs/comm/mailing/info.php
View File

@ -25,7 +25,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");

2
htdocs/comm/mailing/liste.php
View File

@ -25,7 +25,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/mailing.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
if (!$user->rights->mailing->lire) accessforbidden();

16
htdocs/comm/propal/class/propalestats.class.php
View File

@ -19,7 +19,7 @@
*/
/**
* \file htdocs/comm/propal/stats/propalestats.class.php
* \file htdocs/comm/propal/class/propalestats.class.php
* \ingroup propales
* \brief Fichier de la classe de gestion des stats des propales
* \version $Id$
@ -54,16 +54,16 @@ class PropaleStats extends Stats
function PropaleStats($DB, $socid=0)
{
global $user, $conf;
$this->db = $DB;
$object=new Propal($this->db);
$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
$this->field='total';
$this->socid = $socid;
$this->where.= " fk_statut > 0";
$this->where.= " AND p.fk_soc = s.rowid AND s.entity = ".$conf->entity;
@ -100,7 +100,7 @@ class PropaleStats extends Stats
function getNbByYear()
{
global $user;
$sql = "SELECT date_format(p.datep,'%Y') as dm, count(*)";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -116,7 +116,7 @@ class PropaleStats extends Stats
function getAmountByMonth($year)
{
global $user;
$sql = "SELECT date_format(p.datep,'%m') as dm, sum(p.".$this->field.")";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -133,7 +133,7 @@ class PropaleStats extends Stats
function getAverageByMonth($year)
{
global $user;
$sql = "SELECT date_format(p.datep,'%m') as dm, avg(p.".$this->field.")";
$sql.= " FROM ".$this->from;
if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -152,7 +152,7 @@ class PropaleStats extends Stats
function getAllByYear()
{
global $user;
$sql = "SELECT date_format(p.datep,'%Y') as year, count(*) as nb, sum(".$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";

5
htdocs/comm/prospect/class/prospect.class.php
View File

@ -19,12 +19,11 @@
*/
/**
* \file htdocs/prospect.class.php
* \file htdocs/comm/prospect/class/prospect.class.php
* \ingroup societe
* \brief Fichier de la classe des prospects
* \version $Id$
*/
*/
include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");

1
htdocs/commande/class/commande.class.php
View File

@ -26,7 +26,6 @@
* \brief Fichier des classes de commandes
* \version $Id$
*/
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");

2
htdocs/commande/stats/commandestats.class.php → htdocs/commande/class/commandestats.class.php
View File

@ -19,7 +19,7 @@
*/
/**
* \file htdocs/commande/stats/commandestats.class.php
* \file htdocs/commande/class/commandestats.class.php
* \ingroup commandes
* \brief Fichier de la classe de gestion des stats des commandes
* \version $Id$

2
htdocs/commande/stats/index.php
View File

@ -26,7 +26,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/stats/commandestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commandestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$WIDTH=500;

2
htdocs/commande/stats/month.php
View File

@ -26,7 +26,7 @@
*/
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/stats/commandestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commandestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$GRAPHWIDTH=500;

8
htdocs/expedition/stats/expeditionstats.class.php → htdocs/expedition/class/expeditionstats.class.php
View File

@ -15,10 +15,14 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/
/**
* \file htdocs/expedition/class/expeditionstats.class.php
* \ingroup expedition
* \brief Fichier des classes expedition
* \version $Id$
*/
class ExpeditionStats
{
var $db;

2
htdocs/expedition/stats/month.php
View File

@ -26,7 +26,7 @@
require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
require_once(DOL_DOCUMENT_ROOT."/expedition/stats/expeditionstats.class.php");
require_once(DOL_DOCUMENT_ROOT."/expedition/class/expeditionstats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");