Skip to content

Commit

Permalink
Merge branch 'main' into snyk-upgrade-275f40c4d237df08e9cee40c401f8917
Browse files Browse the repository at this point in the history
  • Loading branch information
@valeg-etendo
valeg-etendo authored Dec 22, 2023
2 parents f0a99d3 + 00b0b3f commit 745cb59
Show file tree
Hide file tree
Showing 25 changed files with 1,181 additions and 486 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ dependencies {

}

final String CURRENT_VERSION = "23.3.0"
final String CURRENT_VERSION = "23.3.4"
final String NEXT_RELEASE = "23.4.0"
final String NEXT_HOTFIX = "23.3.1"
final String NEXT_HOTFIX = "23.3.5"

final String DEV_URL = "https://repo.futit.cloud/repository/maven-snapshots/"
final String PROD_URL = uri("https://maven.pkg.github.com/etendosoftware/etendo_core/")
Expand Down
Binary file modified ...s/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.class
View file
Binary file not shown.
19 changes: 5 additions & 14 deletions ...c/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,11 @@
SELECT o.c_order_id
FROM c_order o
JOIN fin_payment_schedule pso ON o.c_order_id = pso.c_order_id
WHERE EXISTS (SELECT 1
FROM c_invoice i
JOIN c_invoiceline il ON il.c_invoice_id = i.c_invoice_id
JOIN c_orderline ol ON il.c_orderline_id = ol.c_orderline_id
WHERE ol.c_order_id = o.c_order_id
AND i.docstatus = ''CO''
AND NOT EXISTS (SELECT 1 FROM fin_payment_scheduledetail psd
JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id
WHERE il.c_invoice_id = psi.c_invoice_id
AND psd.fin_payment_schedule_order = pso.fin_payment_schedule_id)
GROUP BY il.c_invoice_id
HAVING sum(il.linenetamt +coalesce(c_getinvoiceline_taxamount(il.c_invoiceline_id),0)) != 0)
AND EXISTS (SELECT 1 FROM fin_payment_scheduledetail psdo
WHERE psdo.fin_payment_schedule_order = pso.fin_payment_schedule_id)) o
WHERE EXISTS (SELECT 1 FROM c_invoice i JOIN c_invoiceline il ON il.c_invoice_id = i.c_invoice_id JOIN c_orderline ol ON il.c_orderline_id = ol.c_orderline_id
WHERE ol.c_order_id = o.c_order_id AND i.docstatus = ''CO'' AND NOT EXISTS (SELECT 1 FROM fin_payment_scheduledetail psd JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id
WHERE il.c_invoice_id = psi.c_invoice_id AND psd.fin_payment_schedule_order = pso.fin_payment_schedule_id)
GROUP BY il.c_invoice_id HAVING sum(il.linenetamt +coalesce(c_getinvoiceline_taxamount(il.c_invoiceline_id),0)) != 0)
AND EXISTS (SELECT 1 FROM fin_payment_scheduledetail psdo WHERE psdo.fin_payment_schedule_order = pso.fin_payment_schedule_id)) o
JOIN c_orderline ol ON ol.c_order_id = o.c_order_id
JOIN c_invoiceline il ON il.c_orderline_id = ol.c_orderline_id
JOIN c_invoice inv ON inv.c_invoice_id = il.c_invoice_id
Expand Down
255 changes: 181 additions & 74 deletions ...rc/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.java
View file

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions ...aymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.openbravo.client.kernel.event.EntityPersistenceEvent;
import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
import org.openbravo.client.kernel.event.EntityUpdateEvent;
import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.model.financialmgmt.gl.GLItem;
import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
import org.openbravo.model.financialmgmt.payment.FIN_Payment;
Expand Down Expand Up @@ -79,8 +80,10 @@ private void validateTransactionType(final EntityPersistenceEvent event) {
if ((StringUtils.equals(transactionType, APRMConstants.TRXTYPE_BPDeposit)
|| StringUtils.equals(transactionType, APRMConstants.TRXTYPE_BPWithdrawal))
&& glItem == null && payment == null) {
logger.debug("@APRM_INVALID_TRANSACTION@");
throw new OBException("@APRM_INVALID_TRANSACTION@");
if (logger.isDebugEnabled()) {
logger.debug(OBMessageUtils.parseTranslation("@APRM_INVALID_TRANSACTION@"));
}
throw new OBException(OBMessageUtils.parseTranslation("@APRM_INVALID_TRANSACTION@"));
}
}
}
2 changes: 1 addition & 1 deletion ...bravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,7 @@ isc.OBStandardView.addProperties({
// at this point the time fields of the record are formatted in local time
localTime = true;
this.messageBar.hide();
if (this.parentView) {
if (this.parentView && (this.parentView.entity !== this.entity)) {
this.parentView.messageBar.hide();
}

Expand Down
12 changes: 12 additions & 0 deletions ...es_core/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<data>
<!--001C43CE73514C2CA3DF29954CD91A16--><AD_MESSAGE>
<!--001C43CE73514C2CA3DF29954CD91A16--> <AD_MESSAGE_ID><![CDATA[001C43CE73514C2CA3DF29954CD91A16]]></AD_MESSAGE_ID>
<!--001C43CE73514C2CA3DF29954CD91A16--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--001C43CE73514C2CA3DF29954CD91A16--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--001C43CE73514C2CA3DF29954CD91A16--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--001C43CE73514C2CA3DF29954CD91A16--> <VALUE><![CDATA[OBUISC_ListGrid.configureSortText]]></VALUE>
<!--001C43CE73514C2CA3DF29954CD91A16--> <MSGTEXT><![CDATA[Configure Sort...]]></MSGTEXT>
<!--001C43CE73514C2CA3DF29954CD91A16--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--001C43CE73514C2CA3DF29954CD91A16--> <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
<!--001C43CE73514C2CA3DF29954CD91A16--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--001C43CE73514C2CA3DF29954CD91A16--></AD_MESSAGE>

<!--03EFA0B843B84CCC86DA958ECAA3B074--><AD_MESSAGE>
<!--03EFA0B843B84CCC86DA958ECAA3B074--> <AD_MESSAGE_ID><![CDATA[03EFA0B843B84CCC86DA958ECAA3B074]]></AD_MESSAGE_ID>
<!--03EFA0B843B84CCC86DA958ECAA3B074--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
Expand Down
3 changes: 3 additions & 0 deletions ...rface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient-labels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@
isc.ListGrid.addProperties({
sortFieldAscendingText: getLabel('OBUISC_ListGrid.sortFieldAscendingText')
});
isc.ListGrid.addProperties({
configureSortText: getLabel('OBUISC_ListGrid.configureSortText')
});
isc.ListGrid.addProperties({
sortFieldDescendingText: getLabel('OBUISC_ListGrid.sortFieldDescendingText')
});
Expand Down
6 changes: 3 additions & 3 deletions modules_core/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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[23.3.0]]></VERSION>
<!--0138E7A89B5E4DC3932462252801FFBC--> <VERSION><![CDATA[23.3.4]]></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>
Expand All @@ -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/23Q3-0]]></UPDATEINFO>
<!--0138E7A89B5E4DC3932462252801FFBC--> <VERSION_LABEL><![CDATA[23Q3.0]]></VERSION_LABEL>
<!--0138E7A89B5E4DC3932462252801FFBC--> <UPDATEINFO><![CDATA[https://docs.etendo.software/whats-new/release-notes/etendo-classic/versions/23Q3-4]]></UPDATEINFO>
<!--0138E7A89B5E4DC3932462252801FFBC--> <VERSION_LABEL><![CDATA[23Q3.4]]></VERSION_LABEL>
<!--0138E7A89B5E4DC3932462252801FFBC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0138E7A89B5E4DC3932462252801FFBC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
<!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
Expand Down
Loading

0 comments on commit 745cb59

Please sign in to comment.