CI: promote changesets from pi to main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 30 Nov 2010 16:51:24 +0000
changeset 9053 7c27b4b566df
parent 9008 0279bfc8648f (current diff)
parent 9052 0bd66b4ea209 (diff)
child 9054 93384d9aa3c9
CI: promote changesets from pi to main
src-db/database/sourcedata/AD_MODULE.xml
src/build.xml
--- a/src-core/src/org/openbravo/base/HttpBaseServlet.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-core/src/org/openbravo/base/HttpBaseServlet.java	Tue Nov 30 16:51:24 2010 +0000
@@ -388,7 +388,7 @@
    * @param strSql
    *          The SQL statement to prepare.
    * @return PreparedStatement object with the strSql prepared.
-   * @throws Exception
+   * @throws SQLException
    */
   public PreparedStatement getPreparedStatement(Connection conn, String strSql) throws SQLException {
     return (myPool.getPreparedStatement(conn, strSql));
@@ -438,7 +438,7 @@
    * conn provided.
    * 
    * @return Prepared Statement object requested.
-   * @throws Exception
+   * @throws SQLException
    */
   public Statement getStatement(Connection conn) throws SQLException {
     return (myPool.getStatement(conn));
@@ -662,8 +662,6 @@
    * Renders a PDF directly into a HttpServletResponse. <b>NOTE:</b> If you use this method the
    * 'loading' pop-up window will not be closed.
    * 
-   * @param strFo
-   * @param out
    * @throws ServletException
    */
   protected void renderFO(String strFo, HttpServletResponse response) throws ServletException {
--- a/src-core/src/org/openbravo/buildvalidation/BuildValidation.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-core/src/org/openbravo/buildvalidation/BuildValidation.java	Tue Nov 30 16:51:24 2010 +0000
@@ -37,7 +37,7 @@
    * provided, the build will stop, and the messages will be shown to the user. If an empty list is
    * provided, the validation will be considered succesful, and the build will continue
    * 
-   * @Return A list of error Strings
+   * @return A list of error Strings
    */
   public abstract List<String> execute();
 
Binary file src-db/database/lib/dbsourcemanager.jar has changed
--- a/src-db/database/model/excludeFilter.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/model/excludeFilter.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -68,4 +68,5 @@
     <excludedFunction name="AD_GET_DOC_LE_BU"/>
     <excludedFunction name="AD_GET_RDBMS"/>
     <excludedFunction name="AD_CREATE_AUDIT_TRIGGERS"/>
+    <excludedFunction name="TEMP_FINDINARRAY"/>
   </vector>
--- a/src-db/database/model/functions/AD_TAB_COPY.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/model/functions/AD_TAB_COPY.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -95,8 +95,8 @@
           IsCentrallyMaintained, AD_Column_ID, AD_FieldGroup_ID, ISDISPLAYED,
           DISPLAYLOGIC, DISPLAYLENGTH, ISREADONLY,
           SEQNO, SORTNO, ISSAMELINE,
-          ISFIELDONLY, ISENCRYPTED, AD_MODULE_ID,
-          grid_SeqNo
+          ISFIELDONLY, ISENCRYPTED, AD_MODULE_ID, 
+          ShowInRelation, Grid_Seqno
         )
         VALUES
         (v_NextNo, v_Record_ID, Cur_Fields.AD_Client_ID, Cur_Fields.AD_Org_ID,
@@ -106,7 +106,7 @@
         Cur_Fields.DISPLAYLOGIC, Cur_Fields.DISPLAYLENGTH, Cur_Fields.ISREADONLY,
         Cur_Fields.SEQNO, Cur_Fields.SORTNO, Cur_Fields.ISSAMELINE, 
         Cur_Fields.ISFIELDONLY, Cur_Fields.ISENCRYPTED, v_AD_Module_ID,
-        Cur_Fields.grid_SeqNo) ;
+        Cur_Fields.ShowInRelation, Cur_Fields.Grid_Seqno) ;
       -- update translation
       UPDATE AD_Field_Trl
         SET Name=
--- a/src-db/database/model/functions/AD_WINDOW_COPY.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/model/functions/AD_WINDOW_COPY.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -149,14 +149,14 @@
             AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, UpdatedBy,
             Name, Description, Help, IsCentrallyMaintained, AD_Column_ID, AD_FieldGroup_ID,
             ISDISPLAYED, DISPLAYLOGIC, DISPLAYLENGTH, ISREADONLY, SEQNO, SORTNO,
-            ISSAMELINE, ISFIELDONLY, ISENCRYPTED, AD_Module_ID
+            ISSAMELINE, ISFIELDONLY, ISENCRYPTED, AD_Module_ID, ShowInRelation, Grid_Seqno
           )
           SELECT
             v_NextNo_F, v_NextNo_T,
             Cur_Fields.AD_Client_ID, Cur_Fields.AD_Org_ID, Cur_Fields.IsActive, now(), '0', now(), '0',
             coalesce(sub.name, Cur_Fields.Name), coalesce(sub.description, Cur_Fields.Description), coalesce(sub.help, Cur_Fields.Help), Cur_Fields.IsCentrallyMaintained, Cur_Fields.AD_Column_ID, Cur_Fields.AD_FieldGroup_ID,
             Cur_Fields.ISDISPLAYED, Cur_Fields.DISPLAYLOGIC, Cur_Fields.DISPLAYLENGTH, Cur_Fields.ISREADONLY, Cur_Fields.SEQNO, Cur_Fields.SORTNO,
-            Cur_Fields.ISSAMELINE, Cur_Fields.ISFIELDONLY, Cur_Fields.ISENCRYPTED, v_AD_Module_ID
+            Cur_Fields.ISSAMELINE, Cur_Fields.ISFIELDONLY, Cur_Fields.ISENCRYPTED, v_AD_Module_ID, Cur_Fields.ShowInRelation, Cur_Fields.Grid_Seqno
           FROM ad_field s left join 
         (select * from AD_field_trl where ad_language=ad_language_target and ad_field_id=Cur_Fields.ad_field_id ) sub
          on sub.ad_field_id=s.ad_field_id where s.ad_field_id=Cur_Fields.ad_field_id;
--- a/src-db/database/model/functions/C_PERIOD_PROCESS.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/model/functions/C_PERIOD_PROCESS.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -127,14 +127,22 @@
         
         -- Action: Close if not permanently closed
       ELSIF(p_PeriodAction='C') THEN
-        SELECT COUNT(DISTINCT C_YEAR.YEAR) INTO v_Count FROM C_PERIOD, C_PERIODCONTROL, C_YEAR WHERE
-          C_PERIODCONTROL.C_PERIOD_ID=C_PERIOD.C_PERIOD_ID AND C_PERIOD.C_YEAR_ID=C_YEAR.C_YEAR_ID AND C_PERIODCONTROL.PERIODSTATUS IN ('N','O') AND C_YEAR.YEAR<p_YearName
-          AND C_PERIODCONTROL.AD_CLIENT_ID = v_AD_Client_ID AND C_YEAR.C_CALENDAR_ID = p_Calendar;
-        IF (v_Count>=1) THEN
-          RAISE_APPLICATION_ERROR(-20000, '@YearNotClose@');
-        END IF;
         IF (p_IsRecursive='Y') THEN
-         FOR Cur_Document IN
+          SELECT COUNT(DISTINCT C_YEAR.YEAR) INTO v_Count
+          FROM C_PERIOD, C_PERIODCONTROL, C_YEAR
+          WHERE C_PERIODCONTROL.C_PERIOD_ID=C_PERIOD.C_PERIOD_ID
+            AND C_PERIOD.C_YEAR_ID=C_YEAR.C_YEAR_ID
+            AND C_PERIODCONTROL.AD_Org_ID IN (SELECT AD_Org_ID
+                                              FROM AD_Org 
+                                              WHERE AD_ISORGINCLUDED(ad_org.ad_org_id, p_Organization, ad_org.ad_client_id)<>-1)
+            AND C_PERIODCONTROL.PERIODSTATUS IN ('N','O')
+            AND C_YEAR.YEAR<p_YearName
+            AND C_PERIODCONTROL.AD_CLIENT_ID = v_AD_Client_ID
+            AND C_YEAR.C_CALENDAR_ID = p_Calendar;
+          IF (v_Count>=1) THEN
+            RAISE_APPLICATION_ERROR(-20000, '@YearNotClose@');
+          END IF;
+          FOR Cur_Document IN
             (SELECT C_PERIODCONTROL_ID
               FROM C_PERIODCONTROL, C_PERIOD 
               WHERE C_PERIODCONTROL.C_PERIOD_ID=C_PERIOD.C_PERIOD_ID 
@@ -153,6 +161,18 @@
               AND PeriodStatus<>'P';
           END LOOP;
        ELSIF (p_IsRecursive='N') THEN
+         SELECT COUNT(DISTINCT C_YEAR.YEAR) INTO v_Count
+         FROM C_PERIOD, C_PERIODCONTROL, C_YEAR
+         WHERE C_PERIODCONTROL.C_PERIOD_ID=C_PERIOD.C_PERIOD_ID
+           AND C_PERIOD.C_YEAR_ID=C_YEAR.C_YEAR_ID
+           AND C_PERIODCONTROL.AD_Org_ID=p_Organization
+           AND C_PERIODCONTROL.PERIODSTATUS IN ('N','O')
+           AND C_YEAR.YEAR<p_YearName
+           AND C_PERIODCONTROL.AD_CLIENT_ID = v_AD_Client_ID
+           AND C_YEAR.C_CALENDAR_ID = p_Calendar;
+         IF (v_Count>=1) THEN
+           RAISE_APPLICATION_ERROR(-20000, '@YearNotClose@');
+         END IF;
         FOR Cur_Document IN
             (SELECT C_PERIODCONTROL_ID
               FROM C_PERIODCONTROL, C_PERIOD 
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -22483,7 +22483,7 @@
 <!--1356-->  <SEQNO><![CDATA[2]]></SEQNO>
 <!--1356-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--1356-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1356-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1356-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--1356-->  <AD_ELEMENT_ID><![CDATA[469]]></AD_ELEMENT_ID>
 <!--1356-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--1356-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -29506,7 +29506,7 @@
 <!--2010-->  <SEQNO><![CDATA[1]]></SEQNO>
 <!--2010-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2010-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2010-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2010-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--2010-->  <AD_ELEMENT_ID><![CDATA[620]]></AD_ELEMENT_ID>
 <!--2010-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2010-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -165604,6 +165604,7 @@
 <!--800263-->  <AD_TABLE_ID><![CDATA[800015]]></AD_TABLE_ID>
 <!--800263-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
 <!--800263-->  <AD_REFERENCE_VALUE_ID><![CDATA[182]]></AD_REFERENCE_VALUE_ID>
+<!--800263-->  <AD_VAL_RULE_ID><![CDATA[77943B6C53574ACFA45DFC4DA4396B18]]></AD_VAL_RULE_ID>
 <!--800263-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
 <!--800263-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--800263-->  <ISPARENT><![CDATA[N]]></ISPARENT>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -81583,7 +81583,7 @@
 <!--6557-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6557-->  <AD_TAB_ID><![CDATA[317]]></AD_TAB_ID>
 <!--6557-->  <AD_COLUMN_ID><![CDATA[8555]]></AD_COLUMN_ID>
-<!--6557-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6557-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--6557-->  <DISPLAYLOGIC><![CDATA[@IsBOM@='Y']]></DISPLAYLOGIC>
 <!--6557-->  <DISPLAYLENGTH><![CDATA[21]]></DISPLAYLENGTH>
 <!--6557-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -175223,7 +175223,7 @@
 <!--1002100197-->  <AD_TAB_ID><![CDATA[1002100011]]></AD_TAB_ID>
 <!--1002100197-->  <AD_COLUMN_ID><![CDATA[1002100056]]></AD_COLUMN_ID>
 <!--1002100197-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1002100197-->  <DISPLAYLOGIC><![CDATA[@FinancialManagement@='' & @FinancialManagementDep@='N']]></DISPLAYLOGIC>
+<!--1002100197-->  <DISPLAYLOGIC><![CDATA[@FinancialManagement@='']]></DISPLAYLOGIC>
 <!--1002100197-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--1002100197-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--1002100197-->  <SEQNO><![CDATA[60]]></SEQNO>
@@ -181535,9 +181535,9 @@
 <!--090122697F994BE696E9F947FFF34E3C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--090122697F994BE696E9F947FFF34E3C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--090122697F994BE696E9F947FFF34E3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--090122697F994BE696E9F947FFF34E3C-->  <NAME><![CDATA[Upon Clearing Use]]></NAME>
-<!--090122697F994BE696E9F947FFF34E3C-->  <DESCRIPTION><![CDATA[Account used upon clearing]]></DESCRIPTION>
-<!--090122697F994BE696E9F947FFF34E3C-->  <HELP><![CDATA[Account used upon clearing]]></HELP>
+<!--090122697F994BE696E9F947FFF34E3C-->  <NAME><![CDATA[Upon Reconciliation Use]]></NAME>
+<!--090122697F994BE696E9F947FFF34E3C-->  <DESCRIPTION><![CDATA[Account used upon reconciliation]]></DESCRIPTION>
+<!--090122697F994BE696E9F947FFF34E3C-->  <HELP><![CDATA[Account used upon reconciliation]]></HELP>
 <!--090122697F994BE696E9F947FFF34E3C-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--090122697F994BE696E9F947FFF34E3C-->  <AD_TAB_ID><![CDATA[A4A463FA34F946BFA3F687DC8754ED93]]></AD_TAB_ID>
 <!--090122697F994BE696E9F947FFF34E3C-->  <AD_COLUMN_ID><![CDATA[6232620C6944460782633F4AC7A27FCF]]></AD_COLUMN_ID>
@@ -194668,9 +194668,9 @@
 <!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <NAME><![CDATA[Upon Clearing Use]]></NAME>
-<!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <DESCRIPTION><![CDATA[Account used upon clearing]]></DESCRIPTION>
-<!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <HELP><![CDATA[Account used upon clearing]]></HELP>
+<!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <NAME><![CDATA[Upon Reconciliation Use]]></NAME>
+<!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <DESCRIPTION><![CDATA[Account used upon reconciliation]]></DESCRIPTION>
+<!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <HELP><![CDATA[Account used upon reconciliation]]></HELP>
 <!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <AD_TAB_ID><![CDATA[01F5E95D71544D428E1B9004B05D0298]]></AD_TAB_ID>
 <!--7526828ADF604AFC9E1BD0DACDCA1F5B-->  <AD_COLUMN_ID><![CDATA[FAA1FEF24A804354AF4FA092F219E375]]></AD_COLUMN_ID>
@@ -199627,9 +199627,9 @@
 <!--83016B158D074FEBAF1DF77BDFBA1166-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--83016B158D074FEBAF1DF77BDFBA1166-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--83016B158D074FEBAF1DF77BDFBA1166-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--83016B158D074FEBAF1DF77BDFBA1166-->  <NAME><![CDATA[Upon Clearing Use]]></NAME>
-<!--83016B158D074FEBAF1DF77BDFBA1166-->  <DESCRIPTION><![CDATA[Account to be used upon clearing]]></DESCRIPTION>
-<!--83016B158D074FEBAF1DF77BDFBA1166-->  <HELP><![CDATA[Account to be used upon clearing]]></HELP>
+<!--83016B158D074FEBAF1DF77BDFBA1166-->  <NAME><![CDATA[Upon Reconciliation Use]]></NAME>
+<!--83016B158D074FEBAF1DF77BDFBA1166-->  <DESCRIPTION><![CDATA[Account to be used upon reconciliation]]></DESCRIPTION>
+<!--83016B158D074FEBAF1DF77BDFBA1166-->  <HELP><![CDATA[Account to be used upon reconciliation]]></HELP>
 <!--83016B158D074FEBAF1DF77BDFBA1166-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--83016B158D074FEBAF1DF77BDFBA1166-->  <AD_TAB_ID><![CDATA[01F5E95D71544D428E1B9004B05D0298]]></AD_TAB_ID>
 <!--83016B158D074FEBAF1DF77BDFBA1166-->  <AD_COLUMN_ID><![CDATA[32AF02680D2A41278003636782F70471]]></AD_COLUMN_ID>
@@ -205916,9 +205916,9 @@
 <!--DAD73C2515B6410593C6FF1BD479FEF1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--DAD73C2515B6410593C6FF1BD479FEF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--DAD73C2515B6410593C6FF1BD479FEF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DAD73C2515B6410593C6FF1BD479FEF1-->  <NAME><![CDATA[Upon Clearing Use]]></NAME>
-<!--DAD73C2515B6410593C6FF1BD479FEF1-->  <DESCRIPTION><![CDATA[Account to be used upon clearing]]></DESCRIPTION>
-<!--DAD73C2515B6410593C6FF1BD479FEF1-->  <HELP><![CDATA[Account to be used upon clearing]]></HELP>
+<!--DAD73C2515B6410593C6FF1BD479FEF1-->  <NAME><![CDATA[Upon Reconciliation Use]]></NAME>
+<!--DAD73C2515B6410593C6FF1BD479FEF1-->  <DESCRIPTION><![CDATA[Account to be used upon reconciliation]]></DESCRIPTION>
+<!--DAD73C2515B6410593C6FF1BD479FEF1-->  <HELP><![CDATA[Account to be used upon reconciliation]]></HELP>
 <!--DAD73C2515B6410593C6FF1BD479FEF1-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--DAD73C2515B6410593C6FF1BD479FEF1-->  <AD_TAB_ID><![CDATA[A4A463FA34F946BFA3F687DC8754ED93]]></AD_TAB_ID>
 <!--DAD73C2515B6410593C6FF1BD479FEF1-->  <AD_COLUMN_ID><![CDATA[58FC8FF6DEC14546BA58629F1872C0C3]]></AD_COLUMN_ID>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -29696,6 +29696,17 @@
 <!--0C88186ED1124004B02D0916FE06597E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0C88186ED1124004B02D0916FE06597E--></AD_MESSAGE>
 
+<!--0D275D0619E346B197FE50C2F45B6715--><AD_MESSAGE>
+<!--0D275D0619E346B197FE50C2F45B6715-->  <AD_MESSAGE_ID><![CDATA[0D275D0619E346B197FE50C2F45B6715]]></AD_MESSAGE_ID>
+<!--0D275D0619E346B197FE50C2F45B6715-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0D275D0619E346B197FE50C2F45B6715-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0D275D0619E346B197FE50C2F45B6715-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0D275D0619E346B197FE50C2F45B6715-->  <VALUE><![CDATA[WSServerNotReachable]]></VALUE>
+<!--0D275D0619E346B197FE50C2F45B6715-->  <MSGTEXT><![CDATA[Unable to contact with Web Service server]]></MSGTEXT>
+<!--0D275D0619E346B197FE50C2F45B6715-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--0D275D0619E346B197FE50C2F45B6715-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0D275D0619E346B197FE50C2F45B6715--></AD_MESSAGE>
+
 <!--0D6767953F144E638C444E0EE0C0B642--><AD_MESSAGE>
 <!--0D6767953F144E638C444E0EE0C0B642-->  <AD_MESSAGE_ID><![CDATA[0D6767953F144E638C444E0EE0C0B642]]></AD_MESSAGE_ID>
 <!--0D6767953F144E638C444E0EE0C0B642-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -31328,6 +31339,17 @@
 <!--5DDBAC99880F4F159204247F691227DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5DDBAC99880F4F159204247F691227DB--></AD_MESSAGE>
 
+<!--5EA699ECEC3749FF9AEB80E3F2799452--><AD_MESSAGE>
+<!--5EA699ECEC3749FF9AEB80E3F2799452-->  <AD_MESSAGE_ID><![CDATA[5EA699ECEC3749FF9AEB80E3F2799452]]></AD_MESSAGE_ID>
+<!--5EA699ECEC3749FF9AEB80E3F2799452-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5EA699ECEC3749FF9AEB80E3F2799452-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5EA699ECEC3749FF9AEB80E3F2799452-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5EA699ECEC3749FF9AEB80E3F2799452-->  <VALUE><![CDATA[NoProductSelected]]></VALUE>
+<!--5EA699ECEC3749FF9AEB80E3F2799452-->  <MSGTEXT><![CDATA[No product is selected]]></MSGTEXT>
+<!--5EA699ECEC3749FF9AEB80E3F2799452-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--5EA699ECEC3749FF9AEB80E3F2799452-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5EA699ECEC3749FF9AEB80E3F2799452--></AD_MESSAGE>
+
 <!--5F53F7FE0703477883226EA1287EC5BF--><AD_MESSAGE>
 <!--5F53F7FE0703477883226EA1287EC5BF-->  <AD_MESSAGE_ID><![CDATA[5F53F7FE0703477883226EA1287EC5BF]]></AD_MESSAGE_ID>
 <!--5F53F7FE0703477883226EA1287EC5BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -31374,6 +31396,17 @@
 <!--61DD25C13AC94CAF895C25FFFB7A1103-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--61DD25C13AC94CAF895C25FFFB7A1103--></AD_MESSAGE>
 
+<!--631B7EBFDD604B18B92CCF2F855602FE--><AD_MESSAGE>
+<!--631B7EBFDD604B18B92CCF2F855602FE-->  <AD_MESSAGE_ID><![CDATA[631B7EBFDD604B18B92CCF2F855602FE]]></AD_MESSAGE_ID>
+<!--631B7EBFDD604B18B92CCF2F855602FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--631B7EBFDD604B18B92CCF2F855602FE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--631B7EBFDD604B18B92CCF2F855602FE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--631B7EBFDD604B18B92CCF2F855602FE-->  <VALUE><![CDATA[NoProjectIsSelected]]></VALUE>
+<!--631B7EBFDD604B18B92CCF2F855602FE-->  <MSGTEXT><![CDATA[No project is selected]]></MSGTEXT>
+<!--631B7EBFDD604B18B92CCF2F855602FE-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--631B7EBFDD604B18B92CCF2F855602FE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--631B7EBFDD604B18B92CCF2F855602FE--></AD_MESSAGE>
+
 <!--6336B95932C2466B8EC610A10743EA43--><AD_MESSAGE>
 <!--6336B95932C2466B8EC610A10743EA43-->  <AD_MESSAGE_ID><![CDATA[6336B95932C2466B8EC610A10743EA43]]></AD_MESSAGE_ID>
 <!--6336B95932C2466B8EC610A10743EA43-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32936,6 +32969,17 @@
 <!--BDBAEDC585EA4D06BACC9E2469003E4F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--BDBAEDC585EA4D06BACC9E2469003E4F--></AD_MESSAGE>
 
+<!--BF4C881E6E67457BA335A07AE90627F5--><AD_MESSAGE>
+<!--BF4C881E6E67457BA335A07AE90627F5-->  <AD_MESSAGE_ID><![CDATA[BF4C881E6E67457BA335A07AE90627F5]]></AD_MESSAGE_ID>
+<!--BF4C881E6E67457BA335A07AE90627F5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BF4C881E6E67457BA335A07AE90627F5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BF4C881E6E67457BA335A07AE90627F5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BF4C881E6E67457BA335A07AE90627F5-->  <VALUE><![CDATA[InternetNotAvailable]]></VALUE>
+<!--BF4C881E6E67457BA335A07AE90627F5-->  <MSGTEXT><![CDATA[Internet is not available]]></MSGTEXT>
+<!--BF4C881E6E67457BA335A07AE90627F5-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--BF4C881E6E67457BA335A07AE90627F5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BF4C881E6E67457BA335A07AE90627F5--></AD_MESSAGE>
+
 <!--BF73CD95240B43239E7C8F7BD83E03D5--><AD_MESSAGE>
 <!--BF73CD95240B43239E7C8F7BD83E03D5-->  <AD_MESSAGE_ID><![CDATA[BF73CD95240B43239E7C8F7BD83E03D5]]></AD_MESSAGE_ID>
 <!--BF73CD95240B43239E7C8F7BD83E03D5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -33103,6 +33147,17 @@
 <!--C6447DF2EBEE4D7E849149DAF351BF1D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C6447DF2EBEE4D7E849149DAF351BF1D--></AD_MESSAGE>
 
+<!--C64A7803441A4E56A7CF47F35EAC0C46--><AD_MESSAGE>
+<!--C64A7803441A4E56A7CF47F35EAC0C46-->  <AD_MESSAGE_ID><![CDATA[C64A7803441A4E56A7CF47F35EAC0C46]]></AD_MESSAGE_ID>
+<!--C64A7803441A4E56A7CF47F35EAC0C46-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C64A7803441A4E56A7CF47F35EAC0C46-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C64A7803441A4E56A7CF47F35EAC0C46-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C64A7803441A4E56A7CF47F35EAC0C46-->  <VALUE><![CDATA[ScanUpdatesFailed]]></VALUE>
+<!--C64A7803441A4E56A7CF47F35EAC0C46-->  <MSGTEXT><![CDATA[Scan for updates failed]]></MSGTEXT>
+<!--C64A7803441A4E56A7CF47F35EAC0C46-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--C64A7803441A4E56A7CF47F35EAC0C46-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C64A7803441A4E56A7CF47F35EAC0C46--></AD_MESSAGE>
+
 <!--C6B53C6EC4A94F24ACBB8B3EEDF592B5--><AD_MESSAGE>
 <!--C6B53C6EC4A94F24ACBB8B3EEDF592B5-->  <AD_MESSAGE_ID><![CDATA[C6B53C6EC4A94F24ACBB8B3EEDF592B5]]></AD_MESSAGE_ID>
 <!--C6B53C6EC4A94F24ACBB8B3EEDF592B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[2.50.19005]]></VERSION>
+<!--0-->  <VERSION><![CDATA[2.50.19052]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[MP24]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0--></AD_MODULE>
 
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -21615,6 +21615,61 @@
 <!--952E92753B01AF7EE040A8C02101519C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--952E92753B01AF7EE040A8C02101519C--></AD_TEXTINTERFACES>
 
+<!--95B7CFA558F23C40E040007F01010F4F--><AD_TEXTINTERFACES>
+<!--95B7CFA558F23C40E040007F01010F4F-->  <AD_TEXTINTERFACES_ID><![CDATA[95B7CFA558F23C40E040007F01010F4F]]></AD_TEXTINTERFACES_ID>
+<!--95B7CFA558F23C40E040007F01010F4F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--95B7CFA558F23C40E040007F01010F4F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--95B7CFA558F23C40E040007F01010F4F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--95B7CFA558F23C40E040007F01010F4F-->  <TEXT><![CDATA[continued...]]></TEXT>
+<!--95B7CFA558F23C40E040007F01010F4F-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml]]></FILENAME>
+<!--95B7CFA558F23C40E040007F01010F4F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--95B7CFA558F23C40E040007F01010F4F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--95B7CFA558F23C40E040007F01010F4F--></AD_TEXTINTERFACES>
+
+<!--95B7CFA558F43C40E040007F01010F4F--><AD_TEXTINTERFACES>
+<!--95B7CFA558F43C40E040007F01010F4F-->  <AD_TEXTINTERFACES_ID><![CDATA[95B7CFA558F43C40E040007F01010F4F]]></AD_TEXTINTERFACES_ID>
+<!--95B7CFA558F43C40E040007F01010F4F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--95B7CFA558F43C40E040007F01010F4F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--95B7CFA558F43C40E040007F01010F4F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--95B7CFA558F43C40E040007F01010F4F-->  <TEXT><![CDATA[please turn over]]></TEXT>
+<!--95B7CFA558F43C40E040007F01010F4F-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml]]></FILENAME>
+<!--95B7CFA558F43C40E040007F01010F4F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--95B7CFA558F43C40E040007F01010F4F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--95B7CFA558F43C40E040007F01010F4F--></AD_TEXTINTERFACES>
+
+<!--95CA79458E3CC420E040007F01015644--><AD_TEXTINTERFACES>
+<!--95CA79458E3CC420E040007F01015644-->  <AD_TEXTINTERFACES_ID><![CDATA[95CA79458E3CC420E040007F01015644]]></AD_TEXTINTERFACES_ID>
+<!--95CA79458E3CC420E040007F01015644-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--95CA79458E3CC420E040007F01015644-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--95CA79458E3CC420E040007F01015644-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--95CA79458E3CC420E040007F01015644-->  <TEXT><![CDATA[Initial Page Number]]></TEXT>
+<!--95CA79458E3CC420E040007F01015644-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html]]></FILENAME>
+<!--95CA79458E3CC420E040007F01015644-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--95CA79458E3CC420E040007F01015644-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--95CA79458E3CC420E040007F01015644--></AD_TEXTINTERFACES>
+
+<!--95CA79458E3EC420E040007F01015644--><AD_TEXTINTERFACES>
+<!--95CA79458E3EC420E040007F01015644-->  <AD_TEXTINTERFACES_ID><![CDATA[95CA79458E3EC420E040007F01015644]]></AD_TEXTINTERFACES_ID>
+<!--95CA79458E3EC420E040007F01015644-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--95CA79458E3EC420E040007F01015644-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--95CA79458E3EC420E040007F01015644-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--95CA79458E3EC420E040007F01015644-->  <TEXT><![CDATA[Initial Page Number]]></TEXT>
+<!--95CA79458E3EC420E040007F01015644-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]></FILENAME>
+<!--95CA79458E3EC420E040007F01015644-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--95CA79458E3EC420E040007F01015644-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--95CA79458E3EC420E040007F01015644--></AD_TEXTINTERFACES>
+
+<!--95CA79458E40C420E040007F01015644--><AD_TEXTINTERFACES>
+<!--95CA79458E40C420E040007F01015644-->  <AD_TEXTINTERFACES_ID><![CDATA[95CA79458E40C420E040007F01015644]]></AD_TEXTINTERFACES_ID>
+<!--95CA79458E40C420E040007F01015644-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--95CA79458E40C420E040007F01015644-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--95CA79458E40C420E040007F01015644-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--95CA79458E40C420E040007F01015644-->  <TEXT><![CDATA[Initial Page Number]]></TEXT>
+<!--95CA79458E40C420E040007F01015644-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html]]></FILENAME>
+<!--95CA79458E40C420E040007F01015644-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--95CA79458E40C420E040007F01015644-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--95CA79458E40C420E040007F01015644--></AD_TEXTINTERFACES>
+
 <!--9F0C2175AC6145B49570E24110762368--><AD_TEXTINTERFACES>
 <!--9F0C2175AC6145B49570E24110762368-->  <AD_TEXTINTERFACES_ID><![CDATA[9F0C2175AC6145B49570E24110762368]]></AD_TEXTINTERFACES_ID>
 <!--9F0C2175AC6145B49570E24110762368-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -1422,6 +1422,17 @@
 <!--7736D1EBBD04477FB4419BC562328CC7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7736D1EBBD04477FB4419BC562328CC7--></AD_VAL_RULE>
 
+<!--77943B6C53574ACFA45DFC4DA4396B18--><AD_VAL_RULE>
+<!--77943B6C53574ACFA45DFC4DA4396B18-->  <AD_VAL_RULE_ID><![CDATA[77943B6C53574ACFA45DFC4DA4396B18]]></AD_VAL_RULE_ID>
+<!--77943B6C53574ACFA45DFC4DA4396B18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--77943B6C53574ACFA45DFC4DA4396B18-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--77943B6C53574ACFA45DFC4DA4396B18-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--77943B6C53574ACFA45DFC4DA4396B18-->  <NAME><![CDATA[C_Element_ID]]></NAME>
+<!--77943B6C53574ACFA45DFC4DA4396B18-->  <TYPE><![CDATA[S]]></TYPE>
+<!--77943B6C53574ACFA45DFC4DA4396B18-->  <CODE><![CDATA[C_Element_ID=@C_Element_ID@]]></CODE>
+<!--77943B6C53574ACFA45DFC4DA4396B18-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--77943B6C53574ACFA45DFC4DA4396B18--></AD_VAL_RULE>
+
 <!--78CBED13BC3F4BF989A90CA75BA8DFCD--><AD_VAL_RULE>
 <!--78CBED13BC3F4BF989A90CA75BA8DFCD-->  <AD_VAL_RULE_ID><![CDATA[78CBED13BC3F4BF989A90CA75BA8DFCD]]></AD_VAL_RULE_ID>
 <!--78CBED13BC3F4BF989A90CA75BA8DFCD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-util/buildvalidation/build.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-util/buildvalidation/build.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -73,7 +73,7 @@
 
   <target name="sqlcModules" depends="init" unless="checkCore">
     <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${base.modules}'/'${module}'/src-util/buildvalidation/src */src-util/buildvalidation" />
+      <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${base.modules}'/'${module}'/src-util/buildvalidation/src '${module}'/src-util/buildvalidation" />
       <classpath refid="buildvalidation.class.path" />
       <syspropertyset>
         <propertyref name="java.security.egd" />
--- a/src-util/modulescript/build.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-util/modulescript/build.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -73,7 +73,7 @@
 
   <target name="sqlcModules" depends="init" unless="checkCore">
     <java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${base.modules}'/'${module}'/src-util/modulescript/src */src-util/modulescript" />
+      <arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}' '${base.modules}'/'${module}'/src-util/modulescript/src '${module}'/src-util/modulescript" />
       <classpath refid="modulescript.class.path" />
       <syspropertyset>
         <propertyref name="java.security.egd" />
--- a/src-wad/src/org/openbravo/wad/Wad.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/Wad.java	Tue Nov 30 16:51:24 2010 +0000
@@ -55,38 +55,23 @@
  * @author Fernando Iriazabal
  */
 public class Wad extends DefaultHandler {
-  static final int NUM_COLUMNS = 10;
-  static final int COLUMN_1_OF_1 = 11;
-  static final int COLUMN_1_OF_2 = 12;
-  static final int COLUMN_2_OF_2 = 22;
-  static final int NUM_TABS = 8;
-  static final int INCR_TABS = 8;
-  static final int HEIGHT_TABS = 38;
-  static final int MAX_COL_SIZE_RELATION = 50;
-  static final int MAX_SIZE_EDITION_1_COLUMNS = 90;
-  static final int MAX_SIZE_EDITION_2_COLUMNS = 45;
-  static final int MAX_TEXTBOX_LENGTH = 110;
-  static final double PIXEL_TO_LENGTH = 5.6;
-  static final double FIRST_COLS_SIZE = 60;
-  static final double SUBTABS_COL_SIZE = 30;
-  static final double RELATION_MINIMUM_LENGTH = 15.0;
-  static final int IMAGE_RELATION_WIDTH = 16;
-  static final int IMAGE_RELATION_HEIGHT = 16;
-  static final int IMAGE_BUTTON_WIDTH = 16;
-  static final int IMAGE_BUTTON_HEIGHT = 16;
-  XmlEngine xmlEngine;
-  protected WadConnection pool;
-  String strSystemSeparator;
-  static final String calendarDescription = "Calendar";
-  static final String clockDescription = "Clock";
-  static final String calculatorDescription = "Calculator";
-  static String calendarDescriptionTrl = "";
-  static String clockDescriptionTrl = "";
-  static String calculatorDescriptionTrl = "";
-  static String jsDateFormat;
-  static String sqlDateFormat;
-
-  static Logger log4j = Logger.getLogger(Wad.class);
+  private static final int COLUMN_1_OF_1 = 11;
+  private static final int COLUMN_1_OF_2 = 12;
+  private static final int COLUMN_2_OF_2 = 22;
+  private static final int NUM_TABS = 8;
+  private static final int INCR_TABS = 8;
+  private static final int HEIGHT_TABS = 38;
+  private static final int MAX_SIZE_EDITION_1_COLUMNS = 90;
+  private static final int MAX_SIZE_EDITION_2_COLUMNS = 45;
+  private static final int MAX_TEXTBOX_LENGTH = 110;
+  private static final double PIXEL_TO_LENGTH = 5.6;
+  private XmlEngine xmlEngine;
+  private WadConnection pool;
+  private String strSystemSeparator;
+  private static String jsDateFormat;
+  private static String sqlDateFormat;
+
+  private static final Logger log4j = Logger.getLogger(Wad.class);
 
   /**
    * Main function, entrusted to launch the process of generation of sources. The list of arguments
@@ -128,13 +113,9 @@
     String dirActionButton;
     boolean generateWebXml;
     boolean generateTabs;
-    String dirBaseTrl;
-    String translateStr;
     String dirWebClients;
-    String basePath;
     String attachPath;
     String webPath;
-    String strBaseSrc;
     boolean complete;
     boolean quick;
     if (argv.length < 1) {
@@ -196,16 +177,10 @@
         dirActionButton = argv[6];
 
       // Path to base translation generation
-      if (argv.length <= 7)
-        dirBaseTrl = dirFin;
-      else
-        dirBaseTrl = argv[7];
+      // was argv[7] no longer used
 
       // Translate base structure
-      if (argv.length <= 8)
-        translateStr = "";
-      else
-        translateStr = argv[8];
+      // was argv[8] no longer used
 
       // Path to find the client's web.xml file
       if (argv.length <= 9)
@@ -214,10 +189,7 @@
         dirWebClients = argv[9];
 
       // Path of the root project
-      if (argv.length <= 10)
-        basePath = dirFin;
-      else
-        basePath = argv[10];
+      // was argv[10] no longer used
 
       // Path of the attach files
       if (argv.length <= 11)
@@ -232,10 +204,7 @@
         webPath = argv[12];
 
       // Path to the src folder
-      if (argv.length <= 13)
-        strBaseSrc = dirFin;
-      else
-        strBaseSrc = argv[13];
+      // was argv[13] no longer used
 
       // Boolean to indicate if we are doing a complete generation
       if (argv.length <= 14)
@@ -271,13 +240,9 @@
       log4j.info("generate web.xml: " + generateWebXml);
       log4j.info("generate web.xml cliente: " + dirWebClients);
       log4j.info("generate tabs: " + generateTabs);
-      log4j.info("directory Translate : " + dirBaseTrl);
-      log4j.info("translation to : " + translateStr);
       log4j.info("File separator: " + wad.strSystemSeparator);
-      log4j.info("Base path: " + basePath);
       log4j.info("Attach path: " + attachPath);
       log4j.info("Web path: " + webPath);
-      log4j.info("Src path: " + strBaseSrc);
       log4j.info("Quick mode: " + quick);
 
       final File fileFin = new File(dirFin);
@@ -325,27 +290,6 @@
         return;
       }
 
-      final File fileTrl = new File(dirBaseTrl);
-      if (!fileTrl.exists()) {
-        log4j.error("No such directory: " + fileTrl.getAbsoluteFile());
-
-        return;
-      }
-
-      final File fileBase = new File(strBaseSrc);
-      if (!fileBase.exists()) {
-        log4j.error("No such directory: " + fileBase.getAbsoluteFile());
-
-        return;
-      }
-
-      final File fileBaseAplication = new File(basePath);
-      if (!fileBaseAplication.exists()) {
-        log4j.error("No such directory: " + fileBaseAplication.getAbsoluteFile());
-
-        return;
-      }
-
       // Calculate windows to generate
       String strCurrentWindow;
       final StringTokenizer st = new StringTokenizer(strWindowName, ",", false);
@@ -416,8 +360,7 @@
             log4j.info("Processing Window: " + tabsData[i].windowname + " - Tab: "
                 + tabsData[i].tabname + " - id: " + tabsData[i].tabid);
             log4j.debug("Processing: " + tabsData[i].tabid);
-            wad.processTab(fileFin, fileFinReloads, tabsData[i], fileTrl, dirBaseTrl, translateStr,
-                fileBase, fileBaseAplication);
+            wad.processTab(fileFin, fileFinReloads, tabsData[i]);
           }
         }
       }
@@ -529,8 +472,7 @@
 
           // build the html template
           WadActionButton.buildHtml(pool, xmlEngine, fileReference, fd[i], vecFields,
-              MAX_TEXTBOX_LENGTH, MAX_SIZE_EDITION_1_COLUMNS, "", false, calendarDescription,
-              clockDescription, calculatorDescription, jsDateFormat, vecReloads);
+              MAX_TEXTBOX_LENGTH, MAX_SIZE_EDITION_1_COLUMNS, "", false, jsDateFormat, vecReloads);
         }
       }
     } catch (final ServletException e) {
@@ -679,8 +621,7 @@
 
           // build the html template
           WadActionButton.buildHtml(pool, xmlEngine, fileReference, fd[i], vecFields,
-              MAX_TEXTBOX_LENGTH, MAX_SIZE_EDITION_1_COLUMNS, "", true, calendarDescription,
-              clockDescription, calculatorDescription, jsDateFormat, vecReloads);
+              MAX_TEXTBOX_LENGTH, MAX_SIZE_EDITION_1_COLUMNS, "", true, jsDateFormat, vecReloads);
         }
       }
     } catch (final ServletException e) {
@@ -798,21 +739,9 @@
    *          Path where are gonna be created the reloads sources.
    * @param tabsData
    *          An object containing the tabs info.
-   * @param fileTrl
-   *          Path where are gonna be created the translated sources.
-   * @param dirBaseTrl
-   *          Base path of the translated sources.
-   * @param translateStr
-   *          The base package structure for the translated sources.
-   * @param fileBase
-   *          The path to the project's manual sources.
-   * @param fileBaseAplication
-   *          The path to the project root directory.
    * @throws Exception
    */
-  private void processTab(File fileFin, File fileFinReloads, TabsData tabsData, File fileTrl,
-      String dirBaseTrl, String translateStr, File fileBase, File fileBaseAplication)
-      throws Exception {
+  private void processTab(File fileFin, File fileFinReloads, TabsData tabsData) throws Exception {
     try {
       final String tabNamePresentation = tabsData.realtabname;
       // tabName contains tab's UUID for non core tabs
@@ -4279,7 +4208,7 @@
    * @param fileConnection
    *          The path to the connection file.
    */
-  public void createXmlEngine(String fileConnection) {
+  private void createXmlEngine(String fileConnection) {
     // pass null as connection to running the translation at compile time
     xmlEngine = new XmlEngine(null);
     xmlEngine.isResource = true;
@@ -4298,7 +4227,7 @@
    * @param strFileConnection
    *          Path where is allocated the connection file.
    */
-  public void createPool(String strFileConnection) {
+  private void createPool(String strFileConnection) {
     pool = new WadConnection(strFileConnection);
     WADControl.setConnection(pool);
   }
@@ -4310,7 +4239,7 @@
    *          The FieldsData object to copy.
    * @return The new copy of the given FieldsData object.
    */
-  public FieldsData copyarrayElement(FieldsData from) {
+  private FieldsData copyarrayElement(FieldsData from) {
     final FieldsData toAux = new FieldsData();
     toAux.realname = from.realname;
     toAux.name = from.name;
@@ -4359,7 +4288,7 @@
    *          The array of FieldsData objects to copy.
    * @return The copy array of FieldsData objects.
    */
-  public FieldsData[] copyarray(FieldsData[] from) {
+  private FieldsData[] copyarray(FieldsData[] from) {
     log4j.debug("Starting copyarray: " + from.length);
     if (from == null)
       return null;
@@ -4377,7 +4306,7 @@
    * @param strFileProperties
    *          The path of the property file to read.
    */
-  public void readProperties(String strFileProperties) {
+  private void readProperties(String strFileProperties) {
     // Read properties file.
     final Properties properties = new Properties();
     try {
--- a/src-wad/src/org/openbravo/wad/WadActionButton.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/WadActionButton.java	Tue Nov 30 16:51:24 2010 +0000
@@ -39,9 +39,7 @@
  * @author Fernando Iriazabal
  * 
  */
-public class WadActionButton {
-  static final int IMAGE_EDITION_WIDTH = 16;
-  static final int IMAGE_EDITION_HEIGHT = 16;
+class WadActionButton {
 
   /**
    * Generates the action button call for the java of the window.
@@ -744,12 +742,6 @@
    *          Language to translate.
    * @param isGeneric
    *          Indicates if is a generic action button or not.
-   * @param calendarDescription
-   *          String with the description for the calendar controls.
-   * @param clockDescription
-   *          String with the description for the clock controls.
-   * @param calculatorDescription
-   *          String with the description for the calc controls.
    * @param jsDateFormat
    *          Date format for js.
    * @param vecReloads
@@ -758,9 +750,8 @@
    */
   public static void buildHtml(ConnectionProvider conn, XmlEngine xmlEngine, File fileDir,
       FieldsData fd, Vector<Object> vecFields, int max_textbox_length,
-      int max_size_edition_1_columns, String strLanguage, boolean isGeneric,
-      String calendarDescription, String clockDescription, String calculatorDescription,
-      String jsDateFormat, Vector<Object> vecReloads) throws ServletException, IOException {
+      int max_size_edition_1_columns, String strLanguage, boolean isGeneric, String jsDateFormat,
+      Vector<Object> vecReloads) throws ServletException, IOException {
     final String[] discard = { "", "isGeneric", "fieldDiscardProcess", "" };
     if (fd.xmltext.equals(""))
       discard[0] = "helpDiscard";
--- a/src-wad/src/org/openbravo/wad/WadConnection.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/WadConnection.java	Tue Nov 30 16:51:24 2010 +0000
@@ -33,13 +33,12 @@
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.exception.NoConnectionAvailableException;
 
-public class WadConnection implements ConnectionProvider {
-  static Logger log4j = Logger.getLogger(WadConnection.class);
-  protected Connection myPool;
-  String defaultPoolName = "";
-  String bbdd = "";
-  String rdbms = "";
-  String contextName = "openbravo";
+class WadConnection implements ConnectionProvider {
+  private static final Logger log4j = Logger.getLogger(WadConnection.class);
+  private Connection myPool;
+  private String defaultPoolName = "";
+  private String bbdd = "";
+  private String rdbms = "";
 
   public WadConnection(String xmlPoolFile) {
     if (myPool == null) {
--- a/src-wad/src/org/openbravo/wad/WadUtility.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/WadUtility.java	Tue Nov 30 16:51:24 2010 +0000
@@ -40,14 +40,10 @@
 import org.openbravo.xmlEngine.XmlEngine;
 
 public class WadUtility {
-  static Logger log4j = Logger.getLogger(WadUtility.class);
-  static final int IMAGE_EDITION_WIDTH = 200;
-  static final int IMAGE_EDITION_HEIGHT = 200;
-  static final int IMAGE_BUTTON_WIDTH = 16;
-  static final int IMAGE_BUTTON_HEIGHT = 16;
-  static String[][] comparations = { { "==", " == " }, { "=", " == " }, { "!", " != " },
+  private static final Logger log4j = Logger.getLogger(WadUtility.class);
+  private static String[][] comparations = { { "==", " == " }, { "=", " == " }, { "!", " != " },
       { "^", " != " }, { "-", " != " } };
-  static String[][] unions = { { "|", " || " }, { "&", " && " } };
+  private static String[][] unions = { { "|", " || " }, { "&", " && " } };
 
   public WadUtility() {
     PropertyConfigurator.configure("log4j.lcf");
--- a/src-wad/src/org/openbravo/wad/WadUtility_data.xsql	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/WadUtility_data.xsql	Tue Nov 30 16:51:24 2010 +0000
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2009 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -21,21 +21,6 @@
 
 
 <SqlClass name="WadUtilityData" package="org.openbravo.wad">
-  <SqlMethod name="getTranslatedText" type="preparedStatement" return="String">
-      <SqlMethodComment>Get the translate of a text</SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT COALESCE(MAX(TO_CHAR(MT.MSGTEXT)), ?) AS TEXT 
-        FROM AD_MESSAGE M, AD_MESSAGE_TRL MT 
-        WHERE M.AD_MESSAGE_ID = MT.AD_MESSAGE_ID 
-        AND M.VALUE = ? 
-        AND MT.AD_LANGUAGE = ? 
-          ]]>
-      </Sql>
-      <Parameter name="value"/>
-      <Parameter name="value"/>
-      <Parameter name="adLanguage"/>
-  </SqlMethod>
-  
    <SqlMethod name="getReferenceClassName" type="preparedStatement" return="String">
       <Sql><![CDATA[
         SELECT COALESCE(R2.WAD_IMPL, R1.WAD_IMPL) AS TEXT
--- a/src-wad/src/org/openbravo/wad/datasource.xsqlxml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/datasource.xsqlxml	Tue Nov 30 16:51:24 2010 +0000
@@ -262,16 +262,6 @@
     <PARAMETER_TMP id="org">    &#60;Parameter name="adOrgClient" type="replace" optional="true" after="<PARAMETER_TMP id="table">table</PARAMETER_TMP>.AD_Org_ID IN (" text="'1'"/&#62;</PARAMETER_TMP>
   </SqlMethod>
 
-  <SqlMethod name="deleteTransactional" connection="true" type="preparedStatement" return="rowCount">
-    <Sql>&#60;&#33;[CDATA[
-        DELETE FROM <PARAMETER_TMP id="table">table</PARAMETER_TMP>
-        WHERE <PARAMETER_TMP id="key">key</PARAMETER_TMP> = ? 
-        <PARAMETER_TMP id="parent">         AND <PARAMETER_TMP id="keyParent">xx</PARAMETER_TMP> = ? </PARAMETER_TMP>
-    ]]&#62;</Sql>
-    <Parameter name="param1"/>
-    <PARAMETER_TMP id="parent">    <Parameter name="param1" id="paramKeyParent"/></PARAMETER_TMP>
-  </SqlMethod>
-  
   <SqlMethod name="selectOrg" type="preparedStatement" return="string">
     <SqlMethodComment>Select for relation</SqlMethodComment>
     <Sql>&#60;&#33;[CDATA[ 
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml	Tue Nov 30 16:51:24 2010 +0000
@@ -60,7 +60,6 @@
   private static final String tabId = "<PARAMETER_TMP id="tabId">Almacen</PARAMETER_TMP>";
   private static final String defaultTabView = "<PARAMETER_TMP id="defaultView">RELATION</PARAMETER_TMP>";
   private static final int accesslevel = <PARAMETER_TMP id="accessLevel">xx</PARAMETER_TMP>;
-  private static final double SUBTABS_COL_SIZE = 15;
   
   <PARAMETER_TMP id="discardService">
   @Override
@@ -374,18 +373,6 @@
           response.sendRedirect(strDireccion + request.getServletPath() + "?Command=EDIT");
         } else response.sendRedirect(strDireccion + request.getServletPath() + "?Command=RELATION");
       }
-/*    } else if (vars.commandIn("DELETE_RELATION")) {
-<PARAMETER_TMP id="parent">      String strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP> = vars.getGlobalVariable("inp<PARENT_TMP id="keyParentINP">Almacen</PARENT_TMP>", windowId + "|<PARENT_TMP id="keyParent">Almacen</PARENT_TMP>");
-</PARAMETER_TMP>
-      String str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP> = vars.getRequiredInStringParameter("inp<KEY_TMP id="keyData">PosicionAlmacen</KEY_TMP>");
-      String message = deleteRelation(vars, str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP><PARAMETER_TMP id="parent">, strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>);
-      if (!message.equals("")) {
-        bdError(request, response, message, vars.getLanguage());
-      } else {
-        vars.removeSessionValue(windowId + "|<KEY_TMP id="keyData">PosicionAlmacen</KEY_TMP>");
-        vars.setSessionValue(tabId + "|<PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>.view", "RELATION");
-        response.sendRedirect(strDireccion + request.getServletPath());
-      }*/
     } else if (vars.commandIn("DELETE")) {
 <PARAMETER_TMP id="parent">      String strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP> = vars.getGlobalVariable("inp<PARENT_TMP id="keyParentINP">Almacen</PARENT_TMP>", windowId + "|<PARENT_TMP id="keyParent">Almacen</PARENT_TMP>");
 </PARAMETER_TMP>
@@ -671,33 +658,6 @@
       pageErrorPopUp(response);
     } else pageError(response);
   }
-/*
-  String deleteRelation(VariablesSecureApp vars, String str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP><PARAMETER_TMP id="parent">, String strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>) throws IOException, ServletException {
-    log4j.debug("Deleting records");
-    Connection conn = this.getTransactionConnection();
-    try {
-      if (str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>.startsWith("(")) str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP> = str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>.substring(1, str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>.length()-1);
-      if (!str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>.equals("")) {
-        str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP> = Replace.replace(str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>, "'", "");
-        StringTokenizer st = new StringTokenizer(str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>, ",", false);
-        while (st.hasMoreTokens()) {
-          String strKey = st.nextToken();
-          if (<PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data.deleteTransactional(conn, this, strKey<PARAMETER_TMP id="parent">, strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>)==0) {
-            releaseRollbackConnection(conn);
-            log4j.warn("deleteRelation - key :" + strKey + " - 0 records deleted");
-          }
-        }
-      }
-      releaseCommitConnection(conn);
-    } catch (ServletException e) {
-      releaseRollbackConnection(conn);
-      e.printStackTrace();
-      log4j.error("Rollback in transaction");
-      return "ProcessRunError";
-    }
-    return "";
-  }
-*/
   private <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data getEditVariables(Connection con, VariablesSecureApp vars<PARAMETER_TMP id="parent">, String strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>) throws IOException,ServletException {
     <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data data = new <PARAMETER_TMP id="class">Almacen</PARAMETER_TMP>Data();
     ServletException ex = null;
@@ -1170,7 +1130,7 @@
     out.close();
   }
 
-  void printPageButtonFS(HttpServletResponse response, VariablesSecureApp vars, String strProcessId, String path) throws IOException, ServletException {
+  private void printPageButtonFS(HttpServletResponse response, VariablesSecureApp vars, String strProcessId, String path) throws IOException, ServletException {
     log4j.debug("Output: Frames action button");
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
@@ -1184,7 +1144,7 @@
     out.close();
   }
 
-<FIELDS_TMP id="sectionActionButtons2">    void printPageButton<FIELD_TMP id="ButtonRealName2">name</FIELD_TMP><FIELD_TMP id="ProcessID2">xx</FIELD_TMP>(HttpServletResponse response, VariablesSecureApp vars, String str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>, String str<FIELD_TMP id="ButtonName2">name</FIELD_TMP>, String strProcessing<FIELD_TMP id="FieldsLoadName2">, strFields</FIELD_TMP>)
+<FIELDS_TMP id="sectionActionButtons2">    private void printPageButton<FIELD_TMP id="ButtonRealName2">name</FIELD_TMP><FIELD_TMP id="ProcessID2">xx</FIELD_TMP>(HttpServletResponse response, VariablesSecureApp vars, String str<KEY_TMP id="key">PosicionAlmacen</KEY_TMP>, String str<FIELD_TMP id="ButtonName2">name</FIELD_TMP>, String strProcessing<FIELD_TMP id="FieldsLoadName2">, strFields</FIELD_TMP>)
     throws IOException, ServletException {
       log4j.debug("Output: Button process <FIELD_TMP id="ProcessID2">xx</FIELD_TMP>");
       String[] discard = {"newDiscard"};
--- a/src-wad/src/org/openbravo/wad/validation/WADValidationResult.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/validation/WADValidationResult.java	Tue Nov 30 16:51:24 2010 +0000
@@ -30,8 +30,8 @@
  * Contains information of all the warnings and errors detected during the WAD validation
  * 
  */
-public class WADValidationResult {
-  Logger log = Logger.getLogger(WADValidationResult.class);
+class WADValidationResult {
+  private static final Logger log = Logger.getLogger(WADValidationResult.class);
 
   /**
    * Types of possible WAD validations, they have an identifier and a description
@@ -80,7 +80,7 @@
    * 
    * @param validationType
    *          validation type to add the error to
-   * @param error
+   * @param warning
    *          error message
    */
   public void addError(WADValidationType validationType, String warning) {
@@ -105,7 +105,6 @@
   /**
    * Returns true in case the validation contain errors
    * 
-   * @return
    */
   public boolean hasErrors() {
     return errors.size() > 0;
--- a/src-wad/src/org/openbravo/wad/validation/WADValidator.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/validation/WADValidator.java	Tue Nov 30 16:51:24 2010 +0000
@@ -27,7 +27,7 @@
  * DAL for each compilation.
  * 
  */
-public class WADValidator {
+class WADValidator {
   private String modules;
   private ConnectionProvider conn;
   private String checkAll;
@@ -38,7 +38,7 @@
    * 
    * @param conn
    *          Database ConnectionProvider
-   * @param moduleId
+   * @param modules
    *          Module to check
    */
   public WADValidator(ConnectionProvider conn, String modules, boolean friendlyWarnings) {
--- a/src/build.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/build.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -631,6 +631,17 @@
     <antcall target="minimizeJSandCSS" inheritAll="true" inheritrefs="true" />
   </target>
     
+  
+  <target name="build.web.folder.base">
+    <mkdir dir="${base.context}/web" />
+    <copy todir="${base.context}/web" encoding="UTF-8">
+      <fileset dir="${base.modules}">
+        <include name="*/web/*/**" />
+        <exclude name="*/web/*/skins/**" />
+      </fileset>
+      <mapper type="regexp" from="(.*)(\${file.separator}web)(.*)" to="\3" />
+    </copy>
+  </target>
 
   <target name="build.web.folder.skins" if="do.skins">
 
@@ -646,13 +657,7 @@
       <fileset dir="${base.web}/skins" />
     </copy>
 
-    <copy todir="${base.context}/web" encoding="UTF-8">
-      <fileset dir="${base.modules}">
-        <include name="*/web/*/**" />
-        <exclude name="*/web/*/skins/**" />
-      </fileset>
-      <mapper type="regexp" from="(.*)(\${file.separator}web)(.*)" to="\3" />
-    </copy>
+    <antcall target="build.web.folder.base" />
 
     <copy todir="${base.context}/web/skins/ltr" encoding="UTF-8">
       <fileset dir="${base.modules}">
@@ -766,6 +771,7 @@
     <antcall inheritall="true" inheritrefs="true" target="smartbuild.no.new.wad" />
     <antcall inheritall="true" inheritrefs="true" target="compileSqlc" />
     <antcall inheritall="true" inheritrefs="true" target="postsrc" />
+    <antcall inheritall="true" inheritrefs="true" target="build.web.folder.base" />
     <antcall inheritall="true" inheritrefs="true" target="translate" />
     <antcall inheritall="true" inheritrefs="true" target="update.build.timestamp" />
   </target>
--- a/src/org/openbravo/authentication/basic/AutologonAuthenticationManager.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/authentication/basic/AutologonAuthenticationManager.java	Tue Nov 30 16:51:24 2010 +0000
@@ -43,8 +43,9 @@
 
     if (s instanceof ConnectionProvider) {
       ConnectionProvider conn = (ConnectionProvider) s;
-      m_sAutologonUsername = ConfigParameters.retrieveFrom(s.getServletContext()).getOBProperty(
-          "authentication.autologon.username");
+      m_sAutologonUsername = ConfigParameters
+          .retrieveFrom(s.getServletConfig().getServletContext()).getOBProperty(
+              "authentication.autologon.username");
       try {
         m_sUserId = AuthenticationData.getUserId(conn, m_sAutologonUsername);
       } catch (ServletException e) {
--- a/src/org/openbravo/base/model/ModelProvider.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/ModelProvider.java	Tue Nov 30 16:51:24 2010 +0000
@@ -764,7 +764,7 @@
   }
 
   /**
-   * @deprecated, use {@link ForeignKeyDomainType#getForeignKeyColumn(String)}
+   * @deprecated use {@link ForeignKeyDomainType#getForeignKeyColumn(String)}
    */
   protected Column getColumnByReference(String reference, String referenceValue,
       char validationType, String columnName) throws CheckException {
--- a/src/org/openbravo/base/model/RefList.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/RefList.java	Tue Nov 30 16:51:24 2010 +0000
@@ -59,7 +59,7 @@
   }
 
   /**
-   * @deprecated, functionality is now implemented in {@link #setReference(Reference)}
+   * @deprecated functionality is now implemented in {@link #setReference(Reference)}
    */
   public void setAllowedValue() {
   }
--- a/src/org/openbravo/base/model/Reference.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/Reference.java	Tue Nov 30 16:51:24 2010 +0000
@@ -56,15 +56,15 @@
 
   // Validation Types
   /**
-   * @deprecated, validation type is not used anymore
+   * @deprecated validation type is not used anymore
    */
   public static final char TABLE_VALIDATION = 'T';
   /**
-   * @deprecated, validation type is not used anymore
+   * @deprecated validation type is not used anymore
    */
   public static final char SEARCH_VALIDATION = 'S';
   /**
-   * @deprecated, validation type is not used anymore
+   * @deprecated validation type is not used anymore
    */
   public static final char LIST_VALIDATION = 'L';
 
--- a/src/org/openbravo/base/model/domaintype/BaseDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/BaseDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -42,26 +42,14 @@
    * 
    * Note: any subclass should clean-up and close database connections or hibernate sessions. If
    * this is not done then the update.database task may hang when disabling foreign keys.
-   * 
-   * @see org.openbravo.base.model.domaintype.DomainType#initialize(org.openbravo.base.model.ModelProvider)
    */
   public void initialize() {
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.DomainType#setReference(Reference)
-   */
   public void setReference(Reference reference) {
     this.reference = reference;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.DomainType#getReference()
-   */
   public Reference getReference() {
     return reference;
   }
@@ -70,23 +58,10 @@
     return modelProvider;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @seeorg.openbravo.base.model.domaintype.DomainType#setModelProvider(org.openbravo.base.model.
-   * ModelProvider )
-   */
   public void setModelProvider(ModelProvider modelProvider) {
     this.modelProvider = modelProvider;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.openbravo.base.model.domaintype.DomainType#checkObjectIsValid(org.openbravo.base.structure
-   * .BaseOBObjectDef, org.openbravo.base.model.Property)
-   */
   public void checkObjectIsValid(BaseOBObjectDef obObject, Property property)
       throws ValidationException {
     checkIsValidValue(property, obObject.get(property.getName()));
--- a/src/org/openbravo/base/model/domaintype/BaseEnumerateDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/BaseEnumerateDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -38,8 +38,6 @@
 
   /**
    * @return the set of enumerate values
-   * 
-   * @see org.openbravo.base.model.domaintype.DomainType#getEnumerateValues()
    */
   public Set<E> getEnumerateValues() {
     return enumerateValues;
@@ -51,19 +49,11 @@
 
   /**
    * @return class of {@link Object}.
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return Object.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.openbravo.base.model.domaintype.DomainType#checkIsValidValue(org.openbravo.base.model.Property
-   * , java.lang.Object)
-   */
   public void checkIsValidValue(Property property, Object value) throws ValidationException {
     super.checkIsValidValue(property, value);
 
--- a/src/org/openbravo/base/model/domaintype/BaseForeignKeyDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/BaseForeignKeyDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -41,7 +41,6 @@
   /**
    * @return the refered to column based on the table encoded in the table name of the passed
    *         column. This method also handles exceptional column names in a specific way.
-   * @see org.openbravo.base.model.domaintype.DomainType#getForeignKeyColumn(org.openbravo.base.model.Column)
    */
   public Column getForeignKeyColumn(String columnName) {
 
@@ -111,13 +110,6 @@
     return tableName;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * org.openbravo.base.model.domaintype.DomainType#checkIsValidValue(org.openbravo.base.model.Property
-   * , java.lang.Object)
-   */
   public void checkIsValidValue(Property property, Object value) throws ValidationException {
     if (value == null) {
       return;
@@ -146,7 +138,7 @@
    * Returns the entity refered to by this foreign key domain type. Note that for TableDir domain
    * types this method always returns null.
    * 
-   * @param the
+   * @param property
    *          property for this domain type, the property is needed because the domain type is
    *          shared by different properties.
    * @return the entity to which this domain type refers, is null in case of TableDir.
--- a/src/org/openbravo/base/model/domaintype/BigDecimalDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/BigDecimalDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -31,7 +31,6 @@
 
   /**
    * @return class of the {@link BigDecimal}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return BigDecimal.class;
@@ -67,11 +66,6 @@
     }
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public Object createFromString(String strValue) {
     if (strValue == null || strValue.trim().length() == 0) {
@@ -80,11 +74,6 @@
     return new BigDecimal(strValue);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:decimal";
--- a/src/org/openbravo/base/model/domaintype/BinaryDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/BinaryDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -33,17 +33,11 @@
 
   /**
    * @return class of the {@link byte[]}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return byte[].class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#convertToString(java.lang.Object)
-   */
   @Override
   public String convertToString(Object value) {
     try {
@@ -56,11 +50,6 @@
     }
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public Object createFromString(String strValue) {
     try {
@@ -73,11 +62,6 @@
     }
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:base64Binary";
--- a/src/org/openbravo/base/model/domaintype/BooleanDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/BooleanDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -29,17 +29,11 @@
 
   /**
    * @return class of the {@link Boolean}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return Boolean.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public Object createFromString(String strValue) {
     if (strValue == null || strValue.trim().length() == 0) {
@@ -48,11 +42,6 @@
     return new Boolean(strValue);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:boolean";
--- a/src/org/openbravo/base/model/domaintype/ButtonDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/ButtonDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -29,17 +29,11 @@
 
   /**
    * @return class of the {@link Boolean}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return Boolean.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public Object createFromString(String strValue) {
     if (strValue == null || strValue.trim().length() == 0) {
@@ -48,11 +42,6 @@
     return new Boolean(strValue);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:boolean";
--- a/src/org/openbravo/base/model/domaintype/DateDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/DateDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -35,17 +35,11 @@
 
   /**
    * @return class of the {@link Date}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return Date.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#convertToString(java.lang.Object)
-   */
   @Override
   public synchronized String convertToString(Object value) {
     if (value == null) {
@@ -54,11 +48,6 @@
     return xmlDateFormat.format(value);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public synchronized Object createFromString(String strValue) {
     try {
@@ -71,11 +60,6 @@
     }
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:dateTime";
--- a/src/org/openbravo/base/model/domaintype/DatetimeDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/DatetimeDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -35,17 +35,11 @@
 
   /**
    * @return class of the {@link Date}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return Date.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#convertToString(java.lang.Object)
-   */
   @Override
   public synchronized String convertToString(Object value) {
     if (value == null) {
@@ -54,11 +48,6 @@
     return xmlDateFormat.format(value);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public synchronized Object createFromString(String strValue) {
     try {
@@ -71,11 +60,6 @@
     }
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:dateTime";
--- a/src/org/openbravo/base/model/domaintype/LongDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/LongDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -34,7 +34,6 @@
 
   /**
    * @return class of the {@link Long}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return Long.class;
@@ -51,20 +50,10 @@
     super.checkIsValidValue(property, value);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getFormatId()
-   */
   public String getFormatId() {
     return "integer";
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public Object createFromString(String strValue) {
     if (strValue == null || strValue.trim().length() == 0) {
@@ -73,11 +62,6 @@
     return new Long(new BigDecimal(strValue).longValueExact());
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:long";
--- a/src/org/openbravo/base/model/domaintype/ObjectDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/ObjectDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -31,27 +31,16 @@
 
   /**
    * @return class of the {@link Timestamp}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return Object.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public Object createFromString(String strValue) {
     return strValue;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "xs:anyType";
--- a/src/org/openbravo/base/model/domaintype/PrimitiveDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/PrimitiveDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -45,7 +45,7 @@
   String convertToString(Object value);
 
   /**
-   * Converts a string back to an object value of the primitive type ({@see #getPrimitiveType()})
+   * Converts a string back to an object value of the primitive type ({link #getPrimitiveType()})
    * represented by this DomainType. This method is the opposite of the
    * {@link #convertToString(Object)} method.
    * 
--- a/src/org/openbravo/base/model/domaintype/SearchDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/SearchDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -34,7 +34,6 @@
 
   /**
    * @return the column based on the RefSearch ({@link #setRefSearch(RefSearch)}).
-   * @see org.openbravo.base.model.domaintype.DomainType#getForeignKeyColumn(org.openbravo.base.model.Column)
    */
   public Column getForeignKeyColumn(String columnName) {
     // handles a special case that reference value is not set in a column
--- a/src/org/openbravo/base/model/domaintype/StringDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/StringDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -29,17 +29,11 @@
 
   /**
    * @return class of the {@link String}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return String.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public Object createFromString(String strValue) {
     if (strValue == null || strValue.length() == 0) {
@@ -48,11 +42,6 @@
     return strValue;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:string";
--- a/src/org/openbravo/base/model/domaintype/StringEnumerateDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/StringEnumerateDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -31,17 +31,11 @@
    * As a standard only a string/varchar column can have enumerates.
    * 
    * @return class of {@link String}.
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return String.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public Object createFromString(String strValue) {
     if (strValue == null || strValue.length() == 0) {
@@ -50,11 +44,6 @@
     return strValue;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:string";
--- a/src/org/openbravo/base/model/domaintype/TableDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/TableDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -33,7 +33,6 @@
 
   /**
    * @return the column based on the RefTable ({@link #setRefTable(RefTable)}).
-   * @see org.openbravo.base.model.domaintype.DomainType#getForeignKeyColumn(org.openbravo.base.model.Column)
    */
   public Column getForeignKeyColumn(String columnName) {
     // handles a special case that reference value is not set in a column
--- a/src/org/openbravo/base/model/domaintype/TimestampDomainType.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/model/domaintype/TimestampDomainType.java	Tue Nov 30 16:51:24 2010 +0000
@@ -35,17 +35,11 @@
 
   /**
    * @return class of the {@link Timestamp}
-   * @see org.openbravo.base.model.domaintype.DomainType#getPrimitiveType()
    */
   public Class<?> getPrimitiveType() {
     return Timestamp.class;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#convertToString(java.lang.Object)
-   */
   @Override
   public synchronized String convertToString(Object value) {
     if (value == null) {
@@ -54,11 +48,6 @@
     return xmlDateFormat.format(value);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#createFromString(java.lang.String)
-   */
   @Override
   public synchronized Object createFromString(String strValue) {
     try {
@@ -71,11 +60,6 @@
     }
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.openbravo.base.model.domaintype.PrimitiveDomainType#getXMLSchemaType()
-   */
   @Override
   public String getXMLSchemaType() {
     return "ob:dateTime";
--- a/src/org/openbravo/base/secureApp/LoginUtils.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/secureApp/LoginUtils.java	Tue Nov 30 16:51:24 2010 +0000
@@ -11,7 +11,6 @@
  */
 package org.openbravo.base.secureApp;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -129,10 +128,9 @@
 
     OBContext.setAdminMode();
     try {
-      List parameters = new ArrayList();
-      parameters.add(strRol);
-      OBQuery query = OBDal.getInstance().createQuery(RoleOrganization.class,
-          "WHERE role.id = ? ORDER BY client.id, organization.id", parameters);
+      OBQuery<RoleOrganization> query = OBDal.getInstance().createQuery(RoleOrganization.class,
+          "WHERE role.id = :roleId ORDER BY client.id, organization.id");
+      query.setNamedParameter("roleId", strRol);
       query.setFilterOnReadableClients(false);
       query.setFilterOnReadableOrganization(false);
       return query.list();
@@ -142,33 +140,33 @@
   }
 
   public static String buildClientList(List<RoleOrganization> roleorglist) {
-      StringBuilder clientlist = new StringBuilder();
-      String currentclient = null;
-      for (RoleOrganization roleorg : roleorglist) {
-        if (currentclient == null || !currentclient.equals(roleorg.getClient().getId())) {
-          currentclient = roleorg.getClient().getId();
-          if (clientlist.length() > 0) {
-            clientlist.append(',');
-          }
-          clientlist.append('\'');
-          clientlist.append(roleorg.getClient().getId());
-          clientlist.append('\'');
+    StringBuilder clientlist = new StringBuilder();
+    String currentclient = null;
+    for (RoleOrganization roleorg : roleorglist) {
+      if (currentclient == null || !currentclient.equals(roleorg.getClient().getId())) {
+        currentclient = roleorg.getClient().getId();
+        if (clientlist.length() > 0) {
+          clientlist.append(',');
         }
+        clientlist.append('\'');
+        clientlist.append(roleorg.getClient().getId());
+        clientlist.append('\'');
       }
-      return clientlist.toString();
+    }
+    return clientlist.toString();
   }
 
   public static String buildOrgList(List<RoleOrganization> roleorglist) {
-      StringBuilder orglist = new StringBuilder();
-      for (RoleOrganization roleorg : roleorglist) {
-        if (orglist.length() > 0) {
-          orglist.append(',');
-        }
-        orglist.append('\'');
-        orglist.append(roleorg.getOrganization().getId());
-        orglist.append('\'');
+    StringBuilder orglist = new StringBuilder();
+    for (RoleOrganization roleorg : roleorglist) {
+      if (orglist.length() > 0) {
+        orglist.append(',');
       }
-      return orglist.toString();
+      orglist.append('\'');
+      orglist.append(roleorg.getOrganization().getId());
+      orglist.append('\'');
+    }
+    return orglist.toString();
   }
 
   public static boolean fillSessionArguments(ConnectionProvider conn, VariablesSecureApp vars,
--- a/src/org/openbravo/base/structure/BaseOBObject.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/base/structure/BaseOBObject.java	Tue Nov 30 16:51:24 2010 +0000
@@ -150,7 +150,7 @@
    * @param value
    *          the value being set
    * @throws OBSecurityException
-   *           , OBValidationException
+   *           , ValidationException
    */
   public void set(String propName, Object value) {
     final Property p = getEntity().getProperty(propName);
@@ -218,7 +218,7 @@
   /**
    * Validates the content of this object using the property validators.
    * 
-   * @throws OBValidationException
+   * @throws ValidationException
    */
   public void validate() {
     getEntity().validate(this);
--- a/src/org/openbravo/dal/core/DalUtil.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/dal/core/DalUtil.java	Tue Nov 30 16:51:24 2010 +0000
@@ -130,7 +130,7 @@
    * For example the property: organization.name and entity: Product will result in the
    * Organization.name property to be returned.
    * 
-   * @param entity
+   * @param bob
    *          the start entity for the property path
    * @param propertyPath
    *          the property path, dot-separated property names
--- a/src/org/openbravo/dal/core/OBContext.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/dal/core/OBContext.java	Tue Nov 30 16:51:24 2010 +0000
@@ -132,8 +132,8 @@
    * 
    * To restore the previous privileges call the {@link #restorePreviousMode()}.
    * 
-   * @param chekEntityAccess
-   *          Whether entity access should also be checked
+   * @param doOrgClientAccessCheck
+   *          Whether entity access (client+org) should also be checked
    * @see OBContext#restorePreviousMode()
    * @since 2.50MP18
    */
--- a/src/org/openbravo/dal/core/OBInstantiator.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/dal/core/OBInstantiator.java	Tue Nov 30 16:51:24 2010 +0000
@@ -87,7 +87,7 @@
   }
 
   /**
-   * @return returns true if the object is an instance of the Entity handled by the OBInstantiator.
+   * Returns true if the object is an instance of the Entity handled by the OBInstantiator.
    * 
    * @param object
    *          the object to compare with the Entity managed here
--- a/src/org/openbravo/dal/xml/XMLTypeConverter.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/dal/xml/XMLTypeConverter.java	Tue Nov 30 16:51:24 2010 +0000
@@ -60,8 +60,9 @@
   private final SimpleDateFormat xmlDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'");
 
   /**
-   * @return the String format of a {@link Date}, the standard xml format is used:
-   *         yyyy-MM-dd'T'HH:mm:ss.S'Z'
+   * Returns the String format of a {@link Date}, the standard xml format is used:
+   * yyyy-MM-dd'T'HH:mm:ss.S'Z'
+   * 
    * @param dt
    *          the Date to format
    * @return the String representation of the Date in xml format
--- a/src/org/openbravo/erpCommon/ad_forms/DocBank.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocBank.java	Tue Nov 30 16:51:24 2010 +0000
@@ -73,7 +73,7 @@
 
   /**
    * Constructor
-   *
+   * 
    * @param AD_Client_ID
    *          AD_Client_ID
    */
@@ -88,7 +88,7 @@
 
   /**
    * Load Specific Document Details
-   *
+   * 
    * @return true if loadDocumentType was set
    */
   public boolean loadDocumentDetails(FieldProvider[] data, ConnectionProvider conn) {
@@ -137,7 +137,7 @@
 
   /**
    * Load Invoice Line. 4 amounts AMTTYPE_Payment AMTTYPE_Statement2 AMTTYPE_Charge AMTTYPE_Interest
-   *
+   * 
    * @return DocLine Array
    */
   private DocLine[] loadLines(ConnectionProvider conn) {
@@ -176,7 +176,7 @@
 
   /**
    * Get Source Currency Balance - subtracts line amounts from total - no rounding
-   *
+   * 
    * @return positive amount, if total is bigger than lines
    */
   public BigDecimal getBalance() {
@@ -199,14 +199,14 @@
 
   /**
    * Create Facts (the accounting logic) for CMB.
-   *
+   * 
    * <pre>
    *      BankAsset       DR      CR  (Statement)
    *      BankInTransit   DR      CR              (Payment)
    *      Charge          DR          (Charge)
    *      Interest        DR      CR  (Interest)
    * </pre>
-   *
+   * 
    * @param as
    *          accounting schema
    * @return Fact
@@ -235,11 +235,19 @@
     BigDecimal TrxAmt = null;
     BigDecimal ChargeAmt = null;
     BigDecimal ConvertChargeAmt = null;
+    String strDateAcct = "FirstIteration";
     // BigDecimal InterestAmt = null;
     // Lines
     fact = new Fact(this, as, Fact.POST_Actual);
     for (int i = 0; p_lines != null && i < p_lines.length; i++) {
       DocLine_Bank line = (DocLine_Bank) p_lines[i];
+      if (strDateAcct.equals("FirstIteration"))
+        strDateAcct = line.m_DateAcct;
+      else if (!strDateAcct.equals(line.m_DateAcct)) {
+        strDateAcct = line.m_DateAcct;
+        Fact_Acct_Group_ID = SequenceIdData.getUUID();
+      }
+
       // setC_Period_ID(line.m_DateAcct);
       // BankAsset DR CR (Statement)
       TrxAmt = new BigDecimal(line.m_TrxAmt);
@@ -278,10 +286,9 @@
             line.m_C_Currency_ID, TrxAmt.negate().toString(), Fact_Acct_Group_ID, nextSeqNo(SeqNo),
             DocumentType, conn);
       // Charge DR (Charge)
-      fact.createLine(lineAux, new Account(
-          conn, DocLineBankData.selectChargeAccount(conn, C_BankAccount_ID, as.m_C_AcctSchema_ID)),
-          line.m_C_Currency_ID, ChargeAmt.toString(), "", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
-          DocumentType, conn);
+      fact.createLine(lineAux, new Account(conn, DocLineBankData.selectChargeAccount(conn,
+          C_BankAccount_ID, as.m_C_AcctSchema_ID)), line.m_C_Currency_ID, ChargeAmt.toString(), "",
+          Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
       // Interest DR CR (Interest)
       /*
        * if (InterestAmt.signum() < 0)
@@ -294,14 +301,13 @@
        */
       //
       if (ConvertChargeAmt.signum() > 0) // >0 loss
-        fact.createLine(lineAux, getAccount(
-            AcctServer.ACCTTYPE_ConvertChargeLossAmt, as, conn), line.m_C_Currency_ID,
-            line.convertChargeAmt, "", Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+        fact.createLine(lineAux, getAccount(AcctServer.ACCTTYPE_ConvertChargeLossAmt, as, conn),
+            line.m_C_Currency_ID, line.convertChargeAmt, "", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
+            DocumentType, conn);
       else
-        fact.createLine(lineAux, getAccount(
-            AcctServer.ACCTTYPE_ConvertChargeGainAmt, as, conn), line.m_C_Currency_ID, "",
-            ConvertChargeAmt.negate().toString(), Fact_Acct_Group_ID, nextSeqNo(SeqNo),
-            DocumentType, conn);
+        fact.createLine(lineAux, getAccount(AcctServer.ACCTTYPE_ConvertChargeGainAmt, as, conn),
+            line.m_C_Currency_ID, "", ConvertChargeAmt.negate().toString(), Fact_Acct_Group_ID,
+            nextSeqNo(SeqNo), DocumentType, conn);
 
       log4jDocBank.debug("createTaxCorrection - (NIY)");
     }
@@ -311,7 +317,7 @@
 
   /**
    * Get the account for Accounting Schema
-   *
+   * 
    * @param strcBankstatementlineId
    * @param as
    *          accounting schema
@@ -358,7 +364,7 @@
 
   /**
    * Get Document Confirmation
-   *
+   * 
    * not used
    */
   public boolean getDocumentConfirmation(ConnectionProvider conn, String strRecordId) {
--- a/src/org/openbravo/erpCommon/ad_forms/DocDPManagement.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocDPManagement.java	Tue Nov 30 16:51:24 2010 +0000
@@ -212,7 +212,6 @@
   /**
    * 
    * @param oldSeqNo
-   * @return
    */
   public String nextSeqNo(String oldSeqNo) {
     log4j.debug("DocDPManagement - oldSeqNo = " + oldSeqNo);
@@ -227,7 +226,6 @@
    * @param as
    * @param line
    * @param conn
-   * @return
    */
   public String calculateAmount(AcctSchema as, DocLine_DPManagement line, ConnectionProvider conn) {
     String Amt = getConvertedAmt(line.Amount, line.m_C_Currency_ID, as.m_C_Currency_ID,
@@ -268,7 +266,6 @@
    * @param as
    * @param status
    * @param conn
-   * @return
    */
   public Account getAccount(String Isreceipt, String partnerID, AcctSchema as, String status,
       ConnectionProvider conn) {
--- a/src/org/openbravo/erpCommon/ad_forms/DocLineBank_data.xsql	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLineBank_data.xsql	Tue Nov 30 16:51:24 2010 +0000
@@ -33,7 +33,7 @@
       DP.C_Project_ID AS C_Project_ID
       FROM C_BANKSTATEMENTLINE BL left join C_DEBT_PAYMENT DP on BL.C_DEBT_PAYMENT_ID = DP.C_DEBT_PAYMENT_ID
       WHERE C_BANKSTATEMENT_ID = ? 
-      ORDER BY LINE
+      ORDER BY BL.DATEACCT, LINE
      ]]>
      </Sql>
      <Parameter name="C_BANKSTATEMENT_ID"/>
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java	Tue Nov 30 16:51:24 2010 +0000
@@ -1500,8 +1500,14 @@
       up += node + "," + updates.get(node) + "|";
 
     String notifications = getNotificationsHTML(vars.getLanguage());
-    if (notifications.equals(""))
-      notifications = Utility.messageBD(this, "NoUpdatesAvailable", vars.getLanguage());
+    if (notifications.equals("")) {
+      if (!"".equals(ImportModule.getScanError().toString())) {
+        notifications = Utility.messageBD(this, ImportModule.getScanError().toString(), vars
+            .getLanguage());
+      } else {
+        notifications = Utility.messageBD(this, "NoUpdatesAvailable", vars.getLanguage());
+      }
+    }
     up = notifications + "|" + up + "|";
     response.setContentType("text/plain; charset=UTF-8");
     response.setHeader("Cache-Control", "no-cache");
--- a/src/org/openbravo/erpCommon/ad_process/ImportBudget_data.xsql	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/ImportBudget_data.xsql	Tue Nov 30 16:51:24 2010 +0000
@@ -121,7 +121,7 @@
 			  SET C_BP_Group_ID=(
           SELECT C_BP_Group_ID FROM C_BP_Group g
 			    WHERE I_BudgetLine.BPGroupIdent=AD_COLUMN_IDENTIFIER('C_BP_GROUP', TO_CHAR(g.C_BP_GROUP_ID), ?)
-          AND g.AD_Client_ID=I_BudgetLine.AD_Client_ID
+          AND g.AD_Client_ID=I_BudgetLine.AD_Client_ID AND g.AD_ORG_ID = I_BudgetLine.AD_ORG_ID
         )
 			  WHERE C_BP_Group_ID IS NULL
 			  AND I_IsImported<>'Y'
@@ -568,18 +568,18 @@
         UPDATE I_BudgetLine 
         SET C_BudgetLine_ID=(
             SELECT MIN(C_BudgetLine_ID) FROM C_BudgetLine bl
-            WHERE COALESCE(I_BudgetLine.C_ELEMENTVALUE_ID,-1) = COALESCE(bl.C_ELEMENTVALUE_ID,-1)
-              AND COALESCE(I_BudgetLine.C_Period_ID,-1) = COALESCE(bl.C_Period_ID,-1)
-              AND COALESCE(I_BudgetLine.C_Bpartner_ID,-1) = COALESCE(bl.C_Bpartner_ID,-1)
-              AND COALESCE(I_BudgetLine.AD_OrgTrx_ID,-1) = COALESCE(bl.AD_OrgTrx_ID,-1)
-              AND COALESCE(I_BudgetLine.C_SalesRegion_ID,-1) = COALESCE(bl.C_SalesRegion_ID,-1)
-              AND COALESCE(I_BudgetLine.C_Project_ID,-1) = COALESCE(bl.C_Project_ID,-1)
-              AND COALESCE(I_BudgetLine.C_Campaign_ID,-1) = COALESCE(bl.C_Campaign_ID,-1)
-              AND COALESCE(I_BudgetLine.C_Activity_ID,-1) = COALESCE(bl.C_Activity_ID,-1)
-              AND COALESCE(I_BudgetLine.C_BP_Group_ID,-1) = COALESCE(bl.C_BP_Group_ID,-1)
-              AND COALESCE(I_BudgetLine.M_Product_ID,-1) = COALESCE(bl.M_Product_ID,-1)
-              AND COALESCE(I_BudgetLine.M_Product_Category_ID,-1) = COALESCE(bl.M_Product_Category_ID,-1)
-              AND COALESCE(I_BudgetLine.C_Currency_ID,-1) = COALESCE(bl.C_Currency_ID,-1)
+            WHERE COALESCE(I_BudgetLine.C_ELEMENTVALUE_ID, '<NULL>') = COALESCE(bl.C_ELEMENTVALUE_ID, '<NULL>')
+              AND COALESCE(I_BudgetLine.C_Period_ID,'<NULL>') = COALESCE(bl.C_Period_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.C_Bpartner_ID,'<NULL>') = COALESCE(bl.C_Bpartner_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.AD_OrgTrx_ID,'<NULL>') = COALESCE(bl.AD_OrgTrx_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.C_SalesRegion_ID,'<NULL>') = COALESCE(bl.C_SalesRegion_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.C_Project_ID,'<NULL>') = COALESCE(bl.C_Project_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.C_Campaign_ID,'<NULL>') = COALESCE(bl.C_Campaign_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.C_Activity_ID,'<NULL>') = COALESCE(bl.C_Activity_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.C_BP_Group_ID,'<NULL>') = COALESCE(bl.C_BP_Group_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.M_Product_ID,'<NULL>') = COALESCE(bl.M_Product_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.M_Product_Category_ID,'<NULL>') = COALESCE(bl.M_Product_Category_ID,'<NULL>')
+              AND COALESCE(I_BudgetLine.C_Currency_ID,'<NULL>') = COALESCE(bl.C_Currency_ID,'<NULL>')
               AND bl.C_Budget_ID = ?
               AND bl.AD_Client_ID = I_BudgetLine.AD_Client_ID
             )
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html	Tue Nov 30 16:51:24 2010 +0000
@@ -707,6 +707,18 @@
               <td class="ContentCell"></td>
             </tr>
             <tr>
+              <td class="TitleCell"><span class="LabelText">Initial Page Number</span></td>
+              <td class="TextBox_btn_ContentCell">
+                <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                  <tr>
+                    <td class="TextBox_ContentCell">
+                      <input class="TextBox_btn_OneCell_width" type="text" name="inpPageNo" id="paramPageNo" maxlength="10" value="1" outputformat="euroEdition"></input>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
               <td class="TitleCell"><span class="LabelText">Group By</span></td>
               <td class="Combo_ContentCell"> <select name="inpGroupBy" id="inpGroupBy" class="Combo Combo_OneCell_width">
                   <option value=""></option>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java	Tue Nov 30 16:51:24 2010 +0000
@@ -88,6 +88,7 @@
       String strGroupBy = vars.getGlobalVariable("inpGroupBy", "ReportGeneralLedger|GroupBy", "");
       String strHide = vars.getGlobalVariable("inpHideMatched", "ReportGeneralLedger|HideMatched",
           "");
+
       printPageDataSheet(response, vars, strDateFrom, strDateTo, strAmtFrom, strAmtTo,
           strcelementvaluefrom, strcelementvalueto, strOrg, strcBpartnerId, strmProductId,
           strcProjectId, strGroupBy, strHide, strcAcctSchemaId, strcelementvaluefromdes,
@@ -192,10 +193,11 @@
       String strGroupBy = vars
           .getRequestGlobalVariable("inpGroupBy", "ReportGeneralLedger|GroupBy");
       String strHide = vars.getStringParameter("inpHideMatched");
+      String strPageNo = vars.getGlobalVariable("inpPageNo", "ReportGeneralLedger|PageNo", "1");
       if (vars.commandIn("PDF"))
         printPageDataPDF(request, response, vars, strDateFrom, strDateTo, strAmtFrom, strAmtTo,
             strcelementvaluefrom, strcelementvalueto, strOrg, strcBpartnerId, strmProductId,
-            strcProjectId, strGroupBy, strHide, strcAcctSchemaId);
+            strcProjectId, strGroupBy, strHide, strcAcctSchemaId, strPageNo);
       else
         printPageDataXLS(request, response, vars, strDateFrom, strDateTo, strAmtFrom, strAmtTo,
             strcelementvaluefrom, strcelementvalueto, strOrg, strcBpartnerId, strmProductId,
@@ -489,7 +491,8 @@
       VariablesSecureApp vars, String strDateFrom, String strDateTo, String strAmtFrom,
       String strAmtTo, String strcelementvaluefrom, String strcelementvalueto, String strOrg,
       String strcBpartnerId, String strmProductId, String strcProjectId, String strGroupBy,
-      String strHide, String strcAcctSchemaId) throws IOException, ServletException {
+      String strHide, String strcAcctSchemaId, String strPageNo) throws IOException,
+      ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: PDF");
     response.setContentType("text/html; charset=UTF-8");
@@ -578,6 +581,7 @@
       parameters.put("REPORT_SUBTITLE", strSubTitle.toString());
       parameters.put("Previous", Utility.messageBD(this, "Initial Balance", strLanguage));
       parameters.put("Total", Utility.messageBD(this, "Total", strLanguage));
+      parameters.put("PageNo", strPageNo);
       String strDateFormat;
       strDateFormat = vars.getJavaDateFormat();
       parameters.put("strDateFormat", strDateFormat);
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml	Tue Nov 30 16:51:24 2010 +0000
@@ -28,18 +28,15 @@
 		isDefault="false"
 		vAlign="Middle"
 		fontName="Bitstream Vera Sans"
-		fontSize="11"
-	>
-	</style>
+		fontSize="11" 
+	/>
 	<style 
 		name="Report_Title"
 		isDefault="false"
 		leftPadding="5"
 		fontName="Bitstream Vera Sans"
 		fontSize="18"
-	>
-					<box leftPadding="5"></box>
-	</style>
+	/>
 	<style 
 		name="Report_Subtitle"
 		isDefault="false"
@@ -47,9 +44,7 @@
 		leftPadding="5"
 		fontName="Bitstream Vera Sans"
 		fontSize="14"
-	>
-					<box leftPadding="5"></box>
-	</style>
+	/>
 	<style 
 		name="Total_Field"
 		isDefault="false"
@@ -61,9 +56,7 @@
 		fontName="Bitstream Vera Sans"
 		fontSize="11"
 		isBold="true"
-	>
-					<box leftPadding="5"></box>
-	</style>
+	/>
 	<style 
 		name="Detail_Header"
 		isDefault="false"
@@ -79,11 +72,7 @@
 		fontName="Bitstream Vera Sans"
 		fontSize="11"
 		isBold="true"
-	>
-					<box leftPadding="5">					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
-</box>
-	</style>
+	/>
 	<style 
 		name="GroupHeader_DarkGray"
 		isDefault="false"
@@ -95,16 +84,13 @@
 		fontName="Bitstream Vera Sans"
 		fontSize="18"
 		isBold="true"
-	>
-					<box leftPadding="5"></box>
-	</style>
+	/>
 	<style 
 		name="GroupHeader_Gray"
 		isDefault="false"
 		mode="Opaque"
 		backcolor="#999999"
-	>
-	</style>
+	/>
 	<style 
 		name="Detail_Line"
 		isDefault="false"
@@ -119,8 +105,7 @@
 				isDefault="false"
 				mode="Opaque"
 				backcolor="#CCCCCC"
-			>
-			</style>
+			/>
 		</conditionalStyle>
 	</style>
 	<style 
@@ -129,46 +114,40 @@
 		mode="Opaque"
 		forecolor="#000000"
 		backcolor="#CCCCCC"
-	>
-	</style>
+	/>
 	<style 
 		name="Report_Data_Label"
 		isDefault="false"
 		fontName="Bitstream Vera Sans"
 		fontSize="11"
 		isBold="true"
-	>
-	</style>
+	/>
 	<style 
 		name="Report_Data_Field"
 		isDefault="false"
 		fontName="Bitstream Vera Sans"
 		fontSize="11"
 		isBold="false"
-	>
-	</style>
+	/>
 	<style 
 		name="Report_Footer"
 		isDefault="true"
 		fontName="Bitstream Vera Sans"
 		fontSize="11"
-	>
-	</style>
+	/>
 	<style 
 		name="Group_Data_Label"
 		isDefault="false"
 		fontName="Bitstream Vera Sans"
 		fontSize="14"
 		isBold="true"
-	>
-	</style>
+	/>
 	<style 
 		name="Group_Data_Field"
 		isDefault="false"
 		fontName="Bitstream Vera Sans"
 		fontSize="14"
-	>
-	</style>
+	/>
 	<style 
 		name="Detail_Data_Label"
 		isDefault="false"
@@ -177,8 +156,7 @@
 		fontName="Bitstream Vera Sans"
 		fontSize="11"
 		isBold="true"
-	>
-	</style>
+	/>
 	<style 
 		name="Detail_Data_Field"
 		isDefault="false"
@@ -186,16 +164,14 @@
 		backcolor="#CCCCCC"
 		fontName="Bitstream Vera Sans"
 		fontSize="11"
-	>
-	</style>
+	/>
 	<style 
 		name="Group_Footer"
 		isDefault="false"
 		fontName="Bitstream Vera Sans"
 		fontSize="11"
 		isBold="true"
-	>
-	</style>
+	/>
 
 	<parameter name="ATTACH" isForPrompting="false" class="java.lang.String"/>
 	<parameter name="BASE_WEB" isForPrompting="false" class="java.lang.String"/>
@@ -228,6 +204,7 @@
 	<parameter name="GroupByText" isForPrompting="false" class="java.lang.String">
 		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
 	</parameter>
+	<parameter name="PageNo" isForPrompting="false" class="java.lang.String"/>
 	<queryString><![CDATA[SELECT value, name, dateacct,
               SUM(AMTACCTDR) AS amtacctdr, SUM(AMTACCTCR) AS amtacctcr, (SUM(AMTACCTDR)-SUM(AMTACCTCR)) AS total,
               FACT_ACCT_GROUP_ID, id, groupbyid, groupbyname,
@@ -314,11 +291,7 @@
 						width="150"
 						height="18"
 						key="staticText"/>
-					<box leftPadding="5">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font pdfFontName="Helvetica" size="14"/>
 					</textElement>
@@ -343,11 +316,7 @@
 						width="385"
 						height="18"
 						key="textField"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font fontName="Times-Roman" size="14"/>
 					</textElement>
@@ -393,11 +362,7 @@
 						width="517"
 						height="12"
 						key="frame-4"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Total_Gray"
@@ -406,11 +371,7 @@
 						width="65"
 						height="12"
 						key="staticText-8"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
 					</textElement>
@@ -424,11 +385,7 @@
 						width="65"
 						height="12"
 						key="textField-34"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
 					</textElement>
@@ -442,11 +399,7 @@
 						width="65"
 						height="12"
 						key="textField-35"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
 					</textElement>
@@ -460,11 +413,7 @@
 						width="65"
 						height="12"
 						key="textField-36"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
 					</textElement>
@@ -489,11 +438,7 @@
 						width="90"
 						height="16"
 						key="staticText"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" topPadding="2" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font pdfFontName="Helvetica" size="10"/>
 					</textElement>
@@ -507,11 +452,7 @@
 						width="79"
 						height="16"
 						key="textField"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" topPadding="2" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
@@ -549,11 +490,7 @@
 						width="356"
 						height="16"
 						key="textField"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font fontName="Times-Roman" size="10"/>
 					</textElement>
@@ -567,11 +504,7 @@
 						width="65"
 						height="16"
 						key="element-90"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement>
 						<font size="10"/>
 					</textElement>
@@ -585,11 +518,7 @@
 						width="65"
 						height="16"
 						key="element-90"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement>
 						<font size="10"/>
 					</textElement>
@@ -603,11 +532,7 @@
 						width="65"
 						height="16"
 						key="element-90"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement>
 						<font size="10"/>
 					</textElement>
@@ -621,11 +546,7 @@
 						width="65"
 						height="16"
 						key="element-90"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement>
 						<font size="10"/>
 					</textElement>
@@ -650,11 +571,7 @@
 						width="257"
 						height="16"
 						key="element-90"/>
-					<box leftPadding="5" rightPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement>
 						<font size="10"/>
 					</textElement>
@@ -682,11 +599,7 @@
 						width="517"
 						height="12"
 						key="frame-5"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 				<staticText>
 					<reportElement
 						style="Report_Footer"
@@ -695,11 +608,7 @@
 						width="65"
 						height="12"
 						key="staticText-9"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font fontName="SansSerif" size="8"/>
 					</textElement>
@@ -712,11 +621,7 @@
 						width="65"
 						height="12"
 						key="textField-38"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica" size="8" isBold="false"/>
 					</textElement>
@@ -729,11 +634,7 @@
 						width="65"
 						height="12"
 						key="textField-39"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica" size="8" isBold="false"/>
 					</textElement>
@@ -746,11 +647,7 @@
 						width="65"
 						height="12"
 						key="textField-40"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica" size="8" isBold="false"/>
 					</textElement>
@@ -764,11 +661,7 @@
 						width="517"
 						height="12"
 						key="frame-3"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						x="0"
@@ -776,11 +669,7 @@
 						width="65"
 						height="12"
 						key="textField-30"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
 					</textElement>
@@ -793,11 +682,7 @@
 						width="65"
 						height="12"
 						key="textField-31"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
 					</textElement>
@@ -810,11 +695,7 @@
 						width="65"
 						height="12"
 						key="textField-32"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
 					</textElement>
@@ -827,11 +708,7 @@
 						width="65"
 						height="12"
 						key="textField-33"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font pdfFontName="Helvetica-Bold" size="8" isBold="true"/>
 					</textElement>
@@ -966,11 +843,7 @@
 						width="535"
 						height="20"
 						key="textField"/>
-					<box leftPadding="5">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
@@ -984,11 +857,7 @@
 						width="535"
 						height="25"
 						key="staticText-10"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement>
 						<font fontName="SansSerif" size="18"/>
 					</textElement>
@@ -1034,11 +903,7 @@
 						height="12"
 						key="frame-1"
 						stretchType="RelativeToBandHeight"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						x="263"
@@ -1047,11 +912,7 @@
 						height="12"
 						key="textField-13"
 						stretchType="RelativeToBandHeight"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
@@ -1065,11 +926,7 @@
 						height="12"
 						key="textField-14"
 						stretchType="RelativeToBandHeight"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
@@ -1083,11 +940,7 @@
 						height="12"
 						key="textField-15"
 						stretchType="RelativeToBandHeight"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
@@ -1101,11 +954,7 @@
 						height="12"
 						key="textField-16"
 						stretchType="RelativeToBandHeight"/>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
@@ -1119,11 +968,7 @@
 						height="12"
 						key="textField-17"
 						stretchType="RelativeToBandHeight"/>
-					<box leftPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="8"/>
 					</textElement>
@@ -1167,35 +1012,11 @@
 						width="30"
 						height="16"
 						key="textField"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" topPadding="2" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Center" verticalAlignment="Bottom">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
-				<textFieldExpression   class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="501"
-						y="4"
-						width="30"
-						height="16"
-						forecolor="#000000"
-						backcolor="#FFFFFF"
-						key="textField"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Center" verticalAlignment="Bottom" rotation="None" lineSpacing="Single">
-						<font fontName="Bitstream Vera Sans" pdfFontName="Helvetica" size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression   class="java.lang.Integer"><![CDATA[new java.lang.Integer(($V{PAGE_NUMBER}.intValue()) +(Integer.parseInt($P{PageNo}))-(1) )]]></textFieldExpression>
 				</textField>
 				<line direction="TopDown">
 					<reportElement
@@ -1215,11 +1036,7 @@
 						width="79"
 						height="16"
 						key="textField"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" topPadding="2" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement verticalAlignment="Bottom">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
@@ -1233,11 +1050,7 @@
 						width="76"
 						height="16"
 						key="staticText-1"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" topPadding="2" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Bottom">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
@@ -1253,11 +1066,7 @@
 						key="staticText-5">
 							<printWhenExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()==1)]]></printWhenExpression>
 						</reportElement>
-					<box>					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement>
 						<font/>
 					</textElement>
@@ -1266,34 +1075,12 @@
 				<staticText>
 					<reportElement
 						style="Report_Footer"
-						x="481"
-						y="4"
-						width="20"
-						height="16"
-						key="staticText-11"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
-					<textElement textAlignment="Center" verticalAlignment="Bottom">
-						<font fontName="Bitstream Vera Sans" size="10"/>
-					</textElement>
-				<text><![CDATA[of]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="Report_Footer"
 						x="394"
 						y="4"
 						width="57"
 						height="16"
 						key="staticText-12"/>
-					<box leftPadding="5" topPadding="2">					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-</box>
+					<box topBorder="None" topBorderColor="#000000" topPadding="2" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
 					<textElement textAlignment="Right" verticalAlignment="Bottom">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -37,6 +37,7 @@
   <PARAMETER id="paramElementvalueIdFrom" name="paramElementvalueIdFrom" attribute="value"/>
   <PARAMETER id="inpElementValueIdTo_DES" name="inpElementValueIdTo_DES" attribute="value"/>
   <PARAMETER id="inpElementValueIdFrom_DES" name="inpElementValueIdFrom_DES" attribute="value"/>
+  <PARAMETER id="paramPageNo" name="inpPageNo" default=""/>
 
   <PARAMETER id="parameterHide" name="all" default="1"/>
   <PARAMETER id="paramHideMatched" name="paramHide0" boolean="checked" withId="parameterHide" default="0"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html	Tue Nov 30 16:51:24 2010 +0000
@@ -307,6 +307,18 @@
                   <option value=""> <div id="reportC_ACCTSCHEMA_ID"></div></option>
                 </select></td>
             </tr>
+            <tr>
+              <td class="TitleCell"><span class="LabelText">Initial Page Number</span></td>
+              <td class="TextBox_btn_ContentCell">
+                <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                  <tr>
+                    <td class="TextBox_ContentCell">
+                      <input class="TextBox_btn_OneCell_width" type="text" name="inpPageNo" id="paramPageNo" maxlength="10" value="1" outputformat="euroEdition"></input>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
 	    <tr>
 	      <td class="TitleCell"><span class="LabelText">Show closing</span></td>
               <td class="Radio_Check_ContentCell"><input TYPE="checkbox" id="paramShowClosing" name="inpShowClosing" value="0"/></td>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java	Tue Nov 30 16:51:24 2010 +0000
@@ -169,6 +169,8 @@
       // "ReportGeneralLedgerJournal|Table");
       String strTable = vars.getStringParameter("inpTable");
       String strRecord = vars.getStringParameter("inpRecord");
+      String strPageNo = vars.getGlobalVariable("inpPageNo", "ReportGeneralLedgerJournal|PageNo",
+          "1");
       /*
        * Scenario 1: We will have FactAcctGroupId while the request redirect from
        * ReportGeneralLedger Report. Otherwise we don't need to use FactAcctGroupId for PDF or Excel
@@ -196,7 +198,7 @@
       setHistoryCommand(request, "DEFAULT");
       printPagePDF(response, vars, strDateFrom, strDateTo, strDocument, strOrg, strTable,
           strRecord, strFactAcctGroupId, strcAcctSchemaId, strShowClosing, strShowReg,
-          strShowOpening);
+          strShowOpening, strPageNo);
     } else if (vars.commandIn("PREVIOUS_RELATION")) {
       String strInitRecord = vars.getSessionValue("ReportGeneralLedgerJournal.initRecordNumber");
       String strPreviousRecordRange = vars.getSessionValue(PREVIOUS_RANGE);
@@ -481,7 +483,8 @@
   private void printPagePDF(HttpServletResponse response, VariablesSecureApp vars,
       String strDateFrom, String strDateTo, String strDocument, String strOrg, String strTable,
       String strRecord, String strFactAcctGroupId, String strcAcctSchemaId, String strShowClosing,
-      String strShowReg, String strShowOpening) throws IOException, ServletException {
+      String strShowReg, String strShowOpening, String strPageNo) throws IOException,
+      ServletException {
 
     ReportGeneralLedgerJournalData[] data = null;
 
@@ -515,6 +518,7 @@
 
     HashMap<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("Subtitle", strSubtitle);
+    parameters.put("PageNo", strPageNo);
     renderJR(vars, response, strReportName, strOutput, parameters, data, null);
   }
 
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml	Tue Nov 30 16:51:24 2010 +0000
@@ -167,6 +167,7 @@
 	<parameter name="Subtitle" isForPrompting="false" class="java.lang.String"/>
 	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
 	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
+	<parameter name="PageNo" isForPrompting="false" class="java.lang.String"/>
 	<queryString><![CDATA[SELECT IDENTIFIER, DATEACCT, VALUE, NAME, ID, AD_TABLE_ID, DOCBASETYPE, '' AS TOTAL, '' AS DESCRIPTION,
 (CASE AMTACCTDR WHEN 0 THEN NULL ELSE AMTACCTDR END) AS AMTACCTDR, (CASE AMTACCTCR WHEN 0 THEN NULL ELSE AMTACCTCR END) AS AMTACCTCR
 FROM 
@@ -381,6 +382,22 @@
 		</title>
 		<pageHeader>
 			<band height="16"  isSplitAllowed="true" >
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="0"
+						y="0"
+						width="200"
+						height="16"
+						key="staticText-13">
+							<printWhenExpression><![CDATA[new Boolean($V{JournalEntry_COUNT}.intValue()!=0)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Left">
+						<font/>
+					</textElement>
+				<text><![CDATA[continued...]]></text>
+				</staticText>
 			</band>
 		</pageHeader>
 		<columnHeader>
@@ -448,7 +465,50 @@
 			</band>
 		</columnFooter>
 		<pageFooter>
-			<band height="0"  isSplitAllowed="true" >
+			<band height="20"  isSplitAllowed="true" >
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="200"
+						y="0"
+						width="200"
+						height="16"
+						key="staticText-12">
+							<printWhenExpression><![CDATA[new Boolean($V{JournalEntry_COUNT}.intValue()==0)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right">
+						<font/>
+					</textElement>
+				<text><![CDATA[please turn over]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="450"
+						y="0"
+						width="41"
+						height="18"
+						key="staticText-14"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right">
+						<font/>
+					</textElement>
+				<text><![CDATA[Page]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						x="491"
+						y="0"
+						width="34"
+						height="18"
+						key="textField"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement>
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.Integer"><![CDATA[new java.lang.Integer(($V{PAGE_NUMBER}.intValue()) +(Integer.parseInt($P{PageNo}))-(1) )]]></textFieldExpression>
+				</textField>
 			</band>
 		</pageFooter>
 		<summary>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -44,6 +44,7 @@
   <PARAMETER id="inpRecord" name="paramRecord" attribute="value" default=""/>
   <PARAMETER id="inpTable" name="paramTable" attribute="value" default=""/>
   <PARAMETER id="paramC_ACCTSCHEMA_ID" name="cAcctschemaId"/>
+  <PARAMETER id="paramPageNo" name="inpPageNo" default=""/>
 
   <PARAMETER id="parameterShowClosing" name="constantShowClosing" default="1"/>
   <PARAMETER id="paramShowClosing" name="showClosing" boolean="checked" withId="parameterShowClosing" default="0"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html	Tue Nov 30 16:51:24 2010 +0000
@@ -478,6 +478,18 @@
                 </select></td>
               <td class="ContentCell"></td>
             </tr>
+            <tr>
+            <td class="TitleCell"><span class="LabelText">Initial Page Number</span></td>
+              <td class="TextBox_btn_ContentCell">
+                <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                  <tr>
+                    <td class="TextBox_ContentCell">
+                      <input class="TextBox_btn_OneCell_width" type="text" name="inpPageNo" id="paramPageNo" maxlength="10" value="1" outputformat="euroEdition"></input>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
             <tr id="AcctFromTo">
               <td class="TitleCell"><span class="LabelText">From Account</span></td>
               <td class="TextBox_btn_ContentCell" colspan="2">
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java	Tue Nov 30 16:51:24 2010 +0000
@@ -38,7 +38,6 @@
 import org.openbravo.base.filter.IsIDFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.AccountingSchemaMiscData;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.TreeData;
@@ -157,12 +156,12 @@
       String strcProjectId = vars.getInGlobalVariable("inpcProjectId_IN",
           "ReportTrialBalance|cProjectId", "", IsIDFilter.instance);
       String strGroupBy = vars.getRequestGlobalVariable("inpGroupBy", "ReportTrialBalance|GroupBy");
-
+      String strPageNo = vars.getGlobalVariable("inpPageNo", "ReportTrialBalance|PageNo", "1");
       if (vars.commandIn("PDF"))
         printPageDataPDF(request, response, vars, strDateFrom, strDateTo, strOrg, strLevel,
             strcElementValueFrom, strcElementValueFromDes, strcElementValueTo,
             strcElementValueToDes, strcBpartnerId, strmProductId, strcProjectId, strcAcctSchemaId,
-            strGroupBy);
+            strGroupBy, strPageNo);
       else
         printPageDataXLS(request, response, vars, strDateFrom, strDateTo, strOrg, strLevel,
             strcElementValueFrom, strcElementValueTo, strcBpartnerId, strmProductId, strcProjectId,
@@ -377,8 +376,8 @@
 
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_ORG_ID", "",
-          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"),
-          Utility.getContext(this, vars, "#User_Client", "ReportTrialBalance"), '*');
+          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTrialBalance"), Utility
+              .getContext(this, vars, "#User_Client", "ReportTrialBalance"), '*');
       comboTableData.fillParameters(null, "ReportTrialBalance", "");
       xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
     } catch (Exception ex) {
@@ -509,8 +508,8 @@
       VariablesSecureApp vars, String strDateFrom, String strDateTo, String strOrg,
       String strLevel, String strcElementValueFrom, String strcElementValueFromDes,
       String strcElementValueTo, String strcElementValueToDes, String strcBpartnerId,
-      String strmProductId, String strcProjectId, String strcAcctSchemaId, String strGroupBy)
-      throws IOException, ServletException {
+      String strmProductId, String strcProjectId, String strcAcctSchemaId, String strGroupBy,
+      String strPageNo) throws IOException, ServletException {
 
     response.setContentType("text/html; charset=UTF-8");
     ReportTrialBalanceData[] data = null;
@@ -567,6 +566,7 @@
         parameters.put("DEFAULTVIEW", !strIsSubAccount);
         parameters.put("SUBACCOUNTVIEW", strIsSubAccount);
         parameters.put("DUMMY", true);
+        parameters.put("PageNo", strPageNo);
 
         renderJR(vars, response, strReportName, "pdf", parameters, data, null);
       }
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -47,6 +47,7 @@
   <PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
   <PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
   <PARAMETER id="paramSelectedGroupBy" name="groupbyselected" attribute="value" default=""/>
+  <PARAMETER id="paramPageNo" name="inpPageNo" default=""/>
 
   <SUBREPORT id="reportCBPartnerId_IN" name="reportCBPartnerId_IN" report="org/openbravo/erpCommon/reference/List">
     <ARGUMENT name="parameterListSelected" withId="paramVacio"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml	Tue Nov 30 16:51:24 2010 +0000
@@ -181,6 +181,7 @@
 	<parameter name="DUMMY" isForPrompting="false" class="java.lang.Boolean">
 		<defaultValueExpression ><![CDATA[Boolean.TRUE]]></defaultValueExpression>
 	</parameter>
+	<parameter name="PageNo" isForPrompting="false" class="java.lang.String"/>
 	<queryString><![CDATA[SELECT ID, ACCOUNT_ID, NAME,
               SUM(SALDO_INICIAL) AS SALDO_INICIAL,
               SUM(AMTACCTDR) AS AMTACCTDR,
@@ -1047,23 +1048,7 @@
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="Helvetica" size="10"/>
 					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						style="Report_Footer"
-						x="496"
-						y="0"
-						width="36"
-						height="16"
-						forecolor="#000000"
-						backcolor="#FFFFFF"
-						key="textField-14"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" lineSpacing="Single">
-						<font fontName="Helvetica" pdfFontName="Helvetica" size="10" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" pdfEncoding ="CP1252" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression   class="java.lang.String"><![CDATA["Page " + new java.lang.Integer(($V{PAGE_NUMBER}.intValue()) +(Integer.parseInt($P{PageNo}))-(1) )]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="false" pattern="dd/MM/yyyy" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
--- a/src/org/openbravo/erpCommon/businessUtility/COAUtility.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/COAUtility.java	Tue Nov 30 16:51:24 2010 +0000
@@ -500,7 +500,6 @@
    * 
    * @param strMessage
    *          Message to be added to the log returned (will be translated)
-   * @return
    */
   private void logEvent(String strMessage) {
     strLog.append(strMessage).append(NEW_LINE);
--- a/src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java	Tue Nov 30 16:51:24 2010 +0000
@@ -693,7 +693,6 @@
    * 
    * @param strMessage
    *          Message to be added to the log returned (will be translated)
-   * @return
    */
   private void logEvent(String strMessage) {
     strLog.append(strMessage).append(NEW_LINE);
--- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java	Tue Nov 30 16:51:24 2010 +0000
@@ -347,7 +347,7 @@
    *          if null, role inserted for organization with id=0
    * @param name
    *          name of the role
-   * @param strUserLevel
+   * @param strUserLevelProvided
    *          if null, user level " CO" will be set to the new role
    * @return Role object for new element
    */
@@ -1412,7 +1412,6 @@
    * @param strModules
    *          relation of ids (in a format so that can be included in a "in" statement of a "where"
    *          clause
-   * @return
    * @throws Exception
    */
   public static List<Module> getRDModules(String strModules) throws Exception {
@@ -1426,7 +1425,7 @@
   }
 
   /**
-   * @deprecated use {@link #getDataSets(Module module, List<String> accessLevel)}
+   * @deprecated use {@link #getDataSets(Module, List)}
    * 
    * @param module
    * @param accessLevel
--- a/src/org/openbravo/erpCommon/info/Account.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/Account.html	Tue Nov 30 16:51:24 2010 +0000
@@ -115,7 +115,7 @@
   	var f = document.forms[0];
   	f.inpCombination.value = "%";
   	var b = document.getElementById("buttonSave");
-  	setFilters();
+  	setFilters('Save');
   	enableSaveButton(b);
   }
   function gridMovePage(direction) {
--- a/src/org/openbravo/erpCommon/info/ProductMultiple.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/ProductMultiple.html	Tue Nov 30 16:51:24 2010 +0000
@@ -22,6 +22,7 @@
 <title>Product multiple selector</title>
 <link rel="shortcut icon" href="../../../../../web/images/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS"></link>
+<script language="JavaScript" type="text/javascript" id="paramAlertMsg">ALERT_MSG = "No product is selected";</script>
 <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
 <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
 <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
@@ -79,6 +80,10 @@
   	if(action == "SAVE") {
   		data = new Array();
   		rows = dijit.byId('grid').getSelectedRows();
+        if(rows.length == 0){
+            confirm(ALERT_MSG);
+            return false;
+        }
   		for(var i=0; i < rows.length; i++) {
   			var rowkey = rows[i].split("#");
   			var rval = new Array(rowkey[0], rowkey[1]);
--- a/src/org/openbravo/erpCommon/info/ProductMultiple.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/ProductMultiple.java	Tue Nov 30 16:51:24 2010 +0000
@@ -117,6 +117,8 @@
     }
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
+    xmlDocument.setParameter("alertMsg", "ALERT_MSG=\""
+        + Utility.messageBD(this, "NoProductSelected", vars.getLanguage()) + "\";");
     xmlDocument.setParameter("theme", vars.getTheme());
     xmlDocument.setParameter("name", strNameValue);
     try {
--- a/src/org/openbravo/erpCommon/info/ProductMultiple.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/ProductMultiple.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -21,6 +21,7 @@
 	<template file="ProductMultiple.html"/>
 	<PARAMETER id="paramDirectory" name="directory" default=""/>
 	<PARAMETER id="paramLanguage" name="language" default=""/>
+    <PARAMETER id="paramAlertMsg" name="alertMsg" default=""/>
 	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
 	<PARAMETER id="fieldKey" name="key" attribute="value"/>
 	<PARAMETER id="fieldName" name="name" attribute="value"/>
--- a/src/org/openbravo/erpCommon/info/ProjectMultiple.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/ProjectMultiple.html	Tue Nov 30 16:51:24 2010 +0000
@@ -22,6 +22,7 @@
 <title>Project multiple selector</title>
 <link rel="shortcut icon" href="../../../../../web/images/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS"></link>
+<script language="JavaScript" type="text/javascript" id="paramAlertMsg">ALERT_MSG = "No project is selected";</script>
 <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
 <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
 <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
@@ -79,6 +80,10 @@
     if(action == "SAVE") {
       data = new Array();
       rows = dijit.byId('grid').getSelectedRows();
+      if(rows.length == 0){
+          confirm(ALERT_MSG);
+          return false;
+      }
       for(var i=0; i < rows.length; i++) {
         var rowkey = rows[i].split("#");
         var rval = new Array(rowkey[0], rowkey[1]);
--- a/src/org/openbravo/erpCommon/info/ProjectMultiple.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/ProjectMultiple.java	Tue Nov 30 16:51:24 2010 +0000
@@ -110,6 +110,8 @@
     }
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
+    xmlDocument.setParameter("alertMsg", "ALERT_MSG=\""
+        + Utility.messageBD(this, "NoProjectIsSelected", vars.getLanguage()) + "\";");
     xmlDocument.setParameter("theme", vars.getTheme());
     xmlDocument.setParameter("name", strNameValue);
     response.setContentType("text/html; charset=UTF-8");
--- a/src/org/openbravo/erpCommon/info/ProjectMultiple.xml	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/info/ProjectMultiple.xml	Tue Nov 30 16:51:24 2010 +0000
@@ -21,6 +21,7 @@
   <template file="ProjectMultiple.html"/>
   <PARAMETER id="paramDirectory" name="directory" default=""/>
   <PARAMETER id="paramLanguage" name="language" default=""/>
+  <PARAMETER id="paramAlertMsg" name="alertMsg" default=""/>
   <PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
   <PARAMETER id="fieldKey" name="key" attribute="value"/>
   <PARAMETER id="fieldName" name="name" attribute="value"/>
--- a/src/org/openbravo/erpCommon/modules/ImportModule.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/modules/ImportModule.java	Tue Nov 30 16:51:24 2010 +0000
@@ -121,6 +121,7 @@
   public static final int MSG_ERROR = 2;
 
   OBError errors = null;
+  static StringBuilder scanError = null;
   Vector<DynaBean> dynModulesToInstall = new Vector<DynaBean>();
   Vector<DynaBean> dynModulesToUpdate = new Vector<DynaBean>();
   Vector<DynaBean> dependencies = new Vector<DynaBean>();
@@ -219,7 +220,7 @@
   /**
    * Check the dependencies for a file. Used only for local installation from obx file.
    * 
-   * @see {@link #checkDependenciesId(String[], String[], HashMap)}.
+   * @see #checkDependenciesId(String[], String[], HashMap)
    */
   public boolean checkDependenciesFile(InputStream file) throws Exception {
 
@@ -830,6 +831,10 @@
     return errors;
   }
 
+  public static StringBuilder getScanError() {
+    return scanError;
+  }
+
   /**
    * Set the install locally variable, install locally means that no pull is going to be done for
    * the contents of the obx, it will be installed directly from the obx file regardless better
@@ -1527,6 +1532,7 @@
    */
   public static HashMap<String, String> scanForUpdates(ConnectionProvider conn,
       VariablesSecureApp vars) {
+    scanError = new StringBuilder();
     try {
       final HashMap<String, String> updateModules = new HashMap<String, String>();
       final String user = vars == null ? "0" : vars.getUser();
@@ -1537,6 +1543,7 @@
         ImportModuleData.insertLog(conn, user, "", "", "",
             "Scan for updates: Couldn't contact with webservice server", "E");
         log4j.error("Scan for updates, error cound't reach ws server");
+        scanError.append("InternetNotAvailable");
         return updateModules;
       }
 
@@ -1558,6 +1565,7 @@
         } catch (final ServletException ex) {
           log4j.error("Error inserting log", e);
         }
+        scanError.append("WSServerNotReachable");
         return updateModules; // return empty hashmap
       }
 
@@ -1590,6 +1598,7 @@
       } catch (final ServletException ex) {
         log4j.error("Error inserting log", ex);
       }
+      scanError.append("ScanUpdatesFailed");
       return new HashMap<String, String>();
     }
   }
--- a/src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java	Tue Nov 30 16:51:24 2010 +0000
@@ -62,12 +62,10 @@
   }
 
   /**
-   * Deprecated use {@link ModuleUtiltiy#orderByDependency(ArrayList)} instead
+   * Deprecated use {@link ModuleUtiltiy#orderByDependency(List)} instead
    * 
    * @param conn
    * @param modules
-   * @return
-   * @throws Exception
    */
   @Deprecated
   public static ArrayList<String> orderByDependency(ConnectionProvider conn,
--- a/src/org/openbravo/erpCommon/modules/VersionUtility.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/modules/VersionUtility.java	Tue Nov 30 16:51:24 2010 +0000
@@ -452,7 +452,6 @@
      * 
      * @param ver1
      * @param ver2
-     * @return
      */
     public int compareMajorVersions(String ver1, String ver2) {
       return versionCompare(ver1, ver2, true);
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java	Tue Nov 30 16:51:24 2010 +0000
@@ -514,7 +514,6 @@
   /**
    * Deprecated, use instead {@link ActivationKey#checkOPSLimitations(String)}
    * 
-   * @return
    */
   @Deprecated
   public LicenseRestriction checkOPSLimitations() {
@@ -817,7 +816,7 @@
    * Checks whether a disabled module can be enabled again. A commercial module cannot be enabled in
    * case its license has expired or the instance is not commercial.
    * 
-   * @param moduleId
+   * @param module
    * @return true in case the module can be enabled
    */
   public boolean isModuleEnableable(Module module) {
--- a/src/org/openbravo/erpCommon/utility/HttpsUtils.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/HttpsUtils.java	Tue Nov 30 16:51:24 2010 +0000
@@ -165,7 +165,6 @@
    *             information. Use instead {@link HttpsUtils#isInternetAvailable()}
    * @param proxyHost
    * @param proxyPort
-   * @return
    */
   public static boolean isInternetAvailable(String proxyHost, int proxyPort) {
     OBContext.setAdminMode();
--- a/src/org/openbravo/erpCommon/utility/ShowImage.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/ShowImage.java	Tue Nov 30 16:51:24 2010 +0000
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -38,6 +39,12 @@
 
   private static final long serialVersionUID = 1L;
 
+  @Override
+  public void init(ServletConfig config) {
+    super.init(config);
+    boolHist = false;
+  }
+
   /**
    * Receiving an id parameter it looks in database for the image with that id and displays it
    */
--- a/src/org/openbravo/erpCommon/utility/TableSQLData.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/TableSQLData.java	Tue Nov 30 16:51:24 2010 +0000
@@ -2241,7 +2241,6 @@
    * 
    * @param vars
    * @param currPageKey
-   * @return
    * @throws ServletException
    */
   public static int calcAndGetBackendPage(VariablesSecureApp vars, String currPageKey)
--- a/src/org/openbravo/reference/ui/UITableDir.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/reference/ui/UITableDir.java	Tue Nov 30 16:51:24 2010 +0000
@@ -244,12 +244,25 @@
     String name = ((fieldName != null && !fieldName.equals("")) ? fieldName : comboTableData
         .getObjectName());
 
-    String tableDirName;
+    String tableDirName = null;
     if (name.equalsIgnoreCase("createdby") || name.equalsIgnoreCase("updatedby")) {
       tableDirName = "AD_User";
       name = "AD_User_ID";
     } else {
-      tableDirName = name.substring(0, name.length() - 3);
+      // Try to obtain the referenced table from reference. Note it is possible not to be a TableDir
+      // reference, but another one inheriting from this (search).
+      if (subReference != null && !subReference.equals("")) {
+        TableSQLQueryData[] search = TableSQLQueryData.searchInfo(comboTableData.getPool(),
+            subReference);
+        if (search != null && search.length != 0) {
+          name = search[0].columnname;
+          tableDirName = search[0].tablename;
+        }
+      }
+      // If not possible, use the columnname
+      if (tableDirName == null) {
+        tableDirName = name.substring(0, name.length() - 3);
+      }
     }
     ComboTableQueryData trd[] = ComboTableQueryData.identifierColumns(comboTableData.getPool(),
         tableDirName);
--- a/src/org/openbravo/scheduling/ProcessBundle.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/scheduling/ProcessBundle.java	Tue Nov 30 16:51:24 2010 +0000
@@ -240,7 +240,7 @@
    * @param conn
    *          a connection to the database
    * @return the initialized ProcessBundle
-   * @throws Exception
+   * @throws ServletException
    *           if there is an error initializing the bundle
    */
   public ProcessBundle init(ConnectionProvider conn) throws ServletException {
--- a/src/org/openbravo/service/db/CallProcess.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/service/db/CallProcess.java	Tue Nov 30 16:51:24 2010 +0000
@@ -88,7 +88,7 @@
     return call(processCriteria.list().get(0), recordID, parameters);
   }
 
-/**
+  /**
    * Calls a process. The recordID and parameters can be null. Parameters are translated into
    * {@link Parameter} instances.
    * 
@@ -99,7 +99,8 @@
    *          {@link ProcessInstance#getRecordID()}
    * @param parameters
    *          are translated into process parameters, supports only string parameters, for support
-   *          of other parameters see the next method: {@link #callProcess(org.openbravo.model.ad.ui.Process, String, Map)
+   *          of other parameters see the next method:
+   *          {@link #callProcess(org.openbravo.model.ad.ui.Process, String, Map)}
    * @return the created instance with the result ({@link ProcessInstance#getResult()}) or error (
    *         {@link ProcessInstance#getErrorMsg()})
    */
--- a/src/org/openbravo/service/db/DbUtility.java	Tue Nov 30 08:37:28 2010 +0100
+++ b/src/org/openbravo/service/db/DbUtility.java	Tue Nov 30 16:51:24 2010 +0000
@@ -42,9 +42,9 @@
    * because the {@link BatchUpdateException} does not place the underlying exception in the
    * {@link Throwable#getCause()} but in the {@link BatchUpdateException#getNextException()}.
    * 
-   * @param t
+   * @param throwable
    *          the throwable to analyze
-   * @return the underlying sql exception or the original t if none found
+   * @return the underlying sql exception or the original throwable if none found
    */
   public static Throwable getUnderlyingSQLException(Throwable throwable) {
     if (throwable.getCause() instanceof BatchUpdateException
--- a/web/html/en_US/StaticCommunityBranding-MyOB-Basic.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/web/html/en_US/StaticCommunityBranding-MyOB-Basic.html	Tue Nov 30 16:51:24 2010 +0000
@@ -16,82 +16,17 @@
  * Contributor(s):  ______________________________________.
  ************************************************************************
 -->
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="StaticCommunityBranding-MyOB.css"></link>
+<script language="JavaScript" src="StaticCommunityBranding-MyOB.js" type="text/javascript"></script>
 
-<style type="text/css">
-<!--
-p {} 
-h1 {font-size: 16px; font-family: arial, sans-serif;} 
-a:link {color: #58A618; text-decoration: underline;}
-a:visited {color: #58A618; text-decoration: underline;}
-a:hover {color: #000000; text-decoration: underline;}
-
-.LinkCont {
-  font-size: 12px;
-  font-family: arial, sans-serif;
-  line-height: 18px;
-  _line-height: 10px;
-  margin-top: -8px;
-  margin-left: 15px;
-}
-
-.DescriptionCont {
-  font-size: 12px;
-  font-family: arial, sans-serif;
-  line-height: 18px;
-  margin-top: -8px;
-  margin-left: 15px;
-  margin-right: 10px;
-}
--->
-</style>
 <script type="text/javascript">
-  function onResizeDo() {
-    var LinksCont = document.getElementById('LinksCont');
-    var TextCont = document.getElementById('TextCont');
-    var LogoCont = document.getElementById('LogoCont');
-    var LogoMiddleCont = document.getElementById('LogoMiddleCont');
-    var LogoLeftCont = document.getElementById('LogoLeftCont');
-    var LogoRightCont = document.getElementById('LogoRightCont');
-    var body = document.getElementsByTagName('BODY');
-    var bodyHeight = body[0].clientHeight;
-    var bodyWidth = body[0].clientWidth;
-    LinksCont.style.display = '';
-    TextCont.style.display = '';
-    LogoCont.style.display = '';
-    TextCont.style.height = '';
-    var TextCont_style_width = bodyWidth - LinksCont.clientWidth - 30;
-    if (TextCont_style_width < 0) {
-      TextCont_style_width = 0;
-    }
-    TextCont.style.width = TextCont_style_width
-    if (TextCont.clientHeight > 147) {
-      LinksCont.style.height = TextCont.clientHeight;
-    } else {
-      TextCont.style.height = 148;
-    }
-    var LogoCont_style_width = LinksCont.clientWidth + TextCont.clientWidth + 10;
-    if (LogoCont_style_width < 0) {
-      LogoCont_style_width = 0;
-    }
-    LogoCont.style.width = LogoCont_style_width;
-    var LogoMiddleCont_style_width = LogoCont.clientWidth - LogoLeftCont.clientWidth - LogoRightCont.clientWidth - 23;
-    if (LogoMiddleCont_style_width < 0) {
-      LogoMiddleCont_style_width = 0;
-    }
-    LogoMiddleCont.style.width = LogoMiddleCont_style_width;
-
-    if (LogoMiddleCont.clientWidth > 180) {
-      document.getElementById('LogoMiddleText').style.display = '';
-    } else {
-      document.getElementById('LogoMiddleText').style.display = 'none';
-    }
-  }
-
   function onLoadDo() {
     onResizeDo();
     onResizeDo();
+    setTimeout("onResizeDo()", 10);
   }
 </script>
 </head>
@@ -99,8 +34,10 @@
 
 <div style="background-color: #e9e9e9; overflow: hidden; padding: 0; margin: 0;">
 
-    <div style="position: relative; float: left; width: 141px; height: 143px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 3px 8px 8px; display: none;" id="LinksCont">
-      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Links</h1>
+  <div style="height: 162px; overflow: hidden;">
+
+    <div style="position: relative; float: left; width: 141px; height: 146px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 3px 8px 8px; display: none;" id="LinksCont">
+      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin: 10px 5px 13px 15px;">Links</h1>
       <p class="LinkCont"><a href="http://www.openbravo.com/" target="_blank">Openbravo.com</a></p>
       <p class="LinkCont"><a href="http://exchange.openbravo.com/" target="_blank">Exchange</a></p>
       <p class="LinkCont"><a href="http://planet.openbravo.com/" target="_blank">Planet</a></p>
@@ -108,35 +45,32 @@
       <p class="LinkCont"><a href="http://wiki.openbravo.com/" target="_blank">Wiki</a></p>
     </div>
 
-
     <div style="width: 100px; position: relative; float: left; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 8px 3px 7px; display: none;" id="TextCont">
-      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Go to the next level!<br>
-      </h1>
-      <p class="DescriptionCont">As a Basic Edition customer you experience the value of Openbravo solutions. Now you can get even more value through a <a href="http://www.openbravo.com/partners/find-partners-support/" target="_blank">Partner</a>. For more information<a href="http://www.openbravo.com/partners/find-partners-support/" target="_blank"></a>, please <a href="http://www.openbravo.com/form/customer/index.php?source=Form - Basic Edition" target="_blank">contact us</a>.
+      <div style="height: 35px; overflow: hidden;"><h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin: 10px 5px 5px 15px;">Go to the next level!<br>
+      </h1></div>
+      <div style="overflow: hidden; margin-bottom: 4px;" id="TextBody">
+        <p class="DescriptionCont">As a Basic Edition customer you experience the value of Openbravo solutions. Now you can get even more value through a <a href="http://www.openbravo.com/partners/find-partners-support/" target="_blank">Partner</a>. For more information<a href="http://www.openbravo.com/partners/find-partners-support/" target="_blank"></a>, please <a href="http://www.openbravo.com/form/customer/index.php?source=Form - Basic Edition" target="_blank">contact us</a>.
         </a></p>
+      </div>
+      <div style="height: 20px; display: none;" id="TextScrollCont">
+        <div class="TextScrollUp TextScrollUp_normal" onmousedown="scrollButton(this, 'onmousedown');" onmouseup="scrollButton(this, 'onmouseup');" onmouseout="scrollButton(this, 'onmouseout');" onmouseover="scrollButton(this, 'onmouseover');" id="TextScrollUp"></div>
+        <div style="position: relative; float: left; height: 19px; width: 2px; -moz-border-radius-bottomleft: 10px; border-bottom-left-radius: 10px;" id="TextScrollMiddle"></div>
+        <div class="TextScrollDown TextScrollDown_normal"  onmousedown="scrollButton(this, 'onmousedown');" onmouseup="scrollButton(this, 'onmouseup');" onmouseout="scrollButton(this, 'onmouseout');" onmouseover="scrollButton(this, 'onmouseover');" id="TextScrollDown"></div>
+      </div>
     </div>
 
+  </div>
 
-  <br style="clear: both;">
-
-
-  <div style="float: left; height: 145px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 3px 6px 6px 8px; display: none;" id="LogoCont">
+  <div style="float: left; height: 145px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 3px 6px 3px 8px; display: none;" id="LogoCont">
     <h1 style="margin-left: 15px; margin-top: 10px; margin-right: 5px;">Why upgrade to <a href="http://www.openbravo.com/product/erp/" target="_blank">Professional Edition?</a></h1>
-    
-
-<div onclick="window.open('http://www.openbravo.com/product/erp/');return false;" style="cursor: pointer; height: 92px; overflow: hidden;">
+    <div onclick="window.open('http://www.openbravo.com/product/erp/');return false;" style="cursor: pointer; height: 92px; overflow: hidden;">
       <div style="float: left; width: 270px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topleft: 10px; -moz-border-radius-bottomleft: 10px; border-top-left-radius: 10px; border-bottom-left-radius: 10px; border-top: 1px solid #D8D8D8; border-left: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; margin-left: 10px;" id="LogoLeftCont">
         <img src="img/LogoLeft_Pro.png" style="border: 0; margin: 6px 0px 0px 8px;" />
-     
-</div>
-      
-
-
-<div style="float: left; height: 92px; width: 10px; background-color: #E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; font-size: 35px; font-weight: bold; text-align: center; font-family: arial, sans-serif; color: #959595" id="LogoMiddleCont"><div style="margin-top: 25px; display: none;" id="LogoMiddleText">Go Pro!</div></div>
-  
-
-
-<div style="float: left; width: 66px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright: 10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px; border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;" id="LogoRightCont">
+      </div>
+      <div style="float: left; height: 92px; width: 10px; background-color: #E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; font-size: 35px; font-weight: bold; text-align: center; font-family: arial, sans-serif; color: #959595" id="LogoMiddleCont">
+        <div style="margin-top: 25px; display: none;" id="LogoMiddleText">Go Pro!</div>
+      </div>
+      <div style="float: left; width: 66px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright: 10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px; border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;" id="LogoRightCont">
         <div style="width: 65px; height: 90px;">
           <img src="img/LogoRight.png" style="border: 0; margin: 0px 0px 0px 2px;" />
         <div>
@@ -145,4 +79,5 @@
   </div>
 </div>
 
-</body></html>
+</body>
+</html>
--- a/web/html/en_US/StaticCommunityBranding-MyOB-Comm.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/web/html/en_US/StaticCommunityBranding-MyOB-Comm.html	Tue Nov 30 16:51:24 2010 +0000
@@ -16,82 +16,17 @@
  * Contributor(s):  ______________________________________.
  ************************************************************************
 -->
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="StaticCommunityBranding-MyOB.css"></link>
+<script language="JavaScript" src="StaticCommunityBranding-MyOB.js" type="text/javascript"></script>
 
-<style type="text/css">
-<!--
-p {} 
-h1 {font-size: 16px; font-family: arial, sans-serif;} 
-a:link {color: #58A618; text-decoration: underline;}
-a:visited {color: #58A618; text-decoration: underline;}
-a:hover {color: #000000; text-decoration: underline;}
-
-.LinkCont {
-  font-size: 12px;
-  font-family: arial, sans-serif;
-  line-height: 18px;
-  _line-height: 10px;
-  margin-top: -8px;
-  margin-left: 15px;
-}
-
-.DescriptionCont {
-  font-size: 12px;
-  font-family: arial, sans-serif;
-  line-height: 18px;
-  margin-top: -8px;
-  margin-left: 15px;
-  margin-right: 10px;
-}
--->
-</style>
 <script type="text/javascript">
-  function onResizeDo() {
-    var LinksCont = document.getElementById('LinksCont');
-    var TextCont = document.getElementById('TextCont');
-    var LogoCont = document.getElementById('LogoCont');
-    var LogoMiddleCont = document.getElementById('LogoMiddleCont');
-    var LogoLeftCont = document.getElementById('LogoLeftCont');
-    var LogoRightCont = document.getElementById('LogoRightCont');
-    var body = document.getElementsByTagName('BODY');
-    var bodyHeight = body[0].clientHeight;
-    var bodyWidth = body[0].clientWidth;
-    LinksCont.style.display = '';
-    TextCont.style.display = '';
-    LogoCont.style.display = '';
-    TextCont.style.height = '';
-    var TextCont_style_width = bodyWidth - LinksCont.clientWidth - 30;
-    if (TextCont_style_width < 0) {
-      TextCont_style_width = 0;
-    }
-    TextCont.style.width = TextCont_style_width
-    if (TextCont.clientHeight > 147) {
-      LinksCont.style.height = TextCont.clientHeight;
-    } else {
-      TextCont.style.height = 148;
-    }
-    var LogoCont_style_width = LinksCont.clientWidth + TextCont.clientWidth + 10;
-    if (LogoCont_style_width < 0) {
-      LogoCont_style_width = 0;
-    }
-    LogoCont.style.width = LogoCont_style_width;
-    var LogoMiddleCont_style_width = LogoCont.clientWidth - LogoLeftCont.clientWidth - LogoRightCont.clientWidth - 23;
-    if (LogoMiddleCont_style_width < 0) {
-      LogoMiddleCont_style_width = 0;
-    }
-    LogoMiddleCont.style.width = LogoMiddleCont_style_width;
-
-    if (LogoMiddleCont.clientWidth > 180) {
-      document.getElementById('LogoMiddleText').style.display = '';
-    } else {
-      document.getElementById('LogoMiddleText').style.display = 'none';
-    }
-  }
-
   function onLoadDo() {
     onResizeDo();
     onResizeDo();
+    setTimeout("onResizeDo()", 10);
   }
 </script>
 </head>
@@ -99,8 +34,10 @@
 
 <div style="background-color: #e9e9e9; overflow: hidden; padding: 0; margin: 0;">
 
-    <div style="position: relative; float: left; width: 141px; height: 143px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 3px 8px 8px; display: none;" id="LinksCont">
-      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Links</h1>
+  <div style="height: 162px; overflow: hidden;">
+
+    <div style="position: relative; float: left; width: 141px; height: 146px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 3px 8px 8px; display: none;" id="LinksCont">
+      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin: 10px 5px 13px 15px;">Links</h1>
       <p class="LinkCont"><a href="http://www.openbravo.com/" target="_blank">Openbravo.com</a></p>
       <p class="LinkCont"><a href="http://exchange.openbravo.com/" target="_blank">Exchange</a></p>
       <p class="LinkCont"><a href="http://planet.openbravo.com/" target="_blank">Planet</a></p>
@@ -108,33 +45,33 @@
       <p class="LinkCont"><a href="http://wiki.openbravo.com/" target="_blank">Wiki</a></p>
     </div>
 
-
     <div style="width: 100px; position: relative; float: left; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 8px 3px 7px; display: none;" id="TextCont">
-      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Extend your ERP<br>
-      </h1>
-      <p class="DescriptionCont">Discover the power of the Openbravo ecosystem
-       and extend your system with <a href="http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Personalizing_Openbravo_ERP#Installing_a_module_from_the_Central_Repository" target="_blank">modules</a>. For more information please <a href="http://www.openbravo.com/form/customer/index.php?source=Form - Community Edition" target="_blank">contact us</a>.
-      </p>
+      <div style="height: 35px; overflow: hidden;"><h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin: 10px 5px 5px 15px;">Extend your ERP<br>
+      </h1></div>
+      <div style="overflow: hidden; margin-bottom: 4px;" id="TextBody">
+        <p class="DescriptionCont">Discover the power of the Openbravo ecosystem
+         and extend your system with <a href="http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Personalizing_Openbravo_ERP#Installing_a_module_from_the_Central_Repository" target="_blank">modules</a>. For more information please <a href="http://www.openbravo.com/form/customer/index.php?source=Form - Community Edition" target="_blank">contact us</a>.
+        </p>
+      </div>
+      <div style="height: 20px; display: none;" id="TextScrollCont">
+        <div class="TextScrollUp TextScrollUp_normal" onmousedown="scrollButton(this, 'onmousedown');" onmouseup="scrollButton(this, 'onmouseup');" onmouseout="scrollButton(this, 'onmouseout');" onmouseover="scrollButton(this, 'onmouseover');" id="TextScrollUp"></div>
+        <div style="position: relative; float: left; height: 19px; width: 2px; -moz-border-radius-bottomleft: 10px; border-bottom-left-radius: 10px;" id="TextScrollMiddle"></div>
+        <div class="TextScrollDown TextScrollDown_normal"  onmousedown="scrollButton(this, 'onmousedown');" onmouseup="scrollButton(this, 'onmouseup');" onmouseout="scrollButton(this, 'onmouseout');" onmouseover="scrollButton(this, 'onmouseover');" id="TextScrollDown"></div>
+      </div>
     </div>
 
+  </div>
 
-  <br style="clear: both;">
-
-
-  <div style="float: left; height: 145px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 3px 6px 6px 8px; display: none;" id="LogoCont">
+  <div style="float: left; height: 145px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 3px 6px 3px 8px; display: none;" id="LogoCont">
     <h1 style="margin-left: 15px; margin-top: 10px; margin-right: 5px;">Why upgrade to <a href="http://www.openbravo.com/product/erp/get-basic/" target="_blank">Basic Edition?</a></h1>
-    
-
-<div onclick="window.open('http://www.openbravo.com/product/erp/get-basic/'); return false;" style="cursor: pointer; height: 92px; overflow: hidden;">
+    <div onclick="window.open('http://www.openbravo.com/product/erp/get-basic/');return false;" style="cursor: pointer; height: 92px; overflow: hidden;">
       <div style="float: left; width: 270px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topleft: 10px; -moz-border-radius-bottomleft: 10px; border-top-left-radius: 10px; border-bottom-left-radius: 10px; border-top: 1px solid #D8D8D8; border-left: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; margin-left: 10px;" id="LogoLeftCont">
         <img src="img/LogoLeft_Basic.png" style="border: 0; margin: 6px 0px 0px 8px;" />
       </div>
-
-
-<div style="float: left; height: 92px; width: 10px; background-color: #E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; font-size: 35px; font-weight: bold; text-align: center; font-family: arial, sans-serif; color: #959595" id="LogoMiddleCont"><div style="margin-top: 25px; display: none;" id="LogoMiddleText">Get Basic!</div></div>
-      
-
-<div style="float: left; width: 66px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright: 10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px; border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;" id="LogoRightCont">
+      <div style="float: left; height: 92px; width: 10px; background-color: #E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; font-size: 35px; font-weight: bold; text-align: center; font-family: arial, sans-serif; color: #959595" id="LogoMiddleCont">
+        <div style="margin-top: 25px; display: none;" id="LogoMiddleText">Get Basic!</div>
+      </div>
+      <div style="float: left; width: 66px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright: 10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px; border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;" id="LogoRightCont">
         <div style="width: 65px; height: 90px;">
           <img src="img/LogoRight.png" style="border: 0; margin: 0px 0px 0px 2px;" />
         <div>
@@ -143,4 +80,5 @@
   </div>
 </div>
 
-</body></html>
+</body>
+</html>
--- a/web/html/en_US/StaticCommunityBranding-MyOB-STD.html	Tue Nov 30 08:37:28 2010 +0100
+++ b/web/html/en_US/StaticCommunityBranding-MyOB-STD.html	Tue Nov 30 16:51:24 2010 +0000
@@ -16,82 +16,17 @@
  * Contributor(s):  ______________________________________.
  ************************************************************************
 -->
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="StaticCommunityBranding-MyOB.css"></link>
+<script language="JavaScript" src="StaticCommunityBranding-MyOB.js" type="text/javascript"></script>
 
-<style type="text/css">
-<!--
-p {} 
-h1 {font-size: 16px; font-family: arial, sans-serif;} 
-a:link {color: #58A618; text-decoration: underline;}
-a:visited {color: #58A618; text-decoration: underline;}
-a:hover {color: #000000; text-decoration: underline;}
-
-.LinkCont {
-  font-size: 12px;
-  font-family: arial, sans-serif;
-  line-height: 18px;
-  _line-height: 10px;
-  margin-top: -8px;
-  margin-left: 15px;
-}
-
-.DescriptionCont {
-  font-size: 12px;
-  font-family: arial, sans-serif;
-  line-height: 18px;
-  margin-top: -8px;
-  margin-left: 15px;
-  margin-right: 10px;
-}
--->
-</style>
 <script type="text/javascript">
-  function onResizeDo() {
-    var LinksCont = document.getElementById('LinksCont');
-    var TextCont = document.getElementById('TextCont');
-    var LogoCont = document.getElementById('LogoCont');
-    var LogoMiddleCont = document.getElementById('LogoMiddleCont');
-    var LogoLeftCont = document.getElementById('LogoLeftCont');
-    var LogoRightCont = document.getElementById('LogoRightCont');
-    var body = document.getElementsByTagName('BODY');
-    var bodyHeight = body[0].clientHeight;
-    var bodyWidth = body[0].clientWidth;
-    LinksCont.style.display = '';
-    TextCont.style.display = '';
-    LogoCont.style.display = '';
-    TextCont.style.height = '';
-    var TextCont_style_width = bodyWidth - LinksCont.clientWidth - 30;
-    if (TextCont_style_width < 0) {
-      TextCont_style_width = 0;
-    }
-    TextCont.style.width = TextCont_style_width
-    if (TextCont.clientHeight > 147) {
-      LinksCont.style.height = TextCont.clientHeight;
-    } else {
-      TextCont.style.height = 148;
-    }
-    var LogoCont_style_width = LinksCont.clientWidth + TextCont.clientWidth + 10;
-    if (LogoCont_style_width < 0) {
-      LogoCont_style_width = 0;
-    }
-    LogoCont.style.width = LogoCont_style_width;
-    var LogoMiddleCont_style_width = LogoCont.clientWidth - LogoLeftCont.clientWidth - LogoRightCont.clientWidth - 23;
-    if (LogoMiddleCont_style_width < 0) {
-      LogoMiddleCont_style_width = 0;
-    }
-    LogoMiddleCont.style.width = LogoMiddleCont_style_width;
-
-    if (LogoMiddleCont.clientWidth > 180) {
-      document.getElementById('LogoMiddleText').style.display = '';
-    } else {
-      document.getElementById('LogoMiddleText').style.display = 'none';
-    }
-  }
-
   function onLoadDo() {
     onResizeDo();
     onResizeDo();
+    setTimeout("onResizeDo()", 10);
   }
 </script>
 </head>
@@ -99,8 +34,10 @@
 
 <div style="background-color: #e9e9e9; overflow: hidden; padding: 0; margin: 0;">
 
-    <div style="position: relative; float: left; width: 141px; height: 143px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 3px 8px 8px; display: none;" id="LinksCont">
-      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Links</h1>
+  <div style="height: 162px; overflow: hidden;">
+
+    <div style="position: relative; float: left; width: 141px; height: 146px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 3px 8px 8px; display: none;" id="LinksCont">
+      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin: 10px 5px 13px 15px;">Links</h1>
       <p class="LinkCont"><a href="http://www.openbravo.com/" target="_blank">Openbravo.com</a></p>
       <p class="LinkCont"><a href="http://exchange.openbravo.com/" target="_blank">Exchange</a></p>
       <p class="LinkCont"><a href="http://planet.openbravo.com/" target="_blank">Planet</a></p>
@@ -108,34 +45,32 @@
       <p class="LinkCont"><a href="http://wiki.openbravo.com/" target="_blank">Wiki</a></p>
     </div>
 
+    <div style="width: 100px; position: relative; float: left; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 8px 3px 7px; display: none;" id="TextCont">
+      <div style="height: 35px; overflow: hidden;"><h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin: 10px 5px 5px 15px;">Welcome!<br>
+      </h1></div>
+      <div style="overflow: hidden; margin-bottom: 4px;" id="TextBody">
+        <p class="DescriptionCont">Your subscription entitles you to exclusive functionality, support, maintenance, warranties and access to professional services</p>
+        <p class="DescriptionCont">Please <a href="mailto:collaborate@openbravo.com">share</a> your success story!</p>
+      </div>
+      <div style="height: 20px; display: none;" id="TextScrollCont">
+        <div class="TextScrollUp TextScrollUp_normal" onmousedown="scrollButton(this, 'onmousedown');" onmouseup="scrollButton(this, 'onmouseup');" onmouseout="scrollButton(this, 'onmouseout');" onmouseover="scrollButton(this, 'onmouseover');" id="TextScrollUp"></div>
+        <div style="position: relative; float: left; height: 19px; width: 2px; -moz-border-radius-bottomleft: 10px; border-bottom-left-radius: 10px;" id="TextScrollMiddle"></div>
+        <div class="TextScrollDown TextScrollDown_normal"  onmousedown="scrollButton(this, 'onmousedown');" onmouseup="scrollButton(this, 'onmouseup');" onmouseout="scrollButton(this, 'onmouseout');" onmouseover="scrollButton(this, 'onmouseover');" id="TextScrollDown"></div>
+      </div>
+    </div>
 
-    <div style="width: 100px; position: relative; float: left; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 8px 8px 3px 7px; display: none;" id="TextCont">
-      <h1 style="border-bottom: 1px dotted rgb(88, 166, 24); margin-left: 15px; margin-top: 10px; margin-right: 5px;">Welcome!<br>
-      </h1>
-      <p class="DescriptionCont">Your subscription entitles you to exclusive functionality, support, maintenance, warranties and access to professional services</p>
-<p class="DescriptionCont">Please <a href="mailto:collaborate@openbravo.com">share</a> your success story!</p>  </div>
+  </div>
 
-
-  <br style="clear: both;">
-
-
-  <div style="float: left; height: 145px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 3px 6px 6px 8px; display: none;" id="LogoCont">
+  <div style="float: left; height: 145px; background-color: #f8f8f8; -moz-border-radius: 10px; border-radius: 10px; margin: 3px 6px 3px 8px; display: none;" id="LogoCont">
     <h1 style="margin-left: 15px; margin-top: 10px; margin-right: 5px;">Learn more about <a href="http://www.openbravo.com/product/erp/" target="_blank">Professional Edition</a></h1>
-    
-
-<div onclick="window.open('http://www.openbravo.com/product/erp/');return false;" style="cursor: pointer; height: 92px; overflow: hidden;">
+    <div onclick="window.open('http://www.openbravo.com/product/erp/');return false;" style="cursor: pointer; height: 92px; overflow: hidden;">
       <div style="float: left; width: 270px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topleft: 10px; -moz-border-radius-bottomleft: 10px; border-top-left-radius: 10px; border-bottom-left-radius: 10px; border-top: 1px solid #D8D8D8; border-left: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; margin-left: 10px;" id="LogoLeftCont">
         <img src="img/LogoLeft_Pro.png" style="border: 0; margin: 6px 0px 0px 8px;" />
-     
-</div>
-      
-
-
-<div style="float: left; height: 92px; width: 10px; background-color: #E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; font-size: 30px; font-weight: bold; text-align: center; font-family: arial, sans-serif; color: #959595" id="LogoMiddleCont"><div style="margin-top: 25px; display: none;" id="LogoMiddleText">ERP for Life</div></div>
-  
-
-
-<div style="float: left; width: 66px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright: 10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px; border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;" id="LogoRightCont">
+      </div>
+      <div style="float: left; height: 92px; width: 10px; background-color: #E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8; font-size: 30px; font-weight: bold; text-align: center; font-family: arial, sans-serif; color: #959595" id="LogoMiddleCont">
+        <div style="margin-top: 25px; display: none;" id="LogoMiddleText">ERP for Life</div>
+      </div>
+      <div style="float: left; width: 66px; height: 92px; background-color: #E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright: 10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px; border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;" id="LogoRightCont">
         <div style="width: 65px; height: 90px;">
           <img src="img/LogoRight.png" style="border: 0; margin: 0px 0px 0px 2px;" />
         <div>
@@ -144,4 +79,5 @@
   </div>
 </div>
 
-</body></html>
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/html/en_US/StaticCommunityBranding-MyOB.css	Tue Nov 30 16:51:24 2010 +0000
@@ -0,0 +1,135 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+*/
+
+body {
+  margin: 0;
+  padding: 0;
+  overflow: auto;
+}
+
+p {}
+h1 {font-size: 16px; font-family: arial, sans-serif;}
+a:link {color: #58A618; text-decoration: underline;}
+a:visited {color: #58A618; text-decoration: underline;}
+a:hover {color: #000000; text-decoration: underline;}
+
+.LinkCont {
+  font-size: 12px;
+  font-family: arial, sans-serif;
+  line-height: 15px;
+  _line-height: 10px;
+  margin-top: -8px;
+  margin-left: 15px;
+}
+
+.DescriptionCont {
+  font-size: 12px;
+  font-family: arial, sans-serif;
+  line-height: 16px;
+  margin-top: 0px;
+  margin-left: 15px;
+  margin-right: 10px;
+}
+
+.TextScrollUp {
+  position: relative;
+  float: left;
+  height: 19px;
+  width: 49px;
+  cursor: pointer;
+  -moz-border-radius-bottomleft: 10px;
+  border-bottom-left-radius: 10px;
+}
+
+.TextScrollDown {
+  position: relative;
+  float: left;
+  height: 19px;
+  width: 49px;
+  cursor: pointer;
+  -moz-border-radius-bottomright: 10px;
+  border-bottom-right-radius: 10px;
+}
+
+.TextScrollUp_normal {
+  border-top: 1px solid #898989;
+  border-right: 1px solid #898989;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(img/upArrow_normal.png);
+
+}
+
+.TextScrollUp_hover {
+  border-top: 1px solid #CDD7BB;
+  border-right: 1px solid #CDD7BB;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(img/upArrow_hover.png);
+}
+
+.TextScrollUp_active {
+  border-top: 1px solid #555555;
+  border-right: 1px solid #555555;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(img/upArrow_active.png);
+}
+
+.TextScrollUp_disabled {
+  border-top: 1px solid #BBBBBB;
+  border-right: 1px solid #BBBBBB;
+  cursor: default;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(img/upArrow_disabled.png);
+}
+
+.TextScrollDown_normal {
+  border-top: 1px solid #898989;
+  border-left: 1px solid #898989;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(img/downArrow_normal.png);
+}
+
+.TextScrollDown_hover {
+  border-top: 1px solid #CDD7BB;
+  border-left: 1px solid #CDD7BB;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(img/downArrow_hover.png);
+}
+
+.TextScrollDown_active {
+  border-top: 1px solid #555555;
+  border-left: 1px solid #555555;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(img/downArrow_active.png);
+}
+
+.TextScrollDown_disabled {
+  border-top: 1px solid #BBBBBB;
+  border-left: 1px solid #BBBBBB;
+  cursor: default;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: url(img/downArrow_disabled.png);
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/html/en_US/StaticCommunityBranding-MyOB.js	Tue Nov 30 16:51:24 2010 +0000
@@ -0,0 +1,157 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+*/
+
+function onResizeDo() {
+  var LinksCont = document.getElementById('LinksCont');
+  var TextCont = document.getElementById('TextCont');
+  var LogoCont = document.getElementById('LogoCont');
+  var LogoMiddleCont = document.getElementById('LogoMiddleCont');
+  var LogoLeftCont = document.getElementById('LogoLeftCont');
+  var LogoRightCont = document.getElementById('LogoRightCont');
+  var TextBody = document.getElementById('TextBody');
+  var TextScrollCont = document.getElementById('TextScrollCont');
+  var TextScrollUp = document.getElementById('TextScrollUp');
+  var TextScrollMiddle = document.getElementById('TextScrollMiddle');
+  var TextScrollDown = document.getElementById('TextScrollDown');
+  var body = document.getElementsByTagName('BODY');
+  var bodyHeight = body[0].clientHeight;
+  var bodyWidth = body[0].clientWidth;
+  LinksCont.style.display = '';
+  TextCont.style.display = '';
+  LogoCont.style.display = '';
+  TextCont.style.height = '';
+  var TextCont_style_width = bodyWidth - LinksCont.clientWidth - 30;
+  if (TextCont_style_width < 0) {
+    TextCont_style_width = 0;
+  }
+  TextCont.style.width = TextCont_style_width;
+  TextCont.style.height = 146;
+
+  TextBody.style.height = 102;
+
+  var TextScrollUp_style_width = parseInt(TextCont_style_width/2, 10) - 2;
+  var TextScrollMiddle_style_width = 1;
+  var TextScrollDown_style_width = TextCont_style_width - TextScrollMiddle_style_width - TextScrollUp_style_width - 2;
+  if (TextScrollUp_style_width < 0) {
+    TextScrollUp_style_width = 0;
+  }
+  if (TextScrollDown_style_width < 0) {
+    TextScrollDown_style_width = 0;
+  }
+  TextScrollUp.style.width = TextScrollUp_style_width;
+  TextScrollMiddle.style.width = TextScrollMiddle_style_width;
+  TextScrollDown.style.width = TextScrollDown_style_width;
+
+  if (TextBody.scrollTop === 0) {
+    document.getElementById('TextScrollUp').className = "TextScrollUp TextScrollUp_disabled";
+  } else {
+    document.getElementById('TextScrollUp').className = "TextScrollUp TextScrollUp_normal";
+  }
+
+  if (TextBody.scrollTop >= TextBody.scrollHeight - TextBody.clientHeight) {
+    document.getElementById('TextScrollDown').className = "TextScrollDown TextScrollDown_disabled";
+  } else {
+    document.getElementById('TextScrollDown').className = "TextScrollDown TextScrollDown_normal";
+  }
+
+  if (TextBody.scrollHeight > TextBody.clientHeight) {
+    TextBody.style.height = 87;
+    TextScrollCont.style.display = '';
+  } else {
+    TextBody.scrollTop = 0;
+    TextScrollCont.style.display = 'none';
+    TextBody.style.height = 102;
+  }
+
+  if (TextBody.scrollTop >= TextBody.scrollHeight - TextBody.clientHeight) {
+    TextBody.scrollTop = TextBody.scrollHeight + 100;
+  }
+
+  if (TextBody.scrollTop >= TextBody.scrollHeight - TextBody.clientHeight) {
+    document.getElementById('TextScrollDown').className = "TextScrollDown TextScrollDown_disabled";
+  } else {
+    document.getElementById('TextScrollDown').className = "TextScrollDown TextScrollDown_normal";
+  }
+
+  var LogoCont_style_width = LinksCont.clientWidth + TextCont.clientWidth + 10;
+  if (LogoCont_style_width < 0) {
+    LogoCont_style_width = 0;
+  }
+  LogoCont.style.width = LogoCont_style_width;
+  var LogoMiddleCont_style_width = LogoCont.clientWidth - LogoLeftCont.clientWidth - LogoRightCont.clientWidth - 23;
+  if (LogoMiddleCont_style_width < 0) {
+    LogoMiddleCont_style_width = 0;
+  }
+  LogoMiddleCont.style.width = LogoMiddleCont_style_width;
+
+  if (LogoMiddleCont.clientWidth > 180) {
+    document.getElementById('LogoMiddleText').style.display = '';
+  } else {
+    document.getElementById('LogoMiddleText').style.display = 'none';
+  }
+}
+
+var step = 1;
+var timerDown;
+var timerUp;
+function scrollButton(button, action) {
+  var buttonDir = button.id.replace('TextScroll', '');
+  var TextBody = document.getElementById('TextBody');
+  var className = "normal";
+  if (action === 'onmousedown') {
+    if (buttonDir === 'Up') {
+      TextBody.scrollTop -= step;
+      timerUp = setTimeout(function() { scrollButton(button, action); }, 10);
+    } else if (buttonDir === 'Down') {
+      TextBody.scrollTop += step;
+      timerDown = setTimeout(function() { scrollButton(button, action); }, 10);
+    }
+    className = "active";
+  } else if (action === 'onmouseup') {
+    clearTimeout(timerUp);
+    clearTimeout(timerDown);
+    className = "hover";
+  } else if (action === 'onmouseout') {
+    clearTimeout(timerUp);
+    clearTimeout(timerDown);
+    className = "normal";
+  } else if (action === 'onmouseover') {
+    className = "hover";
+  }
+
+  if (TextBody.scrollTop === 0) {
+    document.getElementById('TextScrollUp').className = "TextScrollUp TextScrollUp_disabled";
+    if (buttonDir === "Up") {
+      className = "disabled";
+    }
+  } else if (buttonDir === "Down") {
+    document.getElementById('TextScrollUp').className = "TextScrollUp TextScrollUp_normal";
+  }
+
+  if (TextBody.scrollTop >= TextBody.scrollHeight - TextBody.clientHeight) {
+    document.getElementById('TextScrollDown').className = "TextScrollDown TextScrollDown_disabled";
+    if (buttonDir === "Down") {
+      className = "disabled";
+    }
+  } else if (buttonDir === "Up") {
+    document.getElementById('TextScrollDown').className = "TextScrollDown TextScrollDown_normal";
+  }
+
+  button.className = "TextScroll" + buttonDir + " TextScroll" + buttonDir + "_" + className;
+}
\ No newline at end of file
Binary file web/html/en_US/img/downArrow_active.png has changed
Binary file web/html/en_US/img/downArrow_disabled.png has changed
Binary file web/html/en_US/img/downArrow_hover.png has changed
Binary file web/html/en_US/img/downArrow_normal.png has changed
Binary file web/html/en_US/img/upArrow_active.png has changed
Binary file web/html/en_US/img/upArrow_disabled.png has changed
Binary file web/html/en_US/img/upArrow_hover.png has changed
Binary file web/html/en_US/img/upArrow_normal.png has changed
--- a/web/js/searchs.js	Tue Nov 30 08:37:28 2010 +0100
+++ b/web/js/searchs.js	Tue Nov 30 16:51:24 2010 +0000
@@ -98,7 +98,7 @@
   
   if (navigator.appName.indexOf("Netscape"))
     complementsNS4 = "alwaysRaised=1, dependent=1, directories=0, hotkeys=0, menubar=0, ";
-  var complements = complementsNS4 + "height=" + strHeight + ", width=" + strWidth + ", left=" + strLeft + ", top=" + strTop + ", screenX=" + strLeft + ", screenY=" + strTop + ", location=0, resizable=0, scrollbars=1, status=0, toolbar=0, titlebar=0";
+  var complements = complementsNS4 + "height=" + strHeight + ", width=" + strWidth + ", left=" + strLeft + ", top=" + strTop + ", screenX=" + strLeft + ", screenY=" + strTop + ", location=0, resizable=1, scrollbars=1, status=0, toolbar=0, titlebar=0";
   winSelector = window.open(strPage + ((auxField=="")?"":"?" + auxField), strWindow, complements);
   if (winSelector!=null) {
     /*if (hidden) window.focus();  //Useless since window.focus() after window.open it doesn't run in most browsers. Also in case of selectors with a non-existing search value can open the popup in the background in FF3.6
@@ -379,10 +379,17 @@
   hasCloseWindowSearch = false;
 }
 
-function infoSelectFilters(params) {
+function infoSelectFilters(params, type) {
+    if (!type) {
+      type = 'Search';
+    }
     setGridFilters(params);
     updateGridDataAfterFilter();
-    dijit.byId('grid').requestParams["newFilter"] = "0";
+    if (type === 'Search') {
+      dijit.byId('grid').requestParams["newFilter"] = "0";
+    } else if (type === 'Save') {
+      dijit.byId('grid').requestParams["newFilter"] = "1";
+    }
     return true;
 }
 
@@ -472,7 +479,10 @@
    return true;
  }
  
- function setFilters() {
+ function setFilters(type) {
+   if (!type) {
+     type = 'Search';
+   }
   	var frm = document.forms[0];
   	var paramsData = new Array();
   	var count = 0;
@@ -498,7 +508,7 @@
         paramsData[count++] = new Array(selects[i].name, selects[i].options[selects[i].selectedIndex].value);
       };
     }
-  	infoSelectFilters(paramsData);
+  	infoSelectFilters(paramsData, type);
   }
   
 function calculateNumRows() {
--- a/web/js/utils.js	Tue Nov 30 08:37:28 2010 +0100
+++ b/web/js/utils.js	Tue Nov 30 16:51:24 2010 +0000
@@ -4461,8 +4461,12 @@
   var h = body[0].clientHeight;
   var w = body[0].clientWidth;
   var name = window.navigator.appName;
-  client_middle.style.width = w;
-  client_middle.style.height = h -((table_header?table_header.clientHeight:0) + (client_top?client_top.clientHeight:0) + (client_bottom?client_bottom.clientHeight:0)) - ((name.indexOf("Microsoft")==-1)?1:0);
+  var client_middleWidth = w;
+  var client_middleHeight = h -((table_header?table_header.clientHeight:0) + (client_top?client_top.clientHeight:0) + (client_bottom?client_bottom.clientHeight:0)) - ((name.indexOf("Microsoft")==-1)?1:0);
+  if (client_middleWidth < 0) { client_middleWidth = 0; }
+  if (client_middleHeight < 170) { client_middleHeight = 170; } // To avoid middle area (usually a grid) disappear completly in small windows.
+  client_middle.style.height = client_middleHeight;
+  client_middle.style.width = client_middleWidth;
 
   try {
     if (document.getElementById("grid_toptext")) {
@@ -4490,9 +4494,9 @@
   var w = body[0].clientWidth;
   var name = window.navigator.appName;
   var client_middleWidth = w - 0;
-  var client_middleHeight = h -((table_header?table_header.clientHeight:0) + (client_messagebox?client_messagebox.clientHeight:0) + (client_top?client_top.clientHeight:0) + (client_bottom?client_bottom.clientHeight:0)) - ((name.indexOf("Microsoft")==-1)?1:0);
+  var client_middleHeight = h -((table_header?table_header.clientHeight:0) + (client_messagebox?client_messagebox.clientHeight:0) + (client_top?client_top.clientHeight:0) + (client_bottom?client_bottom.clientHeight:0)) - ((name.indexOf("Microsoft")==-1)?1:1);
   if (client_middleWidth < 0) { client_middleWidth = 0; }
-  if (client_middleHeight < 0) { client_middleHeight = 0; }
+  if (client_middleHeight < 80) { client_middleHeight = 80; } // To avoid middle area (usually a grid) disappear completly in small windows.
   client_middle.style.height = client_middleHeight;
   client_middle.style.width = client_middleWidth;
   client_middle.style.display = "";
Binary file web/skins/Default/Login/banner-unknown.png has changed
--- a/web/skins/Default/Openbravo_ERP_250.css	Tue Nov 30 08:37:28 2010 +0100
+++ b/web/skins/Default/Openbravo_ERP_250.css	Tue Nov 30 16:51:24 2010 +0000
@@ -31,6 +31,7 @@
   font-weight: normal;
   color: #000000;
   background-color: #E8E8E8;
+  overflow: auto;
 }
 
 #main {