X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=26309baa2a8cef38189f1f909eb5d64a59cbb079;hb=c6cc437046ac85f9171f5c7c9184cf25368d9391;hp=1a17092dfeb9cc67d17dc3ce9ae414b9b9f3d705;hpb=9dc10cd2d4d1bceb549171976dfd7e0b4187a72b;p=fa-stable.git

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 1a17092d..26309baa 100644
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -47,13 +47,18 @@ function can_process()
 	}
 
 	$grn_act = get_company_pref('grn_clearing_act');
-	if (get_post('grn_clearing_act') != $grn_act && db_num_rows(get_grn_items(0, '', true)))
+	if ((get_post('grn_clearing_act') != $grn_act) && db_num_rows(get_grn_items(0, '', true)))
 	{
-		display_error(_("Before GRN Clearing Account can be changed all GRNs have to be invoiced").' '.$n);
+		display_error(_("Before GRN Clearing Account can be changed all GRNs have to be invoiced"));
 		$_POST['grn_clearing_act'] = $grn_act;
 		set_focus('grn_clearing_account');
 		return false;
 	}
+	if (!is_account_balancesheet(get_post('retained_earnings_act')) || is_account_balancesheet(get_post('profit_loss_year_act')))
+	{
+		display_error(_("The Retained Earnings Account should be a Balance Account or the Profit and Loss Year Account should be an Expense Account (preferred the last one in the Expense Class)"));
+		return false;
+	}
 	return true;
 }
 
@@ -84,7 +89,7 @@ start_outer_table(TABLESTYLE2);
 
 table_section(1);
 
-if (get_company_pref('grn_clearing_act') === null) { // available form 2.3.1, can be not defined on pre-2.4 installations
+if (get_company_pref('grn_clearing_act') === null) { // available from 2.3.1, can be not defined on pre-2.4 installations
 	set_company_pref('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, 0);
 	refresh_sys_prefs();
 }