X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=c78becaa1605fd725238840aeddb6cec4bcd915e;hb=ce80130dd1e2226e9d1efd57611f0c34af2eea95;hp=df1f3df88849555ecfe8f6affdbff136ced009a4;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index df1f3df8..c78becaa 100644
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 10;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
@@ -14,7 +23,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 +69,23 @@ 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
-    		add_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']);
-		meta_forward($_SERVER['PHP_SELF']);    	
+    	if ($selected_account) 
+		{
+    		update_gl_account($_POST['account_code'], $_POST['account_name'], 
+				$_POST['account_type'], $_POST['account_code2']);
+			update_record_status($_POST['account_code'], $_POST['inactive'],
+				'chart_master', 'account_code');
+			$Ajax->activate('account_code'); // in case of status change
+			display_notification(_("Account data has been updated."));
+		}
+    	else 
+		{
+    		add_gl_account($_POST['account_code'], $_POST['account_name'], 
+				$_POST['account_type'], $_POST['account_code2']);
+			$selected_account = $_POST['AccountList'] = $_POST['account_code'];
+			display_notification(_("New account has been added."));
+		}
+		$Ajax->activate('_page_body');
 	}
 } 
 
@@ -87,10 +108,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 +116,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 +198,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');
 	}
 } 
 
@@ -192,17 +210,20 @@ start_form();
 
 if (db_has_gl_accounts()) 
 {
-	echo "<center>";
-    echo _("Select an Account:") . "&nbsp;";
-    gl_all_accounts_list('AccountList', null);
-    echo "&nbsp;";
-    submit('Select', _("Edit Account"));
-    echo "</center>";
-} 
+	start_table("class = 'tablestyle_noborder'");
+	start_row();
+    gl_all_accounts_list_cells(null, 'AccountList', null, false, false,
+		_('New account'), true, check_value('show_inactive'));
+	check_cells(_("Show inactive:"), 'show_inactive', null, true);
+	end_row();
+	end_table();
+	if (get_post('_show_inactive_update')) {
+		$Ajax->activate('AccountList');
+		set_focus('AccountList');
+	}
+}
 	
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Account"));
 br(1);
-
 start_table($table_style2);
 
 if ($selected_account != "") 
@@ -214,15 +235,18 @@ if ($selected_account != "")
 	$_POST['account_code2'] = $myrow["account_code2"];
 	$_POST['account_name']	= $myrow["account_name"];
 	$_POST['account_type'] = $myrow["account_type"];
-	$_POST['tax_code'] = $myrow["tax_code"];
+ 	$_POST['inactive'] = $myrow["inactive"];
 
 	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['inactive'] = 0;
 	text_row_ex(_("Account Code:"), 'account_code', 11);
 }
 
@@ -232,20 +256,18 @@ text_row_ex(_("Account Name:"), 'account_name', 60);
 
 gl_account_types_list_row(_("Account Group:"), 'account_type', null);
 
-tax_types_list_row(_("Tax Type:"), 'tax_code', null, _('No Tax'));
-
+record_status_list_row(_("Account status:"), 'inactive');
 end_table(1);
 
 if ($selected_account == "") 
 {
-	submit_center('add', _("Add Account"));
+	submit_center('add', _("Add Account"), true, '', 'default');
 } 
 else 
 {
-    submit_center_first('update', _("Update Account"));
-    submit_center_last('delete', _("Delete account"));
+    submit_center_first('update', _("Update Account"), '', 'default');
+    submit_center_last('delete', _("Delete account"), '',true);
 }
-
 end_form();
 
 end_page();