X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=713d0122ffda7fc292716b9cf3a767bf1fea960e;hb=2cb57633d2f3e27b0c2b2e7448564f467e21e1fd;hp=93cda07ef5ff2c5555ed3c07eb84a1c3a2d2d284;hpb=c0d93311185d0657a6ff4a3c1e00c7967738fd27;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 93cda07e..713d0122 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");
@@ -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);
@@ -67,7 +58,7 @@ if (isset($_POST['_DatePaid_changed'])) {
 }
 
 if (list_updated('supplier_id') || list_updated('bank_account')) {
-  get_allocations_for_transaction(22, 0);
+  $_SESSION['alloc']->read();
   $Ajax->activate('alloc_tbl');
 }
 //----------------------------------------------------------------------------------------
@@ -91,6 +82,8 @@ if (isset($_GET['AddedID']))
 
 function check_inputs()
 {
+	global $Refs;
+
 	if ($_POST['amount'] == "") 
 	{
 		$_POST['amount'] = price_format(0);
@@ -109,6 +102,12 @@ function check_inputs()
 		return false;
 	}
 
+	if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') {
+		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 +146,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');
@@ -183,7 +182,7 @@ function handle_add_payment()
 	new_doc_date($_POST['DatePaid']);
 
 	$_SESSION['alloc']->trans_no = $payment_id;
-	handle_allocate();
+	$_SESSION['alloc']->write();
 	//unset($_POST['supplier_id']);
    	unset($_POST['bank_account']);
    	unset($_POST['DatePaid']);
@@ -213,17 +212,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
-		  get_allocations_for_transaction(22, 0);
+		  $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
 
 	set_global_supplier($_POST['supplier_id']);
 	
@@ -231,7 +227,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 +259,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');