X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_payment.php;h=8f997c8888cb92052b1356d297a6c167fe86b5d6;hb=4e31fd74b18825d8ac35f4a38b96ef33a08c2025;hp=bb94fbdb866e138784ef8edcc0877608ad828f1b;hpb=68372f2a08f5a862375c04862c8ccb56df830b4b;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index bb94fbdb..8f997c88 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -29,8 +29,6 @@ check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
 check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
 
-check_db_has_bank_trans_types(_("There are no bank payment types defined in the system."));
-
 //----------------------------------------------------------------------------------------
 if ($ret = context_restore()) {
 	if(isset($ret['supplier_id']))
@@ -38,8 +36,8 @@ if ($ret = context_restore()) {
 }
 if (isset($_POST['_supplier_id_editor'])) {
 	context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 
-		array( 'supplier_id', 'bank_account', 'DatePaid', 
-			'PaymentType', 'ref', 'amount', 'discount', 'memo_') );
+		array( 'supplier_id', 'bank_account', 'DatePaid', 'ref', 'amount', 
+			'discount', 'memo_') );
 }
 if (isset($_POST['_DatePaid_changed'])) {
   $Ajax->activate('_ex_rate');
@@ -100,11 +98,9 @@ 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);
 	}
 
-	bank_trans_types_list_row(_("Payment Type:"), 'PaymentType', null);
-
     ref_row(_("Reference:"), 'ref', '', references::get_next(22));
 
     text_row(_("Memo:"), 'memo_', null, 52,50);
@@ -140,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;
@@ -154,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;
 	}
@@ -192,14 +195,21 @@ 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['PaymentType'], $_POST['bank_account'],
-		input_num('amount'), input_num('discount'), $_POST['ref'], $_POST['memo_']);
+		$_POST['bank_account'],	input_num('amount'), input_num('discount'), 
+		$_POST['ref'], $_POST['memo_'], $rate);
 
 	//unset($_POST['supplier_id']);
    	unset($_POST['bank_account']);
    	unset($_POST['DatePaid']);
-   	unset($_POST['PaymentType']);
    	unset($_POST['currency']);
    	unset($_POST['memo_']);
    	unset($_POST['amount']);