details: https://code.openbravo.com/erp/devel/main/rev/15dbf5983411 changeset: 26800:15dbf5983411 user: Fernando Soto <fernando.soto <at> peoplewalking.com> date: Fri Feb 13 10:20:41 2015 -0500 summary: Fixed bug 25355: Long time to show the lines on the payment in/out windows
details: https://code.openbravo.com/erp/devel/main/rev/093fb9ca1c6d changeset: 26801:093fb9ca1c6d user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu Feb 26 18:09:18 2015 +0100 summary: Related to issue 25355: Fix Dimension fields display Dimension fields display in Payment In Lines and Payment Out Lines tabs will now work with Accounting Dimensions Central Maintenance. Also, Order Payment Schedule and Invoice Payment Schedule fields navigation has been fixed. details: https://code.openbravo.com/erp/devel/main/rev/38c6321b2ad9 changeset: 26802:38c6321b2ad9 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue May 12 09:36:15 2015 +0200 summary: Related to issue 25355: Executed Synchronize Terminology details: https://code.openbravo.com/erp/devel/main/rev/85e792e6b36a changeset: 26803:85e792e6b36a user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri May 29 15:21:50 2015 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/35c004afbdca changeset: 26804:35c004afbdca user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat May 30 19:19:54 2015 +0200 summary: Fixed 30050: cleanup javadoc warnings This commit clean up all javadoc warnings as shown by eclipse or ant generate.java.doc Exception are 3 warnings inside CSSMinimizer.java which is external code and will should be fixed differently (upstream) Most fixes are: - Deleting useless java doc tags (useless as not documenting anything) - Fixing up paramater references and link target details: https://code.openbravo.com/erp/devel/main/rev/a6e31121bf79 changeset: 26805:a6e31121bf79 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Fri May 29 13:58:50 2015 +0200 summary: Related issue 29602: Changed UI pattern to read only mode in some tabs The problem was that some tabs have their UI patterns wrong.They are not set properly. Now it have been solved by updating the UI Pattern to read only mode. details: https://code.openbravo.com/erp/devel/main/rev/099550fa4baa changeset: 26806:099550fa4baa user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Wed May 27 16:27:00 2015 +0200 summary: Fixed issue 29602: window with table defined as view should be RO The problem was that if you had a window that was assigned with a table defined as view you could edited. Now, it is taking into account this condition by checking windows (Type window "M" and "T"). details: https://code.openbravo.com/erp/devel/main/rev/eef37b346fe4 changeset: 26807:eef37b346fe4 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Fri May 29 09:52:37 2015 +0200 summary: Fixes issue 30017: Landed Cost must not be applied to negative receipt lines Goods Receipt selector in Landed Cost window - Receipt tab, will not show receipts which does not have any positive line. Goods Receipt Line selector in Landed Cost window - Receipt tab, will not show negative receipts lines. Landed Cost process will not consider negative receipt lines to distribute the amount of the landed cost. details: https://code.openbravo.com/erp/devel/main/rev/56776f691f4b changeset: 26808:56776f691f4b user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat May 30 19:57:13 2015 +0200 summary: Fixed 30052. Cleanup all 'Unnecessary cast' warnings from Eclipse. As those extra casts are not useful and make the code harder to read/understand -> Remove all those details: https://code.openbravo.com/erp/devel/main/rev/adda5d230a5e changeset: 26809:adda5d230a5e user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat May 30 20:07:50 2015 +0200 summary: Issue 30053. Part 1: Cleanup unnecessary serialVersionUID variables. Those definitions are not useful in this cases and the classes they are in are not serializable. So instead of special feature related to Serialization in this cases just a local unused variable. details: https://code.openbravo.com/erp/devel/main/rev/4408556e4cb4 changeset: 26810:4408556e4cb4 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat May 30 20:29:02 2015 +0200 summary: Issue 30053. Part 2: Cleanup unnecessary slf4j / log4j loggers Remove those where they are private and never used in the file. details: https://code.openbravo.com/erp/devel/main/rev/cb3442689716 changeset: 26811:cb3442689716 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sat May 30 20:59:23 2015 +0200 summary: Issue 30053. Part 3: Delete local unused variables (easy cases) This removes unused local variables / fields for all the easy cases. Where there is no user besides the variables declaration/init and where it is clear that just deleting it is the right thing to do (so no doubt it should be used instead of deleting it) details: https://code.openbravo.com/erp/devel/main/rev/ada6ae238e94 changeset: 26812:ada6ae238e94 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sun May 31 13:33:21 2015 +0200 summary: Fixed 30054: Cleanup warnings in wad-generated code Goal is not to make wad-generated code nicer (as it should go away). But instead to reduce the big number of eclipse warnings in it. So they get out of the way when looking at warning in other code Changes: - remove java.util.Arrays & java.util.List imports and covered by existing java.util.* import - The other 'unused' code warnings are not so easy to fix so in context of wad supress all 'unused' warnings in the srcAD files on class level. As secondary change remove to existing more specific unused annotation as they triggered warnings themselves (and are covered by the new one anyway) - Remove private log4j Logger declaration. It shadows a similar one coming inherited from HttpBaseServer. That one is defined as non-static via this.getClass so is already of the instance we want (the concrete window- servlet). That means logger functionally works as before (you can still set i.e. debug level logging for individual servlet as before). - in printPageEdit function a parameter was being assigned to in the function quite often. Apparently those cannot be surpressed. After checking easy to fix - All caller use just simple constant on every call. - So add local variable on top of function and copy param value. - Keep existing param name as variable name to reduce diff of generated code. Together those reduce number of warnings in srcAD from hundreds down to just 14. details: https://code.openbravo.com/erp/devel/main/rev/1474b680f216 changeset: 26813:1474b680f216 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sun May 31 14:06:56 2015 +0200 summary: Fixed 30055. Fix all warnings in src-trl Two types of changes: - Remove variables which are never read - Do not assign to parameters, copy to local var instead References of parameters cannot be modified in java Content of objects passed in can be, however in all this cases object are String which are immutable Same fix always: Copy of local variable keeping name of old param as new variable name to reduce diff to review. - That avoid any developer confusing maybe thinking change of param would be visible in caller. details: https://code.openbravo.com/erp/devel/main/rev/e46899b00411 changeset: 26814:e46899b00411 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Sun May 31 15:43:59 2015 +0200 summary: Fixed 30056: Cleanup all warnings in src-wad XX - Remove String or int parameter assignment by copying into local variable. - in Wad#processSelCol use Vector.toArray function to avoid needing to replace reference in parameter. Note: .toArray will auto-resize itself to correct size as param is 0-length array - Fix 2 possible NPE. As code to treat null as empty value was only called after .debug triggering NPE as param of log4j.debug will be evaluated even without log level set to debug. - Wad#getVectorElementsNotRepeated function had parameter which was new empty Vector in all its 3 callers. As we do not expect more callers (was is deprecated) just remove the param completely and create new Vector inside the function removing param assignment. - in WadUtility instead of assigning to text-param and immediately returning that value just return it directly as the rest of that function already did. - in WadNumber. Confusion between non-static function param name + field inherited from superclass. As those seem to be very clearly utility functions which should use the param (and not some inherited field) -> just make them static to remove that confusion. - WadValidator gets 'friendlyWarnings' flag on construction but does not currently use it. However we may want to add it (and keep api stable now) so just supress that unused warning. details: https://code.openbravo.com/erp/devel/main/rev/a9518a8e931b changeset: 26815:a9518a8e931b user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Jun 01 13:08:42 2015 +0200 summary: Fixes Issue 29992. Fixes HQL Where Clause in OBUISEL_Selector definition. It now filters by Products that are Stocked based on the Product definition rather than the Stocked flag in the Storage Detail. details: https://code.openbravo.com/erp/devel/main/rev/8721a7b97a6b changeset: 26816:8721a7b97a6b user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Jun 01 13:16:02 2015 +0200 summary: Fixed issue 29602: tab to check shouldn't be obtained from table's window The problem was that tab to check shouldn't be obtained from table's window but directly from the current window. Now it is taking into account. details: https://code.openbravo.com/erp/devel/main/rev/d4644c111852 changeset: 26817:d4644c111852 user: Inigo Sanchez <inigo.sanchez <at> openbravo.com> date: Mon Jun 01 17:30:38 2015 +0200 summary: Related issue 29602:wrong position of parenthesis in a condition The problem was the wrong position of parenthesis in a condicion. Now it has been solved by updating position of parenthesis properly, details: https://code.openbravo.com/erp/devel/main/rev/14de467bd788 changeset: 26818:14de467bd788 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jun 02 01:23:10 2015 +0000 summary: CI: update AD_MODULE to version 26817 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java | 4 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java | 4 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java | 10 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java | 22 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java | 3 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 5 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MultipleDeleteActionHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 12 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TableTreeEventHandler.java | 18 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 12 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java | 3 - modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 1 - modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/GetLabelActionHandler.java | 2 - modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SetContextInfoActionHandler.java | 3 - modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/CalendarWidgetProvider.java | 3 - modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java | 6 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 4 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 26 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 17 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java | 2 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java | 4 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 7 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java | 6 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 18 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java | 1 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/NoteDataSource.java | 2 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 2 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java | 6 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 8 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java | 2 - modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 3 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 20 +- src-core/src/org/openbravo/base/VariablesBase.java | 4 +- src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java | 1 - src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 + src-db/database/sourcedata/AD_COLUMN.xml | 104 +- src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml | 156 + src-db/database/sourcedata/AD_ELEMENT.xml | 24 + src-db/database/sourcedata/AD_FIELD.xml | 1665 ++++++++++ src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 15 +- src-db/database/sourcedata/AD_TAB.xml | 77 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 20 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 134 +- src-test/src/org/openbravo/test/dal/ADCachedMultiThreadTest.java | 2 +- src-test/src/org/openbravo/test/dal/DalPerformanceExampleTest.java | 1 - src-test/src/org/openbravo/test/xml/EntityXMLIssues.java | 2 +- src-trl/src/org/openbravo/translate/RTLSkin.java | 9 +- src-trl/src/org/openbravo/translate/Translate.java | 18 +- src-wad/src/org/openbravo/wad/Wad.java | 45 +- src-wad/src/org/openbravo/wad/WadUtility.java | 9 +- src-wad/src/org/openbravo/wad/controls/WADControl.java | 3 +- src-wad/src/org/openbravo/wad/controls/WADImage.java | 6 +- src-wad/src/org/openbravo/wad/controls/WADNumber.java | 10 +- src-wad/src/org/openbravo/wad/controls/WADSearch.java | 6 +- src-wad/src/org/openbravo/wad/javasource.javaxml | 14 +- src-wad/src/org/openbravo/wad/validation/WADValidator.java | 2 + src/org/openbravo/base/model/Column.java | 2 +- src/org/openbravo/base/model/ModelProvider.java | 3 +- src/org/openbravo/base/provider/OBProviderConfigReader.java | 2 - src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 2 +- src/org/openbravo/base/secureApp/LoginUtils.java | 5 +- src/org/openbravo/base/secureApp/OrgTree.java | 9 - src/org/openbravo/base/session/HostNameTask.java | 2 +- src/org/openbravo/base/session/OBYesNoType.java | 4 +- src/org/openbravo/base/structure/IdentifierProvider.java | 3 +- src/org/openbravo/common/actionhandler/KillProcess.java | 3 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 3 - src/org/openbravo/common/actionhandler/RMShipmentPickEditLines.java | 3 - src/org/openbravo/common/datasource/ResultMapCriteriaUtils.java | 2 +- src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java | 10 +- src/org/openbravo/configuration/ConfigureOption.java | 2 - src/org/openbravo/costing/CostAdjustmentProcess.java | 3 +- src/org/openbravo/costing/CostingAlgorithm.java | 2 +- src/org/openbravo/costing/CostingMigrationProcess.java | 2 +- src/org/openbravo/costing/CostingRuleProcess.java | 2 +- src/org/openbravo/costing/CostingRuleProcessOnProcessHandler.java | 2 +- src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 4 +- src/org/openbravo/costing/LCMatchingProcess.java | 2 +- src/org/openbravo/costing/LandedCostDistributionByAmount.java | 7 +- src/org/openbravo/costing/LandedCostProcess.java | 9 +- src/org/openbravo/dal/security/SecurityChecker.java | 3 +- src/org/openbravo/dal/service/OBDao.java | 2 +- src/org/openbravo/dal/xml/EntityExcelXMLConverter.java | 2 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 1 - src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues.java | 1 - src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Asset_Product.java | 1 - src/org/openbravo/erpCommon/ad_callouts/SL_PC_Case_Product.java | 1 - src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product_Attribute.java | 2 +- src/org/openbravo/erpCommon/ad_forms/About.java | 2 - src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 4 +- src/org/openbravo/erpCommon/ad_forms/DocAmortizationTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocBankTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocCashTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocDPManagementTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocDoubtfulDebt.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocDoubtfulDebtTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java | 2 - src/org/openbravo/erpCommon/ad_forms/DocFINBankStatementTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransactionTemplate.java | 4 - src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINPaymentTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINReconciliationTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocGLJournalTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocInOutTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocInventoryTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocInvoiceTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocLCCostTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocLandedCostTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocLine_FINPayment.java | 2 - src/org/openbravo/erpCommon/ad_forms/DocMatchInvTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocMovementTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocOrderTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocPaymentTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocProductionTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 23 +- src/org/openbravo/erpCommon/ad_forms/Registration.java | 10 - src/org/openbravo/erpCommon/ad_forms/TranslationManager.java | 1 - src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java | 6 +- src/org/openbravo/erpCommon/ad_process/DeleteClient.java | 2 - src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 2 - src/org/openbravo/erpCommon/ad_process/MRPPurchaseCreateReservations.java | 5 +- src/org/openbravo/erpCommon/ad_process/RegisterModule.java | 2 +- src/org/openbravo/erpCommon/ad_process/ResetAccountingProcess.java | 4 - src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 1 - src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 10 - src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_legacy.java | 10 - src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 2 - src/org/openbravo/erpCommon/businessUtility/AuditTrailDeletedRecords.java | 2 +- src/org/openbravo/erpCommon/businessUtility/COAUtility.java | 1 - src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java | 3 +- src/org/openbravo/erpCommon/info/ImageInfoBLOB.java | 3 +- src/org/openbravo/erpCommon/modules/ImportModule.java | 9 +- src/org/openbravo/erpCommon/modules/ModuleTree.java | 3 - src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java | 2 - src/org/openbravo/erpCommon/modules/VersionUtility.java | 2 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 3 - src/org/openbravo/erpCommon/utility/ComboTableData.java | 2 - src/org/openbravo/erpCommon/utility/GenericTree.java | 6 +- src/org/openbravo/erpCommon/utility/LeftTabsBar.java | 2 - src/org/openbravo/erpCommon/utility/NavigationBar.java | 2 - src/org/openbravo/erpCommon/utility/ReferencedLink.java | 42 +- src/org/openbravo/erpCommon/utility/ToolBar.java | 2 - src/org/openbravo/erpCommon/utility/UsedByLink.java | 2 - src/org/openbravo/erpCommon/utility/Utility.java | 7 +- src/org/openbravo/erpCommon/utility/poc/EmailManager.java | 4 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 10 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintInvoices.java | 2 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintOrders.java | 2 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintQuotations.java | 2 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintShipments.java | 2 - src/org/openbravo/erpReports/ReportVatRegisterJR.java | 2 +- src/org/openbravo/event/InvoiceLineEventHandler.java | 15 +- src/org/openbravo/event/MInOutLineEventHandler.java | 22 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 4 +- src/org/openbravo/materialmgmt/VariantAutomaticGenerationProcess.java | 8 +- src/org/openbravo/materialmgmt/VariantChDescUpdateProcess.java | 4 +- src/org/openbravo/scheduling/OBScheduler.java | 6 - src/org/openbravo/service/db/CallProcess.java | 2 +- src/org/openbravo/service/db/DataImportService.java | 3 +- src/org/openbravo/service/importprocess/ImportProcessUtils.java | 2 +- src/org/openbravo/service/rest/DalWebService.java | 2 - src/org/openbravo/service/system/ApplicationDictionaryValidator.java | 3 - 232 files changed, 2576 insertions(+), 647 deletions(-) diffs (truncated from 7661 to 300 lines): diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 02 01:23:10 2015 +0000 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.26793]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.26817]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 02 01:23:10 2015 +0000 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.26793]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.26817]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.26793]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.26817]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Tue Jun 02 01:23:10 2015 +0000 @@ -655,7 +655,7 @@ <!--C095D2CC39704DBE8B906B7CD7710968--> <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS> <!--C095D2CC39704DBE8B906B7CD7710968--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB> <!--C095D2CC39704DBE8B906B7CD7710968--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--C095D2CC39704DBE8B906B7CD7710968--> <UIPATTERN><![CDATA[SR]]></UIPATTERN> +<!--C095D2CC39704DBE8B906B7CD7710968--> <UIPATTERN><![CDATA[RO]]></UIPATTERN> <!--C095D2CC39704DBE8B906B7CD7710968--> <HQLORDERBYCLAUSE><![CDATA[-transactionDate]]></HQLORDERBYCLAUSE> <!--C095D2CC39704DBE8B906B7CD7710968--> <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS> <!--C095D2CC39704DBE8B906B7CD7710968--> <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY> @@ -1059,7 +1059,7 @@ <!--FF8080812F213146012F2135BC25000E--> <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS> <!--FF8080812F213146012F2135BC25000E--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB> <!--FF8080812F213146012F2135BC25000E--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--FF8080812F213146012F2135BC25000E--> <UIPATTERN><![CDATA[SR]]></UIPATTERN> +<!--FF8080812F213146012F2135BC25000E--> <UIPATTERN><![CDATA[RO]]></UIPATTERN> <!--FF8080812F213146012F2135BC25000E--> <HQLFILTERCLAUSE><![CDATA[e.reconciled = false]]></HQLFILTERCLAUSE> <!--FF8080812F213146012F2135BC25000E--> <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS> <!--FF8080812F213146012F2135BC25000E--> <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY> diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java Tue Jun 02 01:23:10 2015 +0000 @@ -27,12 +27,8 @@ import org.openbravo.dal.service.OBDal; import org.openbravo.model.ad.domain.Preference; import org.openbravo.model.common.enterprise.Organization; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class MatchStatementOnLoadPreferenceActionHandler extends BaseActionHandler { - private static final Logger log = LoggerFactory - .getLogger(MatchStatementOnLoadPreferenceActionHandler.class); @Override protected JSONObject execute(Map<String, Object> parameters, String content) { diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java Tue Jun 02 01:23:10 2015 +0000 @@ -30,9 +30,7 @@ import org.codehaus.jettison.json.JSONObject; import org.openbravo.base.exception.OBException; import org.openbravo.base.provider.OBProvider; -import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.client.application.process.BaseProcessActionHandler; -import org.openbravo.client.kernel.RequestContext; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.dal.service.OBDao; @@ -49,7 +47,6 @@ protected JSONObject doExecute(Map<String, Object> parameters, String content) { JSONObject jsonRequest = null; OBContext.setAdminMode(); - VariablesSecureApp vars = RequestContext.get().getVariablesSecureApp(); try { jsonRequest = new JSONObject(content); log.debug(jsonRequest); @@ -121,7 +118,7 @@ int cont = 0; String differentPaymentMethod = "false"; for (int i = 0; i < selectedLines.length(); i++) { - JSONObject selectedLine = selectedLines.getJSONObject((int) i); + JSONObject selectedLine = selectedLines.getJSONObject(i); log.debug(selectedLine); BigDecimal paidAmount = new BigDecimal(selectedLine.getString("payment")); diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Tue Jun 02 01:23:10 2015 +0000 @@ -833,8 +833,8 @@ * * @param vars * VariablseSecureApp with the session data. - * @param selectedPaymentScheduleDetails - * List of FIN_PaymentScheduleDetails that need to be included in the HashMap. + * @param _strSelectedScheduledPaymentDetailIds + * List of id's of FIN_PaymentScheduleDetails that need to be included in the HashMap. * @return A HashMap mapping the FIN_PaymentScheduleDetail's Id with the corresponding amount. */ private HashMap<String, BigDecimal> getSelectedPaymentDetailsAndAmount(VariablesSecureApp vars, @@ -876,7 +876,6 @@ * : amount to split among the set * @param psdSet * : set of payment schedule details where to allocate the amount - * @return */ private HashMap<String, BigDecimal> calculateAmounts(BigDecimal recordAmount, Set<String> psdSet) { BigDecimal remainingAmount = recordAmount; diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java Tue Jun 02 01:23:10 2015 +0000 @@ -33,12 +33,8 @@ import org.openbravo.model.financialmgmt.gl.GLItem; import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction; import org.openbravo.model.financialmgmt.payment.FIN_Payment; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class FIN_FinaccTransactionEventListener extends EntityPersistenceEventObserver { - private static final Logger logger = LoggerFactory - .getLogger(FIN_FinaccTransactionEventListener.class); private static Entity[] entities = { ModelProvider.getInstance().getEntity( FIN_FinaccTransaction.ENTITY_NAME) }; diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java Tue Jun 02 01:23:10 2015 +0000 @@ -83,7 +83,7 @@ AddPaymentDefaultValuesHandler handler = getDefaultsHandler(strWindowId); String paymentMethodId = handler.getDefaultPaymentMethod(requestMap); if (context.has("inpfinPaymentId") && context.get("inpfinPaymentId") != JSONObject.NULL - && StringUtils.isNotBlank((String) context.getString("inpfinPaymentId"))) { + && StringUtils.isNotBlank(context.getString("inpfinPaymentId"))) { if (hasDetailsWithDifferentPaymentMethods((String) context.get("inpfinPaymentId"))) { return ""; } else { @@ -111,7 +111,7 @@ query.setParameter("paymentId", paymentId); FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class, paymentId); for (Object pmId : query.list()) { - if (!payment.getPaymentMethod().getId().equals((String) pmId)) { + if (!payment.getPaymentMethod().getId().equals(pmId)) { return true; } } diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java Tue Jun 02 01:23:10 2015 +0000 @@ -21,26 +21,16 @@ import java.util.Map; -import javax.servlet.http.HttpSession; - -import org.apache.log4j.Logger; import org.openbravo.client.application.FilterExpression; -import org.openbravo.client.application.OBBindingsConstants; -import org.openbravo.client.kernel.RequestContext; import org.openbravo.dal.service.OBDal; import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; public class PaymentSelectorFilterExpression implements FilterExpression { - private Logger log = Logger.getLogger(PaymentSelectorFilterExpression.class); private Map<String, String> requestMap; - private HttpSession httpSession; - private String windowId; @Override public String getExpression(Map<String, String> _requestMap) { requestMap = _requestMap; - httpSession = RequestContext.get().getSession(); - windowId = requestMap.get(OBBindingsConstants.WINDOW_ID_PARAM); if (requestMap.containsKey("inpfinFinancialAccountId")) { FIN_FinancialAccount financialaccount = OBDal.getInstance().get(FIN_FinancialAccount.class, diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java Tue Jun 02 01:23:10 2015 +0000 @@ -329,10 +329,6 @@ /** * Order by selectedPSDs, scheduled date and document number - * - * @param selectedPSDs - * @param transactionType - * @return */ protected StringBuffer getOrderByClause(String transactionType, List<String> selectedPSDs, Map<String, String> requestParameters) { @@ -391,13 +387,6 @@ return hqlQuery; } - /** - * @param _hqlQuery - * @param transactionType - * @param criteria - * @param queryNamedParameters - * @return - */ protected String calculateHavingClause(String _hqlQuery, String transactionType, JSONObject criteria, Map<String, Object> queryNamedParameters) { String hqlQuery = _hqlQuery; @@ -527,13 +516,6 @@ return hqlQuery; } - /** - * @param _hqlQuery - * @param transactionType - * @param selectedPSDs - * @param orderByClause - * @return - */ protected String appendOrderByClause(String _hqlQuery, StringBuffer orderByClause, boolean justCount) { String hqlQuery = _hqlQuery; @@ -570,10 +552,6 @@ buildCriteria.put("criteria", newCriteriaArray); } - /** - * @param expression - * @return - */ protected String getAggregatorFunction(String expression) { return " hqlagg(" + expression + ")"; } diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Tue Jun 02 01:23:10 2015 +0000 @@ -1276,9 +1276,6 @@ /** * Returns the date in which last payment for this invoice took place - * - * @param invoice - * @return */ private static Date getFinalSettlementDate(Invoice invoice) { final OBCriteria<FIN_PaymentSchedInvV> obc = OBDal.getInstance().createCriteria( @@ -1526,7 +1523,7 @@ * Payment Schedule Detail amount. * @param paymentAmount * Amount selected to be collected. Always less or equal than scheduleDetailAmount. - * @param doubtfulDebtAmount + * @param doubtfulDebtTotalAmount * Payment Schedule Detail doubtFulDebt amount. * @return resultant doubtful debt amount. Zero if no doubtful debt amount was present. */ diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java Tue Jun 02 01:23:10 2015 +0000 @@ -42,7 +42,7 @@ final VariablesSecureApp vars = bundle.getContext().toVars(); final ConnectionProvider conProvider = bundle.getConnection(); final String language = bundle.getContext().getLanguage(); - final boolean isForceProcess = (Boolean) "2DDE7D3618034C38A4462B7F3456C28D".equals(bundle + final boolean isForceProcess = "2DDE7D3618034C38A4462B7F3456C28D".equals(bundle .getProcessId()); bankStatement.setProcessNow(true); diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java Tue Jun 02 01:23:10 2015 +0000 @@ -191,9 +191,6 @@ /** * Returns the date in which last payment for this invoice took place - * - * @param invoice - * @return */ private static Date getFinalSettlementDate(Invoice invoice) { final OBCriteria<FIN_PaymentSchedInvV> obc = OBDal.getInstance().createCriteria( diff -r 535b08878cf7 -r 14de467bd788 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java Fri May 29 11:17:43 2015 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java Tue Jun 02 01:23:10 2015 +0000 @@ -111,7 +111,7 @@ bundle.setResult(msg); return; } - final boolean isForceProcess = (Boolean) "6BF16EFC772843AC9A17552AE0B26AB7".equals(bundle + final boolean isForceProcess = "6BF16EFC772843AC9A17552AE0B26AB7".equals(bundle .getProcessId()); // Transaction exists ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
