X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=33c745a1c60c453ba577bc92b6871da328d25718;hb=80dd97a37f674cc3691fa04af4c29607067566b2;hp=0fad0e6eddfc06f0d06b5072da58049106f129d5;hpb=2383d33373d6ddec06906658a0ed6398077c1147;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 0fad0e6e..33c745a1 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security=5;
-$path_to_root="..";
+$page_security = 'SA_SUPPLIERINVOICE';
+$path_to_root = "..";
 
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 
@@ -27,23 +27,10 @@ if ($use_date_picker)
 	$js .= get_js_date_picker();
 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'])) 
@@ -58,6 +45,8 @@ if (isset($_GET['AddedID']))
 
 	display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
 
+	hyperlink_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"));
+
 	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");
@@ -149,13 +138,15 @@ 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');
@@ -169,7 +160,7 @@ function check_data()
 		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');
@@ -239,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."));
@@ -254,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;
 		    }
@@ -272,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;
 		}
@@ -345,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)