comparing with https://code.openbravo.com/erp/mods/org.openbravo.platform.features searching for changes changeset: 49:2314dac21643 tag: tip user: Carlos Aristu date: Tue Apr 21 11:38:36 2020 +0200 summary: related to bug 43784: sample P&E grid that dependent on multiselector parameter diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -377,6 +377,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -715,6 +750,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -869,6 +940,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1446,6 +1553,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -58,6 +58,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -467,6 +493,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -579,6 +631,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_REFERENCE.xml b/src-db/database/sourcedata/AD_REFERENCE.xml --- a/src-db/database/sourcedata/AD_REFERENCE.xml +++ b/src-db/database/sourcedata/AD_REFERENCE.xml @@ -48,6 +48,18 @@ + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_TAB.xml b/src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml +++ b/src-db/database/sourcedata/AD_TAB.xml @@ -1,5 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_TABLE.xml b/src-db/database/sourcedata/AD_TABLE.xml --- a/src-db/database/sourcedata/AD_TABLE.xml +++ b/src-db/database/sourcedata/AD_TABLE.xml @@ -92,4 +92,30 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_WINDOW.xml b/src-db/database/sourcedata/AD_WINDOW.xml --- a/src-db/database/sourcedata/AD_WINDOW.xml +++ b/src-db/database/sourcedata/AD_WINDOW.xml @@ -15,6 +15,21 @@ + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml --- a/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml +++ b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml @@ -19,6 +19,7 @@ + @@ -67,11 +68,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml b/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml new file mode 100644 --- /dev/null +++ b/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/org/openbravo/platform/features/OBPFComponentProvider.java b/src/org/openbravo/platform/features/OBPFComponentProvider.java --- a/src/org/openbravo/platform/features/OBPFComponentProvider.java +++ b/src/org/openbravo/platform/features/OBPFComponentProvider.java @@ -1,5 +1,5 @@ /************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. + * Copyright (C) 2014-2020 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -33,17 +33,20 @@ @Override public List getGlobalComponentResources() { - final List globalResources = new ArrayList(); + final List globalResources = new ArrayList<>(); - globalResources.add(createStaticResource( - "web/org.openbravo.platform.features/js/OBPF_BPCreation.js", false)); + globalResources.add( + createStaticResource("web/org.openbravo.platform.features/js/OBPF_BPCreation.js", false)); globalResources.add(createStaticResource( "web/org.openbravo.platform.features/js/OBPF_AddPayment_GridBtn.js", false)); - globalResources.add(createStaticResource( - "web/org.openbravo.platform.features/js/OBPF_showAlert.js", false)); + globalResources.add( + createStaticResource("web/org.openbravo.platform.features/js/OBPF_showAlert.js", false)); + + globalResources.add( + createStaticResource("web/org.openbravo.platform.features/js/OBPF_BPOnChange.js", false)); return globalResources; } -} \ No newline at end of file +} diff --git a/src/org/openbravo/platform/features/hqltransformer/SimpleOrderHQLTransformer.java b/src/org/openbravo/platform/features/hqltransformer/SimpleOrderHQLTransformer.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/platform/features/hqltransformer/SimpleOrderHQLTransformer.java @@ -0,0 +1,34 @@ +/* + ************************************************************************************ + * Copyright (C) 2020 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ +package org.openbravo.platform.features.hqltransformer; + +import java.util.Map; + +import org.openbravo.service.datasource.hql.HQLInserterQualifier; +import org.openbravo.service.datasource.hql.HqlInserter; +import org.springframework.util.StringUtils; + +@HQLInserterQualifier.Qualifier(tableId = "E2AC7ECFB75F4056A9BEFDD8A30A6C9E", injectionId = "0") +public class SimpleOrderHQLTransformer extends HqlInserter { + + @Override + public String insertHql(Map requestParameters, + Map queryNamedParameters) { + String bpId = requestParameters.get("singleBP"); + String bpIds = requestParameters.get("multiBP"); + if (!StringUtils.isEmpty(bpIds)) { + // TODO multiple filtering when bpIds are received + } + if (!StringUtils.isEmpty(bpId)) { + queryNamedParameters.put("bpId", bpId); + return "e.businessPartner.id = :bpId"; + } + return "1=1"; + } +} diff --git a/web/org.openbravo.platform.features/js/OBPF_BPOnChange.js b/web/org.openbravo.platform.features/js/OBPF_BPOnChange.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.platform.features/js/OBPF_BPOnChange.js @@ -0,0 +1,16 @@ +/* + ************************************************************************************ + * Copyright (C) 202O Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ +OB.OBPF = {}; +OB.OBPF.BPOnChange = {}; + +OB.OBPF.BPOnChange.refreshPEWindow = function (item, view, form) { + var ordersgrid = form.getItem('C_Order_ID').canvas.viewGrid; + ordersgrid.invalidateCache(); + form.redraw(); +}; \ No newline at end of file