Merged last changes from stable.

[fa-stable.git] / admin / gl_setup.php

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index d3c487768c5572c5f9308b04e23a58f865b25f27..79cda9b9911aaabbdc52770a66f8f1ef9c65dcda 100644 (file)
--- 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',0) != $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"));
                $_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;
 }