X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=b0434e68d3670ebd64b78dfc4125d84007d1d106;hb=884c36eec7dbaae89e1f5532cc2c2f8033b010fd;hp=33c745a1c60c453ba577bc92b6871da328d25718;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 33c745a1..b0434e68 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -25,7 +25,7 @@ if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Enter Supplier Invoice"), false, false, "", $js);
+page(_($help_context = "Enter Supplier Invoice"), false, false, "", $js);
//----------------------------------------------------------------------------------------
@@ -36,7 +36,7 @@ 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 "
";
@@ -65,10 +65,7 @@ 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);
}
//--------------------------------------------------------------------------------------------------
@@ -99,8 +96,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."));
@@ -153,7 +149,7 @@ function check_data()
return false;
}
- if (!is_new_reference($_SESSION['supp_trans']->reference, 20))
+ if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE))
{
display_error(_("The entered reference is already in use."));
set_focus('reference');
@@ -186,17 +182,9 @@ 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']
- . "' AND ov_amount!=0"; // ignore voided invoice references
-
- $result=db_query($sql,"The sql to check for the previous entry of the same invoice failed");
-
- $myrow = db_fetch_row($result);
- if ($myrow[0] == 1)
+ if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference']))
{ /*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'] . ")");
return false;
}
@@ -342,27 +330,7 @@ if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
$id2 = find_submit('void_item_id');
if ($id2 != -1)
{
- 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();
+ remove_not_invoice_item($id2);
display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
}
@@ -381,10 +349,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);
@@ -393,7 +359,6 @@ else {
invoice_totals($_SESSION['supp_trans']);
div_end();
- end_outer_table(0, false);
}
//-----------------------------------------------------------------------------------------