X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_invoice.php;h=b0434e68d3670ebd64b78dfc4125d84007d1d106;hb=e4312a1db83482b016235c12f8b784e469fbaeb5;hp=11cd376a9af97ad124208afa5ccda84d65c5cbf9;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 11cd376a..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."));
@@ -138,27 +134,29 @@ if (isset($_POST['AddGLCodeToTrans'])){
function check_data()
{
- If (!$_SESSION['supp_trans']->is_valid_trans_to_post())
+ global $Refs;
+
+ 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;
}
- if (!references::is_valid($_SESSION['supp_trans']->reference))
+ if (!$Refs->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))
+ if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE))
{
display_error(_("The entered reference is already in use."));
set_focus('reference');
return false;
}
- if (!references::is_valid($_SESSION['supp_trans']->supp_reference))
+ if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference))
{
display_error(_("You must enter a supplier's invoice reference."));
set_focus('supp_reference');
@@ -184,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;
}
@@ -228,7 +218,7 @@ if (isset($_POST['PostInvoice']))
function check_item_data($n)
{
global $check_price_charged_vs_order_price,
- $check_qty_charged_vs_del_qty;
+ $check_qty_charged_vs_del_qty, $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."));
@@ -243,15 +233,16 @@ function check_item_data($n)
return false;
}
+ $margin = $SysPrefs->over_charge_allowance();
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)))
+ (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;
}
@@ -261,10 +252,10 @@ function check_item_data($n)
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)))
+ (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;
}
@@ -334,32 +325,12 @@ if ($id4 != -1)
}
$id2 = -1;
-if ($_SESSION["wa_current_user"]->access == 2)
+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));
}
@@ -378,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);
@@ -390,7 +359,6 @@ else {
invoice_totals($_SESSION['supp_trans']);
div_end();
- end_outer_table(0, false);
}
//-----------------------------------------------------------------------------------------