[0000219] Incorrect behaviors regarding Payment forms

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 6719df179bd8c56e5b08b061619683003ff9c7df..8ec8d576bdd6c64ee6f4577509efef682ef5b790 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,14 +19,19 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+03-Apr-2010 Joe Hunt/Chaitanya
+# [0000219] Incorrect behaviors regarding Payment forms
+$ /purchasing/supplier_payment.php
+  /sales/customer_payments.php
+
 20-Mar-2010 Joe Hunt/RodW
 # [0000215} Wrong text in deliver to and not printing it.
 $ /reporting/includes/doctext.inc
   /reporting/includes/doctext2.inc
-  /reporting/header2.inc
+  /reporting/includes/header2.inc
   
 15-Mar-2010 Janusz Dobrowolski
-# Missing check for customer/bramch selected ([0000216])
+# Missing check for customer/branch selected ([0000216])
 $ /sales/sales_order_entry.php
   /sales/customer_payment.php
 # Missing check for supplier selected ([0000217])

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index ddc1bf437060b1419890b79987b50f77630e50f7..265fe536ed01b64f5db599382ae2f0aa220e147c 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -140,7 +140,8 @@ function check_inputs()
                return false;
        }
 
-       if (input_num('amount') - input_num('discount') <= 0) 
+       //if (input_num('amount') - input_num('discount') <= 0) 
+       if (input_num('amount') <= 0) 
        {
                display_error(_("The total of the amount and the discount is zero or negative. Please enter positive values."));
                set_focus('amount');

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 939799f7dd2f46d8b148f73410fdcf25a773ce30..ae46441df03b0247d1010b78d16d5424f28c2dab 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -152,7 +152,8 @@ function can_process()
                return false;
        }
 
-       if ((input_num('amount') - input_num('discount') <= 0)) {
+       //if ((input_num('amount') - input_num('discount') <= 0)) {
+       if (input_num('amount') <= 0) {
                display_error(_("The balance of the amount and discout is zero or negative. Please enter valid amounts."));
                set_focus('discount');
                return false;