Merge branch 'release/24.2.0' into main

build.gradle

@@ -35,9 +35,9 @@ dependencies {
 
 }
 
-final String CURRENT_VERSION = "24.1.8"
-final String NEXT_RELEASE = "24.2.0"
-final String NEXT_HOTFIX = "24.1.9"
+final String CURRENT_VERSION = "24.2.0"
+final String NEXT_RELEASE = "24.3.0"
+final String NEXT_HOTFIX = "24.2.1"
 
 final String DEV_URL = "https://repo.futit.cloud/repository/maven-snapshots/"
 final String PROD_URL = uri("https://maven.pkg.github.com/etendosoftware/etendo_core/")

modules_core/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml

@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[24.1.8]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[24.2.0]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
@@ -20,8 +20,8 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <UPDATEINFO><![CDATA[https://docs.etendo.software/whats-new/release-notes/etendo-classic/versions/24Q1-8]]></UPDATEINFO>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[24Q1.8]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <UPDATEINFO><![CDATA[https://docs.etendo.software/whats-new/release-notes/etendo-classic/versions/24Q2-0]]></UPDATEINFO>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[24Q2.0]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>

package.json

@@ -21,9 +21,9 @@
   "author": "Openbravo SLU",
   "license": "SEE LICENSE IN legal/Openbravo_license.txt",
   "dependencies": {
-    "prettier": "~3.2.0",
+    "prettier": "~3.2.5",
     "eslint-config-prettier": "~9.0.0",
-    "eslint-plugin-prettier": "~5.1.2"
+    "eslint-plugin-prettier": "~5.1.3"
   },
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.12.7",

src-db/database/sourcedata/AD_MODULE.xml

@@ -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[24.1.8]]></VERSION>
+<!--0-->  <VERSION><![CDATA[24.2.0]]></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 Etendo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.etendo.software]]></URL>
@@ -21,9 +21,9 @@ You may obtain a copy of the License at support@etendo.software or in the legal
 <!--0-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0-->  <UPDATEINFO><![CDATA[https://docs.etendo.software/whats-new/release-notes/etendo-classic/versions/24Q1-8]]></UPDATEINFO>
+<!--0-->  <UPDATEINFO><![CDATA[https://docs.etendo.software/whats-new/release-notes/etendo-classic/versions/24Q2-0]]></UPDATEINFO>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[24Q1.8]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[24Q2.0]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0--></AD_MODULE>

src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql

@@ -27,7 +27,7 @@
       <![CDATA[
         SELECT *
         FROM ( SELECT '0' AS RN1, C.* FROM (
-          SELECT VALUE, NAME, DATEACCT,
+          SELECT VALUE, NAME, DATEACCT, CREATED,
               COALESCE(SUM(AMTACCTDR),0) AS AMTACCTDR, COALESCE(SUM(AMTACCTCR),0) AS AMTACCTCR, COALESCE(SUM(AMTACCTDR-AMTACCTCR),0) AS TOTAL,
               MAX(FACT_ACCT_ID) AS FACT_ACCT_ID,
               FACT_ACCT_GROUP_ID, ID, groupbyid, groupbyname,
@@ -40,8 +40,8 @@
               , 0 AS AMTACCTDRPREVSUM, 0 AS AMTACCTCRPREVSUM
           FROM
             (SELECT FACT_ACCT.ACCTVALUE AS VALUE, COALESCE(ev_trl.NAME, ev.NAME) AS NAME,
-                DATEACCT, AMTACCTDR, AMTACCTCR, FACT_ACCT_ID,
-                FACT_ACCT_GROUP_ID, FACT_ACCT.ACCOUNT_ID AS ID, FACT_ACCT.DESCRIPTION,
+                FACT_ACCT.DATEACCT, AMTACCTDR, AMTACCTCR, FACT_ACCT_ID,
+                FACT_ACCT_GROUP_ID, FACT_ACCT.ACCOUNT_ID AS ID, FACT_ACCT.DESCRIPTION, GL.CREATED,
                 CASE ?
                   WHEN 'BPartner' THEN c_bpartner.c_bpartner_id
                   WHEN 'Product' THEN m_product.m_product_id
@@ -60,6 +60,7 @@
               LEFT JOIN C_PROJECT ON FACT_ACCT.C_PROJECT_ID = C_PROJECT.C_PROJECT_ID
               LEFT JOIN c_elementvalue ev ON FACT_ACCT.ACCOUNT_ID = ev.c_elementvalue_id
               LEFT JOIN c_elementvalue_trl ev_trl ON ev.c_elementvalue_id = ev_trl.c_elementvalue_id AND ev_trl.ad_language = ?
+              LEFT JOIN GL_JOURNAL GL ON FACT_ACCT.RECORD_ID = GL.GL_JOURNAL_ID
             WHERE (?='Y' OR FACT_ACCT.ACCOUNT_ID IN (
                       SELECT c_elementvalue_id as name
                       FROM C_ELEMENTVALUE
@@ -75,10 +76,10 @@
               AND 3=3) D
             WHERE 6=6
             GROUP BY groupbyname, groupbyid, VALUE, NAME, ID,
-            DATEACCT, FACTACCTTYPE, FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT
+            DATEACCT, FACTACCTTYPE, FACT_ACCT_GROUP_ID, DESCRIPTION, ISDEBIT, D.CREATED
             HAVING SUM(AMTACCTDR) - SUM(AMTACCTCR) <> 0
             ORDER  BY groupbyname, groupbyid, VALUE, NAME, ID,
-            DATEACCT, FACTACCTTYPE, FACT_ACCT_GROUP_ID,  FACT_ACCT_ID, DESCRIPTION, ISDEBIT
+            DATEACCT, CREATED ASC NULLS FIRST, FACTACCTTYPE, FACT_ACCT_GROUP_ID,  FACT_ACCT_ID, DESCRIPTION, ISDEBIT
           ) C
         ) B WHERE 1=1
       ]]></Sql>