X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=6ec57b01d0968e44e2e18d2a85249e2cc7c54d5f;hb=12e17bf9bcf8e8f56d72aeeb6dde817d1d921615;hp=a530ecb4d8863134066d557f8b266af0c47c72ca;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index a530ecb4..6ec57b01 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $path_to_root="..";
 $page_security = 5;
 include_once($path_to_root . "/includes/session.inc");
@@ -74,11 +83,13 @@ function display_controls()
 		if (!is_date_in_fiscalyear($_POST['DatePaid']))
 			$_POST['DatePaid'] = end_fiscalyear();
 	}		
-	start_table($table_style2, 5, 7);
-	echo "<tr><td valign=top>"; // outer table
-
-	echo "<table>";
+	//start_table($table_style2, 5, 7);
+	//echo "<tr><td valign=top>"; // outer table
+	start_outer_table($table_style2, 5);
 
+	//echo "<table>";
+	table_section(1);
+	
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
 
 	amount_row(_("Amount of Payment:"), 'amount');
@@ -86,9 +97,10 @@ function display_controls()
 
     date_row(_("Date Paid") . ":", 'DatePaid', '', null, 0, 0, 0, null, true);
 
-	echo "</table>";
-	echo "</td><td valign=top class='tableseparator'>"; // outer table
-	echo "<table>";
+	table_section(2);
+	//echo "</table>";
+	//echo "</td><td valign=top class='tableseparator'>"; // outer table
+	//echo "<table>";
 
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
@@ -98,17 +110,17 @@ 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));
 
     text_row(_("Memo:"), 'memo_', null, 52,50);
 
-	echo "</table>";
+	//echo "</table>";
 
-	echo "</td></tr>";
-	end_table(1); // outer table
+	//echo "</td></tr>";
+	end_outer_table(1); // outer table
 
 	submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', true);
 
@@ -136,6 +148,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 +169,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 +207,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']);