X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=4bfc235e52f4cd581b4e9be4de6bf2884929a570;hb=4888cf51abf175a0ed4645e6adb2a326ce7e0e5f;hp=8ee6eff78945ec935104bff7a5a9c02f1187834c;hpb=66626dafdf0a397406e36663f3ed15321d09984a;p=fa-stable.git diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 8ee6eff7..4bfc235e 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -1,11 +1,19 @@ . +***********************************************************************/ +$page_security = 'SA_SUPPLIERCREDIT'; +$path_to_root = ".."; include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc"); -$page_security=5; - include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); @@ -13,34 +21,58 @@ 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(_("Supplier Credit Note"), false, false, "", $js); //---------------------------------------------------------------------------------------- -check_db_has_suppliers(_("There are no suppliers defined in the system.")); - -//--------------------------------------------------------------------------------------------------------------- -if ($ret = context_restore()) { - // return from supplier editor - copy_from_trans($_SESSION['supp_trans']); - if(isset($ret['supplier_id'])) - $_POST['supplier_id'] = $ret['supplier_id']; +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']); } -if (isset($_POST['_supplier_id_editor'])) { - copy_to_trans($_SESSION['supp_trans']); - context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'supp_trans'); + +//--------------------------------------------------------------------------------------------------- + +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.")); //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) { $invoice_no = $_GET['AddedID']; - $trans_type = 21; + $trans_type = ST_SUPPCREDIT; echo "
"; @@ -50,25 +82,11 @@ if (isset($_GET['AddedID'])) display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Credit Note")), 1); 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; - $_SESSION['supp_trans']->is_invoice = false; -} - function clear_fields() { global $Ajax; @@ -79,9 +97,18 @@ function clear_fields() unset($_POST['amount']); unset($_POST['memo_']); unset($_POST['AddGLCodeToTrans']); - $Ajax->activate('gl_ctrls'); + $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,13 +118,12 @@ if (isset($_POST['ClearFields'])) clear_fields(); } -if (isset($_POST['AddGLCodeToTrans'])){ +if (isset($_POST['AddGLCodeToTrans'])) { $Ajax->activate('gl_items'); $input_error = false; - $sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code='" . $_POST['gl_code'] . "'"; - $result = db_query($sql,"get account information"); + $result = get_gl_account_info($_POST['gl_code']); if (db_num_rows($result) == 0) { display_error(_("The account code entered is not a valid code, this line cannot be added to the transaction.")); @@ -116,11 +142,18 @@ if (isset($_POST['AddGLCodeToTrans'])){ } } + if (!is_tax_gl_unique(get_post('gl_code'))) { + display_error(_("Cannot post to GL account used by more than one tax type.")); + set_focus('gl_code'); + $input_error = true; + } + if ($input_error == false) { $_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'); } } @@ -130,33 +163,25 @@ if (isset($_POST['AddGLCodeToTrans'])){ function check_data() { - global $total_grn_value, $total_gl_value; - - 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.")); - set_focus(''); - return false; - } + global $SysPrefs; - if (!references::is_valid($_SESSION['supp_trans']->reference)) + if (!get_post('supplier_id')) { - display_error(_("You must enter an credit note reference.")); - set_focus('reference'); + display_error(_("There is no supplier selected.")); + set_focus('supplier_id'); return false; - } + } - if (!is_new_reference($_SESSION['supp_trans']->reference, 21)) + if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { - display_error(_("The entered reference is already in use.")); - 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 (!references::is_valid($_SESSION['supp_trans']->supp_reference)) + if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT, $_SESSION['supp_trans']->trans_no)) { - display_error(_("You must enter a supplier's credit note reference.")); - set_focus('supp_reference'); + set_focus('reference'); return false; } @@ -168,7 +193,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; } @@ -179,12 +204,36 @@ 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; + } + + 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(get_qoh_on_date($stock['stock_id'], null, + $_SESSION['supp_trans']->tran_date), get_qty_dec($stock['stock_id']))); + return false; + } + } + } + } return true; } @@ -197,7 +246,10 @@ function handle_commit_credit_note() if (!check_data()) return; - $invoice_no = add_supp_invoice($_SESSION['supp_trans']); + 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']); $_SESSION['supp_trans']->clear_items(); unset($_SESSION['supp_trans']); @@ -214,6 +266,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.")); @@ -231,82 +284,92 @@ function check_item_data($n) return true; } +function commit_item_data($n) +{ + if (check_item_data($n)) + { + $_SESSION['supp_trans']->add_grn_to_trans($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)); + reset_tax_input(); + } +} + //----------------------------------------------------------------------------------------- $id = find_submit('grn_item_id'); if ($id != -1) { - if (check_item_data($id)) - { - $complete = False; - - //$_SESSION['supp_trans']->add_grn_to_trans($_POST['GRNNumber'], - // $_POST['po_detail_item'], $_POST['item_code'], - // $_POST['item_description'], $_POST['qty_recd'], - // $_POST['prev_quantity_inv'], $_POST['This_QuantityCredited'], - // $_POST['order_price'], $_POST['ChgPrice'], $complete, - // $_POST['std_cost_unit'], $_POST['gl_code']); - $_SESSION['supp_trans']->add_grn_to_trans($id, - $_POST['po_detail_item'.$id], $_POST['item_code'.$id], - $_POST['item_description'.$id], $_POST['qty_recd'.$id], - $_POST['prev_quantity_inv'.$id], input_num('This_QuantityCredited'.$id), - $_POST['order_price'.$id], input_num('ChgPrice'.$id), $complete, - $_POST['std_cost_unit'.$id], ""); - } + commit_item_data($id); } +if (isset($_POST['InvGRNAll'])) +{ + foreach($_POST as $postkey=>$postval ) + { + if (strpos($postkey, "qty_recd") === 0) + { + $id = substr($postkey, strlen("qty_recd")); + $id = (int)$id; + commit_item_data($id); + } + } +} + + //-------------------------------------------------------------------------------------------------- -$id = find_submit('Delete'); -if ($id != -1) +$id3 = find_submit('Delete'); +if ($id3 != -1) { - $_SESSION['supp_trans']->remove_grn_from_trans($id); + $_SESSION['supp_trans']->remove_grn_from_trans($id3); $Ajax->activate('grn_items'); - $Ajax->activate('grn_table'); - $Ajax->activate('inv_tot'); + reset_tax_input(); } -$id = find_submit('Delete2'); -if ($id != -1) +$id4 = find_submit('Delete2'); +if ($id4 != -1) { - $_SESSION['supp_trans']->remove_gl_codes_from_trans($id); + $_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'); + reset_tax_input(); } +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'); + reset_tax_input(); +} -//-------------------------------------------------------------------------------------------------- - -start_form(false, true); -start_table("$table_style width=98%", 8); -echo ""; // outer table +//-------------------------------------------------------------------------------------------------- -echo "
"; +start_form(); invoice_header($_SESSION['supp_trans']); if ($_POST['supplier_id']=='') display_error('No supplier found for entered search text'); else { - echo ""; // outer table - - $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); - echo ""; // outer table div_start('inv_tot'); invoice_totals($_SESSION['supp_trans']); div_end(); } -echo ""; -end_table(1); // outer table - -$id = find_submit('grn_item_id'); if ($id != -1) { - $Ajax->activate('grn_table'); $Ajax->activate('grn_items'); $Ajax->activate('inv_tot'); } @@ -314,10 +377,9 @@ if ($id != -1) if (get_post('AddGLCodeToTrans')) $Ajax->activate('inv_tot'); - -submit_center('PostCreditNote', _("Enter Credit Note"), true, '', true); -echo "

"; +br(); +submit_center('PostCreditNote', _("Enter Credit Note"), true, '', 'default'); +br(); end_form(); end_page(); -?>