X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=080e8fc36f3d52fadf8e22becda73dc00b3db55c;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=40c62435f0315002fa4414550d8926270ec0d562;hpb=49d2702ed98abe7a564a4abb4c8c5fa225f362e8;p=fa-stable.git diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 40c62435..080e8fc3 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -21,14 +21,35 @@ include_once($path_to_root . "/includes/data_checks.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(_($help_context = "Enter Supplier Invoice"), false, false, "", $js); - //---------------------------------------------------------------------------------------- +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']); + } + $help_context = "Enter Supplier Invoice"; + $_SESSION['page_title'] = _("Enter Supplier Invoice"); + + $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE); +} else if(isset($_GET['ModifyInvoice'])) { + $help_context = 'Modifying Purchase Invoice'; + $_SESSION['page_title'] = sprintf( _("Modifying Purchase Invoice # %d"), $_GET['ModifyInvoice']); + $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['ModifyInvoice']); +} + +page($_SESSION['page_title'], false, false, "", $js); + +if (isset($_GET['ModifyInvoice'])) + check_is_editable(ST_SUPPINVOICE, $_GET['ModifyInvoice']); + check_db_has_suppliers(_("There are no suppliers defined in the system.")); //--------------------------------------------------------------------------------------------------------------- @@ -45,7 +66,8 @@ if (isset($_GET['AddedID'])) display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1); - hyperlink_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice")); + hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"), + "PInvoice=".$invoice_no."&trans_type=".$trans_type); hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1"); @@ -65,10 +87,9 @@ 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); +} else if(isset($_GET['ModifyInvoice'])) { + $_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['ModifyInvoice']); } //-------------------------------------------------------------------------------------------------- @@ -85,6 +106,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. @@ -129,6 +159,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'); } } @@ -145,27 +176,12 @@ function check_data() return false; } - if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) + if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no)) { - display_error(_("You must enter an invoice reference.")); set_focus('reference'); return false; } - 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 (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) - { - display_error(_("You must enter a supplier's invoice reference.")); - set_focus('supp_reference'); - return false; - } - if (!is_date( $_SESSION['supp_trans']->tran_date)) { display_error(_("The invoice as entered cannot be processed because the invoice date is in an incorrect format.")); @@ -174,7 +190,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('trans_date'); return false; } @@ -185,9 +201,17 @@ function check_data() return false; } - if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'])) + if (trim(get_post('supp_reference')) == false) + { + 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'] . ")")); + display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")"); + set_focus('supp_reference'); return false; } @@ -202,8 +226,8 @@ function handle_commit_invoice() if (!check_data()) return; - - $invoice_no = add_supp_invoice($_SESSION['supp_trans']); + $inv = $_SESSION['supp_trans']; + $invoice_no = add_supp_invoice($inv); $_SESSION['supp_trans']->clear_items(); unset($_SESSION['supp_trans']); @@ -220,8 +244,8 @@ if (isset($_POST['PostInvoice'])) function check_item_data($n) { - global $check_price_charged_vs_order_price, - $check_qty_charged_vs_del_qty, $SysPrefs; + global $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.")); @@ -237,7 +261,7 @@ function check_item_data($n) } $margin = $SysPrefs->over_charge_allowance(); - if ($check_price_charged_vs_order_price == True) + if ($SysPrefs->check_price_charged_vs_order_price == True) { if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) { if ($_POST['order_price'.$n]==0 || @@ -252,7 +276,7 @@ function check_item_data($n) } } - if ($check_qty_charged_vs_del_qty == True) + if ($SysPrefs->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))) @@ -285,6 +309,7 @@ function commit_item_data($n) $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n), $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete, $_POST['std_cost_unit'.$n], ""); + reset_tax_input(); } } @@ -315,7 +340,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,8 +348,8 @@ 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'); } $id2 = -1; @@ -336,7 +361,7 @@ if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) remove_not_invoice_item($id2); display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2)); - } + } } if (isset($_POST['go'])) @@ -344,7 +369,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(); } start_form(); @@ -352,10 +377,8 @@ 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 { - start_outer_table("$table_style2 width=98%", 5); - display_grn_items($_SESSION['supp_trans'], 1); display_gl_items($_SESSION['supp_trans'], 1); @@ -364,7 +387,6 @@ else { invoice_totals($_SESSION['supp_trans']); div_end(); - end_outer_table(0, false); } //----------------------------------------------------------------------------------------- @@ -387,4 +409,3 @@ end_form(); //-------------------------------------------------------------------------------------------------- end_page(); -?>