X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=6ef026317382e7c0e9628b7ee0a8702345ab17e1;hb=749eba79a95008edf017d7d6381779fd46d91308;hp=e5900142851880d566ade96b24114db10afc2480;hpb=33ba3d43d75c04080dd0d49067bafd2188fd04b1;p=fa-stable.git diff --git a/gl/gl_bank.php b/gl/gl_bank.php index e5900142..6ef02631 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -1,9 +1,20 @@ . +***********************************************************************/ +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); +$page_security = isset($_GET['NewPayment']) || + @($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT) + ? 'SA_PAYMENT' : 'SA_DEPOSIT'; include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/data_checks.inc"); @@ -19,12 +30,18 @@ if ($use_date_picker) $js .= get_js_date_picker(); if (isset($_GET['NewPayment'])) { - $_SESSION['page_title'] = _("Bank Account Payment Entry"); - handle_new_order(systypes::bank_payment()); + $_SESSION['page_title'] = _($help_context = "Bank Account Payment Entry"); + handle_new_order(ST_BANKPAYMENT); } else if(isset($_GET['NewDeposit'])) { - $_SESSION['page_title'] = _("Bank Account Deposit Entry"); - handle_new_order(systypes::bank_deposit()); + $_SESSION['page_title'] = _($help_context = "Bank Account Deposit Entry"); + handle_new_order(ST_BANKDEPOSIT); +} else if(isset($_GET['ModifyPayment'])) { + $_SESSION['page_title'] = _($help_context = "Modify Bank Account Entry")." #".$_GET['trans_no']; + create_cart(ST_BANKPAYMENT, $_GET['trans_no']); +} else if(isset($_GET['ModifyDeposit'])) { + $_SESSION['page_title'] = _($help_context = "Modify Bank Account Entry")." #".$_GET['trans_no']; + create_cart(ST_BANKDEPOSIT, $_GET['trans_no']); } page($_SESSION['page_title'], false, false, '', $js); @@ -32,29 +49,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; @@ -68,9 +68,25 @@ function line_start_focus() { if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::bank_payment(); + $trans_type = ST_BANKPAYMENT; - display_notification_centered(_("Payment has been entered")); + display_notification_centered(_("Payment $trans_no has been entered")); + + 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 A &Deposit"), "NewDeposit=yes"); + + display_footer_exit(); +} + +if (isset($_GET['UpdatedID'])) +{ + $trans_no = $_GET['UpdatedID']; + $trans_type = ST_BANKPAYMENT; + + display_notification_centered(_("Payment $trans_no has been modified")); display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment"))); @@ -84,9 +100,9 @@ if (isset($_GET['AddedID'])) if (isset($_GET['AddedDep'])) { $trans_no = $_GET['AddedDep']; - $trans_type = systypes::bank_deposit(); + $trans_type = ST_BANKDEPOSIT; - display_notification_centered(_("Deposit has been entered")); + display_notification_centered(_("Deposit $trans_no has been entered")); display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Deposit"))); @@ -96,6 +112,22 @@ if (isset($_GET['AddedDep'])) display_footer_exit(); } +if (isset($_GET['UpdatedDep'])) +{ + $trans_no = $_GET['UpdatedDep']; + $trans_type = ST_BANKDEPOSIT; + + display_notification_centered(_("Deposit $trans_no has been modified")); + + display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Deposit"))); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Deposit"), "NewDeposit=yes"); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter A &Payment"), "NewPayment=yes"); + + display_footer_exit(); +} + if (isset($_POST['_date__changed'])) { $Ajax->activate('_ex_rate'); } @@ -108,16 +140,83 @@ function handle_new_order($type) unset ($_SESSION['pay_items']); } - session_register("pay_items"); + //session_register("pay_items"); $_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_']; } +function create_cart($type, $trans_no) +{ + global $Refs; + + if (isset($_SESSION['pay_items'])) + { + unset ($_SESSION['pay_items']); + } + + $_SESSION['pay_items'] = new items_cart($type); + $_SESSION['pay_items']->order_id = $trans_no; + + if ($trans_no) { + $result = get_gl_trans($type, $trans_no); + + if ($result) { + while ($row = db_fetch($result)) { + if ($row['amount'] == 0) continue; + if (is_bank_account($row['account'])) continue; + $date = $row['tran_date']; + $_SESSION['pay_items']->add_gl_item($row['account'], $row['dimension_id'], + $row['dimension2_id'], $row['amount'], $row['memo_']); + } + } + $_SESSION['pay_items']->memo_ = get_comments_string($type, $trans_no); + $_SESSION['pay_items']->tran_date = sql2date($date); + $_SESSION['pay_items']->reference = $Refs->get($type, $trans_no); + //////////////////////////////////////////// + // Check Ref Original ????? + $_POST['ref_original'] = $_SESSION['pay_items']->reference; // Store for comparison when updating + + $bank_trans = db_fetch(get_bank_trans($type, $trans_no)); + $_POST['bank_account'] = $bank_trans["bank_act"]; + $_POST['PayType'] = $bank_trans["person_type_id"]; + + if ($bank_trans["person_type_id"] == PT_CUSTOMER) //2 + { + $trans = get_customer_trans($trans_no, $type); + $_POST['person_id'] = $trans["debtor_no"]; + $_POST['PersonDetailID'] = $trans["branch_code"]; + } + elseif ($bank_trans["person_type_id"] == PT_SUPPLIER) //3 + { + $trans = get_supp_trans($trans_no, $type); + $_POST['person_id'] = $trans["supplier_id"]; + } + elseif ($bank_trans["person_type_id"] == PT_MISC) //0 + $_POST['person_id'] = $bank_trans["person_id"]; + elseif ($bank_trans["person_type_id"] == PT_QUICKENTRY) //4 + $_POST['person_id'] = $bank_trans["person_id"]; + else + $_POST['person_id'] = $bank_trans["person_id"]; + + } else { + $_SESSION['pay_items']->reference = $Refs->get_next(0); + $_SESSION['pay_items']->tran_date = new_doc_date(); + if (!is_date_in_fiscalyear($_SESSION['pay_items']->tran_date)) + $_SESSION['pay_items']->tran_date = end_fiscalyear(); + $_POST['ref_original'] = -1; + } + + $_POST['memo_'] = $_SESSION['pay_items']->memo_; + $_POST['ref'] = $_SESSION['pay_items']->reference; + $_POST['date_'] = $_SESSION['pay_items']->tran_date; + + //$_SESSION['pay_items'] = &$_SESSION['pay_items']; +} //----------------------------------------------------------------------------------------------- if (isset($_POST['Process'])) @@ -131,13 +230,19 @@ if (isset($_POST['Process'])) $input_error = 1; } - if (!references::is_valid($_POST['ref'])) + if ($_SESSION['pay_items']->gl_items_total() == 0.0) { + display_error(_("The total bank amount cannot be 0.")); + set_focus('code_id'); + $input_error = 1; + } + + if (!$Refs->is_valid($_POST['ref'])) { display_error( _("You must enter a reference.")); set_focus('ref'); $input_error = 1; } - elseif (!is_new_reference($_POST['ref'], $_SESSION['pay_items']->trans_type)) + elseif ($_POST['ref'] != $_SESSION['pay_items']->reference && !is_new_reference($_POST['ref'], $_SESSION['pay_items']->trans_type)) { display_error( _("The entered reference is already in use.")); set_focus('ref'); @@ -162,21 +267,42 @@ if (isset($_POST['Process'])) if (isset($_POST['Process'])) { - + begin_transaction(); + + $_SESSION['pay_items'] = &$_SESSION['pay_items']; + $new = $_SESSION['pay_items']->order_id == 0; + + if (!$new) + { + clear_bank_trans($_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, true); + $trans = reinsert_bank_transaction( + $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, $_POST['bank_account'], + $_SESSION['pay_items'], $_POST['date_'], + $_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'), + $_POST['ref'], $_POST['memo_'], false); + } + else $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['ref'], $_POST['memo_']); + $_POST['ref'], $_POST['memo_'], false); $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() ? + + commit_transaction(); + + if ($new) + meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ? "AddedID=$trans_no" : "AddedDep=$trans_no"); + else + meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ? + "UpdatedID=$trans_no" : "UpdatedDep=$trans_no"); } /*end of process credit note */ @@ -200,7 +326,7 @@ function check_item_data() //if (is_bank_account($_POST['code_id'])) //{ - // if ($_SESSION['pay_items']->trans_type == systypes::bank_payment()) + // if ($_SESSION['pay_items']->trans_type == ST_BANKPAYMENT) // 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.")); @@ -215,11 +341,11 @@ function check_item_data() function handle_update_item() { - $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount'); + $amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount'); if($_POST['UpdateItem'] != "" && check_item_data()) { - $_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['dimension_id'], - $_POST['dimension2_id'], $amount , $_POST['LineMemo']); + $_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['code_id'], + $_POST['dimension_id'], $_POST['dimension2_id'], $amount , $_POST['LineMemo']); } line_start_focus(); } @@ -238,7 +364,7 @@ function handle_new_item() { if (!check_item_data()) return; - $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount'); + $amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount'); $_SESSION['pay_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']); @@ -261,20 +387,20 @@ if (isset($_POST['CancelItemChanges'])) 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); + $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 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_table(TABLESTYLE2, "width=90%", 10); start_row(); echo ""; -display_gl_items($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? +display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? _("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']); gl_options_controls(); echo ""; @@ -282,8 +408,8 @@ end_row(); 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); +submit_center_last('Process', $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? + _("Process Payment"):_("Process Deposit"), '', 'default'); end_form();