X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=68ed1c8f61b8762878d9c9528c21ebc1bc93d2c4;hb=20a783f75445c8889335b8a51cf5723b3b19cdb2;hp=4843e2b6eedce051242c4adeded68b28dbe5fde8;hpb=dca46563d3e8b7546e7095b7d96b40d9838c4c75;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 4843e2b6..68ed1c8f 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$path_to_root="..";
-$page_security = 5;
+$page_security = 'SA_SUPPLIERPAYMNT';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/ui/allocation_cart.inc");
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -28,7 +28,7 @@ if ($use_date_picker)
 
 add_js_file('payalloc.js');
 
-page(_("Supplier Payment Entry"), false, false, "", $js);
+page(_($help_context = "Supplier Payment Entry"), false, false, "", $js);
 
 if (isset($_GET['supplier_id']))
 {
@@ -42,15 +42,6 @@ check_db_has_suppliers(_("There are no suppliers defined in the system."));
 check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
 
 //----------------------------------------------------------------------------------------
-if ($ret = context_restore()) {
-	if(isset($ret['supplier_id']))
-		$_POST['supplier_id'] = $ret['supplier_id'];
-}
-if (isset($_POST['_supplier_id_editor'])) {
-	context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 
-		array( 'supplier_id', 'bank_account', 'DatePaid', 'ref', 'amount', 
-			'discount', 'memo_') );
-}
 
 if (!isset($_POST['supplier_id']))
 	$_POST['supplier_id'] = get_global_supplier(false);
@@ -91,6 +82,8 @@ if (isset($_GET['AddedID']))
 
 function check_inputs()
 {
+	global $Refs;
+
 	if ($_POST['amount'] == "") 
 	{
 		$_POST['amount'] = price_format(0);
@@ -109,6 +102,15 @@ function check_inputs()
 		return false;
 	}
 
+	if (isset($_POST['charge']) && input_num('charge') > 0) {
+		$charge_acct = get_company_pref('bank_charge_act');
+		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');
+			return false;
+		}	
+	}
+
 	if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
 	{
 		display_error(_("The exchange rate must be numeric and greater than zero."));
@@ -147,14 +149,14 @@ function check_inputs()
 		set_focus('DatePaid');
 		return false;
 	}
-    if (!references::is_valid($_POST['ref'])) 
+    if (!$Refs->is_valid($_POST['ref'])) 
     {
 		display_error(_("You must enter a reference."));
 		set_focus('ref');
 		return false;
 	}
 
-	if (!is_new_reference($_POST['ref'], 22)) 
+	if (!is_new_reference($_POST['ref'], ST_SUPPAYMENT)) 
 	{
 		display_error(_("The entered reference is already in use."));
 		set_focus('ref');
@@ -162,7 +164,11 @@ function check_inputs()
 	}
 
 	$_SESSION['alloc']->amount = -input_num('amount');
-	return check_allocations();
+
+	if (isset($_POST["TotalNumberOfAllocs"]))
+		return check_allocations();
+	else
+		return true;
 }
 
 //----------------------------------------------------------------------------------------
@@ -213,17 +219,14 @@ if (isset($_POST['ProcessSuppPayment']))
 
 start_form();
 
-	//start_table($table_style2, 5, 7);
-	//echo "<tr><td valign=top>"; // outer table
-	start_outer_table("$table_style2 width=90%", 5);
+	start_outer_table("$table_style2 width=60%", 5);
 
-	//echo "<table>";
 	table_section(1);
 
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
 	if (!isset($_POST['bank_account'])) // first page call
-		  $_SESSION['alloc'] = new allocation(22, 0);
+		  $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
 
 	set_global_supplier($_POST['supplier_id']);
 	
@@ -231,7 +234,7 @@ start_form();
 
 	table_section(2);
 
-    ref_row(_("Reference:"), 'ref', '', references::get_next(22));
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
 
     date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
 
@@ -263,7 +266,7 @@ start_form();
 	
 	if ($bank_currency != $supplier_currency) 
 	{
-		display_note(_("The amount and discount are in the bank account's currency."), 2, 0);
+		display_note(_("The amount and discount are in the bank account's currency."), 0, 1);
 	}
 
 	submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default');