X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=d3cef151f0c9717f509b2785006930d5cec14b40;hb=4888cf51abf175a0ed4645e6adb2a326ce7e0e5f;hp=1a0ac95c5be03436a87c3c270a1597767a944439;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 1a0ac95c..d3cef151 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -21,16 +21,12 @@ 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(); //---------------------------------------------------------------------------------------- -check_db_has_suppliers(_("There are no suppliers defined in the system.")); - -//-------------------------------------------------------------------------------------------------- - if (isset($_GET['New'])) { if (isset( $_SESSION['supp_trans'])) @@ -54,6 +50,8 @@ 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.")); + //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -68,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"); @@ -107,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. @@ -151,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'); } } @@ -161,33 +170,25 @@ function check_data() { global $Refs; - if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) + if (!get_post('supplier_id')) { - 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.")); + display_error(_("There is no supplier selected.")); + set_focus('supplier_id'); return false; - } + } - if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) + if (!$_SESSION['supp_trans']->is_valid_trans_to_post()) { - display_error(_("You must enter an invoice reference.")); - set_focus('reference'); + 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 (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no)) + if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no)) { - 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.")); @@ -207,9 +208,17 @@ function check_data() return false; } + 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'] . ")"); + set_focus('supp_reference'); return false; } @@ -227,10 +236,6 @@ function handle_commit_invoice() $inv = $_SESSION['supp_trans']; $invoice_no = add_supp_invoice($inv); - // presume supplier data need correction - if ($inv->stored_algorithm != $inv->tax_algorithm) - update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm); - $_SESSION['supp_trans']->clear_items(); unset($_SESSION['supp_trans']); @@ -246,8 +251,7 @@ 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) { @@ -264,7 +268,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 || @@ -279,7 +283,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))) @@ -298,21 +302,11 @@ function commit_item_data($n) { if (check_item_data($n)) { - if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n])) - { - $complete = true; - } - else - { - $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_quantity_inv'.$n), - $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete, - $_POST['std_cost_unit'.$n], ""); - unset($_POST['mantax']); + $_POST['order_price'.$n], input_num('ChgPrice'.$n)); + reset_tax_input(); } } @@ -342,9 +336,8 @@ $id3 = find_submit('Delete'); if ($id3 != -1) { $_SESSION['supp_trans']->remove_grn_from_trans($id3); - unset($_POST['mantax']); $Ajax->activate('grn_items'); - $Ajax->activate('inv_tot'); + reset_tax_input(); } $id4 = find_submit('Delete2'); @@ -352,8 +345,22 @@ 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'); +} + +$id5 = find_submit('Edit'); +if ($id5 != -1) +{ + $_POST['gl_code'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_code; + $_POST['dimension_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim; + $_POST['dimension2_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim2; + $_POST['amount'] = $_SESSION['supp_trans']->gl_codes[$id5]->amount; + $_POST['memo_'] = $_SESSION['supp_trans']->gl_codes[$id5]->memo_; + + $_SESSION['supp_trans']->remove_gl_codes_from_trans($id5); + reset_tax_input(); + $Ajax->activate('gl_items'); } $id2 = -1; @@ -365,7 +372,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'])) @@ -373,7 +380,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(); @@ -401,7 +408,7 @@ if ($id != -1 || $id2 != -1) $Ajax->activate('inv_tot'); } -if (get_post('AddGLCodeToTrans')) +if (get_post('AddGLCodeToTrans') || get_post('update')) $Ajax->activate('inv_tot'); br(); @@ -413,4 +420,3 @@ end_form(); //-------------------------------------------------------------------------------------------------- end_page(); -?>