Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 14:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

move discount.class.php to core directory

Browse Source
This commit is contained in:
Philippe Grand
2010-04-13 14:30:11 +00:00
parent e5a5c2ae98
commit 84f8a18a72
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.'/discount.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php');
$this->db->begin(); $this->db->begin();

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/facture.class.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("orders");
$langs->load("bills"); $langs->load("bills");

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

@@ -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.'/discount.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php');
$this->db->begin(); $this->db->begin();

2
htdocs/commande/fiche.php
View File

@@ -1752,7 +1752,7 @@ else
{ {
if ($objp->description == '(CREDIT_NOTE)') 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=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/commande/fiche.php
View File

@@ -450,7 +450,7 @@ if ($id > 0 || ! empty($ref))
{ {
if ($objp->description == '(CREDIT_NOTE)') 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=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));

4
htdocs/compta/facture.php
View File

@@ -32,7 +32,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/facture.class.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.'/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');
@@ -283,7 +283,7 @@ if ($_POST['action'] == "setabsolutediscount" && $user->rights->facture->creer)
} }
if (! empty($_POST["remise_id_for_payment"])) 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 = new DiscountAbsolute($db);
$discount->fetch($_POST["remise_id_for_payment"]); $discount->fetch($_POST["remise_id_for_payment"]);

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/facture.class.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."/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.'/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/facture.class.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/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");

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

@@ -860,7 +860,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.'/discount.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php');
$this->db->begin(); $this->db->begin();
@@ -1958,7 +1958,7 @@ class Facture extends CommonObject
*/ */
function getSumCreditNotesUsed() function getSumCreditNotesUsed()
{ {
require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php');
$discountstatic=new DiscountAbsolute($this->db); $discountstatic=new DiscountAbsolute($this->db);
$result=$discountstatic->getSumCreditNotesUsed($this); $result=$discountstatic->getSumCreditNotesUsed($this);
@@ -1979,7 +1979,7 @@ class Facture extends CommonObject
*/ */
function getSumDepositsUsed() function getSumDepositsUsed()
{ {
require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/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/info.php
View File

@@ -26,7 +26,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture.class.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/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/facture.class.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/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/discount.class.php → htdocs/core/discount.class.php
View File

@@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/discount.class.php * \file htdocs/core/discount.class.php
* \ingroup propal facture commande * \ingroup propal facture commande
* \brief Fichier de la classe de gestion des remises * \brief Fichier de la classe de gestion des remises
* \version $Id$ * \version $Id$

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/account.class.php"); // requis car utilise par les classes qui heritent 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');
/** /**

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

@@ -1155,7 +1155,7 @@ class Societe extends CommonObject
if ($this->id) 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 = new DiscountAbsolute($this->db);
$discount->fk_soc=$this->id; $discount->fk_soc=$this->id;
@@ -1187,7 +1187,7 @@ class Societe extends CommonObject
*/ */
function getAvailableDiscounts($user='',$filter='',$maxvalue=0) 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); $discountstatic=new DiscountAbsolute($this->db);
$result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue); $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue);