X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=c7bedf4dcd16502bd153c201a98e839283b28335;hb=95f98ed74ac6379b95e2ceb1eb0c9bbcd36fd4a9;hp=955bd23ca331d4ec822cb33d342c84768cbe51d2;hpb=c640dae024fb9554d476bd863a68ef82ada8822d;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 955bd23c..c7bedf4d 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -72,8 +72,6 @@ if (!isset($_POST['bank_account'])) { // first page call
 	if (isset($_GET['PInvoice'])) {
 		//  get date and supplier
 		$inv = get_supp_trans($_GET['PInvoice'], $_GET['trans_type']);
-		$dflt_act = get_default_bank_account($inv['curr_code']);
-		$_POST['bank_account'] = $dflt_act['id'];
 		if ($inv) {
 			$_SESSION['alloc']->person_id = $_POST['supplier_id'] = $inv['supplier_id'];
 			$_SESSION['alloc']->read();
@@ -114,6 +112,17 @@ if (isset($_GET['AddedID'])) {
 
 //----------------------------------------------------------------------------------------
 
+function get_default_supplier_payment_bank_account($supplier_id, $date)
+{
+	$previous_payment = get_supp_payment_before($supplier_id, date2sql($date));
+	if ($previous_payment)
+	{
+		return $previous_payment['bank_id'];
+	}
+	return get_default_supplier_bank_account($supplier_id);
+}
+//----------------------------------------------------------------------------------------
+
 function check_inputs()
 {
 	global $Refs;
@@ -202,16 +211,8 @@ function check_inputs()
 		return false;
 	}
 
-    if (!$Refs->is_valid($_POST['ref'])) 
-    {
-		display_error(_("You must enter a reference."));
-		set_focus('ref');
-		return false;
-	}
-
-	if (!is_new_reference($_POST['ref'], ST_SUPPAYMENT)) 
+	if (!check_reference($_POST['ref'], ST_SUPPAYMENT))
 	{
-		display_error(_("The entered reference is already in use."));
 		set_focus('ref');
 		return false;
 	}
@@ -283,9 +284,12 @@ 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['bank_account'] = get_default_supplier_payment_bank_account($_POST['supplier_id'], $_POST['DatePaid']);
+	} else
+	{
 		$_POST['amount'] = price_format(0);
+	}
 
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
 
@@ -295,7 +299,9 @@ start_form();
 
     date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
 
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT, null, 
+    	array('supplier'=>get_post('supplier_id'), 'date'=>get_post('DatePaid'))), false, ST_SUPPAYMENT);
+
 
 	table_section(3);
 
@@ -307,7 +313,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);
 	}
 
 	amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);