X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=2b8c07b392e62e1d7d21b14c6c398aa197a7b61b;hb=13367be8aaf5175295f7aab7160370458dad1824;hp=4db923b90fae7426b623c508f4d5f0b3394f852f;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 4db923b9..2b8c07b3 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -23,14 +23,48 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); -if ($use_date_picker) +if (user_use_date_picker()) $js .= get_js_date_picker(); -page(_($help_context = "Supplier Credit Note"), false, false, "", $js); //---------------------------------------------------------------------------------------- check_db_has_suppliers(_("There are no suppliers defined in the system.")); +if (isset($_GET['ModifyCredit'])) + check_is_editable(ST_SUPPINVOICE, $_GET['ModifyCredit']); + +//--------------------------------------------------------------------------------------------------- + +if (isset($_GET['New'])) +{ + if (isset( $_SESSION['supp_trans'])) + { + unset ($_SESSION['supp_trans']->grn_items); + unset ($_SESSION['supp_trans']->gl_codes); + unset ($_SESSION['supp_trans']); + } + + if (isset($_GET['invoice_no'])) + { + $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['invoice_no']); + $_SESSION['supp_trans']->src_doc = $_GET['invoice_no']; + + + $_SESSION['supp_trans']->trans_type = ST_SUPPCREDIT; + $_SESSION['supp_trans']->trans_no = 0; + $_SESSION['supp_trans']->supp_reference = ''; + // $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no']; + $help_context = "Supplier Credit Note"; + $_SESSION['page_title'] = _("Supplier Credit Note"); + + } else { + $help_context = "Supplier Credit Note"; + $_SESSION['page_title'] = _("Supplier Credit Note"); + $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT); + } +} +page($_SESSION['page_title'], false, false, "", $js); + //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -47,26 +81,8 @@ if (isset($_GET['AddedID'])) hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Credit Note"), "New=1"); hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no"); - - display_footer_exit(); -} - -//--------------------------------------------------------------------------------------------------- - -if (isset($_GET['New'])) -{ - if (isset( $_SESSION['supp_trans'])) - { - unset ($_SESSION['supp_trans']->grn_items); - unset ($_SESSION['supp_trans']->gl_codes); - unset ($_SESSION['supp_trans']); - } - $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT); - if (isset($_GET['invoice_no'])) - { - $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no']; - } + display_footer_exit(); } function clear_fields() @@ -82,6 +98,15 @@ function clear_fields() $Ajax->activate('gl_items'); set_focus('gl_code'); } + +function reset_tax_input() +{ + global $Ajax; + + unset($_POST['mantax']); + $Ajax->activate('inv_tot'); +} + //------------------------------------------------------------------------------------------------ // GL postings are often entered in the same form to two accounts // so fileds are cleared only on user demand. @@ -91,7 +116,7 @@ if (isset($_POST['ClearFields'])) clear_fields(); } -if (isset($_POST['AddGLCodeToTrans'])){ +if (isset($_POST['AddGLCodeToTrans'])) { $Ajax->activate('gl_items'); $input_error = false; @@ -126,6 +151,7 @@ if (isset($_POST['AddGLCodeToTrans'])){ $_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name, $_POST['dimension_id'], $_POST['dimension2_id'], input_num('amount'), $_POST['memo_']); + reset_tax_input(); set_focus('gl_code'); } } @@ -135,8 +161,8 @@ if (isset($_POST['AddGLCodeToTrans'])){ function check_data() { - global $total_grn_value, $total_gl_value, $Refs; - + global $total_grn_value, $total_gl_value, $Refs, $SysPrefs; + if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { display_error(_("The credit note cannot be processed because the there are no items or values on the invoice. Credit notes are expected to have a charge.")); @@ -151,7 +177,7 @@ function check_data() return false; } - if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT)) + if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no)) { display_error(_("The entered reference is already in use.")); set_focus('reference'); @@ -173,7 +199,7 @@ function check_data() } elseif (!is_date_in_fiscalyear($_SESSION['supp_trans']->tran_date)) { - display_error(_("The entered date is not in fiscal year.")); + display_error(_("The entered date is out of fiscal year or is closed for further data entry.")); set_focus('tran_date'); return false; } @@ -190,6 +216,21 @@ function check_data() return false; } + if (!$SysPrefs->allow_negative_stock()) { + foreach ($_SESSION['supp_trans']->grn_items as $n => $item) { + if (is_inventory_item($item->item_code)) + { + if (check_negative_stock($item->item_code, -$item->this_quantity_inv, null, $_SESSION['supp_trans']->tran_date)) + { + $stock = get_item($item->item_code); + display_error(_("The return cannot be processed because there is an insufficient quantity for item:") . + " " . $stock['stock_id'] . " - " . $stock['description'] . " - " . + _("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($stock['stock_id']))); + return false; + } + } + } + } return true; } @@ -222,6 +263,7 @@ if (isset($_POST['PostCreditNote'])) function check_item_data($n) { + if (!check_num('This_QuantityCredited'.$n, 0)) { display_error(_("The quantity to credit must be numeric and greater than zero.")); @@ -280,7 +322,7 @@ if ($id3 != -1) { $_SESSION['supp_trans']->remove_grn_from_trans($id3); $Ajax->activate('grn_items'); - $Ajax->activate('inv_tot'); + reset_tax_input(); } $id4 = find_submit('Delete2'); @@ -288,13 +330,13 @@ if ($id4 != -1) { $_SESSION['supp_trans']->remove_gl_codes_from_trans($id4); clear_fields(); + reset_tax_input(); $Ajax->activate('gl_items'); - $Ajax->activate('inv_tot'); } if (isset($_POST['RefreshInquiry'])) { $Ajax->activate('grn_items'); - $Ajax->activate('inv_tot'); + reset_tax_input(); } if (isset($_POST['go'])) @@ -302,7 +344,7 @@ if (isset($_POST['go'])) $Ajax->activate('gl_items'); display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV); $_POST['totamount'] = price_format(0); $Ajax->activate('totamount'); - $Ajax->activate('inv_tot'); + reset_tax_input(); }