X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=9335c1f1e81348ceb72e96cda1858cd3698264ce;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=0806b7cf5d48e5373d0dcc0b957ffab6013e67bc;hpb=902c99a41a0c467d919e08c729ac1dbe82e8bbcd;p=fa-stable.git diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 0806b7cf..9335c1f1 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -21,14 +21,47 @@ include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); $js = ""; -if ($use_popup_windows) +if ($SysPrefs->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); //---------------------------------------------------------------------------------------- +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_docs = array( $_GET['invoice_no'] => $_SESSION['supp_trans']->supp_reference); + + + $_SESSION['supp_trans']->trans_type = ST_SUPPCREDIT; + $_SESSION['supp_trans']->trans_no = 0; + $_SESSION['supp_trans']->supp_reference = ''; + $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); + check_db_has_suppliers(_("There are no suppliers defined in the system.")); //--------------------------------------------------------------------------------------------------------------- @@ -47,26 +80,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 +97,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 +115,7 @@ if (isset($_POST['ClearFields'])) clear_fields(); } -if (isset($_POST['AddGLCodeToTrans'])){ +if (isset($_POST['AddGLCodeToTrans'])) { $Ajax->activate('gl_items'); $input_error = false; @@ -126,6 +150,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 +160,8 @@ if (isset($_POST['AddGLCodeToTrans'])){ function check_data() { - global $total_grn_value, $total_gl_value, $Refs, $SysPrefs; - + global $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.")); @@ -144,27 +169,12 @@ function check_data() return false; } - if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) + if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no)) { - display_error(_("You must enter an credit note reference.")); set_focus('reference'); return false; } - if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT)) - { - display_error(_("The entered reference is already in use.")); - set_focus('reference'); - return false; - } - - if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) - { - display_error(_("You must enter a supplier's credit note reference.")); - set_focus('supp_reference'); - return false; - } - if (!is_date($_SESSION['supp_trans']->tran_date)) { display_error(_("The credit note as entered cannot be processed because the date entered is not valid.")); @@ -173,7 +183,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; } @@ -184,9 +194,17 @@ function check_data() return false; } - if ($_SESSION['supp_trans']->ov_amount < ($total_gl_value + $total_grn_value)) + if (trim(get_post('supp_reference')) == false) { - display_error(_("The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed.")); + display_error(_("You must enter a supplier's invoice reference.")); + set_focus('supp_reference'); + return false; + } + + if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no)) + { /*Transaction reference already entered */ + display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")"); + set_focus('supp_reference'); return false; } @@ -194,13 +212,13 @@ function check_data() foreach ($_SESSION['supp_trans']->grn_items as $n => $item) { if (is_inventory_item($item->item_code)) { - $qoh = get_qoh_on_date($item->item_code, null, $_SESSION['supp_trans']->tran_date); - if ($item->this_quantity_inv > $qoh) + 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']))); + _("Quantity On Hand") . " = " . number_format2(get_qoh_on_date($stock['stock_id'], null, + $_SESSION['supp_trans']->tran_date), get_qty_dec($stock['stock_id']))); return false; } } @@ -266,6 +284,7 @@ function commit_item_data($n) $_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n), $_POST['order_price'.$n], input_num('ChgPrice'.$n), $_POST['std_cost_unit'.$n], ""); + reset_tax_input(); } } @@ -297,7 +316,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'); @@ -305,13 +324,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'])) @@ -319,7 +338,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(); } @@ -331,9 +350,9 @@ invoice_header($_SESSION['supp_trans']); if ($_POST['supplier_id']=='') display_error('No supplier found for entered search text'); else { - $total_grn_value = display_grn_items($_SESSION['supp_trans'], 1); + display_grn_items($_SESSION['supp_trans'], 1); - $total_gl_value = display_gl_items($_SESSION['supp_trans'], 1); + display_gl_items($_SESSION['supp_trans'], 1); div_start('inv_tot'); invoice_totals($_SESSION['supp_trans']); @@ -355,4 +374,3 @@ br(); end_form(); end_page(); -?>