X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=8f997c8888cb92052b1356d297a6c167fe86b5d6;hb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;hp=a530ecb4d8863134066d557f8b266af0c47c72ca;hpb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index a530ecb4..8f997c88 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -98,7 +98,7 @@ function display_controls()
 	$bank_currency = get_bank_account_currency($_POST['bank_account']);
 	if ($bank_currency != $supplier_currency) 
 	{
-		exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid']);
+		exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid'], true);
 	}
 
     ref_row(_("Reference:"), 'ref', '', references::get_next(22));
@@ -136,6 +136,13 @@ function check_inputs()
 		return false;
 	}
 
+	if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
+	{
+		display_error(_("The exchange rate must be numeric and greater than zero."));
+		set_focus('_ex_rate');
+		return false;
+	}
+
 	if ($_POST['discount'] == "") 
 	{
 		$_POST['discount'] = 0;
@@ -150,7 +157,7 @@ function check_inputs()
 
 	if (input_num('amount') - input_num('discount') <= 0) 
 	{
-		display_error(_("The total of the amount and the discount negative. Please enter positive values."));
+		display_error(_("The total of the amount and the discount is zero or negative. Please enter positive values."));
 		set_focus('amount');
 		return false;
 	}
@@ -188,9 +195,17 @@ function check_inputs()
 
 function handle_add_payment()
 {
+	$supp_currency = get_supplier_currency($_POST['supplier_id']);
+	$bank_currency = get_bank_account_currency($_POST['bank_account']);
+	$comp_currency = get_company_currency();
+	if ($comp_currency != $bank_currency && $bank_currency != $supp_currency)
+		$rate = 0;
+	else
+		$rate = input_num('_ex_rate');
+
 	$payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
 		$_POST['bank_account'],	input_num('amount'), input_num('discount'), 
-		$_POST['ref'], $_POST['memo_']);
+		$_POST['ref'], $_POST['memo_'], $rate);
 
 	//unset($_POST['supplier_id']);
    	unset($_POST['bank_account']);