From 44405e5415fb2d3fd9aac3f444b10f436ba3a1ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Sep 2017 15:04:29 +0200
Subject: [PATCH] Fix #7335 #7365 Better fix
---
htdocs/compta/facture/card.php | 8 ++++++++
htdocs/core/class/discount.class.php | 10 +++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 60f711688cc..82eeb3d49c0 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3156,6 +3156,14 @@ else if ($id > 0 || ! empty($ref))
$facthatreplace->fetch($objectidnext);
print ' (' . $langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)) . ')';
}
+
+ if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
+ $discount = new DiscountAbsolute($db);
+ $result = $discount->fetch(0, $object->id);
+ if ($result > 0){
+ print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(), $discount->getNomUrl(1, 'discount')).'<br>';
+ }
+ }
print '</td></tr>';
// Relative and absolute discounts
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 41c5d67688c..443534eb1b3 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -64,7 +64,7 @@ class DiscountAbsolute
* @param int $fk_facture_source fk_facture_source
* @return int <0 if KO, =0 if not found, >0 if OK
*/
- function fetch($rowid,$fk_facture_source=0)
+ function fetch($rowid, $fk_facture_source=0)
{
global $conf;
@@ -386,7 +386,7 @@ class DiscountAbsolute
function getSumDepositsUsed($invoice, $multicurrency=0)
{
dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
-
+
if ($invoice->element == 'facture' || $invoice->element == 'invoice')
{
$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
@@ -407,7 +407,7 @@ class DiscountAbsolute
dol_print_error($this->error);
return -1;
}
-
+
$resql=$this->db->query($sql);
if ($resql)
{
@@ -432,7 +432,7 @@ class DiscountAbsolute
function getSumCreditNotesUsed($invoice, $multicurrency=0)
{
dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
-
+
if ($invoice->element == 'facture' || $invoice->element == 'invoice')
{
$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
@@ -453,7 +453,7 @@ class DiscountAbsolute
dol_print_error($this->error);
return -1;
}
-
+
$resql=$this->db->query($sql);
if ($resql)
{
--
GitLab