X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=c40def6c8f52f5a6cc3c23c19e3024f236ac9b5d;hb=604d89ac6d18712d8b55bed821afe07b7106db3d;hp=ae5b1daf2b23d5563bc72c8d20cdb9bfcdbbc18e;hpb=4301c9cda0f510cc52335408380b368e51c2a663;p=fa-stable.git

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index ae5b1daf..c40def6c 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -31,8 +31,6 @@ page($_SESSION['page_title'], false, false, '', $js);
 //-----------------------------------------------------------------------------------------------
 check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
 
-check_db_has_bank_trans_types(_("There are no bank payment types defined in the system."));
-
 //----------------------------------------------------------------------------------------
 if ($ret = context_restore()) {
 	if(isset($ret['supplier_id']))
@@ -55,7 +53,7 @@ if (isset($_POST['_person_id_editor'])) {
 //
 context_call($path_to_root.$editor.$_POST['person_id'], 
 	array('bank_account', 'date_', 'PayType', 'person_id',
-		'PersonDetailID', 'type', 'ref', 'memo_') );
+		'PersonDetailID', 'ref', 'memo_') );
 }
 //--------------------------------------------------------------------------------------------------
 function line_start_focus() {
@@ -170,7 +168,7 @@ if (isset($_POST['Process']))
 		$_SESSION['pay_items']->trans_type, $_POST['bank_account'],
 		$_SESSION['pay_items'], $_POST['date_'],
 		$_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'),
-		$_POST['type'],	$_POST['ref'], $_POST['memo_']);
+		$_POST['ref'], $_POST['memo_']);
 
 	$trans_type = $trans[0];
    	$trans_no = $trans[1];
@@ -247,7 +245,6 @@ function handle_new_item()
 		$_POST['dimension2_id'], $amount, $_POST['LineMemo']);
 	line_start_focus();
 }
-
 //-----------------------------------------------------------------------------------------------
 $id = find_submit('Delete');
 if ($id != -1)
@@ -264,67 +261,10 @@ if (isset($_POST['CancelItemChanges']))
 
 if (isset($_POST['go']))
 {
-	if (!check_num('totamount', 0))
-	{
-		display_error( _("The amount entered is not a valid number or is less than zero."));
-		set_focus('totamount');
-	}
-	elseif (!get_post('person_id'))
-	{
-		if ($_SESSION['pay_items']->trans_type==systypes::bank_payment())	
-			display_error( _("No Quick Entries are defined for Payment."));
-		else	
-			display_error( _("No Quick Entries are defined for Deposit."));
-		set_focus('totamount');
-	}
-	else
-	{
-		$rate = 0;
-		$totamount = input_num('totamount');
-		$totamount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * $totamount;
-		$qe = get_quick_entry($_POST['person_id']);
-		$qe_lines = get_quick_entry_lines($_POST['person_id']);
-		while ($qe_line = db_fetch($qe_lines))
-		{
-			if ($qe_line['tax_acc'])
-			{
-				$account = get_gl_account($qe_line['account']);
-				$tax_group = $account['tax_code'];
-				$items = get_tax_group_items($tax_group);
-				while ($item = db_fetch($items))
-					$rate += $item['rate'];
-				if ($rate != 0)
-					$totamount = $totamount * 100 / ($rate + 100);
-				$_SESSION['pay_items']->clear_items();
-
-				$_SESSION['pay_items']->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], 
-					$totamount, $qe['description']);
-				$items = get_tax_group_items($tax_group);
-				while ($item = db_fetch($items))
-				{
-					if ($item['rate'] != 0)
-					{
-						$amount = $totamount * $item['rate'] / 100;
-						$code = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? $item['purchasing_gl_code'] : 
-							$item['sales_gl_code']);
-						$_SESSION['pay_items']->add_gl_item($code, 0, 0, $amount, $qe['description']);
-					}
-				}
-			}
-			else
-			{
-				if ($qe_line['pct'])
-					$amount = $totamount * $qe_line['amount'] / 100;
-				else
-					$amount = $qe_line['amount'];
-				$_SESSION['pay_items']->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], 
-					$amount, $qe['description']);
-			}		
-		}
-		line_start_focus();
-	}	
-}	
-
+	display_quick_entries($_SESSION['pay_items'], $_POST['person_id'], input_num('totamount'), 
+		$_SESSION['pay_items']->trans_type==systypes::bank_payment());
+	line_start_focus();
+}
 //-----------------------------------------------------------------------------------------------
 
 start_form(false, true);