Merge tag '24.2.1' into develop

🚀 Release 24.2.1
etendosoftware · Jul 5, 2024 · 51cdfa5 · 51cdfa5
2 parents 53849a1 + 1cb3bc1
commit 51cdfa5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -35,9 +35,9 @@ dependencies {
 
 }
 
-final String CURRENT_VERSION = "24.2.0"
+final String CURRENT_VERSION = "24.2.1"
 final String NEXT_RELEASE = "24.3.0"
-final String NEXT_HOTFIX = "24.2.1"
+final String NEXT_HOTFIX = "24.2.2"
 
 final String DEV_URL = "https://repo.futit.cloud/repository/maven-snapshots/"
 final String PROD_URL = uri("https://maven.pkg.github.com/etendosoftware/etendo_core/")

diff --git a/modules_core/com.smf.jobs.defaults/src-db/database/sourcedata/AD_TABLE.xml b/modules_core/com.smf.jobs.defaults/src-db/database/sourcedata/AD_TABLE.xml
@@ -24,9 +24,9 @@
 ic.salesOrder.id,
 o.name as adorgname,
 ic.documentType as cdoctypename,
-ic.documentNo,
+ic.documentNo as documentNo,
 bp.name as cbpartnername,
-ic.orderDate,
+ic.orderDate as orderDate,
 case when @linesIncludeTaxes@ = 'Y' then ic.amountlinesgross else ic.amountlines end as amountlines,
 case 
     when ic.term = 'N' 
@@ -36,7 +36,7 @@ case
     else 
         case when @linesIncludeTaxes@ = 'Y' then ic.notinvoicedlinesgross else ic.notinvoicedlines end
 end as notinvoicedlines,
-ic.term AS TermName,
+ic.term as TermName,
 case 
     when ic.term = 'N' 
         then 0.0 
@@ -55,14 +55,14 @@ case
         then 0.0 
     else ic.pendinglines 
 end as pendinglines,
-ic.orderedQuantity,
-ic.deliveredQuantity,
-((case when @linesIncludeTaxes@ = 'Y' then ic.amountlinesgross else ic.amountlines end)-(case when @linesIncludeTaxes@ = 'Y' then ic.notinvoicedlinesgross else ic.notinvoicedlines end)) AS linesinvoiced,
+ic.orderedQuantity as orderedQuantity,
+ic.deliveredQuantity as deliveredQuantity,
+((case when @linesIncludeTaxes@ = 'Y' then ic.amountlinesgross else ic.amountlines end)-(case when @linesIncludeTaxes@ = 'Y' then ic.notinvoicedlinesgross else ic.notinvoicedlines end)) as linesinvoiced,
 ic.amountlinesgross as totalgross,
-ic.creationDate,
-ic.createdBy,
-ic.updated,
-ic.updatedBy
+ic.creationDate as creationDate,
+ic.createdBy as createdBy,
+ic.updated as updated,
+ic.updatedBy as updatedBy
 from
 InvoiceCandidateV ic
 join ic.salesOrder ord

diff --git a/modules_core/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml b/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.2.0]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[24.2.1]]></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/24Q2-0]]></UPDATEINFO>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[24Q2.0]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <UPDATEINFO><![CDATA[https://docs.etendo.software/whats-new/release-notes/etendo-classic/versions/24Q2-1]]></UPDATEINFO>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[24Q2.1]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>

diff --git a/src-db/database/sourcedata/AD_MODULE.xml b/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.2.0]]></VERSION>
+<!--0-->  <VERSION><![CDATA[24.2.1]]></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/24Q2-0]]></UPDATEINFO>
+<!--0-->  <UPDATEINFO><![CDATA[https://docs.etendo.software/whats-new/release-notes/etendo-classic/versions/24Q2-1]]></UPDATEINFO>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[24Q2.0]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[24Q2.1]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0--></AD_MODULE>