From 60e4e23870c5716806c4bfb7cf697549ae92e963 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Sep 2021 17:33:18 +0200 Subject: [PATCH] Update object_discounts.tpl.php --- htdocs/core/tpl/object_discounts.tpl.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php index e30cd8fe72a..2bac4fca588 100644 --- a/htdocs/core/tpl/object_discounts.tpl.php +++ b/htdocs/core/tpl/object_discounts.tpl.php @@ -30,6 +30,14 @@ $objclassname = get_class($object); $isInvoice = in_array($object->element, array('facture', 'invoice', 'facture_fourn', 'invoice_supplier')); $isNewObject = empty($object->id) && empty($object->rowid); +// Clean variables not defined +if (!isset($absolute_discount)) { + $absolute_discount = 0; +} +if (!isset($absolute_creditnote)) { + $absolute_creditnote = 0; +} + // Relative and absolute discounts $addrelativediscount = ''.$langs->trans("EditRelativeDiscount").''; $addabsolutediscount = ''.$langs->trans("EditGlobalDiscounts").''; @@ -78,7 +86,7 @@ if ($absolute_discount > 0) { } // Is there credit notes availables ? -if (isset($absolute_creditnote) && $absolute_creditnote > 0) { +if ($absolute_creditnote > 0) { // If validated, we show link "add credit note to payment" if ($cannotApplyDiscount || !$isInvoice || $isNewObject || $object->statut != $objclassname::STATUS_VALIDATED || $object->type == $objclassname::TYPE_CREDIT_NOTE) { $translationKey = !empty($discount_type) ? 'HasCreditNoteFromSupplier' : 'CompanyHasCreditNote'; @@ -104,7 +112,7 @@ if (isset($absolute_creditnote) && $absolute_creditnote > 0) { } } -if (!empty($absolute_creditnote) && $absolute_discount <= 0 && $absolute_creditnote <= 0) { +if ($absolute_discount <= 0 && $absolute_creditnote <= 0) { $translationKey = !empty($discount_type) ? 'HasNoAbsoluteDiscountFromSupplier' : 'CompanyHasNoAbsoluteDiscount'; print '
'.$langs->trans($translationKey).'.';