X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=21361cb8c497878426dbaadde60bd07857f19075;hb=0dfa3ce0411c9d123d25d6a0079668e551a88b14;hp=a35533218f0e2f002dd315445255e5d27b24b8ba;hpb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;p=fa-stable.git diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index a3553321..21361cb8 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -21,17 +21,18 @@ 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(); //---------------------------------------------------------------------------------------- -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['ModifyCredit'])) { + check_is_editable(ST_SUPPCREDIT, $_GET['ModifyCredit']); + $_SESSION['page_title'] = sprintf( _("Modifying Supplier Credit # %d"), $_GET['ModifyCredit']); + $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT, $_GET['ModifyCredit']); +} //--------------------------------------------------------------------------------------------------- @@ -47,25 +48,26 @@ if (isset($_GET['New'])) 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']->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 = ''; - // $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no']; + $_SESSION['supp_trans']->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); - } elseif (isset($_GET['ModifyInvoice'])) { - $help_context = 'Modifying Purchase Invoice'; - $_SESSION['page_title'] = sprintf( _("Modifying Supplier Credit # %d"), $_GET['ModifyCredit']); - $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT, $_GET['ModifyCredit']); } } page($_SESSION['page_title'], false, false, "", $js); +check_db_has_suppliers(_("There are no suppliers defined in the system.")); + //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -99,6 +101,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. @@ -143,6 +154,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'); } } @@ -152,36 +164,28 @@ 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()) + if (!get_post('supplier_id')) { - 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.")); - set_focus(''); + display_error(_("There is no supplier selected.")); + set_focus('supplier_id'); return false; - } + } - if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) + if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { - display_error(_("You must enter an credit note reference.")); - set_focus('reference'); + 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.")); + set_focus(''); return false; } - if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no)) + if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no)) { - 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.")); @@ -201,9 +205,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; } @@ -211,16 +223,15 @@ 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; } - return true; } } } @@ -236,10 +247,7 @@ function handle_commit_credit_note() if (!check_data()) return; - if (isset($_POST['invoice_no'])) - $invoice_no = add_supp_invoice($_SESSION['supp_trans'], $_POST['invoice_no']); - else - $invoice_no = add_supp_invoice($_SESSION['supp_trans']); + $invoice_no = add_supp_invoice($_SESSION['supp_trans']); $_SESSION['supp_trans']->clear_items(); unset($_SESSION['supp_trans']); @@ -282,8 +290,8 @@ function commit_item_data($n) $_POST['po_detail_item'.$n], $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n], $_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n), - $_POST['order_price'.$n], input_num('ChgPrice'.$n), - $_POST['std_cost_unit'.$n], ""); + $_POST['order_price'.$n], input_num('ChgPrice'.$n)); + reset_tax_input(); } } @@ -315,7 +323,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'); @@ -323,13 +331,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'])) @@ -337,7 +345,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(); } @@ -349,9 +357,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']); @@ -373,4 +381,3 @@ br(); end_form(); end_page(); -?>