X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=6b21c935a1584b30f5cee9b2b325782055a0fd90;hb=48589f9ce6c51bb25e2fa8ed83c57d9dfa485e44;hp=d7172ee0e412431d123a9b146ce6ba5432a0c7bb;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index d7172ee0..6b21c935 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 (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'])) @@ -69,7 +67,7 @@ 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("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"), - "PInvoice=".$invoice_no); + "PInvoice=".$invoice_no."&trans_type=".$trans_type); hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1"); @@ -178,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, $_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.")); @@ -218,9 +201,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; } @@ -238,10 +229,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']); @@ -257,8 +244,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) { @@ -275,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 || @@ -290,7 +276,7 @@ function check_item_data($n) } } - if ($check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n])) + 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))) @@ -309,20 +295,10 @@ 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], ""); + $_POST['order_price'.$n], input_num('ChgPrice'.$n)); reset_tax_input(); } } @@ -366,6 +342,20 @@ if ($id4 != -1) $Ajax->activate('gl_items'); } +$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; if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) { @@ -411,7 +401,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(); @@ -423,4 +413,3 @@ end_form(); //-------------------------------------------------------------------------------------------------- end_page(); -?>