X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=b4e6c87864d7ee66a19765bd971386255c541e8d;hb=87ac1ff401682a1ccbbbf01ece7afe8ff518d3fe;hp=c68e482ffcd39d386092aaab3457e0f41aa8c92b;hpb=dad97fc59689ecc6843dcdaa4ba7f85b5368bb9a;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index c68e482f..b4e6c878 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -57,26 +57,33 @@ if (isset($_POST['_DatePaid_changed'])) {
   $Ajax->activate('_ex_rate');
 }
 
+if (list_updated('supplier_id')) {
+	$_POST['amount'] = price_format(0);
+	$_SESSION['alloc']->person_id = get_post('supplier_id');
+	$Ajax->activate('amount');
+} elseif (list_updated('bank_account'))
+	$Ajax->activate('alloc_tbl');
+
 //----------------------------------------------------------------------------------------
 
 if (!isset($_POST['bank_account'])) { // first page call
-	  $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
+	$_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0, get_post('supplier_id'));
 
 	if (isset($_GET['PInvoice'])) {
 		//  get date and supplier
 		$inv = get_supp_trans($_GET['PInvoice'], ST_SUPPINVOICE);
+		$dflt_act = get_default_bank_account($inv['curr_code']);
+		$_POST['bank_account'] = $dflt_act['id'];
 		if($inv) {
-			$_POST['supplier_id'] = $inv['supplier_id'];
+			$_SESSION['alloc']->person_id = $_POST['supplier_id'] = $inv['supplier_id'];
+			$_SESSION['alloc']->read();
 			$_POST['DatePaid'] = sql2date($inv['tran_date']);
-//			$_POST['discount'] = price_format(0);
-//		$_POST['bank_account'], $_POST['ref']
 			$_POST['memo_'] = $inv['supp_reference'];
 			foreach($_SESSION['alloc']->allocs as $line => $trans) {
 				if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
-					$_POST['amount'] =
-						$_SESSION['alloc']->amount = price_format($_SESSION['alloc']->allocs[$line]->amount);
-					$_SESSION['alloc']->allocs[$line]->current_allocated =
-						$_SESSION['alloc']->allocs[$line]->amount;
+					$un_allocated = abs($trans->amount) - $trans->amount_allocated;
+					$_SESSION['alloc']->amount = $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
+					$_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
 					break;
 				}
 			}
@@ -93,12 +100,14 @@ if (isset($_GET['AddedID'])) {
 	submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, 'prtopt');
 	submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, null, 1);
 
-    display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")));
-
-	hyperlink_no_params($path_to_root . "/purchasing/inquiry/supplier_allocation_inquiry.php?supplier_id=", _("Select Another &Supplier Transaction for Payment"));
-//    hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
+	submenu_view(_("View this Payment"), ST_SUPPAYMENT, $payment_id);
+    display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")), 0, 1);
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Supplier &Payment"), "supplier_id=" . $_POST['supplier_id']);
+	submenu_option(_("Enter another supplier &payment"), "/purchasing/supplier_payment.php?supplier_id=".$_POST['supplier_id']);
+	submenu_option(_("Enter Other &Payment"), "/gl/gl_bank.php?NewPayment=Yes");
+	submenu_option(_("Enter &Customer Payment"), "/sales/customer_payments.php");
+	submenu_option(_("Enter Other &Deposit"), "/gl/gl_bank.php?NewDeposit=Yes");
+	submenu_option(_("Bank Account &Transfer"), "/gl/bank_transfer.php");
 
 	display_footer_exit();
 }
@@ -116,7 +125,7 @@ function check_inputs()
 		return false;
 	} 
 	
-	if ($_POST['amount'] == "") 
+	if (@$_POST['amount'] == "") 
 	{
 		$_POST['amount'] = price_format(0);
 	}
@@ -143,14 +152,7 @@ function check_inputs()
 		}	
 	}
 
-//	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'] == "") 
+	if (@$_POST['discount'] == "") 
 	{
 		$_POST['discount'] = 0;
 	}
@@ -186,14 +188,14 @@ function check_inputs()
 	} 
 	elseif (!is_date_in_fiscalyear($_POST['DatePaid'])) 
 	{
-		display_error(_("The entered date is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('DatePaid');
 		return false;
 	}
 
 	$limit = get_bank_account_limit($_POST['bank_account'], $_POST['DatePaid']);
 
-	if ($limit != null && ($limit < input_num('amount')))
+	if (($limit !== null) && (floatcmp($limit, input_num('amount')) < 0))
 	{
 		display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit)));
 		set_focus('amount');
@@ -216,6 +218,7 @@ function check_inputs()
 
 	if (!db_has_currency_rates(get_supplier_currency($_POST['supplier_id']), $_POST['DatePaid'], true))
 		return false;
+
 	$_SESSION['alloc']->amount = -input_num('amount');
 
 	if (isset($_POST["TotalNumberOfAllocs"]))
@@ -228,25 +231,13 @@ 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');
-		$supplier_amount = input_num('bank_amount'); 
-			if($supplier_amount) $rate = input_num('amount')/$supplier_amount;
-	}
-
 	$payment_id = write_supp_payment(0, $_POST['supplier_id'], $_POST['bank_account'],
 		$_POST['DatePaid'], $_POST['ref'], input_num('amount'),	input_num('discount'), $_POST['memo_'], 
 		input_num('charge'), input_num('bank_amount', input_num('amount')));
 	new_doc_date($_POST['DatePaid']);
 
 	$_SESSION['alloc']->trans_no = $payment_id;
+	$_SESSION['alloc']->date_ = $_POST['DatePaid'];
 	$_SESSION['alloc']->write();
 
    	unset($_POST['bank_account']);
@@ -291,23 +282,32 @@ start_form();
 
 	set_global_supplier($_POST['supplier_id']);
 
+	if (!list_updated('bank_account') && !get_post('__ex_rate_changed'))
+		$_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);
+	else
+		$_POST['amount'] = price_format(0);
+
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
 
 	bank_balance_row($_POST['bank_account']);
 
 	table_section(2);
 
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
-
     date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
 
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
+
 	table_section(3);
 
-	$supplier_currency = get_supplier_currency($_POST['supplier_id']);
-	$bank_currency = get_bank_account_currency($_POST['bank_account']);
+	$comp_currency = get_company_currency();
+	$supplier_currency = $_SESSION['alloc']->set_person($_POST['supplier_id'], PT_SUPPLIER);
+	if (!$supplier_currency)
+			$supplier_currency = $comp_currency;
+	$_SESSION['alloc']->currency = $bank_currency = get_bank_account_currency($_POST['bank_account']);
+
 	if ($bank_currency != $supplier_currency) 
 	{
-		amount_row("Bank Amount:", 'bank_amount', null, '', $bank_currency, 2);
+		amount_row(_("Bank Amount:"), 'bank_amount', null, '', $bank_currency, 2);
 	}
 
 	amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
@@ -316,7 +316,6 @@ start_form();
 	end_outer_table(1);
 
 	div_start('alloc_tbl');
-	display_heading(sprintf(_("Accounts Payable settled in %s:"), $supplier_currency));
 	show_allocatable(false);
 	div_end();