X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=d516070a351f8d528c4831bcaecee677056cf932;hb=5189bc26f377d678d0a3d88a2b623d69c0e1a278;hp=bb22a30fa8a104755ff0cf80ec6718df7aa4aab1;hpb=fc24ee893402902fc58632dabb5d7c2594e191d0;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index bb22a30f..d516070a 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -21,9 +21,9 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
 add_js_file('payalloc.js');
@@ -57,13 +57,6 @@ 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
@@ -71,16 +64,14 @@ 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) {
+		$inv = get_supp_trans($_GET['PInvoice'], $_GET['trans_type']);
+		if ($inv) {
 			$_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']) {
+				if ($trans->type == $_GET['trans_type'] && $trans->type_no == $_GET['PInvoice']) {
 					$un_allocated = abs($trans->amount) - $trans->amount_allocated;
 					$_SESSION['alloc']->amount = $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
 					$_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
@@ -114,6 +105,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;
@@ -144,7 +146,7 @@ function check_inputs()
 	}
 
 	if (isset($_POST['charge']) && input_num('charge') > 0) {
-		$charge_acct = get_company_pref('bank_charge_act');
+		$charge_acct = get_bank_charge_account($_POST['bank_account']);
 		if (get_gl_account($charge_acct) == false) {
 			display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
 			set_focus('charge');
@@ -202,16 +204,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;
 	}
@@ -233,7 +227,7 @@ function handle_add_payment()
 {
 	$payment_id = write_supp_payment(0, $_POST['supplier_id'], $_POST['bank_account'],
 		$_POST['DatePaid'], $_POST['ref'], input_num('amount'),	input_num('discount'), $_POST['memo_'], 
-		input_num('charge'), input_num('bank_amount', input_num('amount')));
+		input_num('charge'), input_num('bank_amount', input_num('amount')), $_POST['dimension_id'], $_POST['dimension2_id']);
 	new_doc_date($_POST['DatePaid']);
 
 	$_SESSION['alloc']->trans_no = $payment_id;
@@ -274,6 +268,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'] = '';
@@ -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,11 +313,25 @@ 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);
 
+	$row = get_supplier($_POST['supplier_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',
+			null, true, ' ', false, 1, false);
+	else
+		hidden('dimension_id', 0);
+	if ($dim > 1)
+		dimensions_list_row(_("Dimension")." 2:", 'dimension2_id',
+			null, true, ' ', false, 2, false);
+	else
+		hidden('dimension2_id', 0);
 
 	end_outer_table(1);
 
@@ -330,4 +350,3 @@ start_form();
 end_form();
 
 end_page();
-?>