From 84f8a18a72f33db1a78bc6c4350d5d5de6df7b74 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 13 Apr 2010 14:30:11 +0000 Subject: [PATCH] move discount.class.php to core directory --- htdocs/comm/propal/propal.class.php | 2 +- htdocs/comm/remx.php | 2 +- htdocs/commande/commande.class.php | 2 +- htdocs/commande/fiche.php | 2 +- htdocs/compta/commande/fiche.php | 2 +- htdocs/compta/facture.php | 4 ++-- htdocs/compta/facture/contact.php | 2 +- htdocs/compta/facture/document.php | 2 +- htdocs/compta/facture/facture.class.php | 6 +++--- htdocs/compta/facture/info.php | 2 +- htdocs/compta/facture/note.php | 2 +- htdocs/{ => core}/discount.class.php | 2 +- htdocs/includes/modules/commande/modules_commande.php | 2 +- htdocs/societe/societe.class.php | 4 ++-- 14 files changed, 18 insertions(+), 18 deletions(-) rename htdocs/{ => core}/discount.class.php (99%) diff --git a/htdocs/comm/propal/propal.class.php b/htdocs/comm/propal/propal.class.php index a2b890803d8..80f68d08b96 100644 --- a/htdocs/comm/propal/propal.class.php +++ b/htdocs/comm/propal/propal.class.php @@ -192,7 +192,7 @@ class Propal extends CommonObject global $langs; include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $this->db->begin(); diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index c58cc820139..e16040affac 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -28,7 +28,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/discount.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/discount.class.php"); $langs->load("orders"); $langs->load("bills"); diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index 2958044a1e3..d43d1dea657 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -1108,7 +1108,7 @@ class Commande extends CommonObject global $langs; include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $this->db->begin(); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index f4a3baf5d66..2cbaa2448de 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1752,7 +1752,7 @@ else { if ($objp->description == '(CREDIT_NOTE)') { - require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $discount=new DiscountAbsolute($db); $discount->fetch($objp->fk_remise_except); print ' - '.$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0)); diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 964e1a31ad7..cd374db7924 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -450,7 +450,7 @@ if ($id > 0 || ! empty($ref)) { if ($objp->description == '(CREDIT_NOTE)') { - require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $discount=new DiscountAbsolute($db); $discount->fetch($objp->fk_remise_except); print ' - '.$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0)); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index b9bd63eb6fc..ace9e0638d6 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -32,7 +32,7 @@ require('../main.inc.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.'/compta/facture/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); @@ -283,7 +283,7 @@ if ($_POST['action'] == "setabsolutediscount" && $user->rights->facture->creer) } if (! empty($_POST["remise_id_for_payment"])) { - require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $discount = new DiscountAbsolute($db); $discount->fetch($_POST["remise_id_for_payment"]); diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 1a5d6d6911c..b6900c94fe4 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 13845429261..b6ab2434df2 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -28,7 +28,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); diff --git a/htdocs/compta/facture/facture.class.php b/htdocs/compta/facture/facture.class.php index 418a33ad8d2..a8f8d09caea 100644 --- a/htdocs/compta/facture/facture.class.php +++ b/htdocs/compta/facture/facture.class.php @@ -860,7 +860,7 @@ class Facture extends CommonObject global $langs; include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $this->db->begin(); @@ -1958,7 +1958,7 @@ class Facture extends CommonObject */ function getSumCreditNotesUsed() { - require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getSumCreditNotesUsed($this); @@ -1979,7 +1979,7 @@ class Facture extends CommonObject */ function getSumDepositsUsed() { - require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getSumDepositsUsed($this); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index d5a49ce8089..3c300270f54 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 6bc3110e95f..a1806580877 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:""; diff --git a/htdocs/discount.class.php b/htdocs/core/discount.class.php similarity index 99% rename from htdocs/discount.class.php rename to htdocs/core/discount.class.php index d606fb08024..6aa300c1c6a 100644 --- a/htdocs/discount.class.php +++ b/htdocs/core/discount.class.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/discount.class.php + * \file htdocs/core/discount.class.php * \ingroup propal facture commande * \brief Fichier de la classe de gestion des remises * \version $Id$ diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 7ea519bb49d..06684a3a409 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -32,7 +32,7 @@ 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."/compta/bank/account.class.php"); // requis car utilise par les classes qui heritent -require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); /** diff --git a/htdocs/societe/societe.class.php b/htdocs/societe/societe.class.php index 2c0415d57c2..06a73fb407d 100644 --- a/htdocs/societe/societe.class.php +++ b/htdocs/societe/societe.class.php @@ -1155,7 +1155,7 @@ class Societe extends CommonObject if ($this->id) { - require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $discount = new DiscountAbsolute($this->db); $discount->fk_soc=$this->id; @@ -1187,7 +1187,7 @@ class Societe extends CommonObject */ function getAvailableDiscounts($user='',$filter='',$maxvalue=0) { - require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php'); $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue);