From 247509e752c1172ee5ae703bb254595e83bf1251 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Wed, 9 Sep 2009 22:28:27 +0000 Subject: [PATCH] By changing a simple sentence in allocation_cart.inc, the customer/supplier payments works with prompt payment discounts --- CHANGELOG.txt | 4 ++++ includes/ui/allocation_cart.inc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cbf3d88e..e71bc6b3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +10-Swp-2009 Joe Hunt +! By changing a simple sentence in allocation_cart.inc, the customer/supplier payments works with prompt payment discounts +$ /includes/ui/allocation_cart.inc + 09-Sep-2009 Janusz Dobrowolski # Added two special access areas for bank gl postings and grn removal. $ /gl/gl_journal.php diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc index d89eb9ec..32cb1add 100644 --- a/includes/ui/allocation_cart.inc +++ b/includes/ui/allocation_cart.inc @@ -339,7 +339,7 @@ function check_allocations() if ($_SESSION['alloc']->type == 21 || $_SESSION['alloc']->type == 22) $amount = -$amount; - if ($total_allocated - $amount > sys_prefs::allocation_settled_allowance()) + if ($total_allocated - ($amount + input_num('discount')) > sys_prefs::allocation_settled_allowance()) { display_error(_("These allocations cannot be processed because the amount allocated is more than the total amount left to allocate.")); return false; -- 2.30.2