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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
ldestailleur
2025-07-29 13:36:43 +02:00
parent bdddb38878 f4c6e2495c
commit 0860e8886c
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
htdocs/core/class/discount.class.php
View File

@@ -614,30 +614,44 @@ class DiscountAbsolute extends CommonObject
*/ */
public function getAvailableDiscounts($company = null, $user = null, $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0) public function getAvailableDiscounts($company = null, $user = null, $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)
{ {
global $conf; global $conf, $hookmanager;
dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG); dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG);
$sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount"; $parameters = array(
$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc"; 'company' => $company,
$sql .= " WHERE rc.entity = ".$conf->entity; 'user' => $user,
$sql .= " AND rc.discount_type=".((int) $discount_type); 'filter' => $filter,
if (!empty($discount_type)) { 'maxvalue' => $maxvalue,
$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier 'discount_type' => $discount_type,
'multicurrency' => $multicurrency
);
$reshook = $hookmanager->executeHooks('getAvailableDiscounts', $parameters);
if (empty($reshook)) {
$sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount";
$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc";
$sql .= " WHERE rc.entity = ".$conf->entity;
$sql .= " AND rc.discount_type=".((int) $discount_type);
if (!empty($discount_type)) {
$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
} else {
$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
}
if (is_object($company)) {
$sql .= " AND rc.fk_soc = ".((int) $company->id);
}
if (is_object($user)) {
$sql .= " AND rc.fk_user = ".((int) $user->id);
}
if ($filter) {
$sql .= " AND (".$filter.")";
}
if ($maxvalue) {
$sql .= ' AND rc.amount_ttc <= '.((float) price2num($maxvalue));
}
} else { } else {
$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer $sql = $hookmanager->resArray['sql'];
}
if (is_object($company)) {
$sql .= " AND rc.fk_soc = ".((int) $company->id);
}
if (is_object($user)) {
$sql .= " AND rc.fk_user = ".((int) $user->id);
}
if ($filter) {
$sql .= " AND (".$filter.")";
}
if ($maxvalue) {
$sql .= ' AND rc.amount_ttc <= '.((float) price2num($maxvalue));
} }
$resql = $this->db->query($sql); $resql = $this->db->query($sql);