Merging changes form main trunk 2.2.5-2.2.6

[fa-stable.git] / purchasing / supplier_credit.php

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 6f27aa51874fbc29c262059c9a4913101fda05d0..9b62ec4defebd2dfd60562d6116e946b8c578515 100644 (file)
--- 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,19 +25,18 @@ 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);
 
 //----------------------------------------------------------------------------------------
 
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
 //---------------------------------------------------------------------------------------------------------------
-set_editor('supplier', 'supplier_id' , 'reference');
 
 if (isset($_GET['AddedID'])) 
 {
        $invoice_no = $_GET['AddedID'];
-       $trans_type = 21;
+       $trans_type = ST_SUPPCREDIT;
 
 
     echo "<center>";
@@ -99,8 +97,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."));
@@ -139,7 +136,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())
        {
@@ -148,21 +145,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');
@@ -320,8 +317,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);
@@ -329,8 +324,6 @@ else {
        div_start('inv_tot');
        invoice_totals($_SESSION['supp_trans']);
        div_end();
-
-       end_outer_table(0, false);
 }
 
 if ($id != -1)