X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_invoice.php;h=15a6529f1667438d4cb72d32503b4779ac153ef6;hb=2cb57633d2f3e27b0c2b2e7448564f467e21e1fd;hp=11cd376a9af97ad124208afa5ccda84d65c5cbf9;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 11cd376a..15a6529f 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -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 "
";
@@ -138,27 +138,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');
@@ -228,7 +230,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 +245,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 +264,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,7 +337,7 @@ 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)
@@ -356,7 +359,7 @@ if ($_SESSION["wa_current_user"]->access == 2)
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"]), "",
+ add_stock_move(ST_SUPPRECEIVE, $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();