Removed unused GL account settings

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index 5108f3aa4049905ae02531af1d676e983b9f4965..e288e1aaa26b186380c24fbd6874056b9ab08d04 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -1,9 +1,8 @@
 <?php
 
 
-function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act, $grn_act,
-               $exchange_diff_act, $purch_exchange_diff_act,
-               $retained_earnings_act, $freight_act,
+function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act, 
+               $freight_act,
                $default_sales_act,
                $default_sales_discount_act,
                $default_prompt_payment_act,
@@ -12,7 +11,6 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
                $default_adj_act,
                $default_inv_sales_act,
                $default_assembly_act,
-               $payroll_act,
                $allow_negative_stock,
                $po_over_receive,
                $po_over_charge,
@@ -23,10 +21,7 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
 {
        $sql = "UPDATE ".TB_PREF."company SET
                debtors_act=".db_escape($debtors_act).", pyt_discount_act=".db_escape($pyt_discount_act).",
-               creditors_act=".db_escape($creditors_act).", grn_act=".db_escape($grn_act).",
-               exchange_diff_act=".db_escape($exchange_diff_act).",
-               purch_exchange_diff_act=".db_escape($purch_exchange_diff_act).",
-               retained_earnings_act=".db_escape($retained_earnings_act).",
+               creditors_act=".db_escape($creditors_act).",
                freight_act=".db_escape($freight_act).",
                default_sales_act=".db_escape($default_sales_act).",
                default_sales_discount_act=".db_escape($default_sales_discount_act).",
@@ -36,7 +31,6 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
                default_adj_act=".db_escape($default_adj_act).",
                default_inv_sales_act=".db_escape($default_inv_sales_act).",
                default_assembly_act=".db_escape($default_assembly_act).",
-               payroll_act=".db_escape($payroll_act).",
                allow_negative_stock=$allow_negative_stock,
                po_over_receive=$po_over_receive,
                po_over_charge=$po_over_charge,

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index df1f3df88849555ecfe8f6affdbff136ced009a4..363c1bd2f41f7d0ab77cda2b1c9d65a9bcd8945f 100644 (file)
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -14,7 +14,7 @@ check_db_has_gl_account_groups(_("There are no account groups defined. Please de
 
 //-------------------------------------------------------------------------------------
 
-if (isset($_POST['Select'])) 
+if (isset($_POST['_AccountList_update'])) 
 {
        $_POST['selected_account'] = $_POST['AccountList'];
 }
@@ -60,11 +60,19 @@ if (isset($_POST['add']) || isset($_POST['update']))
        {
                if ($accounts_alpha == 2)
                        $_POST['account_code'] = strtoupper($_POST['account_code']);
-       if ($selected_account)
-               update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']);                 
-       else
+       if ($selected_account) 
+               {
+               update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']);
+                       display_notification(_("Account data has been updated."));
+               }
+       else 
+               {
                add_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']);
-               meta_forward($_SERVER['PHP_SELF']);     
+                       $selected_account = $_POST['AccountList'] = $_POST['account_code'];
+                       display_notification(_("New account has been added."));
+                       $Ajax->activate('_page_body');
+               }
+
        }
 } 
 
@@ -87,10 +95,6 @@ function can_delete($selected_account)
        $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act='$selected_account' 
                OR pyt_discount_act='$selected_account' 
                OR creditors_act='$selected_account' 
-               OR grn_act='$selected_account' 
-               OR exchange_diff_act='$selected_account' 
-               OR purch_exchange_diff_act='$selected_account' 
-               OR retained_earnings_act='$selected_account'
                OR freight_act='$selected_account'
                OR default_sales_act='$selected_account' 
                OR default_sales_discount_act='$selected_account'
@@ -99,8 +103,7 @@ function can_delete($selected_account)
                OR default_cogs_act='$selected_account'
                OR default_adj_act='$selected_account'
                OR default_inv_sales_act='$selected_account'
-               OR default_assembly_act='$selected_account'
-               OR payroll_act='$selected_account'";
+               OR default_assembly_act='$selected_account'";
        $result = db_query($sql,"Couldn't test for default company GL codes");
 
        $myrow = db_fetch_row($result);
@@ -182,7 +185,9 @@ if (isset($_POST['delete']))
        if (can_delete($selected_account))
        {
                delete_gl_account($selected_account);
-               meta_forward($_SERVER['PHP_SELF']);             
+               $selected_account = $_POST['account_code'] = $_POST['AccountList'] = '';
+               display_notification("Selected account has been deleted");
+               $Ajax->activate('_page_body');
        }
 } 
 
@@ -194,15 +199,12 @@ if (db_has_gl_accounts())
 {
        echo "<center>";
     echo _("Select an Account:") . "&nbsp;";
-    gl_all_accounts_list('AccountList', null);
-    echo "&nbsp;";
-    submit('Select', _("Edit Account"));
+    gl_all_accounts_list('AccountList', null, false, false, false,
+               _('New account'), true);
     echo "</center>";
-} 
+}
        
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Account"));
 br(1);
-
 start_table($table_style2);
 
 if ($selected_account != "") 
@@ -217,12 +219,14 @@ if ($selected_account != "")
        $_POST['tax_code'] = $myrow["tax_code"];
 
        hidden('account_code', $_POST['account_code']);
-       hidden('selected_account', $_POST['selected_account']);
+       hidden('selected_account', $selected_account);
                
        label_row(_("Account Code:"), $_POST['account_code']);
 } 
 else 
 {
+       $_POST['account_code'] = $_POST['account_code2'] = '';
+       $_POST['account_name']  = $_POST['account_type'] = $_POST['tax_code'] = '';
        text_row_ex(_("Account Code:"), 'account_code', 11);
 }
 
@@ -238,14 +242,13 @@ end_table(1);
 
 if ($selected_account == "") 
 {
-       submit_center('add', _("Add Account"));
+       submit_center('add', _("Add Account"), true, '', true);
 } 
 else 
 {
-    submit_center_first('update', _("Update Account"));
-    submit_center_last('delete', _("Delete account"));
+    submit_center_first('update', _("Update Account"), '', true);
+    submit_center_last('delete', _("Delete account"), '',true);
 }
-
 end_form();
 
 end_page();