X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=f3e5bc95fb759afdf7270734c5ac95d0eb444b09;hb=95303d7b5280820af76ddbd8908b120813f1e763;hp=9867f3f15cbad44eedd415ca4396d6d663e55df6;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 9867f3f1..f3e5bc95 100644
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 10;
 $path_to_root="../..";
@@ -71,12 +71,17 @@ if (isset($_POST['add']) || isset($_POST['update']))
 			$_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']);
+    		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'], $_POST['tax_code']);
+    		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."));
 		}
@@ -182,6 +187,17 @@ function can_delete($selected_account)
 		return false;
 	}									
 	
+	$sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE 
+		dest_id='$selected_account' AND UPPER(LEFT(action, 1)) <> 'T'";
+	$result = db_query($sql,"Couldn't test for existing suppliers GL codes");
+
+	$myrow = db_fetch_row($result);
+	if ($myrow[0] > 0) 
+	{
+		display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines."));
+		return false;
+	}									
+
 	return true;
 }
 
@@ -205,11 +221,17 @@ start_form();
 
 if (db_has_gl_accounts()) 
 {
-	echo "<center>";
-    echo _("Select an Account:") . "&nbsp;";
-    gl_all_accounts_list('AccountList', null, false, false,
-		_('New account'), true);
-    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');
+	}
 }
 	
 br(1);
@@ -224,7 +246,7 @@ 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', $selected_account);
@@ -234,7 +256,8 @@ if ($selected_account != "")
 else 
 {
 	$_POST['account_code'] = $_POST['account_code2'] = '';
-	$_POST['account_name']	= $_POST['account_type'] = $_POST['tax_code'] = '';
+	$_POST['account_name']	= $_POST['account_type'] = '';
+ 	$_POST['inactive'] = 0;
 	text_row_ex(_("Account Code:"), 'account_code', 11);
 }
 
@@ -244,17 +267,16 @@ 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"), true, '', true);
+	submit_center('add', _("Add Account"), true, '', 'default');
 } 
 else 
 {
-    submit_center_first('update', _("Update Account"), '', true);
+    submit_center_first('update', _("Update Account"), '', 'default');
     submit_center_last('delete', _("Delete account"), '',true);
 }
 end_form();