0024651: Wrong Balance Sheet is obtained when previous year is not closed

diff --git a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql
@@ -224,8 +224,9 @@
       <Sql><![CDATA[
         SELECT CASE WHEN C.CLOSE_FACT_ACCT_GROUP_ID IS NULL THEN 'N' ELSE 'Y' END || SELECTED.C_YEAR_ID AS ID,
           C_YEAR.YEAR AS NAME
-        FROM C_PERIOD PREVIOUS LEFT JOIN AD_ORG_CLOSING C ON C.C_YEAR_ID = PREVIOUS.C_YEAR_ID, C_PERIOD SELECTED, C_YEAR,
-          AD_ORG_ACCTSCHEMA OAS
+        FROM C_PERIOD PREVIOUS LEFT JOIN AD_ORG_CLOSING C ON C.C_YEAR_ID = PREVIOUS.C_YEAR_ID
+                               LEFT JOIN AD_ORG_ACCTSCHEMA OAS ON C.AD_ORG_ACCTSCHEMA_ID = OAS.AD_ORG_ACCTSCHEMA_ID,
+          C_PERIOD SELECTED, C_YEAR
         WHERE PREVIOUS.AD_CLIENT_ID = ?
           AND SELECTED.AD_CLIENT_ID = ?
           AND SELECTED.ISACTIVE = 'Y'
@@ -240,7 +241,7 @@
           )
           AND C_YEAR.C_YEAR_ID = SELECTED.C_YEAR_ID
           AND C.AD_ORG_ACCTSCHEMA_ID = OAS.AD_ORG_ACCTSCHEMA_ID
-          AND OAS.C_ACCTSCHEMA_ID = ?
+          AND (OAS.C_ACCTSCHEMA_ID = ? OR OAS.C_ACCTSCHEMA_ID IS NULL)
         UNION
         SELECT 'M'||Y.C_YEAR_ID AS ID, Y.YEAR AS NAME
         FROM C_PERIOD P, C_YEAR Y

diff --git a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java
@@ -21,9 +21,11 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.servlet.ServletException;
@@ -304,7 +306,7 @@
 
   private String getYearsToClose(Date startingDate, String strOrg, Calendar calendar,
       String strcAcctSchemaId, boolean isYearRef) {
-    Set<Year> previousYears = getOrderedPreviousYears(startingDate, calendar);
+    List<Year> previousYears = getOrderedPreviousYears(startingDate, calendar);
     Set<String> notClosedYears = new HashSet<String>();
     for (Year previousYear : previousYears) {
       for (Organization org : getCalendarOwnerOrgs(strOrg)) {
@@ -351,9 +353,9 @@
     }
   }
 
-  private Set<Year> getOrderedPreviousYears(Date startingDate, Calendar calendar) {
+  private List<Year> getOrderedPreviousYears(Date startingDate, Calendar calendar) {
     final StringBuilder hqlString = new StringBuilder();
-    Set<Year> result = new HashSet<Year>();
+    List<Year> result = new ArrayList<Year>();
     hqlString.append("select y");
     hqlString.append(" from FinancialMgmtYear y, FinancialMgmtPeriod as p");
     hqlString
@@ -364,7 +366,9 @@
     query.setParameter("calendar", calendar);
     for (Object resultObject : query.list()) {
       final Year previousYear = (Year) resultObject;
-      result.add(previousYear);
+      if (!result.contains(previousYear)) {
+        result.add(previousYear);
+      }
     }
     return result;
   }