X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=b76e768e68bb672d0153d233238509c1b45b1516;hb=12e17bf9bcf8e8f56d72aeeb6dde817d1d921615;hp=86a909cfa82e29fc996ef66df326d35376e18b79;hpb=1f0c585ef87e9138499a71ae2954b1a177a6ef97;p=fa-stable.git

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 86a909cf..b76e768e 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];
@@ -187,12 +185,12 @@ if (isset($_POST['Process']))
 
 function check_item_data()
 {
-	if (!check_num('amount', 0))
-	{
-		display_error( _("The amount entered is not a valid number or is less than zero."));
-		set_focus('amount');
-		return false;
-	}
+	//if (!check_num('amount', 0))
+	//{
+	//	display_error( _("The amount entered is not a valid number or is less than zero."));
+	//	set_focus('amount');
+	//	return false;
+	//}
 
 	if ($_POST['code_id'] == $_POST['bank_account'])
 	{
@@ -201,15 +199,15 @@ function check_item_data()
 		return false;
 	}
 
-	if (is_bank_account($_POST['code_id']))
-	{
-		if ($_SESSION['pay_items']->trans_type == systypes::bank_payment())
-			display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this."));
-		else
- 			display_error( _("You cannot make a deposit from a bank account. Please use the transfer funds facility for this."));
-		set_focus('code_id');
-		return false;
-	}
+	//if (is_bank_account($_POST['code_id']))
+	//{
+	//	if ($_SESSION['pay_items']->trans_type == systypes::bank_payment())
+	//		display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this."));
+	//	else
+ 	//		display_error( _("You cannot make a deposit from a bank account. Please use the transfer funds facility for this."));
+	//	set_focus('code_id');
+	//	return false;
+	//}
 
    	return true;
 }
@@ -247,22 +245,8 @@ function handle_new_item()
 		$_POST['dimension2_id'], $amount, $_POST['LineMemo']);
 	line_start_focus();
 }
-
-//-----------------------------------------------------------------------------------------------
-$id = find_submit('Delete');
-if ($id != -1)
-	handle_delete_item($id);
-
-if (isset($_POST['AddItem']))
-	handle_new_item();
-
-if (isset($_POST['UpdateItem']))
-	handle_update_item();
-
-if (isset($_POST['CancelItemChanges']))
-	line_start_focus();
-
-if (isset($_POST['go']))
+/*
+function display_quick_entries(&$cart)
 {
 	if (!check_num('totamount', 0))
 	{
@@ -271,7 +255,7 @@ if (isset($_POST['go']))
 	}
 	elseif (!get_post('person_id'))
 	{
-		if ($_SESSION['pay_items']->trans_type==systypes::bank_payment())	
+		if ($cart->trans_type==systypes::bank_payment())	
 			display_error( _("No Quick Entries are defined for Payment."));
 		else	
 			display_error( _("No Quick Entries are defined for Deposit."));
@@ -281,31 +265,67 @@ if (isset($_POST['go']))
 	{
 		$rate = 0;
 		$totamount = input_num('totamount');
+		$totamount = ($cart->trans_type==systypes::bank_payment() ? 1:-1) * $totamount;
 		$qe = get_quick_entry($_POST['person_id']);
-		$account = get_gl_account($qe['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);
-		$totamount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * $totamount;
-		$_SESSION['pay_items']->clear_items();
-		$_SESSION['pay_items']->add_gl_item($qe['account'], 0, 0, $totamount, $qe['description']);
-		$items = get_tax_group_items($tax_group);
-		while ($item = db_fetch($items))
+		$qe_lines = get_quick_entry_lines($_POST['person_id']);
+		while ($qe_line = db_fetch($qe_lines))
 		{
-			if ($item['rate'] != 0)
+			if ($qe_line['tax_acc'])
 			{
-				$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']);
+				$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);
+				$cart->clear_items();
+
+				$cart->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 = ($cart->trans_type==systypes::bank_payment() ? $item['purchasing_gl_code'] : 
+							$item['sales_gl_code']);
+						$cart->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'];
+				$cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], 
+					$amount, $qe['description']);
+			}		
 		}
 		line_start_focus();
 	}	
-}	
+}
+*/
+//-----------------------------------------------------------------------------------------------
+$id = find_submit('Delete');
+if ($id != -1)
+	handle_delete_item($id);
+
+if (isset($_POST['AddItem']))
+	handle_new_item();
+
+if (isset($_POST['UpdateItem']))
+	handle_update_item();
+
+if (isset($_POST['CancelItemChanges']))
+	line_start_focus();
+
+if (isset($_POST['go']))
+	display_quick_entries($_SESSION['pay_items'], $_POST['person_id'], input_num('totamount'), 
+		$_SESSION['pay_items']->trans_type==systypes::bank_payment());
 
 //-----------------------------------------------------------------------------------------------