X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=34218c6f275b6b59a0730e0395655fee1d16d758;hb=8f7ac519b7aaf8ec219862597e878d3a28316ac6;hp=ff7f196a5d69b91be5184bd7088d5d13bd2ad09c;hpb=e8ae3516539a520338117f25d401c0fc234973a4;p=fa-stable.git diff --git a/gl/gl_bank.php b/gl/gl_bank.php index ff7f196a..34218c6f 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -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']); @@ -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();