details: https://code.openbravo.com/erp/devel/pi/rev/28034fc4a242 changeset: 32482:28034fc4a242 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 15:25:28 2017 +0200 summary: [250removal] Delete DataGrid servlet (was only used for generated 2.50 windows)
This removes the DataGrid servlet which is the backend for the old 2.50 style grid implementation for generated windows. Other manual code apart from the windows does also use the same grid implementation however those cases (i.e. 2.50 popup selectors all have custom backends and do not use this common one). Doing check in all getAllModules did not find references to the part removed here (DataGrid.html servlet mapping or the 2 xmlEngine control files). Note: 3 other xmlEngine templates related to the Grid backend are not removed as they are used by other internal + module code: - DataGridStructure - DataGridTotal - DataGridID The xsql file Access data was only used by DataGrid class and as it is non public can be just removed. details: https://code.openbravo.com/erp/devel/pi/rev/f5a24c0a9ea3 changeset: 32483:f5a24c0a9ea3 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 15:29:34 2017 +0200 summary: [250removal] remove ExecuteQuery.executeUpdate & selectAndSearch ExecuteQuery is a helper class used very seldomly to manually run sql queries without using xsql. The executeStament part to be able to run i.e. DELETE was only used by the DataGrid removed in the previous commit. Apart the selectAndSearch method was a special case method only used in the generated servlet for the old 2.50 windows which have been removed already. This commit removes both methods and only leaves the basic 'select' method as it is still used in a few other places. Checking in getAllModules did not find any module using the ExecuteQuery class at all. details: https://code.openbravo.com/erp/devel/pi/rev/0b0d4c83f671 changeset: 32484:0b0d4c83f671 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 15:35:52 2017 +0200 summary: [250removal] Light code-cleanup of ExecuteQuery - make methods as private - remove unused code - convert a printStackTrace to log4j.error details: https://code.openbravo.com/erp/devel/pi/rev/1ae170fcf1b2 changeset: 32485:1ae170fcf1b2 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 15:39:30 2017 +0200 summary: [250cleanup] Follow up removal of unused code Some code is now unused after the previous deletions and gets removed here. Checking in getAllModules: - ModelSQLGeneration: no modules found using it - TableSQLData is used in many modules however only 2 items of the file are used: maxRowsPerGridPage constant + calcAndGetBackendPage method - WindowAccessData.hasNotDeleteAccess -> no module using it details: https://code.openbravo.com/erp/devel/pi/rev/e1b5773776a0 changeset: 32486:e1b5773776a0 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 15:56:18 2017 +0200 summary: [250cleanup] Remove ToolBar buttons implementation for ExportGrid The ToolBar class used to create the toolbar in 2.50 style manual code does contain references to ExportGrid servlet. No direct user of those can be found in pi or getAllModules. Remove the text-reference to url mapping of ExportGrid removing the functionality and replace it by a logged error + stacktrace so any code which would call it can get easily found. Checking for 'no user can be found' was done via checking typical use of the ToolBar class which is: - new ToolBar - 1 prepare*Template* call - toString The new ToolBar adds all possible buttons to internal list, the prepare call then removes the unwatend ones and the toString finally outputs the rest. Checking all prepare* methods only 2 of all do NOT remove the 3 ExportGrid related buttons: - prepareRelationTemplateNoSearch - prepareRelationTemplate The first one is called in manual servlet Transactions, however a code check shows that it does call a second prepare method later removing the ExportGrid buttons. The 2nd method does not have any user. One checked module does contain a full customized copy of the whole ToolBar class however its own usage does not use those 2 relevant methods above. details: https://code.openbravo.com/erp/devel/pi/rev/36333c3832d0 changeset: 32487:36333c3832d0 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 16:18:13 2017 +0200 summary: [250cleanup] Remove old 2.50 ExportGrid (to csv,pdf,xls) code After previous commit there is no text reference to URL using ExportGrid servlet. This commit removes the servlet & its ad_model_object + _mapping entries Apart it removes a number of non public utility classes which where only used by ExportGrid.java After this removal the whole class ModelSQLGeneration, a function in TableSQLData & the plantilla.jrxml do not have any user left and are removed. For those removals above getAllModules where checked a no user found for the removed files/methods. details: https://code.openbravo.com/erp/devel/pi/rev/9ea00c4b3d56 changeset: 32488:9ea00c4b3d56 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 16:23:54 2017 +0200 summary: [250removal] Cleanup old unused code in KeyMap Apart from 1 method used in only 2 reports there are no users of this class. Delete most of the implementation which is never used and only keep the small part left needed for those 2 reports. That allows also small xsql method deletion in non-public TableSQLQuery_data . Checked in getAllModules that no module references this class. details: https://code.openbravo.com/erp/devel/pi/rev/770d843788fc changeset: 32489:770d843788fc user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 16:32:42 2017 +0200 summary: [250cleanup] Disable/remove Buscador from 2.50 ToolBar Similar to previous commit for ExportGrid. 2.50 ToolBar has a button to use the 2.50 Search Popup for the old generated windows. The only prepare* methods not removing this button are: - prepareEditionTemplate - prepareRelationTemplate - prepareSimpleToolBarTemplateFrame Out of those checking getAllModules only found 1 hit for the first in the org.openbravo.deprecated.cleanupv3 module into which many years ago old code was moved when it was deleted from pi. That InvoiceVendorMultiLine.java was very old grid edit functionality when 2.50 grid was not yet editable. As that is related to removed 2.50 grid it will no longer work anyway so is not a stopper here. Same as before the SEARCH + SEARCH_FILTERED buttons are disabled and when some module should trigger a code-path using them -> An error with stacktrace will be raised to easily find such code. details: https://code.openbravo.com/erp/devel/pi/rev/ba07cb72dc88 changeset: 32490:ba07cb72dc88 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 16:49:21 2017 +0200 summary: [250 cleanup] Start remove 2.50 search popup aka Buscador Make it unreachable by removing its ad_model_object + _mapping entries Remove the 4 xmlEngine templates and its matching ad_textinterfaces entries. details: https://code.openbravo.com/erp/devel/pi/rev/8363fe911ae2 changeset: 32491:8363fe911ae2 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 16:51:32 2017 +0200 summary: [250cleanup] Remove Buscador search and directly related code. This removes the servlet itself and xsql methods which are no now no longer used. details: https://code.openbravo.com/erp/devel/pi/rev/8cc012c69d5e changeset: 32492:8cc012c69d5e user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 17:08:34 2017 +0200 summary: [250 cleanup] Follow removal of now unused code in UIReference + implementors After Buscador removal the following method from UIReference are never called: - generateFilterAcceptScript - generateFilterHtml - setReplaceWith - setStrIsSOTrx - hasSecondaryFilter Checking getAllModules did not show any reference to UIReference class at all. So this change remove those 5 methods from UIReferene itself and also all subclasses. details: https://code.openbravo.com/erp/devel/pi/rev/652e54a8d452 changeset: 32493:652e54a8d452 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 17:09:21 2017 +0200 summary: [250cleanup] Remove now unused (public) xsql file This file was public before as used in the various UIReference implementations. After last commit is is no longer used. details: https://code.openbravo.com/erp/devel/pi/rev/4b2f0f33953f changeset: 32494:4b2f0f33953f user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 17:10:37 2017 +0200 summary: [250cleanup] Remove some unused and no longer parts of UIReferenceUtility. After previous cleanups 2 items from this utility are unused. As both are directly related to only old 2.50 popup (text box constant + utility function to add js import without duplicate) they are no longer useful to keep and removed here. details: https://code.openbravo.com/erp/devel/pi/rev/2cc1a9e6fa9f changeset: 32495:2cc1a9e6fa9f user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 17:39:33 2017 +0200 summary: [250 cleanup] Big follow-up cleanup after *Grid removal After removal of DataGrid, ExportGrid, Buscador & ModelSQLGeneration lots of related code is no longer used & useful. - All of TableSQLData except 2 commonly used items is removed: - maxRowsPerGridData & calcAndGetBackendPage - that also allows removal of erpCommon.utility.TableSQLQuery_data.xsql - removes Utility.fillTableSQLParameters function - several methods in UIReference as removed + all ther implementors: - generateSQL - getFilter - identifier - getGridType - as consequence several UIReferenceUtility methods are no longer used and had to be removed also as they referenced the deleted TableSQLData As consequence of this cleanup several ui/* files do no longer contain any special implementation compared to their super-classes. That could allow for some potential future simplication. details: https://code.openbravo.com/erp/devel/pi/rev/889e58f9758e changeset: 32496:889e58f9758e user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 17:41:47 2017 +0200 summary: [250cleanup] Make TableSQLData stop implementing Serializable After previous code-removal only 2 static items are left. As the class does not have any state left and only those utility methods implementing Serializable is no longer useful. details: https://code.openbravo.com/erp/devel/pi/rev/c34eed9dd05e changeset: 32497:c34eed9dd05e user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 17:45:41 2017 +0200 summary: [250cleanup] Remove flush from UIReference constructor. Previous code-cleanup allows for deletion of now unused member conn which is initialized in constructor. However as that previous init was done doing an inplicit flush this is slight behavior change which is why this change is done in separate commit. If any code should rely on that implicit flush being done that would be definitely wrong and removing the flush in useful as it is unexpected by calling code and can affect performance in some cases. details: https://code.openbravo.com/erp/devel/pi/rev/0f59932cea51 changeset: 32498:0f59932cea51 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 18:00:36 2017 +0200 summary: [250cleanup] Remove ComboTableData.fillParametersFromSearch + cleanup That method was only called from old 2.50 search popup aka Buscador. That now being removed that method is no longer useful. Remove it. Various other ComboTableData related method had fromSearch boolean which now is never called with true -> remove that parameter. In the end that allow removal of special logic for fromSearch=true from Utility.parseParameterValue leaving only the still used common case. details: https://code.openbravo.com/erp/devel/pi/rev/e9a9fe106cc6 changeset: 32499:e9a9fe106cc6 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 18:05:02 2017 +0200 summary: [250cleanup] move non-public Utility.parseParameterValues to ComboSQLData After removal of TableSQLData this utility function is only used from inside ComboSQLData. As it is non-public we can freely move it around without changing api. So this changes moves it into ComboSQLData and makes it private. details: https://code.openbravo.com/erp/devel/pi/rev/78096daaa2fa changeset: 32500:78096daaa2fa user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat Jul 08 18:06:21 2017 +0200 summary: [250uncleanup] Fix unused variable warning by removing it. Some earlier change makde the window_name value of ToolBar no longer used. Remove that memeber to avoid unused code warning. details: https://code.openbravo.com/erp/devel/pi/rev/3c366092ab92 changeset: 32501:3c366092ab92 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 13 16:04:26 2017 +0200 summary: [250cleanup] removed last occurrences of KeyMap They were useless in any case details: https://code.openbravo.com/erp/devel/pi/rev/bbd0507304dd changeset: 32502:bbd0507304dd user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 13 16:06:14 2017 +0200 summary: [250cleanup] removed unused KeyMap class details: https://code.openbravo.com/erp/devel/pi/rev/2f7959cc2662 changeset: 32503:2f7959cc2662 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Thu Jul 20 10:33:19 2017 +0200 summary: [250cleanup] Remove unused EncryptedButtons xmlEngine templates That xmlEngine template is unused already since the bigger wad window cleanup done in 17Q2. Remove it here + the related translation data. Checked in getAllModules and no module is referencing the remove files. details: https://code.openbravo.com/erp/devel/pi/rev/b69110075180 changeset: 32504:b69110075180 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Thu Jul 20 11:28:33 2017 +0200 summary: Fixed 36498: Merge pi-250cleanup with pi rev: 9933d754a9b9 diffstat: build.xml | 4 - modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 46 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 18 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java | 5 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 2 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 6 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java | 126 - src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/tables/M_MOVEMENTLINE.xml | 14 + src-db/database/model/triggers/C_INVOICE_TRG2.xml | 74 +- src-db/database/model/triggers/C_ORDER_TRG2.xml | 25 +- src-db/database/sourcedata/AD_COLUMN.xml | 98 +- src-db/database/sourcedata/AD_ELEMENT.xml | 2 +- src-db/database/sourcedata/AD_FIELD.xml | 66 +- src-db/database/sourcedata/AD_MESSAGE.xml | 18 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 36 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 60 - src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 363 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src-test/build.xml | 8 +- src-test/src/org/openbravo/test/base/OBBaseTest.java | 5 + src-test/src/org/openbravo/test/base/TestLogAppender.java | 9 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 2 +- src-test/src/org/openbravo/test/javascript/CompressionTest.java | 39 - src-test/src/org/openbravo/test/javascript/JavaScriptAPIChecker.java | 211 - src-test/src/org/openbravo/test/javascript/JavaScriptAPITest.java | 95 - src-test/src/org/openbravo/test/javascript/JavaScriptAntTest.java | 116 - src-test/src/org/openbravo/test/javascript/JavaScriptParser.java | 135 - src-test/src/org/openbravo/test/javascript/test-compression.js | 446 - src-test/src/org/openbravo/test/system/ErrorTextParserTest.java | 2 + src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 41 +- src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java | 2 +- src/org/openbravo/costing/LCCostMatchFromInvoiceHandler.java | 4 +- src/org/openbravo/erpCommon/ad_actionButton/EncryptedButtons.html | 189 - src/org/openbravo/erpCommon/ad_actionButton/EncryptedButtons.xml | 39 - src/org/openbravo/erpCommon/ad_callouts/OperativeQuantity_To_BaseQuantity.java | 49 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 9 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 21 +- src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java | 16 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 11 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 18 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html | 6 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 40 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html | 11 +- src/org/openbravo/erpCommon/ad_forms/ProductInfo.java | 4 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 6 +- src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailXLS.jrxml | 39 +- src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailXLSDoubtfulDebt.jrxml | 23 +- src/org/openbravo/erpCommon/ad_reports/AgingScheduleXLS.jrxml | 54 +- src/org/openbravo/erpCommon/businessUtility/Buscador.html | 290 - src/org/openbravo/erpCommon/businessUtility/Buscador.java | 285 - src/org/openbravo/erpCommon/businessUtility/Buscador.xml | 35 - src/org/openbravo/erpCommon/businessUtility/Buscador_FS.html | 27 - src/org/openbravo/erpCommon/businessUtility/Buscador_FS.xml | 21 - src/org/openbravo/erpCommon/businessUtility/Buscador_data.xsql | 232 - src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 9 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 122 +- src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 25 +- src/org/openbravo/erpCommon/security/Login.html | 2 +- src/org/openbravo/erpCommon/utility/Access_data.xsql | 77 - src/org/openbravo/erpCommon/utility/BandStyleVO.java | 99 - src/org/openbravo/erpCommon/utility/ComboTableData.java | 72 +- src/org/openbravo/erpCommon/utility/DataGrid.java | 731 --- src/org/openbravo/erpCommon/utility/DataGridDelete.srpt | 30 - src/org/openbravo/erpCommon/utility/DataGridDelete.xml | 30 - src/org/openbravo/erpCommon/utility/ExecuteQuery.java | 176 +- src/org/openbravo/erpCommon/utility/ExportGrid.java | 185 - src/org/openbravo/erpCommon/utility/ExportGrid_data.xsql | 32 - src/org/openbravo/erpCommon/utility/GridBO.java | 103 - src/org/openbravo/erpCommon/utility/GridColumnVO.java | 66 - src/org/openbravo/erpCommon/utility/GridReportVO.java | 144 - src/org/openbravo/erpCommon/utility/KeyMap.java | 286 - src/org/openbravo/erpCommon/utility/ModelSQLGeneration.java | 311 - src/org/openbravo/erpCommon/utility/ReportDesignBO.java | 148 - src/org/openbravo/erpCommon/utility/StaticCommunityBranding.java | 18 +- src/org/openbravo/erpCommon/utility/TableSQLData.java | 2247 +--------- src/org/openbravo/erpCommon/utility/TableSQLQuery_data.xsql | 234 - src/org/openbravo/erpCommon/utility/ToolBar.java | 32 +- src/org/openbravo/erpCommon/utility/Utility.java | 114 +- src/org/openbravo/erpCommon/utility/WindowAccess_data.xsql | 40 - src/org/openbravo/erpCommon/utility/plantilla.jrxml | 142 - src/org/openbravo/erpReports/ReportPaymentFilter.html | 1 - src/org/openbravo/erpReports/ReportPaymentFilter.xml | 1 - src/org/openbravo/erpReports/ReportRegisterFilter.html | 1 - src/org/openbravo/erpReports/ReportTaxPaymentJR.java | 7 - src/org/openbravo/erpReports/ReportVatRegisterJR.java | 11 +- src/org/openbravo/event/InvoiceEventHandler.java | 68 + src/org/openbravo/event/OrderEventHandler.java | 26 +- src/org/openbravo/event/RoleEventHandler.java | 4 +- src/org/openbravo/materialmgmt/UOMUtil.java | 31 + src/org/openbravo/reference/ui/UIAmount.java | 4 - src/org/openbravo/reference/ui/UIButton.java | 19 - src/org/openbravo/reference/ui/UIDate.java | 121 - src/org/openbravo/reference/ui/UIImage.java | 23 - src/org/openbravo/reference/ui/UIImageBLOB.java | 4 - src/org/openbravo/reference/ui/UILink.java | 4 - src/org/openbravo/reference/ui/UIList.java | 91 - src/org/openbravo/reference/ui/UINumber.java | 83 - src/org/openbravo/reference/ui/UIPAttribute.java | 63 - src/org/openbravo/reference/ui/UIPrice.java | 5 - src/org/openbravo/reference/ui/UIReference.java | 170 - src/org/openbravo/reference/ui/UIReferenceUtility.java | 147 - src/org/openbravo/reference/ui/UISearch.java | 248 - src/org/openbravo/reference/ui/UIString.java | 30 - src/org/openbravo/reference/ui/UITable.java | 63 - src/org/openbravo/reference/ui/UITableDir.java | 208 - src/org/openbravo/reference/ui/UITime.java | 74 - src/org/openbravo/reference/ui/UIYesNo.java | 21 - web/html/en_US/StaticCommunityBranding-2.50-Basic.html | 64 - web/html/en_US/StaticCommunityBranding-2.50-Basic_files/banner.png | 0 web/html/en_US/StaticCommunityBranding-2.50-Comm.html | 65 - web/html/en_US/StaticCommunityBranding-2.50-Comm_files/banner.png | 0 web/html/en_US/StaticCommunityBranding-2.50-STD.html | 66 - web/html/en_US/StaticCommunityBranding-2.50-STD_files/banner.png | 0 web/js/dojotoolkit/dojo/_base/xhr.js | 4 +- web/js/dojotoolkit/dojo/dojo.js | 2 +- web/js/dojotoolkit/dojo/dojo.js.uncompressed.js | 5 +- web/js/utils.js | 2 +- 123 files changed, 978 insertions(+), 9768 deletions(-) diffs (truncated from 13512 to 300 lines): diff -r b4290824ae05 -r b69110075180 build.xml --- a/build.xml Fri Jul 07 10:43:24 2017 +0200 +++ b/build.xml Thu Jul 20 11:28:33 2017 +0200 @@ -617,10 +617,6 @@ <target name="run.test" depends="init"> <ant dir="${base.src.test}" target="run.test" inheritAll="true" inheritRefs="true" /> </target> - - <target name="run.api.test.javascript"> - <ant dir="${base.src.test}" target="run.api.test.javascript" inheritAll="true" inheritRefs="true" /> - </target> <target name="run.api.test.model" description="Checks current xml db model and dictionary API for not-allowed changes. Requires stableDBdir parameter"> diff -r b4290824ae05 -r b69110075180 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Fri Jul 07 10:43:24 2017 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jul 20 11:28:33 2017 +0200 @@ -2872,7 +2872,7 @@ <!--FF80808130D5DD6A0130D5EEF54A000A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF80808130D5DD6A0130D5EEF54A000A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF80808130D5DD6A0130D5EEF54A000A--> <VALUE><![CDATA[OBUIAPP_GAinCommunity]]></VALUE> -<!--FF80808130D5DD6A0130D5EEF54A000A--> <MSGTEXT><![CDATA[Only Professional and Basic Edition subscribers can restrict access to modules in %0 maturity status.<br/> +<!--FF80808130D5DD6A0130D5EEF54A000A--> <MSGTEXT><![CDATA[Only Professional and Enterprise Edition subscribers can restrict access to modules in %0 maturity status.<br/> <a href="http://wiki.openbravo.com/wiki/Modules_Management#Learn_why"; class="OBNoteListGridDelete" target="_blank">Learn why</a>.]]></MSGTEXT> <!--FF80808130D5DD6A0130D5EEF54A000A--> <MSGTYPE><![CDATA[W]]></MSGTYPE> <!--FF80808130D5DD6A0130D5EEF54A000A--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> @@ -2885,7 +2885,7 @@ <!--FF80808130DC55FE0130DC9631A60019--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF80808130DC55FE0130DC9631A60019--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF80808130DC55FE0130DC9631A60019--> <VALUE><![CDATA[OBUIAPP_ActivateMessage]]></VALUE> -<!--FF80808130DC55FE0130DC9631A60019--> <MSGTEXT><![CDATA[%0 only available for Professional and Basic Edition subscribers. <br/><a target="_blank" href="http://www.openbravo.com/product/erp/editions/";>Learn more</a> about the benefits of Openbravo's Professional and Basic Editions.]]></MSGTEXT> +<!--FF80808130DC55FE0130DC9631A60019--> <MSGTEXT><![CDATA[%0 only available for Professional and Enterprise Edition subscribers. <br/><a target="_blank" href="http://www.openbravo.com/product/erp/editions/";>Learn more</a> about the benefits of Openbravo's Professional and Enterprise Editions.]]></MSGTEXT> <!--FF80808130DC55FE0130DC9631A60019--> <MSGTIP><![CDATA[%0 is a place-holder used to show a feature description]]></MSGTIP> <!--FF80808130DC55FE0130DC9631A60019--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF80808130DC55FE0130DC9631A60019--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> diff -r b4290824ae05 -r b69110075180 modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java Fri Jul 07 10:43:24 2017 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java Thu Jul 20 11:28:33 2017 +0200 @@ -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) 2013-2016 Openbravo SLU + * All portions are Copyright (C) 2013-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -31,6 +31,7 @@ import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.erpCommon.utility.OBMessageUtils; +import org.openbravo.materialmgmt.VariantChDescUpdateProcess; import org.openbravo.model.common.plm.Characteristic; import org.openbravo.model.common.plm.CharacteristicValue; import org.openbravo.model.common.plm.Product; @@ -158,7 +159,9 @@ } } + OBDal.getInstance().flush(); + new VariantChDescUpdateProcess().update(productId, null); JSONObject message = new JSONObject(); message.put("severity", "success"); message.put("text", OBMessageUtils.messageBD("UpdateCharacteristicsSuccess")); diff -r b4290824ae05 -r b69110075180 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Fri Jul 07 10:43:24 2017 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Thu Jul 20 11:28:33 2017 +0200 @@ -680,10 +680,7 @@ // store grid editing information which can be used when the fic returns // this is needed as after the fic return the edit row may have changed. - var gridEditInformation = this.view.viewGrid.getEditForm() ? { - grid: this.view.viewGrid, - editRow: this.view.viewGrid.getEditRow() - } : null; + var gridEditInformation = this.view.viewGrid.getEditForm() ? this.getGridEditInformation() : null; // do not make a request to the FIC in NEW mode if: // - the record is new and @@ -785,7 +782,7 @@ processFICReturn: function (response, data, request, gridEditInformation) { var length, modeIsNew = request.params.MODE === 'NEW', - noErrors, errorSolved; + noErrors, errorSolved, editingSameRecord, id; delete this.contextInfo; @@ -815,6 +812,15 @@ sessionAttributes = data.sessionAttributes, editValues, item, section, retHiddenInputs = data.hiddenInputs; + if (this.grid && gridEditInformation) { + id = this.getValue(OB.Constants.ID); + editingSameRecord = this.grid.getEditRow() === gridEditInformation.editRow && (!gridEditInformation.id || !id || id === gridEditInformation.id); + if (!editingSameRecord) { + // We're trying to process a FIC response that was triggered for a different row than the + // one that's currently being edited, it must be discarded + return; + } + } // apparently sometimes an empty string is returned if (calloutMessages && calloutMessages.length > 0 && calloutMessages[calloutMessages.length - 1].text !== '') { @@ -822,23 +828,6 @@ this.view.messageBar.setMessage(isc.OBMessageBar[calloutMessages[calloutMessages.length - 1].severity], null, calloutMessages[calloutMessages.length - 1].text); } - // edit row has changed when returning, don't update the form anymore - if (this.grid && gridEditInformation && this.grid.getEditRow() !== gridEditInformation.editRow) { - if (columnValues) { - for (prop in columnValues) { - if (columnValues.hasOwnProperty(prop)) { - this.setColumnValuesInEditValues(prop, columnValues[prop], gridEditInformation); - } - } - } - editValues = gridEditInformation.grid.getEditValues(gridEditInformation.editRow); - if (editValues && editValues.actionAfterFicReturn) { - OB.Utilities.callAction(editValues.actionAfterFicReturn); - gridEditInformation.grid.setEditValue(gridEditInformation.editRow, 'actionAfterFicReturn', null, true, true); - } - return; - } - if (columnValues) { for (prop in columnValues) { if (columnValues.hasOwnProperty(prop)) { @@ -1455,10 +1444,7 @@ // store grid editing information which can be used when the fic returns // this is needed as after the fic return the edit row may have changed. - var gridEditInformation = this.view.viewGrid.isEditing() ? { - grid: this.view.viewGrid, - editRow: this.view.viewGrid.getEditRow() - } : null; + var gridEditInformation = this.view.viewGrid.isEditing() ? this.getGridEditInformation() : null; OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', allProperties, requestParams, function (response, data, request) { @@ -1484,6 +1470,14 @@ this.view.toolBar.updateButtonState(true); }, + getGridEditInformation: function () { + return { + grid: this.view.viewGrid, + editRow: this.view.viewGrid.getEditRow(), + id: this.view.viewGrid.getEditForm().getValue(OB.Constants.ID) + }; + }, + itemChanged: function (item, newValue) { this.itemChangeActions(item); }, diff -r b4290824ae05 -r b69110075180 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 Fri Jul 07 10:43:24 2017 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Jul 20 11:28:33 2017 +0200 @@ -3675,15 +3675,15 @@ var focusItem = editForm.getFocusItem(); if (focusItem && !focusItem.hasPickList) { focusItem.blur(focusItem.form, focusItem); - if (editForm.inFicCall) { - // use editValues object as the edit form will be re-used for a next row - this.setEditValue(rowNum, 'actionAfterFicReturn', { - target: this, - method: this.saveEditedValues, - parameters: [rowNum, colNum, newValues, oldValues, editValuesID, editCompletionEvent, saveCallback, true] - }, true, true); - return; - } + } + if (editForm.inFicCall) { + // use editValues object as the edit form will be re-used for a next row + this.setEditValue(rowNum, 'actionAfterFicReturn', { + target: this, + method: this.saveEditedValues, + parameters: [rowNum, colNum, newValues, oldValues, editValuesID, editCompletionEvent, saveCallback, true] + }, true, true); + return; } } // reset the new values as this can have changed because of a fic call or in the blur event of the focused item diff -r b4290824ae05 -r b69110075180 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java Fri Jul 07 10:43:24 2017 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java Thu Jul 20 11:28:33 2017 +0200 @@ -42,9 +42,6 @@ * @author mtaal */ public class ApplicationComponent extends BaseTemplateComponent { - - private static final String MYOB_UIMODE = "MyOB"; - private FormatDefinition formatDefinition = null; private FormatDefinition getFormatDefinition() { @@ -136,7 +133,7 @@ } public String getCommunityBrandingUrl() { - return Utility.getCommunityBrandingUrl(MYOB_UIMODE); + return Utility.getCommunityBrandingUrl(); } public String getCommunityBrandingStaticUrl() { diff -r b4290824ae05 -r b69110075180 modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml --- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Fri Jul 07 10:43:24 2017 +0200 +++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml Thu Jul 20 11:28:33 2017 +0200 @@ -165,7 +165,7 @@ <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID> <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE> <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> -<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <AUTHOR_MSG><![CDATA[Requires Project Management module, which is part of Basic or Professional Edition]]></AUTHOR_MSG> +<!--862EEC18D6FC4FA68E7867E3CF337CC7--> <AUTHOR_MSG><![CDATA[Requires Project Management module, which is part of Professional or Enterprise Edition]]></AUTHOR_MSG> <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <AUTHOR_URL><![CDATA[http://www.openbravo.com/product/erp/]]></AUTHOR_URL> <!--862EEC18D6FC4FA68E7867E3CF337CC7--> <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE> <!--862EEC18D6FC4FA68E7867E3CF337CC7--></OBKMO_WIDGET_CLASS> diff -r b4290824ae05 -r b69110075180 modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java --- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java Fri Jul 07 10:43:24 2017 +0200 +++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java Thu Jul 20 11:28:33 2017 +0200 @@ -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) 2013-2016 Openbravo SLU + * All portions are Copyright (C) 2013-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -236,7 +236,7 @@ boolean allowNotApplyingWhereClauseToChildren = !tableTree.isApplyWhereClauseToChildNodes(); if ((fetchRoot || !allowNotApplyingWhereClauseToChildren) && hqlWhereClause != null) { // Include the hql where clause for all root nodes and for child nodes only if it is required - whereClause.append(hqlWhereClause + " and "); + whereClause.append("(" + hqlWhereClause + ") and "); } if (hqlWhereClauseRootNodes != null && fetchRoot) { @@ -555,7 +555,7 @@ whereClause.append(".id"); } whereClause.append(" = ? "); - whereClause.append(" and " + hqlWhereClause); + whereClause.append(" and (" + hqlWhereClause + ")"); final OBQuery<BaseOBObject> query = OBDal.getInstance().createQuery(entity.getName(), whereClause.toString()); diff -r b4290824ae05 -r b69110075180 modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java --- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java Fri Jul 07 10:43:24 2017 +0200 +++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java Thu Jul 20 11:28:33 2017 +0200 @@ -22,35 +22,18 @@ import static org.openbravo.erpCommon.utility.ComboTableData.CLIENT_LIST_PARAM_HOLDER; import static org.openbravo.erpCommon.utility.ComboTableData.ORG_LIST_PARAM_HOLDER; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Vector; - -import javax.servlet.ServletException; - import org.openbravo.base.model.Entity; import org.openbravo.base.model.ModelProvider; import org.openbravo.base.model.Property; -import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.dal.core.DalUtil; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; -import org.openbravo.dal.service.OBQuery; import org.openbravo.data.FieldProvider; -import org.openbravo.erpCommon.businessUtility.BuscadorData; import org.openbravo.erpCommon.utility.ComboTableData; import org.openbravo.erpCommon.utility.ComboTableQueryData; -import org.openbravo.erpCommon.utility.TableSQLData; import org.openbravo.model.ad.domain.Reference; import org.openbravo.reference.ui.UIReference; -import org.openbravo.reference.ui.UIReferenceUtility; -import org.openbravo.reference.ui.UITableDir; import org.openbravo.userinterface.selector.Selector; -import org.openbravo.utils.FormatUtilities; /** * Implements the User Interface part of the new customizable Reference. This part takes care of the @@ -64,90 +47,6 @@ super(reference, subreference); } - /** - * Generates the HTML code for the input used to display the reference in the filter popup - */ - public void generateFilterHtml(StringBuffer strHtml, VariablesSecureApp vars, BuscadorData field, - String strTab, String strWindow, ArrayList<String> vecScript, Vector<Object> vecKeys) - throws IOException, ServletException { - - OBContext.setAdminMode(); - try { ------------------------------------------------------------------------------ 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
