X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_journal.php;h=bc3e15e963286245665aec8bcee31404c28b80cf;hb=467fca01c62dd47bcd97ec957a49b0209732c9d0;hp=58832bdd1f9abf8c677cbccd8c27d017aa5af2f7;hpb=12e17bf9bcf8e8f56d72aeeb6dde817d1d921615;p=fa-stable.git diff --git a/gl/gl_journal.php b/gl/gl_journal.php index 58832bdd..bc3e15e9 100644 --- a/gl/gl_journal.php +++ b/gl/gl_journal.php @@ -1,16 +1,16 @@ . + See the License here . ***********************************************************************/ -$page_security = 3; -$path_to_root=".."; +$page_security = 'SA_JOURNALENTRY'; +$path_to_root = ".."; include_once($path_to_root . "/includes/ui/items_cart.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -28,9 +28,16 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Journal Entry"), false, false,'', $js); +if (isset($_GET['ModifyGL'])) { + $_SESSION['page_title'] = sprintf(_("Modifying Journal Transaction # %d."), + $_GET['trans_no']); + $help_context = "Modifying Journal Entry"; +} else + $_SESSION['page_title'] = _($help_context = "Journal Entry"); +page($_SESSION['page_title'], false, false,'', $js); //-------------------------------------------------------------------------------------------------- + function line_start_focus() { global $Ajax; @@ -42,34 +49,85 @@ function line_start_focus() { if (isset($_GET['AddedID'])) { $trans_no = $_GET['AddedID']; - $trans_type = systypes::journal_entry(); + $trans_type = ST_JOURNAL; display_notification_centered( _("Journal entry has been entered") . " #$trans_no"); display_note(get_gl_view_str($trans_type, $trans_no, _("&View this Journal Entry"))); - hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Journal Entry")); + reset_focus(); + hyperlink_params($_SERVER['PHP_SELF'], _("Enter &New Journal Entry"), "NewJournal=Yes"); + + display_footer_exit(); +} elseif (isset($_GET['UpdatedID'])) +{ + $trans_no = $_GET['UpdatedID']; + $trans_type = ST_JOURNAL; + + display_notification_centered( _("Journal entry has been updated") . " #$trans_no"); + + display_note(get_gl_view_str($trans_type, $trans_no, _("&View this Journal Entry"))); + + hyperlink_no_params($path_to_root."/gl/inquiry/journal_inquiry.php", _("Return to Journal &Inquiry")); display_footer_exit(); } //-------------------------------------------------------------------------------------------------- -function handle_new_order() +if (isset($_GET['NewJournal'])) +{ + create_cart(0,0); +} +elseif (isset($_GET['ModifyGL'])) +{ + if (!isset($_GET['trans_type']) || $_GET['trans_type']!= 0) { + display_error(_("You can edit directly only journal entries created via Journal Entry page.")); + hyperlink_params("$path_to_root/gl/gl_journal.php", _("Entry &New Journal Entry"), "NewJournal=Yes"); + display_footer_exit(); + } + create_cart($_GET['trans_type'], $_GET['trans_no']); +} + +function create_cart($type=0, $trans_no=0) { + global $Refs; + if (isset($_SESSION['journal_items'])) { - $_SESSION['journal_items']->clear_items(); unset ($_SESSION['journal_items']); } - session_register("journal_items"); + $cart = new items_cart($type); + $cart->order_id = $trans_no; - $_SESSION['journal_items'] = new items_cart(systypes::journal_entry()); + if ($trans_no) { + $result = get_gl_trans($type, $trans_no); - $_POST['date_'] = Today(); - if (!is_date_in_fiscalyear($_POST['date_'])) - $_POST['date_'] = end_fiscalyear(); - $_SESSION['journal_items']->tran_date = $_POST['date_']; + if ($result) { + while ($row = db_fetch($result)) { + if ($row['amount'] == 0) continue; + $date = $row['tran_date']; + $cart->add_gl_item($row['account'], $row['dimension_id'], + $row['dimension2_id'], $row['amount'], $row['memo_']); + } + } + $cart->memo_ = get_comments_string($type, $trans_no); + $cart->tran_date = sql2date($date); + $cart->reference = $Refs->get($type, $trans_no); + $_POST['ref_original'] = $cart->reference; // Store for comparison when updating + } else { + $cart->reference = $Refs->get_next(0); + $cart->tran_date = new_doc_date(); + if (!is_date_in_fiscalyear($cart->tran_date)) + $cart->tran_date = end_fiscalyear(); + $_POST['ref_original'] = -1; + } + + $_POST['memo_'] = $cart->memo_; + $_POST['ref'] = $cart->reference; + $_POST['date_'] = $cart->tran_date; + + $_SESSION['journal_items'] = &$cart; } //----------------------------------------------------------------------------------------------- @@ -91,7 +149,6 @@ if (isset($_POST['Process'])) $input_error = 1; } - if (!is_date($_POST['date_'])) { display_error(_("The entered date is invalid.")); @@ -104,34 +161,44 @@ if (isset($_POST['Process'])) set_focus('date_'); $input_error = 1; } - if (!references::is_valid($_POST['ref'])) + if (!$Refs->is_valid($_POST['ref'])) { display_error( _("You must enter a reference.")); set_focus('ref'); $input_error = 1; } - elseif (references::exists(systypes::journal_entry(), $_POST['ref'])) + elseif ($Refs->exists(ST_JOURNAL, $_POST['ref'])) { - display_error( _("The entered reference is already in use.")); - set_focus('ref'); - $input_error = 1; + // The reference can exist already so long as it's the same as the original (when modifying) + if ($_POST['ref'] != $_POST['ref_original']) { + display_error( _("The entered reference is already in use.")); + set_focus('ref'); + $input_error = 1; + } } - if ($input_error == 1) unset($_POST['Process']); } if (isset($_POST['Process'])) { + $cart = &$_SESSION['journal_items']; + $new = $cart->order_id == 0; - $trans_no = add_journal_entries($_SESSION['journal_items']->gl_items, - $_POST['date_'], $_POST['ref'], check_value('Reverse'), $_POST['memo_']); + $cart->reference = $_POST['ref']; + $cart->memo_ = $_POST['memo_']; + $cart->tran_date = $_POST['date_']; - $_SESSION['journal_items']->clear_items(); - unset($_SESSION['journal_items']); + $trans_no = write_journal_entries($cart, check_value('Reverse')); - meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); -} /*end of process credit note */ + $cart->clear_items(); + new_doc_date($_POST['date_']); + unset($_SESSION['journal_items']); + if($new) + meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); + else + meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no"); +} //----------------------------------------------------------------------------------------------- @@ -169,9 +236,14 @@ function check_item_data() set_focus('AmountCredit'); return false; } + + if (!is_tax_gl_unique(get_post('code_id'))) { + display_error(_("Cannot post to GL account used by more than one tax type.")); + set_focus('code_id'); + return false; + } - - if ($_SESSION["wa_current_user"]->access != 2 && is_bank_account($_POST['code_id'])) + if (!$_SESSION["wa_current_user"]->can_access('SA_BANKJOURNAL') && is_bank_account($_POST['code_id'])) { display_error(_("You cannot make a journal entry for a bank account. Please use one of the banking functions for bank transactions.")); set_focus('code_id'); @@ -192,8 +264,8 @@ function handle_update_item() else $amount = -input_num('AmountCredit'); - $_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['dimension_id'], - $_POST['dimension2_id'], $amount, $_POST['LineMemo']); + $_SESSION['journal_items']->update_gl_item($_POST['Index'], $_POST['code_id'], + $_POST['dimension_id'], $_POST['dimension2_id'], $amount, $_POST['LineMemo']); } line_start_focus(); } @@ -223,62 +295,6 @@ function handle_new_item() line_start_focus(); } -/* -function display_quick_entries(&$cart) -{ - if (!get_post('person_id')) - { - display_error( _("No Quick Entries are defined.")); - set_focus('totamount'); - } - else - { - $rate = 0; - $totamount = input_num('totamount'); - //$totamount = ($cart->trans_type==systypes::bank_payment() ? 1:-1) * $totamount; - $qe = get_quick_entry($_POST['person_id']); - $qe_lines = get_quick_entry_lines($_POST['person_id']); - while ($qe_line = db_fetch($qe_lines)) - { - if ($qe_line['tax_acc']) - { - $account = get_gl_account($qe_line['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); - $cart->clear_items(); - - $cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], - $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 = ($amount < 0 ? $item['purchasing_gl_code'] : - $item['sales_gl_code']); - $cart->add_gl_item($code, 0, 0, $amount, $qe['description']); - } - } - } - else - { - if ($qe_line['pct']) - $amount = $totamount * $qe_line['amount'] / 100; - else - $amount = $qe_line['amount']; - $cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], - $amount, $qe['description']); - } - } - line_start_focus(); - } -} -*/ //----------------------------------------------------------------------------------------------- $id = find_submit('Delete'); if ($id != -1) @@ -294,21 +310,18 @@ if (isset($_POST['CancelItemChanges'])) line_start_focus(); if (isset($_POST['go'])) - display_quick_entries($_SESSION['journal_items'], $_POST['person_id'], input_num('totamount')); -//----------------------------------------------------------------------------------------------- - -if (isset($_GET['NewJournal']) || !isset($_SESSION['journal_items'])) { - handle_new_order(); -} - + display_quick_entries($_SESSION['journal_items'], $_POST['person_id'], input_num('totamount'), QE_JOURNAL); + $_POST['totamount'] = price_format(0); $Ajax->activate('totamount'); + line_start_focus(); +} //----------------------------------------------------------------------------------------------- start_form(); display_order_header($_SESSION['journal_items']); -start_table("$table_style2 width=90%", 10); +start_table(TABLESTYLE2, "width=90%", 10); start_row(); echo ""; display_gl_items(_("Rows"), $_SESSION['journal_items']); @@ -318,7 +331,7 @@ end_row(); end_table(1); submit_center('Process', _("Process Journal Entry"), true , - _('Process journal entry only if debits equal to credits'), true); + _('Process journal entry only if debits equal to credits'), 'default'); end_form(); //------------------------------------------------------------------------------------------------