X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=4db923b90fae7426b623c508f4d5f0b3394f852f;hb=9502b1b3fc30a8b12c647f7e024e8b8da6a50af6;hp=bd2fb08ae0ae717a2640f051bfa20b8660a21f59;hpb=cf7be1f00c6abe59755286e0c3108d9d3c0356da;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index bd2fb08a..4db923b9 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -9,12 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$path_to_root="..";
+$page_security = 'SA_SUPPLIERCREDIT';
+$path_to_root = "..";
 
 include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc");
 
-$page_security=5;
-
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/data_checks.inc");
@@ -26,7 +25,7 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Supplier Credit Note"), false, false, "", $js);
+page(_($help_context = "Supplier Credit Note"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------
 
@@ -37,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 = 21;
+	$trans_type = ST_SUPPCREDIT;
 
 
     echo "<center>";
@@ -63,8 +62,7 @@ if (isset($_GET['New']))
 		unset ($_SESSION['supp_trans']);
 	}
 
-	$_SESSION['supp_trans'] = new supp_trans;
-	$_SESSION['supp_trans']->is_invoice = false;
+	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
 	if (isset($_GET['invoice_no']))
 	{
 		$_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no'];
@@ -98,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,7 +135,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 
 function check_data()
 {
-	global $total_grn_value, $total_gl_value;
+	global $total_grn_value, $total_gl_value, $Refs;
 	
 	if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
 	{
@@ -147,21 +144,21 @@ function check_data()
 		return false;
 	}
 
-	if (!references::is_valid($_SESSION['supp_trans']->reference)) 
+	if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
 	{
 		display_error(_("You must enter an credit note reference."));
 		set_focus('reference');
 		return false;
 	}
 
-	if (!is_new_reference($_SESSION['supp_trans']->reference, 21)) 
+	if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT)) 
 	{
 		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 credit note reference."));
 		set_focus('supp_reference');
@@ -246,13 +243,11 @@ function commit_item_data($n)
 {
 	if (check_item_data($n))
 	{
-		$complete = False;
-
 		$_SESSION['supp_trans']->add_grn_to_trans($n,
     		$_POST['po_detail_item'.$n], $_POST['item_code'.$n],
     		$_POST['item_description'.$n], $_POST['qty_recd'.$n],
     		$_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n),
-    		$_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+    		$_POST['order_price'.$n], input_num('ChgPrice'.$n),
     		$_POST['std_cost_unit'.$n], "");
 	}
 }
@@ -319,8 +314,6 @@ invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
 	display_error('No supplier found for entered search text');
 else {
-	start_outer_table("$table_style2 width=98%", 5);
-
 	$total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
 
 	$total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
@@ -328,8 +321,6 @@ else {
 	div_start('inv_tot');
 	invoice_totals($_SESSION['supp_trans']);
 	div_end();
-
-	end_outer_table(0, false);
 }
 
 if ($id != -1)