X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=9341a11cc1f403771899605fd9dd0d2bc726fc16;hb=827b3428d4c8c473cb637ac9df6621f4a0ba6f9a;hp=b4a83c48a3948506d95c3b63363a07535c372d41;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index b4a83c48..9341a11c 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -23,6 +23,18 @@ page(_("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'])) @@ -60,6 +72,63 @@ if (isset($_GET['New'])) } //-------------------------------------------------------------------------------------------------- +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_ctrls'); + set_focus('gl_code'); +} +//------------------------------------------------------------------------------------------------ +// 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; + + $sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code='" . $_POST['gl_code'] . "'"; + $result = db_query($sql,"get account information"); + 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 ($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_']); + set_focus('gl_code'); + } +} + +//------------------------------------------------------------------------------------------------ function check_data() { @@ -72,34 +141,40 @@ function check_data() if (!references::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)) { 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.")); + set_focus('trans_date'); return false; } elseif (!is_date_in_fiscalyear($_SESSION['supp_trans']->tran_date)) { display_error(_("The entered date is not in fiscal year.")); + set_focus('trans_date'); return false; } if (!is_date( $_SESSION['supp_trans']->due_date)) { display_error(_("The invoice as entered cannot be processed because the due date is in an incorrect format.")); + set_focus('due_date'); return false; } @@ -140,35 +215,168 @@ 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; + 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; + } -start_form(false, true); + if (!check_num('ChgPrice'.$n)) + { + display_error( _("The price is not numeric.")); + set_focus('ChgPrice'.$n); + return false; + } -start_table("$table_style2 width=80%", 8); -echo ""; // outer table + 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 + (sys_prefs::over_charge_allowance() / 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() . "%"); + set_focus('ChgPrice'.$n); + return false; + } + } + } -echo "
"; + if ($check_qty_charged_vs_del_qty == True) + { + if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) > + (1+ (sys_prefs::over_charge_allowance() / 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() . "%"); + set_focus('this_quantity_inv'.$n); + return false; + } + } -invoice_header($_SESSION['supp_trans']); + return true; +} + +$id = find_submit('grn_item_id'); +if ($id != -1) +{ + if (check_item_data($id)) + { + if (input_num('this_quantity_inv'.$id) >= ($_POST['qty_recd'.$id] - $_POST['prev_quantity_inv'.$id])) + { + $complete = true; + } + else + { + $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], ""); + } +} -echo ""; // outer table +//-------------------------------------------------------------------------------------------------- +$id = find_submit('Delete'); +if ($id != -1) +{ + $_SESSION['supp_trans']->remove_grn_from_trans($id); + $Ajax->activate('grn_items'); + $Ajax->activate('grn_table'); + $Ajax->activate('inv_tot'); +} -echo "
"; +$id = find_submit('Delete2'); +if ($id != -1) +{ + $_SESSION['supp_trans']->remove_gl_codes_from_trans($id); + clear_fields(); + $Ajax->activate('gl_items'); + $Ajax->activate('inv_tot'); +} -display_grn_items($_SESSION['supp_trans']); +start_form(false, true); -display_gl_items($_SESSION['supp_trans']); +start_table("$table_style2 width=98%", 8); +echo ""; // outer table -//echo ""; // outer table -echo "
"; -invoice_totals($_SESSION['supp_trans']); +echo "
"; +invoice_header($_SESSION['supp_trans']); +if ($_POST['supplier_id']=='') + display_error('No supplier found for entered search text'); +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'); +} + +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")); +submit_center('PostInvoice', _("Enter Invoice"), true, '', true); echo "
"; end_form();