X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=9bd3559f4b13596e9b888e4230e9ad0fb0efff94;hb=69851193cf74ade16aec9b1dbdd9ef843c560058;hp=265fe536ed01b64f5db599382ae2f0aa220e147c;hpb=377319a22efc991182358aedf09960886802d3e7;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 265fe536..9bd3559f 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -57,14 +57,35 @@ if (isset($_POST['_DatePaid_changed'])) {
   $Ajax->activate('_ex_rate');
 }
 
-if (list_updated('supplier_id') || list_updated('bank_account')) {
-  $_SESSION['alloc']->read();
-  $Ajax->activate('alloc_tbl');
-}
 //----------------------------------------------------------------------------------------
 
-if (isset($_GET['AddedID'])) 
-{
+if (!isset($_POST['bank_account'])) { // first page call
+	  $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
+
+	if (isset($_GET['PInvoice'])) {
+		//  get date and supplier
+		$inv = get_supp_trans($_GET['PInvoice'], ST_SUPPINVOICE);
+		if($inv) {
+			$_POST['supplier_id'] = $inv['supplier_id'];
+			$_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;
+					break;
+				}
+			}
+			unset($inv);
+		} else
+			display_error(_("Invalid purchase invoice number."));
+	}
+}
+if (isset($_GET['AddedID'])) {
 	$payment_id = $_GET['AddedID'];
 
    	display_notification_centered( _("Payment has been sucessfully entered"));
@@ -74,9 +95,10 @@ if (isset($_GET['AddedID']))
 
     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");
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier &payment"), "supplier_id=" . $_POST['supplier_id']);
+	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Supplier &Payment"), "supplier_id=" . $_POST['supplier_id']);
 
 	display_footer_exit();
 }
@@ -160,6 +182,16 @@ function check_inputs()
 		set_focus('DatePaid');
 		return false;
 	}
+
+	$limit = get_bank_account_limit($_POST['bank_account'], $_POST['DatePaid']);
+
+	if ($limit != null && ($limit < input_num('amount')))
+	{
+		display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit)));
+		set_focus('amount');
+		return false;
+	}
+
     if (!$Refs->is_valid($_POST['ref'])) 
     {
 		display_error(_("You must enter a reference."));
@@ -174,6 +206,8 @@ function check_inputs()
 		return false;
 	}
 
+	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"]))
@@ -230,18 +264,26 @@ if (isset($_POST['ProcessSuppPayment']))
 
 start_form();
 
-	start_outer_table("$table_style2 width=60%", 5);
+	start_outer_table(TABLESTYLE2, "width=60%", 5);
 
 	table_section(1);
 
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
-	if (!isset($_POST['bank_account'])) // first page call
-		  $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
+	if (list_updated('supplier_id') || list_updated('bank_account')) {
+	  $_SESSION['alloc']->read();
+	  $_POST['memo_'] = $_POST['amount'] = '';
+	  $Ajax->activate('alloc_tbl');
+	}
 
 	set_global_supplier($_POST['supplier_id']);
 	
+	if (!list_updated('bank_account'))
+		$_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);		
+	
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
+	
+	bank_balance_row($_POST['bank_account']);
 
 	table_section(2);
 
@@ -264,12 +306,12 @@ start_form();
 	end_outer_table(1); // outer table
 
 	if ($bank_currency == $supplier_currency) {
-  	div_start('alloc_tbl');
+  		div_start('alloc_tbl');
 		show_allocatable(false);
-	div_end();
+		div_end();
 	}
 
-	start_table("$table_style width=60%");
+	start_table(TABLESTYLE, "width=60%");
 	amount_row(_("Amount of Discount:"), 'discount');
 	amount_row(_("Amount of Payment:"), 'amount');
 	textarea_row(_("Memo:"), 'memo_', null, 22, 4);