X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=080e8fc36f3d52fadf8e22becda73dc00b3db55c;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=9341a11cc1f403771899605fd9dd0d2bc726fc16;hpb=66626dafdf0a397406e36663f3ed15321d09984a;p=fa-stable.git diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 9341a11c..080e8fc3 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"); @@ -12,35 +21,43 @@ 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(_("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); -check_db_has_suppliers(_("There are no suppliers defined in the system.")); +if (isset($_GET['ModifyInvoice'])) + check_is_editable(ST_SUPPINVOICE, $_GET['ModifyInvoice']); -//--------------------------------------------------------------------------------------------------------------- -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'); -} +check_db_has_suppliers(_("There are no suppliers defined in the system.")); //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) { $invoice_no = $_GET['AddedID']; - $trans_type = 20; + $trans_type = ST_SUPPINVOICE; echo "
"; @@ -49,8 +66,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."&trans_type=".$trans_type); + 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,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']); } //-------------------------------------------------------------------------------------------------- @@ -82,9 +103,18 @@ function clear_fields() unset($_POST['amount']); unset($_POST['memo_']); unset($_POST['AddGLCodeToTrans']); - $Ajax->activate('gl_ctrls'); + $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. @@ -99,8 +129,7 @@ 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"); + $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.")); @@ -119,11 +148,18 @@ if (isset($_POST['AddGLCodeToTrans'])){ } } + 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'); } } @@ -132,33 +168,20 @@ if (isset($_POST['AddGLCodeToTrans'])){ function check_data() { - 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; - } + global $Refs; - if (!references::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, 20)) + 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 (!references::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.")); @@ -167,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; } @@ -178,13 +201,17 @@ 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"); + if (trim(get_post('supp_reference')) == false) + { + display_error(_("You must enter a supplier's invoice reference.")); + set_focus('supp_reference'); + return false; + } - $myrow = db_fetch_row($result); - if ($myrow[0] == 1) + 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; } @@ -199,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']); @@ -217,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; + 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.")); @@ -233,28 +260,29 @@ function check_item_data($n) return false; } - if ($check_price_charged_vs_order_price == True) + $margin = $SysPrefs->over_charge_allowance(); + if ($SysPrefs->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 + (sys_prefs::over_charge_allowance() / 100))) + (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 :") . sys_prefs::over_charge_allowance() . "%"); + _("The over-charge percentage allowance is :") . $margin . "%"); set_focus('ChgPrice'.$n); return false; } } } - 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+ (sys_prefs::over_charge_allowance() / 100))) + (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 :") . sys_prefs::over_charge_allowance() . "%"); + . _("The over-charge percentage allowance is :") . $margin . "%"); set_focus('this_quantity_inv'.$n); return false; } @@ -263,12 +291,11 @@ function check_item_data($n) return true; } -$id = find_submit('grn_item_id'); -if ($id != -1) +function commit_item_data($n) { - if (check_item_data($id)) + if (check_item_data($n)) { - if (input_num('this_quantity_inv'.$id) >= ($_POST['qty_recd'.$id] - $_POST['prev_quantity_inv'.$id])) + if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n])) { $complete = true; } @@ -277,69 +304,95 @@ if ($id != -1) $complete = false; } - $_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_quantity_inv'.$id), - $_POST['order_price'.$id], input_num('ChgPrice'.$id), $complete, - $_POST['std_cost_unit'.$id], ""); + $_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], ""); + reset_tax_input(); } } -//-------------------------------------------------------------------------------------------------- -$id = find_submit('Delete'); +//----------------------------------------------------------------------------------------- + +$id = find_submit('grn_item_id'); if ($id != -1) { - $_SESSION['supp_trans']->remove_grn_from_trans($id); + 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'); - $Ajax->activate('grn_table'); - $Ajax->activate('inv_tot'); + reset_tax_input(); } -$id = find_submit('Delete2'); -if ($id != -1) +$id4 = find_submit('Delete2'); +if ($id4 != -1) { - $_SESSION['supp_trans']->remove_gl_codes_from_trans($id); + $_SESSION['supp_trans']->remove_gl_codes_from_trans($id4); clear_fields(); + reset_tax_input(); $Ajax->activate('gl_items'); - $Ajax->activate('inv_tot'); } -start_form(false, true); +$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_table("$table_style2 width=98%", 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 - - echo "
"; - display_grn_items($_SESSION['supp_trans'], 1); - //display_grn_items_for_selection(); + display_gl_items($_SESSION['supp_trans'], 1); - //display_gl_controls(); - //echo ""; // outer table - echo "
"; div_start('inv_tot'); invoice_totals($_SESSION['supp_trans']); div_end(); -} -echo ""; -end_table(); // outer table +} //----------------------------------------------------------------------------------------- -$id = find_submit('grn_item_id'); -$id2 = find_submit('void_item_id'); + if ($id != -1 || $id2 != -1) { - $Ajax->activate('grn_table'); $Ajax->activate('grn_items'); $Ajax->activate('inv_tot'); } @@ -347,41 +400,12 @@ if ($id != -1 || $id2 != -1) if (get_post('AddGLCodeToTrans')) $Ajax->activate('inv_tot'); -if ($_SESSION["wa_current_user"]->access == 2) -{ - if ($id2 != -1) // Added section 2008-10-18 Joe Hunt for voiding delivery lines - { - begin_transaction(); - - $myrow = get_grn_item_detail($id2); - - $grn = get_grn_batch($myrow['grn_batch_id']); - - $sql = "UPDATE ".TB_PREF."purch_order_details - SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"]; - db_query($sql, "The quantity invoiced of the purchase order line could not be updated"); - - $sql = "UPDATE ".TB_PREF."grn_items - SET qty_recd = quantity_inv WHERE id = ".$myrow["id"]; - db_query($sql, "The quantity invoiced off the items received record could not be updated"); - - update_average_material_cost($grn["supplier_id"], $myrow["item_code"], - $myrow["unit_price"], -$myrow["QtyOstdg"], Today()); - - add_stock_move(25, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "", - -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']); - - commit_transaction(); - } -} - -echo "
"; -submit_center('PostInvoice', _("Enter Invoice"), true, '', true); -echo "
"; +br(); +submit_center('PostInvoice', _("Enter Invoice"), true, '', 'default'); +br(); end_form(); //-------------------------------------------------------------------------------------------------- end_page(); -?>