X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=bb22a30fa8a104755ff0cf80ec6718df7aa4aab1;hb=e79c80704f4d0bc3d3792365dfd7ebf32f9b4227;hp=8096c2f4e83cb2c3e0618ab912aaa633b9bb42ee;hpb=87e4961d8cb13efab395b6a5548164d6a748bf3d;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 8096c2f4..bb22a30f 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -72,15 +72,18 @@ if (!isset($_POST['bank_account'])) { // first page call
 	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['memo_'] = $inv['supp_reference'];
 			foreach($_SESSION['alloc']->allocs as $line => $trans) {
 				if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
 					$un_allocated = abs($trans->amount) - $trans->amount_allocated;
-					$_POST['amount'] = $_SESSION['alloc']->amount =
-						$_SESSION['alloc']->allocs[$line]->current_allocated = price_format($un_allocated);
+					$_SESSION['alloc']->amount = $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
+					$_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
 					break;
 				}
 			}
@@ -234,6 +237,7 @@ function handle_add_payment()
 	new_doc_date($_POST['DatePaid']);
 
 	$_SESSION['alloc']->trans_no = $payment_id;
+	$_SESSION['alloc']->date_ = $_POST['DatePaid'];
 	$_SESSION['alloc']->write();
 
    	unset($_POST['bank_account']);
@@ -264,7 +268,7 @@ if (isset($_POST['ProcessSuppPayment']))
 
 start_form();
 
-	start_outer_table(TABLESTYLE2, "width=60%", 5);
+	start_outer_table(TABLESTYLE2, "width='60%'", 5);
 
 	table_section(1);
 
@@ -303,7 +307,7 @@ start_form();
 
 	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);
@@ -315,7 +319,7 @@ start_form();
 	show_allocatable(false);
 	div_end();
 
-	start_table(TABLESTYLE, "width=60%");
+	start_table(TABLESTYLE, "width='60%'");
 	amount_row(_("Amount of Discount:"), 'discount', null, '', $supplier_currency);
 	amount_row(_("Amount of Payment:"), 'amount', null, '', $supplier_currency);
 	textarea_row(_("Memo:"), 'memo_', null, 22, 4);