Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

according to new tree directory

Browse Source
This commit is contained in:
Philippe Grand
2010-04-28 10:02:54 +00:00
parent cafe7fb970
commit b68a359265
78 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev/skeletons/skeleton_class.class.php
View File

@@ -27,7 +27,7 @@
*/ */
// Put here all includes required by your class file // Put here all includes required by your class file
//require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); //require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
//require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
//require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); //require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");

2
htdocs/adherents/class/adherent.class.php
View File

@@ -28,7 +28,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");

2
htdocs/adherents/class/adherent_type.class.php
View File

@@ -26,7 +26,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
/** /**

2
htdocs/adherents/class/cotisation.class.php
View File

@@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
/** /**

2
htdocs/admin/menus/edit.php
View File

@@ -26,7 +26,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
$langs->load("admin"); $langs->load("admin");

2
htdocs/boutique/commande/class/boutiquecommande.class.php
View File

@@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/address.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/address.class.php");
include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'); include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php');

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

@@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

4
htdocs/comm/propal/propal.class.php
View File

@@ -32,7 +32,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php");
require_once(DOL_DOCUMENT_ROOT ."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT ."/contact/class/contact.class.php");
@@ -192,7 +192,7 @@ class Propal extends CommonObject
global $langs; global $langs;
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$this->db->begin(); $this->db->begin();

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

@@ -27,7 +27,7 @@
require("../../../main.inc.php"); require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$WIDTH=500; $WIDTH=500;
$HEIGHT=200; $HEIGHT=200;

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

@@ -26,7 +26,7 @@
require("../../../main.inc.php"); require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/stats/propalestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$GRAPHWIDTH=500; $GRAPHWIDTH=500;
$GRAPHHEIGHT=200; $GRAPHHEIGHT=200;

2
htdocs/comm/remx.php
View File

@@ -28,7 +28,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/discount.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/discount.class.php");
$langs->load("orders"); $langs->load("orders");
$langs->load("bills"); $langs->load("bills");

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

@@ -27,7 +27,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
@@ -1108,7 +1108,7 @@ class Commande extends CommonObject
global $langs; global $langs;
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$this->db->begin(); $this->db->begin();

2
htdocs/commande/fiche.php
View File

@@ -1777,7 +1777,7 @@ else
{ {
if ($objp->description == '(CREDIT_NOTE)') if ($objp->description == '(CREDIT_NOTE)')
{ {
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$discount=new DiscountAbsolute($db); $discount=new DiscountAbsolute($db);
$discount->fetch($objp->fk_remise_except); $discount->fetch($objp->fk_remise_except);
print ' - '.$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0)); print ' - '.$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));

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

@@ -27,7 +27,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.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/stats/commandestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$WIDTH=500; $WIDTH=500;
$HEIGHT=200; $HEIGHT=200;

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

@@ -27,7 +27,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.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/stats/commandestats.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$GRAPHWIDTH=500; $GRAPHWIDTH=500;
$GRAPHHEIGHT=200; $GRAPHHEIGHT=200;

2
htdocs/compta/bank/class/account.class.php
View File

@@ -27,7 +27,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
htdocs/compta/bank/class/bankcateg.class.php
View File

@@ -27,7 +27,7 @@
*/ */
// Put here all includes required by your class file // Put here all includes required by your class file
//require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); //require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
//require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
//require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); //require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");

2
htdocs/compta/bank/graph.php
View File

@@ -28,7 +28,7 @@
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$langs->load("banks"); $langs->load("banks");

2
htdocs/compta/commande/fiche.php
View File

@@ -475,7 +475,7 @@ if ($id > 0 || ! empty($ref))
{ {
if ($objp->description == '(CREDIT_NOTE)') if ($objp->description == '(CREDIT_NOTE)')
{ {
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$discount=new DiscountAbsolute($db); $discount=new DiscountAbsolute($db);
$discount->fetch($objp->fk_remise_except); $discount->fetch($objp->fk_remise_except);
print ' - '.$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0)); print ' - '.$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));

2
htdocs/compta/deplacement/class/deplacement.class.php
View File

@@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**
* \class Deplacement * \class Deplacement

2
htdocs/compta/deplacement/stats/index.php
View File

@@ -25,7 +25,7 @@
*/ */
require("../../../main.inc.php"); require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/stats/deplacementstats.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/stats/deplacementstats.class.php");
$langs->load("trips"); $langs->load("trips");

2
htdocs/compta/deplacement/stats/month.php
View File

@@ -25,7 +25,7 @@
*/ */
require("../../../main.inc.php"); require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/stats/deplacementstats.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/stats/deplacementstats.class.php");
$langs->load("trips"); $langs->load("trips");

2
htdocs/compta/dons/class/don.class.php
View File

@@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
htdocs/compta/facture.php
View File

@@ -33,7 +33,7 @@ require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/facture/modules_facture.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');

8
htdocs/compta/facture/class/facture.class.php
View File

@@ -31,7 +31,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php");
require_once(DOL_DOCUMENT_ROOT ."/societe/client.class.php"); require_once(DOL_DOCUMENT_ROOT ."/societe/client.class.php");
@@ -869,7 +869,7 @@ class Facture extends CommonObject
global $langs; global $langs;
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');
include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$this->db->begin(); $this->db->begin();
@@ -1967,7 +1967,7 @@ class Facture extends CommonObject
*/ */
function getSumCreditNotesUsed() function getSumCreditNotesUsed()
{ {
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$discountstatic=new DiscountAbsolute($this->db); $discountstatic=new DiscountAbsolute($this->db);
$result=$discountstatic->getSumCreditNotesUsed($this); $result=$discountstatic->getSumCreditNotesUsed($this);
@@ -1988,7 +1988,7 @@ class Facture extends CommonObject
*/ */
function getSumDepositsUsed() function getSumDepositsUsed()
{ {
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$discountstatic=new DiscountAbsolute($this->db); $discountstatic=new DiscountAbsolute($this->db);
$result=$discountstatic->getSumDepositsUsed($this); $result=$discountstatic->getSumDepositsUsed($this);

2
htdocs/compta/facture/contact.php
View File

@@ -27,7 +27,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');

2
htdocs/compta/facture/document.php
View File

@@ -28,7 +28,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");

2
htdocs/compta/facture/info.php
View File

@@ -26,7 +26,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');

2
htdocs/compta/facture/note.php
View File

@@ -26,7 +26,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
$socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";

2
htdocs/compta/facture/stats/index.php
View File

@@ -25,7 +25,7 @@
*/ */
require("../../../main.inc.php"); require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/stats/facturestats.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/stats/facturestats.class.php");
$WIDTH=500; $WIDTH=500;

2
htdocs/compta/facture/stats/month.php
View File

@@ -25,7 +25,7 @@
*/ */
require("../../../main.inc.php"); require("../../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$GRAPHWIDTH=500; $GRAPHWIDTH=500;
$GRAPHHEIGHT=200; $GRAPHHEIGHT=200;

2
htdocs/compta/paiement/cheque/remisecheque.class.php
View File

@@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
htdocs/compta/prelevement/class/bon-prelevement.class.php
View File

@@ -24,7 +24,7 @@
\version $Id$ \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");

2
htdocs/compta/sociales/class/chargesociales.class.php
View File

@@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
/** \class ChargeSociales /** \class ChargeSociales

2
htdocs/compta/tva/class/tva.class.php
View File

@@ -25,7 +25,7 @@
*/ */
// Put here all includes required by your class file // Put here all includes required by your class file
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
htdocs/contact/class/contact.class.php
View File

@@ -28,7 +28,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
htdocs/contrat/class/contrat.class.php
View File

@@ -28,7 +28,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php");

0
htdocs/core/address.class.php → htdocs/core/class/address.class.php
View File

0
htdocs/core/commonobject.class.php → htdocs/core/class/commonobject.class.php
View File

2
htdocs/core/commonobjectline.class.php → htdocs/core/class/commonobjectline.class.php
View File

@@ -17,7 +17,7 @@
*/ */
/** /**
\file htdocs/core/commonobjectline.class.php \file htdocs/core/class/commonobjectline.class.php
\ingroup core \ingroup core
\brief File of the superclass of classes of lines of business objects (invoice, contract, PROPAL, commands, etc. ...) \brief File of the superclass of classes of lines of business objects (invoice, contract, PROPAL, commands, etc. ...)
\version $Id$ \version $Id$

0
htdocs/core/conf.class.php → htdocs/core/class/conf.class.php
View File

0
htdocs/core/cookie.class.php → htdocs/core/class/cookie.class.php
View File

0
htdocs/core/discount.class.php → htdocs/core/class/discount.class.php
View File

2
htdocs/core/dolexception.class.php → htdocs/core/class/dolexception.class.php
View File

@@ -17,7 +17,7 @@
*/ */
/** /**
* \file htdocs/core/DolException.class.php * \file htdocs/core/class/DolException.class.php
* \ingroup core * \ingroup core
* \brief File of class for exceptions * \brief File of class for exceptions
* \version $Id$ * \version $Id$

0
htdocs/core/dolgraph.class.php → htdocs/core/class/dolgraph.class.php
View File

2
htdocs/core/events.class.php → htdocs/core/class/events.class.php
View File

@@ -27,7 +27,7 @@
*/ */
// Put here all includes required by your class file // Put here all includes required by your class file
//require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); //require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
//require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
//require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); //require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");

2
htdocs/core/menu.class.php → htdocs/core/class/menu.class.php
View File

@@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/core/menu.class.php * \file htdocs/core/class/menu.class.php
* \brief Fichier de la classe de gestion du menu gauche * \brief Fichier de la classe de gestion du menu gauche
* \version $Id$ * \version $Id$
*/ */

0
htdocs/core/menubase.class.php → htdocs/core/class/menubase.class.php
View File

2
htdocs/expedition/expedition.class.php
View File

@@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");

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

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

2
htdocs/fichinter/fichinter.class.php
View File

@@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
htdocs/includes/menus/barre_left/auguria.lib.php
View File

@@ -87,7 +87,7 @@ function print_left_auguria_menu($db,$menu_array)
*/ */
if ($mainmenu) if ($mainmenu)
{ {
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
$menuArbo = new Menubase($db,'auguria','left'); $menuArbo = new Menubase($db,'auguria','left');
$overwritemenufor = $menuArbo->listeMainmenu(); $overwritemenufor = $menuArbo->listeMainmenu();

2
htdocs/includes/menus/barre_left/eldy.lib.php
View File

@@ -829,7 +829,7 @@ function print_left_eldy_menu($db,$menu_array)
} }
// Affichage des menus personnalises // Affichage des menus personnalises
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
$menuArbo = new Menubase($db,'eldy','left'); $menuArbo = new Menubase($db,'eldy','left');
$overwritemenufor = $menuArbo->listeMainmenu(); $overwritemenufor = $menuArbo->listeMainmenu();

2
htdocs/includes/menus/barre_top/auguria.lib.php
View File

@@ -34,7 +34,7 @@
*/ */
function print_auguria_menu($db,$atarget,$hideifnotallowed) function print_auguria_menu($db,$atarget,$hideifnotallowed)
{ {
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
global $user,$conf,$langs,$dolibarr_main_db_name; global $user,$conf,$langs,$dolibarr_main_db_name;

2
htdocs/includes/menus/barre_top/eldy.lib.php
View File

@@ -361,7 +361,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
// Show personalized menus // Show personalized menus
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
$menuArbo = new Menubase($db,'eldy','top'); $menuArbo = new Menubase($db,'eldy','top');

2
htdocs/includes/menus/barre_top/empty.php
View File

@@ -73,7 +73,7 @@ class MenuTop {
/* /*
// Code to show personalized menus // Code to show personalized menus
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
$menuArbo = new Menubase($this->db,'empty','top'); $menuArbo = new Menubase($this->db,'empty','top');
$tabMenu = $menuArbo->menuTopCharger(2,$_SESSION['mainmenu'],'empty'); $tabMenu = $menuArbo->menuTopCharger(2,$_SESSION['mainmenu'],'empty');

2
htdocs/includes/modules/DolibarrModules.class.php
View File

@@ -961,7 +961,7 @@ class DolibarrModules
{ {
global $user; global $user;
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
$err=0; $err=0;

2
htdocs/includes/modules/commande/modules_commande.php
View File

@@ -32,7 +32,7 @@
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
/** /**

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

@@ -234,7 +234,7 @@ class InterfaceLogevents
// Add entry in event table // Add entry in event table
if ($this->date) if ($this->date)
{ {
include_once(DOL_DOCUMENT_ROOT.'/core/events.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/events.class.php');
$event=new Events($this->db); $event=new Events($this->db);
$event->type=$action; $event->type=$action;

2
htdocs/install/etape2.php
View File

@@ -26,7 +26,7 @@
include("./inc.php"); include("./inc.php");
require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php");
require_once($dolibarr_main_document_root."/core/conf.class.php"); require_once($dolibarr_main_document_root."/core/class/conf.class.php");
require_once($dolibarr_main_document_root."/lib/admin.lib.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php");
$etape = 2; $etape = 2;

2
htdocs/install/etape4.php
View File

@@ -29,7 +29,7 @@
include_once("./inc.php"); include_once("./inc.php");
require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php");
require_once($dolibarr_main_document_root."/core/conf.class.php"); require_once($dolibarr_main_document_root."/core/class/conf.class.php");
require_once($dolibarr_main_document_root."/lib/admin.lib.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php");

2
htdocs/install/inc.php
View File

@@ -209,7 +209,7 @@ function conf($dolibarr_main_document_root)
global $dolibarr_main_db_pass; global $dolibarr_main_db_pass;
global $character_set_client; global $character_set_client;
$return=include_once($dolibarr_main_document_root."/core/conf.class.php"); $return=include_once($dolibarr_main_document_root."/core/class/conf.class.php");
if (! $return) return -1; if (! $return) return -1;
$conf=new Conf(); $conf=new Conf();

2
htdocs/install/upgrade2.php
View File

@@ -38,7 +38,7 @@ require_once($dolibarr_main_document_root . '/contrat/class/contrat.class.php');
require_once($dolibarr_main_document_root . '/commande/class/commande.class.php'); require_once($dolibarr_main_document_root . '/commande/class/commande.class.php');
require_once($dolibarr_main_document_root . '/fourn/fournisseur.commande.class.php'); require_once($dolibarr_main_document_root . '/fourn/fournisseur.commande.class.php');
require_once($dolibarr_main_document_root . '/lib/price.lib.php'); require_once($dolibarr_main_document_root . '/lib/price.lib.php');
require_once($dolibarr_main_document_root . '/core/menubase.class.php'); require_once($dolibarr_main_document_root . '/core/class/menubase.class.php');
$grant_query=''; $grant_query='';
$etape = 2; $etape = 2;

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

@@ -119,7 +119,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
$entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]); $entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]);
if (isset($_COOKIE[$entityCookieName])) if (isset($_COOKIE[$entityCookieName]))
{ {
include_once(DOL_DOCUMENT_ROOT . "/core/cookie.class.php"); include_once(DOL_DOCUMENT_ROOT . "/core/class/cookie.class.php");
$cryptkey = (! empty($conf->file->cookie_cryptkey) ? $conf->file->cookie_cryptkey : '' ); $cryptkey = (! empty($conf->file->cookie_cryptkey) ? $conf->file->cookie_cryptkey : '' );

2
htdocs/livraison/livraison.class.php
View File

@@ -26,7 +26,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php"); require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");

4
htdocs/main.inc.php
View File

@@ -182,7 +182,7 @@ if ($conf->file->main_force_https)
// Chargement des includes complementaires de presentation // Chargement des includes complementaires de presentation
if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/menu.class.php"); // Need 10ko memory (11ko in 2.2) if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/class/menu.class.php"); // Need 10ko memory (11ko in 2.2)
if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/html.form.class.php"); // Need 660ko memory (800ko in 2.2) if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/html.form.class.php"); // Need 660ko memory (800ko in 2.2)
if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php'); // Need 22ko memory if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php'); // Need 22ko memory
//stopwithmem(); //stopwithmem();
@@ -511,7 +511,7 @@ if (! defined('NOLOGIN'))
// Create entity cookie, just used for login page // Create entity cookie, just used for login page
if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY) && !empty($conf->global->MAIN_MULTICOMPANY_COOKIE) && isset($_POST["entity"])) if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY) && !empty($conf->global->MAIN_MULTICOMPANY_COOKIE) && isset($_POST["entity"]))
{ {
include_once(DOL_DOCUMENT_ROOT."/core/cookie.class.php"); include_once(DOL_DOCUMENT_ROOT."/core/class/cookie.class.php");
$entity = $_SESSION["dol_login"].'|'.$_POST["entity"]; $entity = $_SESSION["dol_login"].'|'.$_POST["entity"];
$entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]); $entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]);

4
htdocs/master.inc.php
View File

@@ -138,7 +138,7 @@ if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_d
* Create $conf object * Create $conf object
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/conf.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/conf.class.php");
$conf = new Conf(); $conf = new Conf();
@@ -278,7 +278,7 @@ if (! defined('NOREQUIREDB'))
$entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]); $entityCookieName = 'DOLENTITYID_'.md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]);
if (! empty($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) // Just for view specific login page if (! empty($_COOKIE[$entityCookieName]) && ! empty($conf->file->cookie_cryptkey)) // Just for view specific login page
{ {
include_once(DOL_DOCUMENT_ROOT."/core/cookie.class.php"); include_once(DOL_DOCUMENT_ROOT."/core/class/cookie.class.php");
$lastuser = ''; $lastuser = '';
$lastentity = ''; $lastentity = '';

2
htdocs/product/product.class.php
View File

@@ -27,7 +27,7 @@
* \brief Fichier de la classe des produits predefinis * \brief Fichier de la classe des produits predefinis
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
htdocs/product/service.class.php
View File

@@ -23,7 +23,7 @@
* \brief Fichier de la classe des services predefinis * \brief Fichier de la classe des services predefinis
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
htdocs/product/stats/fiche.php
View File

@@ -29,7 +29,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("products"); $langs->load("products");

2
htdocs/product/stock/entrepot.class.php
View File

@@ -25,7 +25,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
/** /**

2
htdocs/projet/project.class.php
View File

@@ -24,7 +24,7 @@
* \brief Fichier de la classe de gestion des projets * \brief Fichier de la classe de gestion des projets
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**
* \class Project * \class Project

2
htdocs/projet/tasks/task.class.php
View File

@@ -25,7 +25,7 @@
* \remarks Initialy built by build_class_from_table on 2008-09-10 12:41 * \remarks Initialy built by build_class_from_table on 2008-09-10 12:41
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
/** /**

6
htdocs/societe/societe.class.php
View File

@@ -29,7 +29,7 @@
* \brief File for third party class * \brief File for third party class
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
/** /**
@@ -1162,7 +1162,7 @@ class Societe extends CommonObject
if ($this->id) if ($this->id)
{ {
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$discount = new DiscountAbsolute($this->db); $discount = new DiscountAbsolute($this->db);
$discount->fk_soc=$this->id; $discount->fk_soc=$this->id;
@@ -1194,7 +1194,7 @@ class Societe extends CommonObject
*/ */
function getAvailableDiscounts($user='',$filter='',$maxvalue=0) function getAvailableDiscounts($user='',$filter='',$maxvalue=0)
{ {
require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
$discountstatic=new DiscountAbsolute($this->db); $discountstatic=new DiscountAbsolute($this->db);
$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue); $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue);

2
htdocs/support/inc.php
View File

@@ -169,7 +169,7 @@ function conf($dolibarr_main_document_root)
global $dolibarr_main_db_pass; global $dolibarr_main_db_pass;
global $character_set_client; global $character_set_client;
$return=include_once($dolibarr_main_document_root."/core/conf.class.php"); $return=include_once($dolibarr_main_document_root."/core/class/conf.class.php");
if (! $return) return -1; if (! $return) return -1;
$conf=new Conf(); $conf=new Conf();

2
htdocs/user/group/usergroup.class.php
View File

@@ -24,7 +24,7 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
if ($conf->ldap->enabled) require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); if ($conf->ldap->enabled) require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");

2
htdocs/user/user.class.php
View File

@@ -35,7 +35,7 @@
\version $Id$ \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
/** /**

2
scripts/banks/build-graph-sold-example.php
View File

@@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
} }
require_once($path."../../htdocs/master.inc.php"); require_once($path."../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
if (! isset($argv[1]) || ! $argv[1]) { if (! isset($argv[1]) || ! $argv[1]) {