X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=86a909cfa82e29fc996ef66df326d35376e18b79;hb=348062667e6a96e9849bf25de0f2a426b4f0b9c6;hp=d827877d7acec789a7bea4ebcd2065453d1be8de;hpb=3fba15e99fb2191e2ee3d3c87f2ccbd423a3f388;p=fa-stable.git

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index d827877d..86a909cf 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -33,6 +33,30 @@ 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']))
+		$_POST['person_id'] = $ret['supplier_id'];
+	if(isset($ret['customer_id']))
+		$_POST['person_id'] = $ret['customer_id'];
+	set_focus('person_id');
+	if(isset($ret['branch_id'])) {
+		$_POST['PersonDetailID'] = $ret['branch_id'];
+		set_focus('PersonDetailID');
+	}
+}
+if (isset($_POST['_person_id_editor'])) {
+	if ($_POST['PayType']==payment_person_types::supplier())
+		$editor = '/purchasing/manage/suppliers.php?supplier_id=';
+	else
+		$editor = '/sales/manage/customers.php?debtor_no=';
+		
+//	$_SESSION['pay_items'] should stay unchanged during call
+//
+context_call($path_to_root.$editor.$_POST['person_id'], 
+	array('bank_account', 'date_', 'PayType', 'person_id',
+		'PersonDetailID', 'type', 'ref', 'memo_') );
+}
 //--------------------------------------------------------------------------------------------------
 function line_start_focus() {
   global 	$Ajax;
@@ -50,11 +74,11 @@ if (isset($_GET['AddedID']))
 
    	display_notification_centered(_("Payment has been entered"));
 
-	display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Payment")));
+	display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment")));
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Payment"), "NewPayment=yes");
+	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Payment"), "NewPayment=yes");
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter A Deposit"), "NewDeposit=yes");
+	hyperlink_params($_SERVER['PHP_SELF'], _("Enter A &Deposit"), "NewDeposit=yes");
 
 	display_footer_exit();
 }
@@ -74,6 +98,9 @@ if (isset($_GET['AddedDep']))
 
 	display_footer_exit();
 }
+if (isset($_POST['_date__changed'])) {
+	$Ajax->activate('_ex_rate');
+}
 //--------------------------------------------------------------------------------------------------
 
 function handle_new_order($type)
@@ -235,6 +262,50 @@ if (isset($_POST['UpdateItem']))
 if (isset($_POST['CancelItemChanges']))
 	line_start_focus();
 
+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');
+		$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))
+		{
+			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']);
+			}
+		}
+		line_start_focus();
+	}	
+}	
 
 //-----------------------------------------------------------------------------------------------