From 86811c9e3b47f5ae05546ac9540ea65c0f3a0edc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Sep 2005 16:51:41 +0000 Subject: [PATCH] Optim: On evite de charger product.class si on en a pas besoin --- htdocs/categories/categorie.class.php | 3 ++- htdocs/commande/commande.class.php | 2 ++ htdocs/compta/facture/facture-rec.class.php | 3 ++- htdocs/compta/facture/fiche-rec.php | 2 +- htdocs/contrat/contrat.class.php | 2 ++ htdocs/contrat/ligne.php | 1 + htdocs/expedition/commande.php | 7 ++++--- htdocs/expedition/fiche.php | 7 +++++-- htdocs/facture.class.php | 1 + htdocs/fourn/fournisseur.class.php | 12 +++++++----- htdocs/fourn/fournisseur.commande.class.php | 5 +++-- htdocs/fourn/product/categorie.php | 1 + htdocs/fourn/product/fiche.php | 1 + htdocs/fourn/product/photos.php | 3 +-- .../includes/modules/facture/pdf_crabe.modules.php | 2 ++ .../includes/modules/facture/pdf_oursin.modules.php | 3 ++- .../modules/facture/pdf_tourteau.modules.php | 13 +------------ .../modules/propale/pdf_propale_azur.modules.php | 2 ++ htdocs/master.inc.php | 1 - htdocs/product/barcode.php | 1 + htdocs/product/fiche.php | 1 + htdocs/product/fournisseurs.php | 1 + htdocs/product/photos.php | 1 + htdocs/product/price.php | 1 + htdocs/product/stats/commande.php | 3 ++- htdocs/product/stats/contrat.php | 3 ++- htdocs/product/stats/facture.php | 3 ++- htdocs/product/stats/fiche.php | 1 + htdocs/product/stats/propal.php | 3 ++- htdocs/product/stock/product.php | 3 +-- htdocs/propal.class.php | 2 +- 31 files changed, 56 insertions(+), 38 deletions(-) diff --git a/htdocs/categories/categorie.class.php b/htdocs/categories/categorie.class.php index fa32194c864..d6cb6df2bb2 100644 --- a/htdocs/categories/categorie.class.php +++ b/htdocs/categories/categorie.class.php @@ -22,7 +22,8 @@ * */ -require_once DOL_DOCUMENT_ROOT."/product.class.php"; +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + class Categorie { diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index fae1efbdf7d..52eecc52330 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -27,6 +27,8 @@ \version $Revision$ */ +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + /** \class Commande diff --git a/htdocs/compta/facture/facture-rec.class.php b/htdocs/compta/facture/facture-rec.class.php index 025555156b7..93ced228a1d 100644 --- a/htdocs/compta/facture/facture-rec.class.php +++ b/htdocs/compta/facture/facture-rec.class.php @@ -27,7 +27,8 @@ \version $Revision$ */ -require_once(DOL_DOCUMENT_ROOT ."/notify.class.php"); +require_once(DOL_DOCUMENT_ROOT."/notify.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); /** diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index d119ff6cd30..81533ab265a 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -27,10 +27,10 @@ \version $Revision$ */ - require("./pre.inc.php"); require_once("./facture-rec.class.php"); require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $user->getrights('facture'); diff --git a/htdocs/contrat/contrat.class.php b/htdocs/contrat/contrat.class.php index 6acead79f19..a6d22b05887 100644 --- a/htdocs/contrat/contrat.class.php +++ b/htdocs/contrat/contrat.class.php @@ -27,6 +27,8 @@ \version $Revision$ */ +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + /** \class Contrat diff --git a/htdocs/contrat/ligne.php b/htdocs/contrat/ligne.php index 16c2a898cd7..1b6aec006f7 100644 --- a/htdocs/contrat/ligne.php +++ b/htdocs/contrat/ligne.php @@ -28,6 +28,7 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index e514515c6fb..b4199b5592d 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -20,16 +20,17 @@ * $Source$ */ +// Code identique a /expedition/fiche.php + /** \file htdocs/expedition/commande.php \ingroup expedition \version $Revision$ */ - -// Code identique a /expedition/fiche.php - require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + $user->getrights('commande'); $user->getrights('expedition'); diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 6c2b1045a86..433ee56d432 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -22,6 +22,8 @@ * */ +// Code identique a /expedition/commande.php + /** \file htdocs/expedition/fiche.php \ingroup expedition @@ -30,14 +32,15 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); +require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); $langs->load("bills"); if (!$user->rights->expedition->lire) accessforbidden(); -require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); // Sécurité accés client if ($user->societe_id > 0) diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 20eb6148d51..03200a1fdfa 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -30,6 +30,7 @@ */ require_once(DOL_DOCUMENT_ROOT ."/notify.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/product.class.php"); /** diff --git a/htdocs/fourn/fournisseur.class.php b/htdocs/fourn/fournisseur.class.php index 72fb2da7278..6b85462b1be 100644 --- a/htdocs/fourn/fournisseur.class.php +++ b/htdocs/fourn/fournisseur.class.php @@ -20,21 +20,23 @@ * */ -/*! +/** \file htdocs/fourn/fournisseur.class.php \ingroup societe \brief Fichier de la classe des fournisseurs \version $Revision$ */ -/*! +require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); +require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + + +/** \class Fournisseur \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"); - class Fournisseur extends Societe { var $db; diff --git a/htdocs/fourn/fournisseur.commande.class.php b/htdocs/fourn/fournisseur.commande.class.php index 26e0276ddd5..0f60b1b884c 100644 --- a/htdocs/fourn/fournisseur.commande.class.php +++ b/htdocs/fourn/fournisseur.commande.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -28,6 +27,8 @@ \version $Revision$ */ +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + /** \class CommandeFournisseur diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php index 16d513e5411..d1113885e18 100644 --- a/htdocs/fourn/product/categorie.php +++ b/htdocs/fourn/product/categorie.php @@ -19,6 +19,7 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $mesg = ''; diff --git a/htdocs/fourn/product/fiche.php b/htdocs/fourn/product/fiche.php index e92d0f1619d..868caa421f4 100644 --- a/htdocs/fourn/product/fiche.php +++ b/htdocs/fourn/product/fiche.php @@ -29,6 +29,7 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("products"); diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php index c1b072e8daf..aeff8b08669 100644 --- a/htdocs/fourn/product/photos.php +++ b/htdocs/fourn/product/photos.php @@ -29,8 +29,7 @@ */ require("./pre.inc.php"); -; - +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); if (!$user->rights->produit->lire) accessforbidden(); diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 7687c83e6b8..dcf8f77294f 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -28,6 +28,8 @@ \version $Revision$ */ +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + /** \class pdf_crabe diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 993957d514f..8df782d25f4 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -30,13 +30,14 @@ \version $Revision$ */ +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + /** \class pdf_oursin \brief Classe permettant de générer les factures au modèle oursin */ - class pdf_oursin extends ModelePDFFactures { var $marges=array("g"=>10,"h"=>5,"d"=>10,"b"=>15); diff --git a/htdocs/includes/modules/facture/pdf_tourteau.modules.php b/htdocs/includes/modules/facture/pdf_tourteau.modules.php index 26bd2ce5786..a2aa447f9a2 100644 --- a/htdocs/includes/modules/facture/pdf_tourteau.modules.php +++ b/htdocs/includes/modules/facture/pdf_tourteau.modules.php @@ -19,7 +19,6 @@ * * $Id$ * $Source$ - * */ /** \file htdocs/includes/modules/facture/pdf_tourteau.modules.php @@ -106,17 +105,7 @@ class pdf_tourteau extends ModelePDFFactures { $pdf->SetXY (11, $curY ); - // if ($fac->lignes[$i]->produit_id) - // { - // $prod = new Product($this->db, $fac->lignes[$i]->produit_id); - // $prod->fetch($fac->lignes[$i]->produit_id); - // $pdf->MultiCell(118, 5, $prod->description, 0, 'J'); - // } - //else - // { - $pdf->MultiCell(118, 5, $fac->lignes[$i]->desc, 0, 'J'); - // } - + $pdf->MultiCell(118, 5, $fac->lignes[$i]->desc, 0, 'J'); $nexY = $pdf->GetY(); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 4193ba8b7a5..1c5d1ca5d70 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -28,6 +28,8 @@ \version $Revision$ */ +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); + /** \class pdf_propale_azur diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 43a351a2e12..8117ae1075c 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -245,7 +245,6 @@ if (defined('FICHEINTER_OUTPUTDIR') && FICHEINTER_OUTPUTDIR) { $conf->fichinter- $conf->adherent->enabled=defined("MAIN_MODULE_ADHERENT")?MAIN_MODULE_ADHERENT:0; $conf->adherent->dir_output=DOL_DATA_ROOT."/adherent"; $conf->produit->enabled=defined("MAIN_MODULE_PRODUIT")?MAIN_MODULE_PRODUIT:0; -if ($conf->produit->enabled) require_once(DOL_DOCUMENT_ROOT ."/product.class.php"); $conf->produit->dir_output=DOL_DATA_ROOT."/produit"; $conf->produit->dir_images=DOL_DATA_ROOT."/produit/images"; $conf->barcode->enabled=defined("MAIN_MODULE_BARCODE")?MAIN_MODULE_BARCODE:0; diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php index a7e11fa7cb5..983e942d252 100644 --- a/htdocs/product/barcode.php +++ b/htdocs/product/barcode.php @@ -30,6 +30,7 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("products"); $langs->load("bills"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 7a9fa1162f3..60f7a87f6ce 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -33,6 +33,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("bills"); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index ab5b930048e..4e64c215b9c 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -32,6 +32,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("products"); $langs->load("suppliers"); diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index 9846dbaaac3..a804e385386 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -32,6 +32,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("products"); $langs->load("bills"); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 3baef787014..7334998bcfc 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -30,6 +30,7 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("products"); $langs->load("bills"); diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 984aa10b85e..295caa12af8 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -30,7 +30,8 @@ require("./pre.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("orders"); diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 5cc14245176..828a171c128 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -30,7 +30,8 @@ require("./pre.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("contracts"); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 7d403999dcc..5057c288b2a 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -30,7 +30,8 @@ require("./pre.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("bills"); diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 743ba61182b..825123cb324 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -31,6 +31,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("products"); $langs->load("bills"); diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 6ff85888066..001aec0f876 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -29,7 +29,8 @@ require("./pre.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/propal.class.php"); +require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $mesg = ''; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index b443325281b..f778f88bb4d 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -20,10 +20,8 @@ * * $Id$ * $Source$ - * */ - /** \file htdocs/product/stock/product.php \ingroup product @@ -32,6 +30,7 @@ */ require("./pre.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $langs->load("products"); $langs->load("bills"); diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index b820d655271..11a0987b520 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -22,7 +22,6 @@ * $Source$ */ - /** \file htdocs/propal.class.php \brief Fichier de la classe des propales @@ -32,6 +31,7 @@ \version $Revision$ */ +require_once(DOL_DOCUMENT_ROOT ."/product.class.php"); /**