Fix: Pb de classe commande charge 2 fois. Tous les chemins des require doivent etre de la forme DOL_DOCUMENT_ROOT."/commande/commande.class.php"

This commit is contained in:
Laurent Destailleur 2005-08-13 21:23:02 +00:00
parent 336e1937f1
commit 5beb8aee03
21 changed files with 35 additions and 36 deletions

View File

@ -28,7 +28,7 @@
require ("../htdocs/master.inc.php");
require_once ("../htdocs/facture.class.php");
require_once ("../htdocs/propal.class.php");
require_once ("../htdocs/commande/commande.class.php");
require_once (DOL_DOCUMENT_ROOT."/commande/commande.class.php");
require_once ("../htdocs/societe.class.php");
/*

View File

@ -67,7 +67,7 @@ $dates = array (mktime(12,0,0,1,3,2003),
mktime(12,0,0,10,3,2003)
);
require DOL_DOCUMENT_ROOT."/commande/commande.class.php";
require(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$com = new Commande($db);

View File

@ -243,7 +243,7 @@ if ($_GET["action"] == 'commande')
mktime(12,0,0,12,13,2003),
);
require DOL_DOCUMENT_ROOT."/commande/commande.class.php";
require(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$com = new Commande($db);

View File

@ -20,7 +20,7 @@
*
*/
require("../../main.inc.php");
require("./commande.class.php");
require(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
function llxHeader($head = "", $urlp = "") {
global $user, $conf;

View File

@ -32,7 +32,7 @@
require_once("./pre.inc.php");
require_once("../contact.class.php");
require_once("../actioncomm.class.php");
require_once("../commande/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
require_once("../contrat/contrat.class.php");
$langs->load("companies");

View File

@ -41,7 +41,7 @@ if (!$user->rights->propale->lire)
accessforbidden();
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
require_once('./propal_model_pdf.class.php');
require_once('../propal.class.php');
require_once('../actioncomm.class.php');

View File

@ -29,7 +29,7 @@
*/
require("../main.inc.php");
require_once DOL_DOCUMENT_ROOT."/commande/commande.class.php";
require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$langs->load("orders");

View File

@ -29,7 +29,7 @@
*/
require("./pre.inc.php");
require("../commande.class.php");
require(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
require("./commandestats.class.php");
$WIDTH=500;

View File

@ -29,7 +29,7 @@
*/
require("./pre.inc.php");
require("../commande.class.php");
require(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
require("./commandestats.class.php");
/*

View File

@ -28,8 +28,7 @@
*/
require("../../main.inc.php");
require_once DOL_DOCUMENT_ROOT.'/commande/commande.class.php';
require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
$langs->load("orders");

View File

@ -47,7 +47,7 @@ require_once "../paiement.class.php";
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php");
if ($conf->propal->enabled) require_once("../propal.class.php");
if ($conf->contrat->enabled) require_once("../contrat/contrat.class.php");
if ($conf->commande->enabled) require_once("../commande/commande.class.php");
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
require_once DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php";

View File

@ -35,7 +35,7 @@ if (!$user->rights->propale->lire)
accessforbidden();
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
require_once("../propal.class.php");
//require_once("../actioncomm.class.php");

View File

@ -30,8 +30,8 @@
require("../main.inc.php");
require_once DOL_DOCUMENT_ROOT."/commande/commande.class.php";
require_once DOL_DOCUMENT_ROOT."/expedition/expedition.class.php";
require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
$langs->load("orders");
$langs->load("sendings");

View File

@ -33,8 +33,8 @@ $langs->load("suppliers");
$langs->load("companies");
$user->getrights('fournisseur');
require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.class.php";
require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php";
require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.class.php");
require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php");
function llxHeader($head = "", $title = "", $help_url='', $addons='')
{

View File

@ -32,8 +32,8 @@
\brief Classe permettant la gestion des fournisseur
*/
include_once DOL_DOCUMENT_ROOT."/societe.class.php";
include_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php";
include_once(DOL_DOCUMENT_ROOT."/societe.class.php");
include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php");
class Fournisseur extends Societe {
var $db;
@ -127,8 +127,8 @@ class Fournisseur extends Societe {
function ProductCommande($user, $product_id)
{
include_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php";
include_once DOL_DOCUMENT_ROOT."/product.class.php";
include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php");
include_once(DOL_DOCUMENT_ROOT."/product.class.php");
$commf = new CommandeFournisseur($this->db);

View File

@ -301,7 +301,7 @@ if ($conf->commercial->enabled || $conf->compta->enabled)
// Nbre commandes clients à honorer
if ($conf->commande->enabled && $user->rights->commande->lire)
{
include_once("./commande/commande.class.php");
include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$board=new Commande($db);
$board->load_board();

View File

@ -29,9 +29,9 @@
*/
require("./pre.inc.php");
require("../propal.class.php");
require("../facture.class.php");
require("../commande/commande.class.php");
require_once("../propal.class.php");
require_once("../facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$langs->load("projects");
$langs->load("companies");

View File

@ -29,9 +29,9 @@
*/
require("./pre.inc.php");
require("../propal.class.php");
require("../facture.class.php");
require("../commande/commande.class.php");
require_once("../propal.class.php");
require_once("../facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$langs->load("projects");
$langs->load("companies");

View File

@ -29,9 +29,9 @@
*/
require("./pre.inc.php");
require("../propal.class.php");
require("../facture.class.php");
require("../commande/commande.class.php");
require_once("../propal.class.php");
require_once("../facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
if (!$user->rights->projet->lire) accessforbidden();

View File

@ -29,9 +29,9 @@
*/
require("./pre.inc.php");
require("../propal.class.php");
require("../facture.class.php");
require("../commande/commande.class.php");
require_once("../propal.class.php");
require_once("../facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$langs->load("projects");
$langs->load("companies");

View File

@ -734,7 +734,7 @@ class Propal
if ($statut == 2)
{
/* Propale signée */
include_once DOL_DOCUMENT_ROOT . "/commande/commande.class.php";
include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$this->create_commande($user);
@ -769,7 +769,7 @@ class Propal
if ($this->statut == 2)
{
/* Propale signée */
include_once DOL_DOCUMENT_ROOT . "/commande/commande.class.php";
include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
$commande = new Commande($this->db);
$commande->create_from_propale($user, $this->id);
return 1;