X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=c4b91de93164aca359a267a50f7c5bd6f376c1ac;hb=a1a4dfb6ba6bc8104bf29cc02858c2e2eab1abfb;hp=24aff0759561ccbbad6fc1b57a5119ece3e2d2b2;hpb=5b8ee3cb748382ab5a2665a620183f08c8ba204b;p=fa-stable.git diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 24aff075..c4b91de9 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = 'SA_SUPPLIERINVOICE'; +$path_to_root = ".."; include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); @@ -16,31 +25,18 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -page(_("Enter Supplier Invoice"), false, false, "", $js); - +page(_($help_context = "Enter Supplier Invoice"), 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 = 20; + $trans_type = ST_SUPPINVOICE; echo "
"; @@ -49,8 +45,13 @@ if (isset($_GET['AddedID'])) display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1); - hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1"); + hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"), + "PInvoice=".$invoice_no); + + hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1"); + hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no"); + display_footer_exit(); } @@ -65,37 +66,108 @@ if (isset($_GET['New'])) unset ($_SESSION['supp_trans']); } - //session_register("SuppInv"); - session_register("supp_trans"); - $_SESSION['supp_trans'] = new supp_trans; - $_SESSION['supp_trans']->is_invoice = true; + $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE); } //-------------------------------------------------------------------------------------------------- +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_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. +// +if (isset($_POST['ClearFields'])) +{ + clear_fields(); +} + +if (isset($_POST['AddGLCodeToTrans'])){ + + $Ajax->activate('gl_items'); + $input_error = false; + + $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.")); + 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 (!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'); + } +} + +//------------------------------------------------------------------------------------------------ function check_data() { - If (!$_SESSION['supp_trans']->is_valid_trans_to_post()) + global $Refs; + + if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { display_error(_("The invoice cannot be processed because the there are no items or values on the invoice. Invoices are expected to have a charge.")); return false; } - if (!references::is_valid($_SESSION['supp_trans']->reference)) + if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) { display_error(_("You must enter an invoice reference.")); set_focus('reference'); return false; } - if (!is_new_reference($_SESSION['supp_trans']->reference, 20)) + if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE)) { 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 invoice reference.")); set_focus('supp_reference'); @@ -121,13 +193,9 @@ function check_data() return false; } - $sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id='" . $_SESSION['supp_trans']->supplier_id . "' AND supp_reference='" . $_POST['supp_reference'] . "'"; - $result=db_query($sql,"The sql to check for the previous entry of the same invoice failed"); - - $myrow = db_fetch_row($result); - if ($myrow[0] == 1) + if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'])) { /*Transaction reference already entered */ - display_error(_("This invoice number has already been entered. It cannot be entered again." . " (" . $_POST['supp_reference'] . ")")); + display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")"); return false; } @@ -158,38 +226,158 @@ if (isset($_POST['PostInvoice'])) handle_commit_invoice(); } +function check_item_data($n) +{ + global $check_price_charged_vs_order_price, + $check_qty_charged_vs_del_qty, $SysPrefs; + if (!check_num('this_quantity_inv'.$n, 0) || input_num('this_quantity_inv'.$n)==0) + { + display_error( _("The quantity to invoice must be numeric and greater than zero.")); + set_focus('this_quantity_inv'.$n); + return false; + } + + if (!check_num('ChgPrice'.$n)) + { + display_error( _("The price is not numeric.")); + set_focus('ChgPrice'.$n); + return false; + } + + $margin = $SysPrefs->over_charge_allowance(); + if ($check_price_charged_vs_order_price == True) + { + if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) { + if ($_POST['order_price'.$n]==0 || + input_num('ChgPrice'.$n)/$_POST['order_price'.$n] > + (1 + ($margin/ 100))) + { + display_error(_("The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.") . + _("The over-charge percentage allowance is :") . $margin . "%"); + set_focus('ChgPrice'.$n); + return false; + } + } + } + + if ($check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n])) + { + if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) > + (1+ ($margin / 100))) + { + display_error( _("The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.") + . _("The over-charge percentage allowance is :") . $margin . "%"); + set_focus('this_quantity_inv'.$n); + return false; + } + } + + 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_quantity_inv'.$n), + $_POST['order_price'.$n], input_num('ChgPrice'.$n), + $_POST['std_cost_unit'.$n], ""); + reset_tax_input(); + } +} + +//----------------------------------------------------------------------------------------- + +$id = find_submit('grn_item_id'); +if ($id != -1) +{ + 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); + } + } +} + //-------------------------------------------------------------------------------------------------- +$id3 = find_submit('Delete'); +if ($id3 != -1) +{ + $_SESSION['supp_trans']->remove_grn_from_trans($id3); + $Ajax->activate('grn_items'); + reset_tax_input(); +} + +$id4 = find_submit('Delete2'); +if ($id4 != -1) +{ + $_SESSION['supp_trans']->remove_gl_codes_from_trans($id4); + clear_fields(); + reset_tax_input(); + $Ajax->activate('gl_items'); +} + +$id2 = -1; +if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) +{ + $id2 = find_submit('void_item_id'); + if ($id2 != -1) + { + remove_not_invoice_item($id2); + display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2)); -start_form(false, true); + } +} -start_table("$table_style2 width=80%", 8); -echo ""; // outer table +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(); +} -echo "
"; +start_form(); invoice_header($_SESSION['supp_trans']); + if ($_POST['supplier_id']=='') - display_error('No supplier found for entered search text'); + display_error(_("There is no supplier selected.")); else { - echo ""; // outer table + display_grn_items($_SESSION['supp_trans'], 1); - echo "
"; + display_gl_items($_SESSION['supp_trans'], 1); - display_grn_items($_SESSION['supp_trans']); + div_start('inv_tot'); + invoice_totals($_SESSION['supp_trans']); + div_end(); - display_gl_items($_SESSION['supp_trans']); +} - //echo ""; // outer table - echo "
"; - invoice_totals($_SESSION['supp_trans']); +//----------------------------------------------------------------------------------------- + +if ($id != -1 || $id2 != -1) +{ + $Ajax->activate('grn_items'); + $Ajax->activate('inv_tot'); } -echo ""; -end_table(); // outer table +if (get_post('AddGLCodeToTrans')) + $Ajax->activate('inv_tot'); -echo "
"; -submit_center('PostInvoice', _("Enter Invoice"), true, '', true); -echo "
"; +br(); +submit_center('PostInvoice', _("Enter Invoice"), true, '', 'default'); +br(); end_form();