X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=f4982933fa2d347d9c226e0d1fc4a405e930890a;hb=fbfb1ee42fac43d2e149eaad52de19becfc10034;hp=cb737896a1c07ac85d7366e8e640c312ef5ed71e;hpb=03f640384f3739ed3d2b378e883a179286e6639a;p=fa-stable.git diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index cb737896..f4982933 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"); @@ -17,30 +25,18 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Supplier Credit Note"), false, false, "", $js); +page(_($help_context = "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($_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['AddedID'])) { $invoice_no = $_GET['AddedID']; - $trans_type = 21; + $trans_type = ST_SUPPCREDIT; echo "
"; @@ -50,7 +46,8 @@ 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(); } @@ -65,8 +62,11 @@ if (isset($_GET['New'])) unset ($_SESSION['supp_trans']); } - $_SESSION['supp_trans'] = new supp_trans; - $_SESSION['supp_trans']->is_invoice = false; + $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT); + if (isset($_GET['invoice_no'])) + { + $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no']; + } } function clear_fields() @@ -82,6 +82,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. @@ -96,8 +105,7 @@ 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 +124,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,7 +145,7 @@ if (isset($_POST['AddGLCodeToTrans'])){ function check_data() { - global $total_grn_value, $total_gl_value; + global $total_grn_value, $total_gl_value, $Refs, $SysPrefs; if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { @@ -139,21 +154,21 @@ function check_data() return false; } - if (!references::is_valid($_SESSION['supp_trans']->reference)) + if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) { display_error(_("You must enter an credit note reference.")); set_focus('reference'); return false; } - if (!is_new_reference($_SESSION['supp_trans']->reference, 21)) + 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 (!references::is_valid($_SESSION['supp_trans']->supp_reference)) + if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) { display_error(_("You must enter a supplier's credit note reference.")); set_focus('supp_reference'); @@ -185,6 +200,22 @@ 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(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 +228,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 +248,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.")); @@ -235,14 +270,13 @@ function commit_item_data($n) { if (check_item_data($n)) { - $complete = False; - $_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), $complete, + $_POST['order_price'.$n], input_num('ChgPrice'.$n), $_POST['std_cost_unit'.$n], ""); + reset_tax_input(); } } @@ -274,7 +308,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'); @@ -282,38 +316,40 @@ 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'); + 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); $total_gl_value = 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 if ($id != -1) { @@ -324,9 +360,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();