X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fgl_bank.php;h=fc6c50e67f0129a5b3a6bbd3525b095b1665e087;hb=9f2ede887db250a31f9c64c24e2813d81dce0af2;hp=b035587bff5ba46fb077204fa2ae990391295ce9;hpb=ed12c6b38e84077b5183de344c3a204162bd4e87;p=fa-stable.git diff --git a/gl/gl_bank.php b/gl/gl_bank.php index b035587b..fc6c50e6 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root=".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); @@ -31,8 +40,30 @@ 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'])) + $_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_') ); +} //-------------------------------------------------------------------------------------------------- function line_start_focus() { global $Ajax; @@ -50,9 +81,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_no_params($_SERVER['PHP_SELF'], _("Enter Another Payment")); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Payment"), "NewPayment=yes"); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter A &Deposit"), "NewDeposit=yes"); display_footer_exit(); } @@ -66,48 +99,21 @@ if (isset($_GET['AddedDep'])) display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Deposit"))); - hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter Another Deposit")); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Deposit"), "NewDeposit=yes"); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter A Payment"), "NewPayment=yes"); display_footer_exit(); } - -//-------------------------------------------------------------------------------------------------- - -function copy_to_py() -{ - $_SESSION['pay_items']->from_loc = $_POST['bank_account']; - $_SESSION['pay_items']->tran_date = $_POST['date_']; - $_SESSION['pay_items']->transfer_type = $_POST['type']; - $_SESSION['pay_items']->increase = $_POST['PayType']; - if (!isset($_POST['person_id'])) - $_POST['person_id'] = ""; - $_SESSION['pay_items']->person_id = $_POST['person_id']; - if (!isset($_POST['PersonDetailID'])) - $_POST['PersonDetailID'] = ""; - $_SESSION['pay_items']->branch_id = $_POST['PersonDetailID']; - $_SESSION['pay_items']->memo_ = $_POST['memo_']; +if (isset($_POST['_date__changed'])) { + $Ajax->activate('_ex_rate'); } - //-------------------------------------------------------------------------------------------------- -function copy_from_py() -{ - $_POST['bank_account'] = $_SESSION['pay_items']->from_loc; - $_POST['date_'] = $_SESSION['pay_items']->tran_date; - $_POST['type'] = $_SESSION['pay_items']->transfer_type; - $_POST['PayType'] = $_SESSION['pay_items']->increase; - $_POST['person_id'] = $_SESSION['pay_items']->person_id; - $_POST['PersonDetailID'] = $_SESSION['pay_items']->branch_id; - $_POST['memo_'] = $_SESSION['pay_items']->memo_; -} - -//----------------------------------------------------------------------------------------------- - function handle_new_order($type) { if (isset($_SESSION['pay_items'])) { - $_SESSION['pay_items']->clear_items(); unset ($_SESSION['pay_items']); } @@ -115,7 +121,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_']; @@ -165,20 +171,21 @@ if (isset($_POST['Process'])) if (isset($_POST['Process'])) { - + $trans = add_bank_transaction( $_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]; + new_doc_date($_POST['date_']); $_SESSION['pay_items']->clear_items(); unset($_SESSION['pay_items']); - meta_forward($_SERVER['PHP_SELF'], $trans_type==systypes::bank_payment() ? + meta_forward($_SERVER['PHP_SELF'], $trans_type==systypes::bank_payment() ? "AddedID=$trans_no" : "AddedDep=$trans_no"); } /*end of process credit note */ @@ -187,12 +194,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 +208,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; } @@ -242,22 +249,15 @@ function handle_new_item() if (!check_item_data()) return; $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount'); - + $_SESSION['pay_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']); line_start_focus(); } - //----------------------------------------------------------------------------------------------- $id = find_submit('Delete'); -if ($id != -1) { - copy_from_py(); +if ($id != -1) handle_delete_item($id); -} -if (isset($_POST['AddItem']) || isset($_POST['UpdateItem'])) { - copy_to_py(); - line_start_focus(); -} if (isset($_POST['AddItem'])) handle_new_item(); @@ -265,20 +265,26 @@ if (isset($_POST['AddItem'])) if (isset($_POST['UpdateItem'])) handle_update_item(); -if (isset($_POST['CancelItemChanges'])) { +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() ? QE_PAYMENT : QE_DEPOSIT); + $_POST['totamount'] = price_format(0); $Ajax->activate('totamount'); + line_start_focus(); +} //----------------------------------------------------------------------------------------------- -start_form(false, true); +start_form(); display_bank_header($_SESSION['pay_items']); start_table("$table_style2 width=90%", 10); start_row(); echo "