X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=32f4020b5f3765f6839343e2d68b3d781a50223b;hb=ee0dff4cdf462ac0476531181ad61ff7f9db1c6c;hp=45fb163e618ed0a681bae2f6921ba5b8dda269ff;hpb=b2a9c105e368f6e4fdb35477665edeff13fb574b;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 45fb163e..32f4020b 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -57,21 +57,15 @@ 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, get_post('supplier_id'));
 
 	if (isset($_GET['PInvoice'])) {
+		$supp = isset($_POST['supplier_id']) ? $_POST['supplier_id'] : null;
 		//  get date and supplier
-		$inv = get_supp_trans($_GET['PInvoice'], $_GET['trans_type']);
+		$inv = get_supp_trans($_GET['PInvoice'], $_GET['trans_type'], $supp);
 		if ($inv) {
 			$_SESSION['alloc']->person_id = $_POST['supplier_id'] = $inv['supplier_id'];
 			$_SESSION['alloc']->read();
@@ -102,6 +96,10 @@ if (isset($_GET['AddedID'])) {
     display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")), 0, 1);
 
 	submenu_option(_("Enter another supplier &payment"), "/purchasing/supplier_payment.php?supplier_id=".$_POST['supplier_id']);
+
+	submenu_option(_("Enter &Supplier Invoice"), "/purchasing/supplier_invoice.php?New=1");
+	submenu_option(_("Enter direct &Invoice"), "/purchasing/po_entry_items.php?NewInvoice=Yes");
+
 	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");
@@ -275,6 +273,13 @@ start_form();
 
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
+	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 (list_updated('supplier_id') || list_updated('bank_account')) {
 	  $_SESSION['alloc']->read();
 	  $_POST['memo_'] = $_POST['amount'] = '';
@@ -319,8 +324,8 @@ start_form();
 	amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
 
 	$row = get_supplier($_POST['supplier_id']);
-	$_POST['dimension_id'] = $row['dimension_id'];
-	$_POST['dimension2_id'] = $row['dimension2_id'];
+	$_POST['dimension_id'] = @$row['dimension_id'];
+	$_POST['dimension2_id'] = @$row['dimension2_id'];
 	$dim = get_company_pref('use_dimension');
 	if ($dim > 0)
 		dimensions_list_row(_("Dimension").":", 'dimension_id',