X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_payment.php;h=938c2a8d506d4b984195e86abf6fa5dcc79074eb;hb=7286bbfc939360b0fcb573ae075b2b8e899d96c8;hp=68ed1c8f61b8762878d9c9528c21ebc1bc93d2c4;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 68ed1c8f..938c2a8d 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -19,6 +19,7 @@ include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 //include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
 if ($use_popup_windows)
@@ -63,13 +64,42 @@ if (list_updated('supplier_id') || list_updated('bank_account')) {
 }
 //----------------------------------------------------------------------------------------
 
-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"));
 
-    display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment")));
+	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_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
 
@@ -225,9 +255,6 @@ start_form();
 
     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);
-
 	set_global_supplier($_POST['supplier_id']);
 	
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);