details: https://code.openbravo.com/erp/devel/pi/rev/8da6d323b15e changeset: 33494:8da6d323b15e user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Fri Feb 16 10:50:52 2018 +0100 summary: [error-pages] Removing unused WadData method and syntax corrections
details: https://code.openbravo.com/erp/devel/pi/rev/51c7dee05e68 changeset: 33495:51c7dee05e68 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Mon Feb 19 10:18:12 2018 +0100 summary: [error-pages] Refactored WadData to simplify code details: https://code.openbravo.com/erp/devel/pi/rev/a9f9174afe5f changeset: 33496:a9f9174afe5f user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Tue Feb 20 10:28:15 2018 +0100 summary: [error-pages] Added log info for error pages processing details: https://code.openbravo.com/erp/devel/pi/rev/47f211b36770 changeset: 33497:47f211b36770 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Tue Feb 20 12:21:38 2018 +0100 summary: [error-pages] Refactoring variable name details: https://code.openbravo.com/erp/devel/pi/rev/1042ce4100e3 changeset: 33498:1042ce4100e3 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Tue Feb 20 12:22:45 2018 +0100 summary: [error-pages] Adding missing method rename details: https://code.openbravo.com/erp/devel/pi/rev/61c59ba769d5 changeset: 33499:61c59ba769d5 user: Javier Armendáriz <javier.armendariz <at> openbravo.com> date: Tue Feb 20 13:39:26 2018 +0100 summary: related to issue 37740: code review improvements - Extracting common functionality to display error code and exception type pages using a single Sqlc method - Extracted getBaseDesignFolder to get the base design folder just once - Add log info in error page generation in web.xml - Other minor code improvements diffstat: .hgsigs | 1 + .hgtags | 1 + legal/Licensing.txt | 16 +- lib/runtime/commons-codec-1.11.jar | Bin lib/runtime/commons-codec-1.5.jar | Bin lib/runtime/commons-logging-1.1.1.jar | Bin lib/runtime/commons-logging-1.2.jar | Bin lib/runtime/jackson-annotations-2.5.1.jar | Bin lib/runtime/jackson-annotations-2.9.4.jar | Bin lib/runtime/jackson-core-2.5.1.jar | Bin lib/runtime/jackson-core-2.9.4.jar | Bin lib/runtime/jackson-databind-2.5.1.jar | Bin lib/runtime/jackson-databind-2.9.4.jar | Bin modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 1 + modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java | 5 +- modules/org.openbravo.client.application/lib/runtime/httpclient-4.0.jar | Bin modules/org.openbravo.client.application/lib/runtime/httpclient-4.5.5.jar | Bin modules/org.openbravo.client.application/lib/runtime/httpcore-4.0.1.jar | Bin modules/org.openbravo.client.application/lib/runtime/httpcore-4.4.9.jar | Bin modules/org.openbravo.client.application/lib/runtime/httpmime-4.1.jar | Bin modules/org.openbravo.client.application/lib/runtime/httpmime-4.5.5.jar | Bin modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java | 23 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 4 +- src-core/.classpath | 2 +- src-core/src/org/openbravo/base/HttpSessionWrapper.java | 18 +- src-core/src/org/openbravo/database/SessionInfo.java | 2 + src-db/database/build-create.xml | 17 +- src-db/database/model/functions/C_ORDER_POST1.xml | 12 + src-db/database/model/functions/M_CREATE_RESERVE_FROM_SOL.xml | 33 +- src-db/database/model/functions/M_MOVEMENT_POST.xml | 52 +- src-db/database/model/functions/M_RESERVE_STOCK_MANUAL.xml | 4 +- src-db/database/model/tables/C_ORDERLINE.xml | 3 + src-db/database/sourcedata/AD_COLUMN.xml | 4 +- src-db/database/sourcedata/AD_FIELD.xml | 1 - src-db/database/sourcedata/AD_MESSAGE.xml | 14 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + src-db/database/sourcedata/AD_VAL_RULE.xml | 23 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 2 + src-test/src/org/openbravo/test/AllWebserviceTests.java | 4 +- src-test/src/org/openbravo/test/base/BaseTest.java | 5 +- src-test/src/org/openbravo/test/dal/ViewTest.java | 57 +- src-test/src/org/openbravo/test/datasource/ResetCookieOnLogin.java | 70 ++ src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxForcedReservation.java | 24 +- src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxOverReservation1MovementLineTest.java | 59 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxOverReservation2MovementLinesTest.java | 67 ++ src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxOverReservationTest.java | 60 - src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxPartialReservation1MovementLineTest.java | 56 + src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxPartialReservation2MovementLinesTest.java | 67 ++ src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxPartialReservationTest.java | 55 - src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryBoxTest.java | 24 +- src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryFullUnboxPartialReservation.java | 16 +- src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryPartialUnboxPartialReservation.java | 66 -- src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryPartialUnboxPartialReservation1MovementLineUnboxTest.java | 80 ++ src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryPartialUnboxPartialReservation2MovementLinesUnboxTest.java | 73 ++ src-test/src/org/openbravo/test/referencedinventory/ReferencedInventoryTestSuite.java | 9 +- src-test/src/org/openbravo/test/system/Sessions.java | 99 +++ src-trl/src/org/openbravo/translate/Translate.java | 10 +- src-wad/src/org/openbravo/wad/Wad.java | 28 +- src-wad/src/org/openbravo/wad/Wad_data.xsql | 51 +- src-wad/src/org/openbravo/wad/web.xml | 28 +- src-wad/src/org/openbravo/wad/webConf.xml | 4 +- src/org/openbravo/common/actionhandler/OrderCreatePOLines.java | 5 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 10 +- src/org/openbravo/dal/core/DalUtil.java | 3 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 5 +- src/org/openbravo/erpCommon/ad_callouts/SL_TableAudit.java | 23 +- src/org/openbravo/erpCommon/ad_forms/DocLineCashVATReady_PaymentTransactionReconciliation.java | 2 + src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java | 1 + src/org/openbravo/erpCommon/ad_forms/DocLine_FINPayment.java | 2 + src/org/openbravo/erpCommon/ad_forms/ProductInfo.java | 1 + src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrderXLS.jrxml | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 10 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 10 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 76 +- src/org/openbravo/erpCommon/security/Login.html | 10 +- src/org/openbravo/erpCommon/security/SessionListener.java | 26 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 1 + src/org/openbravo/erpCommon/utility/Utility.java | 2 + src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 6 +- src/org/openbravo/event/OrderEventHandler.java | 313 +++++++-- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 46 +- src/org/openbravo/financial/FinancialUtils.java | 1 + src/org/openbravo/materialmgmt/ServicePriceUtils.java | 1 + src/org/openbravo/materialmgmt/VariantChDescUpdateProcess.java | 7 +- src/org/openbravo/materialmgmt/VariantChDescUpdateProcessor.java | 4 +- src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryProcessor.java | 154 +++- src/org/openbravo/materialmgmt/refinventory/ReferencedInventoryUtil.java | 77 ++ src/org/openbravo/materialmgmt/refinventory/ReservationManager.java | 253 -------- src/org/openbravo/materialmgmt/refinventory/UnboxProcessor.java | 12 +- src/org/openbravo/scheduling/ProcessMonitor.java | 6 +- 95 files changed, 1412 insertions(+), 971 deletions(-) diffs (truncated from 4152 to 300 lines): diff -r d8ae93d75a18 -r 61c59ba769d5 .hgsigs --- a/.hgsigs Wed Feb 14 13:36:17 2018 +0100 +++ b/.hgsigs Tue Feb 20 13:39:26 2018 +0100 @@ -224,3 +224,4 @@ bbeae307872835b1e84136c537adec44b7a0b3c1 0 iEYEABECAAYFAlpDLAIACgkQCX/oGf+2qkNiugCgj1TTu2BeYoAqAqD08Gci3lHJvogAnAvmNL987nIAckknQ1CosIUDmA+K 2e43174aba46ec6956a0e703bbb9bee5292c871a 0 iEYEABECAAYFAlpuyUwACgkQCX/oGf+2qkPuJgCePIRg5ennwj6kgpOnyxZCPUV54Y0Ani30NnQNuNkXNkBMyykw2JfW21Vs 43d95f7cb67084eb978752359847ab28b9aa14f6 0 iEYEABECAAYFAlpEpSMACgkQCX/oGf+2qkNdMACdGNGo6rpHht3lNH3FmwtsNcIe65sAn1sM9rBx/Sm3ytwcL2C5irUyD05J +2ed90e80323f7bf5245be3946e2f60ea68d30f6e 0 iEYEABECAAYFAlqFgUsACgkQCX/oGf+2qkMGWwCg9AesP/a8fHuHrGVkUZcGk0x8CSgAniD73vR4fZ3uaU1eqtQr9HYlwpCQ diff -r d8ae93d75a18 -r 61c59ba769d5 .hgtags --- a/.hgtags Wed Feb 14 13:36:17 2018 +0100 +++ b/.hgtags Tue Feb 20 13:39:26 2018 +0100 @@ -235,3 +235,4 @@ f500d43a59bb69265a7aa704a9fd20bffd68c8a9 3.0PR17Q3.2 dd65065492e55421c107be4c87894a508bb1244d 3.0PR17Q3.3 a8b6912d30a34e4a7d0873fc0fe53df228417b49 3.0PR17Q4 +82be2c7d9d11d77238355e65724408b6c5aa2ffb 3.0PR17Q4.1 diff -r d8ae93d75a18 -r 61c59ba769d5 legal/Licensing.txt --- a/legal/Licensing.txt Wed Feb 14 13:36:17 2018 +0100 +++ b/legal/Licensing.txt Tue Feb 20 13:39:26 2018 +0100 @@ -106,14 +106,14 @@ # catalina-ant.jar # commons-beanutils-1.8.3.jar # commons-betwixt-0.8.jar -# commons-codec-1.5.jar +# commons-codec-1.11.jar # commons-collections-3.2.1.jar # commons-dbcp-1.4.jar # commons-digester-1.8.1.jar # commons-fileupload-1.2.2.jar # commons-io-2.4.jar # commons-lang-2.6.jar -# commons-logging-1.1.1.jar +# commons-logging-1.2.jar # commons-pool-1.5.6.jar # fop-1.1.jar # jakarta-oro-2.0.8.jar @@ -146,9 +146,9 @@ # itext-pdfa-5.5.0.jar Both files under AGPL V3 license with LGPL Exception (included as iTextpdf_license.txt in this folder) -# jackson-core-2.5.1.jar -# jackson-databind-2.5.1.jar -# jackson-annotations-2.5.1.jar +# jackson-core-2.9.4.jar +# jackson-databind-2.9.4.jar +# jackson-annotations-2.9.4.jar All files under the Apache 2.0 license (included as Apache_license-2.0.txt in this folder) # jasperreports-6.0.0.jar @@ -257,9 +257,9 @@ # shrinkwrap-spi-1.2.2.jar # validation-api-1.0.0.GA.jar # jsmin.0.2.4.jar -# httpcore-4.0.1.jar -# httpclient-4.0.jar -# httpmime-4.1.jar +# httpcore-4.4.9.jar +# httpclient-4.5.5.jar +# httpmime-4.5.5.jar # guice-2.0.jar # tomcat-juli.jar # tomcat-jdbc.jar diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/commons-codec-1.11.jar Binary file lib/runtime/commons-codec-1.11.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/commons-codec-1.5.jar Binary file lib/runtime/commons-codec-1.5.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/commons-logging-1.1.1.jar Binary file lib/runtime/commons-logging-1.1.1.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/commons-logging-1.2.jar Binary file lib/runtime/commons-logging-1.2.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/jackson-annotations-2.5.1.jar Binary file lib/runtime/jackson-annotations-2.5.1.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/jackson-annotations-2.9.4.jar Binary file lib/runtime/jackson-annotations-2.9.4.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/jackson-core-2.5.1.jar Binary file lib/runtime/jackson-core-2.5.1.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/jackson-core-2.9.4.jar Binary file lib/runtime/jackson-core-2.9.4.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/jackson-databind-2.5.1.jar Binary file lib/runtime/jackson-databind-2.5.1.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 lib/runtime/jackson-databind-2.9.4.jar Binary file lib/runtime/jackson-databind-2.9.4.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Wed Feb 14 13:36:17 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Tue Feb 20 13:39:26 2018 +0100 @@ -86,6 +86,7 @@ /** * @deprecated */ +@Deprecated public class MatchTransaction extends HttpSecureAppServlet { private static final long serialVersionUID = 1L; VariablesSecureApp vars = null; diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java --- a/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java Wed Feb 14 13:36:17 2018 +0100 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java Tue Feb 20 13:39:26 2018 +0100 @@ -11,7 +11,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) 2014-2017 Openbravo SLU + * All portions are Copyright (C) 2014-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -80,6 +80,9 @@ if (isReadOnlyPool(parent)) { initialized = true; } else { + // SessionInfo will be initialized when the SessionListener ServletContextListener is + // invoked. That listener will check if there are audited tables and notify SessionInfo, + // from them on SessionInfo will know whether the ad_context_info table should be created if (SessionInfo.isInitialized()) { SessionInfo.initDB(con.getConnection(), rbdms); initialized = true; diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/lib/runtime/httpclient-4.0.jar Binary file modules/org.openbravo.client.application/lib/runtime/httpclient-4.0.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/lib/runtime/httpclient-4.5.5.jar Binary file modules/org.openbravo.client.application/lib/runtime/httpclient-4.5.5.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/lib/runtime/httpcore-4.0.1.jar Binary file modules/org.openbravo.client.application/lib/runtime/httpcore-4.0.1.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/lib/runtime/httpcore-4.4.9.jar Binary file modules/org.openbravo.client.application/lib/runtime/httpcore-4.4.9.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/lib/runtime/httpmime-4.1.jar Binary file modules/org.openbravo.client.application/lib/runtime/httpmime-4.1.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/lib/runtime/httpmime-4.5.5.jar Binary file modules/org.openbravo.client.application/lib/runtime/httpmime-4.5.5.jar has changed diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java Wed Feb 14 13:36:17 2018 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java Tue Feb 20 13:39:26 2018 +0100 @@ -11,7 +11,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) 2010-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -220,6 +220,7 @@ * * @deprecated use {@link BaseProcessActionHandler#fixRequestMap(Map, JSONObject)} */ + @Deprecated protected Map<String, String> fixRequestMap(Map<String, Object> parameters) { return fixRequestMap(parameters, null); } diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Wed Feb 14 13:36:17 2018 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Tue Feb 20 13:39:26 2018 +0100 @@ -11,7 +11,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) 2010-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -22,6 +22,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -133,8 +134,6 @@ tabId = readParameter(parameters, "TAB_ID"); // The ID of the record. Only relevant on EDIT, CHANGE and SETSESSION modes rowId = readParameter(parameters, "ROW_ID"); - // The IDs of the selected records in case more than one - String multipleRowIds[] = (String[]) parameters.get("MULTIPLE_ROW_IDS"); // The column changed by the user. Only relevant on CHANGE mode String changedColumn = readParameter(parameters, "CHANGED_COLUMN"); Tab tab = getTab(tabId); @@ -295,10 +294,11 @@ long t7 = System.currentTimeMillis(); List<JSONObject> attachments = new ArrayList<JSONObject>(); int attachmentCount = 0; - if (multipleRowIds != null) { - attachmentCount = computeAttachmentCount(tab, multipleRowIds, true); + if (jsContent.has("MULTIPLE_ROW_IDS")) { + attachmentCount = computeAttachmentCount(tab, + convertJSONArray(jsContent.getJSONArray("MULTIPLE_ROW_IDS")), true); } else { - attachmentCount = computeAttachmentCount(tab, new String[] { rowId }, false); + attachmentCount = computeAttachmentCount(tab, Arrays.asList(rowId), false); } // Notes information @@ -397,7 +397,7 @@ * flag to not return the actual count just 1 or 0 * @return count of attachment found for the given records. */ - private int computeAttachmentCount(Tab tab, String[] recordIds, boolean doExists) { + private int computeAttachmentCount(Tab tab, List<String> recordIds, boolean doExists) { String tableId = tab.getTable().getId(); OBCriteria<Attachment> attachmentFiles = OBDao.getFilteredCriteria(Attachment.class, Restrictions.eq("table.id", tableId), Restrictions.in("record", recordIds)); @@ -424,15 +424,15 @@ } private List<String> convertJSONArray(JSONArray jsonArray) { - List<String> visibleProperties = new ArrayList<String>(); + List<String> elements = new ArrayList<String>(jsonArray.length()); for (int i = 0; i < jsonArray.length(); i++) { try { - visibleProperties.add(jsonArray.getString(i)); + elements.add(jsonArray.getString(i)); } catch (JSONException e) { throw new OBException("Error while reading the visible properties JSON array"); } } - return visibleProperties; + return elements; } private JSONObject buildJSONObject(String mode, Tab tab, Map<String, JSONObject> columnValues, diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Wed Feb 14 13:36:17 2018 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Tue Feb 20 13:39:26 2018 +0100 @@ -11,7 +11,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) 2010-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -1215,7 +1215,7 @@ // loads the foreign key filter auxiliary cache of all the filter fields that were using the 'id' filter type when the view was saved loadFilterAuxiliaryCache: function (filterAuxCache) { var i, cacheElement, filterField; - if (!filterAuxCache || !isc.isA.Array(filterAuxCache) || filterAuxCache.length === 0) { + if (!this.canLoadFilterAuxiliaryCache(filterAuxCache)) { return; } for (i = 0; i < filterAuxCache.length; i++) { @@ -1228,6 +1228,10 @@ } }, + canLoadFilterAuxiliaryCache: function (filterAuxCache) { + return filterAuxCache && isc.isA.Array(filterAuxCache) && filterAuxCache.length > 0 && this.filterEditor && this.filterEditor.getEditForm(); + }, + // overridden to also store the group mode // http://forums.smartclient.com/showthread.php?p=93877#post93877 getGroupState: function () { @@ -2673,7 +2677,7 @@ } } } - if (this.filterEditor) { + if (this.filterEditor && this.filterEditor.getEditForm()) { this.filterEditor.getEditForm().setValue(this.getCheckboxField().name, newValue); this.filterEditor.getEditForm().getField(this.getCheckboxField().name).defaultValue = newValue; } diff -r d8ae93d75a18 -r 61c59ba769d5 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js Wed Feb 14 13:36:17 2018 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js Tue Feb 20 13:39:26 2018 +0100 @@ -11,7 +11,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) 2010-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): Sreedhar Sirigiri (TDS), Mallikarjun M (TDS) ************************************************************************ @@ -1342,13 +1342,13 @@ ROW_ID: currentValues.id }; multipleSelectedRowIds = []; + allProperties = currentContext.getContextInfo(false, true, false, true); if (selectedRecords.size() > 1) { for (i = 0; i < selectedRecords.size(); i++) { multipleSelectedRowIds[i] = selectedRecords[i].id; } - requestParams.MULTIPLE_ROW_IDS = multipleSelectedRowIds; + allProperties.MULTIPLE_ROW_IDS = multipleSelectedRowIds; } - allProperties = currentContext.getContextInfo(false, true, false, true); if (currentContext.viewGrid && currentContext.viewGrid.fields) { len = currentContext.viewGrid.fields.length; for (i = 0; i < len; i++) { @@ -1374,6 +1374,7 @@ TAB_ID: this.view.tabId }; multipleSelectedRowIds = []; + allProperties = this.view.getContextInfo(false, true, false, true); if (selectedRecords.size() >= 1) { for (i = 0; i < selectedRecords.size(); i++) { if (i === 0) { @@ -1382,10 +1383,9 @@ multipleSelectedRowIds[i] = selectedRecords[i].id; } if (selectedRecords.size() > 1) { ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
