X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_credit.php;h=8ee6eff78945ec935104bff7a5a9c02f1187834c;hb=ab79693b43787b7b91a696a56d6287d87cfebdc1;hp=af63044b64f211062dc3caba03c7a1cc966fcba3;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index af63044b..8ee6eff7 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -2,11 +2,11 @@ $path_to_root=".."; -include($path_to_root . "/purchasing/includes/supp_trans_class.inc"); +include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc"); $page_security=5; -include($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); @@ -15,12 +15,26 @@ 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) + $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($_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'])) @@ -55,6 +69,63 @@ if (isset($_GET['New'])) $_SESSION['supp_trans']->is_invoice = false; } +function clear_fields() +{ + global $Ajax; + + unset($_POST['gl_code']); + unset($_POST['dimension_id']); + unset($_POST['dimension2_id']); + unset($_POST['amount']); + unset($_POST['memo_']); + unset($_POST['AddGLCodeToTrans']); + $Ajax->activate('gl_ctrls'); + set_focus('gl_code'); +} +//------------------------------------------------------------------------------------------------ +// GL postings are often entered in the same form to two accounts +// so fileds are cleared only on user demand. +// +if (isset($_POST['ClearFields'])) +{ + clear_fields(); +} + +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"); + 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.")); + set_focus('gl_code'); + $input_error = true; + } + else + { + $myrow = db_fetch_row($result); + $gl_act_name = $myrow[1]; + if (!check_num('amount')) + { + display_error(_("The amount entered is not numeric. This line cannot be added to the transaction.")); + set_focus('amount'); + $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_']); + set_focus('gl_code'); + } +} + + //--------------------------------------------------------------------------------------------------- function check_data() @@ -64,40 +135,47 @@ function check_data() 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; } if (!references::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)) { display_error(_("The entered reference is already in use.")); + set_focus('reference'); return false; } if (!references::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.")); + set_focus('tran_date'); return false; } elseif (!is_date_in_fiscalyear($_SESSION['supp_trans']->tran_date)) { display_error(_("The entered date is not in fiscal year.")); + set_focus('tran_date'); return false; } if (!is_date( $_SESSION['supp_trans']->due_date)) { display_error(_("The invoice as entered cannot be processed because the due date is in an incorrect format.")); + set_focus('due_date'); return false; } @@ -134,32 +212,110 @@ if (isset($_POST['PostCreditNote'])) handle_commit_credit_note(); } +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.")); + set_focus('This_QuantityCredited'.$n); + return false; + } + + if (!check_num('ChgPrice'.$n, 0)) + { + display_error(_("The price is either not numeric or negative.")); + set_focus('ChgPrice'.$n); + return false; + } + + return true; +} + +//----------------------------------------------------------------------------------------- + +$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], ""); + } +} + +//-------------------------------------------------------------------------------------------------- +$id = find_submit('Delete'); +if ($id != -1) +{ + $_SESSION['supp_trans']->remove_grn_from_trans($id); + $Ajax->activate('grn_items'); + $Ajax->activate('grn_table'); + $Ajax->activate('inv_tot'); +} + +$id = find_submit('Delete2'); +if ($id != -1) +{ + $_SESSION['supp_trans']->remove_gl_codes_from_trans($id); + clear_fields(); + $Ajax->activate('gl_items'); + $Ajax->activate('inv_tot'); +} + + //-------------------------------------------------------------------------------------------------- start_form(false, true); -start_table("$table_style width=80%", 8); +start_table("$table_style width=98%", 8); echo "