X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=aff95cb3c9e76c74d96f6fdd564eb81bfeabf9fa;hb=7ba24fed715d41c0210f4395fd885ef34a483d5e;hp=fa78eeb26db77bdec79af878302dda8b94536a63;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index fa78eeb2..aff95cb3 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.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>.
 ***********************************************************************/
-$page_security = 3;
-$path_to_root="..";
+$page_security = isset($_GET['NewPayment']) ? 'SA_PAYMENT' : 'SA_DEPOSIT';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 include_once($path_to_root . "/includes/session.inc");
 
@@ -41,29 +41,12 @@ page($_SESSION['page_title'], false, false, '', $js);
 check_db_has_bank_accounts(_("There are no bank accounts 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', 'ref', 'memo_') );
+if (list_updated('PersonDetailID')) {
+	$br = get_branch(get_post('PersonDetailID'));
+	$_POST['person_id'] = $br['debtor_no'];
+	$Ajax->activate('person_id');
 }
+
 //--------------------------------------------------------------------------------------------------
 function line_start_focus() {
   global 	$Ajax;
@@ -121,7 +104,7 @@ function handle_new_order($type)
 
 	$_SESSION['pay_items'] = new items_cart($type);
 
-	$_POST['date_'] = Today();
+	$_POST['date_'] = new_doc_date();
 	if (!is_date_in_fiscalyear($_POST['date_']))
 		$_POST['date_'] = end_fiscalyear();
 	$_SESSION['pay_items']->tran_date = $_POST['date_'];
@@ -180,6 +163,7 @@ if (isset($_POST['Process']))
 
 	$trans_type = $trans[0];
    	$trans_no = $trans[1];
+	new_doc_date($_POST['date_']);
 
 	$_SESSION['pay_items']->clear_items();
 	unset($_SESSION['pay_items']);
@@ -276,7 +260,7 @@ if (isset($_POST['go']))
 }
 //-----------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_bank_header($_SESSION['pay_items']);
 
@@ -292,7 +276,7 @@ end_table(1);
 
 submit_center_first('Update', _("Update"), '', null);
 submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ?
-	_("Process Payment"):_("Process Deposit"), '', true);
+	_("Process Payment"):_("Process Deposit"), '', 'default');
 
 end_form();