details: https://code.openbravo.com/erp/devel/main/rev/554dc31721c0 changeset: 34257:554dc31721c0 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu May 17 10:05:57 2018 +0200 summary: fixes issue 38556: Default Expression in Selector Field does not work properly
After the changes introduced with[1] the request data is sent to the SelectorDefaultFilterActionHandler as part of the POST payload rather than in the query string. This caused that the selector id was not being found in that handler, avoiding the correct processing of the data. The problem has been fixed by retrieving the data to process both from the request parameters and content. [1] https://code.openbravo.com/erp/devel/pi/rev/2a79f597da83870d152ee3176ffa679a01ac19d5 details: https://code.openbravo.com/erp/devel/main/rev/ed85e6db704a changeset: 34258:ed85e6db704a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 17 17:22:21 2018 +0200 summary: fixed bug 38568: can get stuck forever sending emails Added a fixed 10 minutes timeout for communications with smtp servers, this same timeout is applied to connection creation as well as reading responses from server. Note it is not applied to writing operations. details: https://code.openbravo.com/erp/devel/main/rev/9ac3c2f0a875 changeset: 34259:9ac3c2f0a875 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed May 16 00:04:54 2018 +0530 summary: Fixes Issue 38605:Slow updating to 18Q2 on an environment with high loads of data In general no of shipment completely invoice are more as compare to that are not completely invoiced. Hence mddulescript logic is changed to update iscompletelyinvoiced as No for the applicable shipments. For rest of the existing shipments flag is set as Yes using onCreateDefault for iscompletelyinvoiced column of M_Inout table. details: https://code.openbravo.com/erp/devel/main/rev/36053cb67cf9 changeset: 34260:36053cb67cf9 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed May 16 14:31:08 2018 +0530 summary: Related to Issue 38605:Sample data updated in QA testing for IsCompletelyInvoiced flag in M_Inout details: https://code.openbravo.com/erp/devel/main/rev/4dc6ea55b227 changeset: 34261:4dc6ea55b227 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed May 23 15:30:28 2018 +0200 summary: Related to Issue 38605. Added missing .class file details: https://code.openbravo.com/erp/devel/main/rev/d13caf113d0e changeset: 34262:d13caf113d0e user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu May 24 18:01:58 2018 +0200 summary: fixes issue 38617: Allow to skip the login page redirection done in index.jsp After the fix for issue #30031, it was not possible to login in Openbravo by using the authentication retrieved with an external login page. This is because in the index.jsp we first check if the DB session has been created and if not, a redirect to the login page is done. This was breaking the flow where the authentication is performed externally and then a redirection with the result is done to directly access Openbravo, because in that case the DB session does not exists yet causing the redirection to the login page instead of granting the access into the application. To fix this problem a new method called useExternalLoginPage() has been added to the AuthenticationManager class. It should be overridden by the subclasses that want to avoid the redirection if the DB session is not still present when trying to access into the application. details: https://code.openbravo.com/erp/devel/main/rev/49df7805985a changeset: 34263:49df7805985a user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri May 25 12:59:25 2018 +0200 summary: fixes issue 38631: Specify the HTML version to use when building the javadoc Starting from JDK9 it is possible to specify the HTML version to use when building the javadoc. In JDK10, if the format is not specified a warning is displayed. Setting HTML5 as the default format starting from JDK9. details: https://code.openbravo.com/erp/devel/main/rev/e0c799c4d5ba changeset: 34264:e0c799c4d5ba user: Atul Gaware <atul.gaware <at> openbravo.com> date: Tue May 29 00:27:14 2018 +0530 summary: Fixes Issue 0038643: Debit and credit amounts are wrongly updated in G/L Journal lines with different currency than general ledger currency **amtSourceDr was wrongly set as amtAcctDr and amtSourceCr as amtAcctCr in the callouts refactor project. Both values are set correctly now. details: https://code.openbravo.com/erp/devel/main/rev/0c1cad7ac1a8 changeset: 34265:0c1cad7ac1a8 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Wed May 30 10:43:21 2018 +0200 summary: fixes issue 38653: Wrong combo values if the org id is not received by the FIC Before the changes on issue #37980 when retrieving an empty organization in the FIC, the query to calculate the selected combo value was filtering by every organization in the client. After that changes, the query to calculate the combo is filtering by an empty organization list, avoiding to retrieve the correct value. This is eventually caused by a change on how the Utility.getReferenceableOrg() method behaves. It now returns an empty list ('') if no organization is provided. To fix the problem we are now not including the org filtering in the query generated by UIDefinition.getValueInComboReference() method if an empty organization list is provided when building the query. In this case, filtering by client should be enough. details: https://code.openbravo.com/erp/devel/main/rev/9f8b56a41406 changeset: 34266:9f8b56a41406 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jun 14 17:08:07 2018 +0200 summary: fixed bug 38758: with write access to an org and one child, can't read siblings Having an organization A, with at least 2 child nodes B and C and a role with write access to A and only one of its children B, randomly cannot read info in C. Readable organizations should be all the ones that are part of the natural tree of each of the writable organizations. When calculating them there was a wrong optimization that assumed if an organization was already calculated to be part of the readable orgs, its natural tree would also be so there was no need to recalculate it. This is not true if it was included becuase it is part of natural tree of one of its writable descendants, in this case if this org is also writable its natural tree needs to be calculated. As calculating natural tree on memory is not that expensive it is not worth to include more complex logic to decide whether it requires to be calculated or not: now it will be calculated for all writable organizations. details: https://code.openbravo.com/erp/devel/main/rev/42688f7eac68 changeset: 34267:42688f7eac68 user: Mark <markmm82 <at> gmail.com> date: Thu Jun 14 19:20:21 2018 -0400 summary: Fixes issue 38773:Index on M_MATCHPO to improve performance in Create Lines From Caused by a query that is executed for every candidate order validating that exists lines that can be invoiced requesting information from M_MATCHPO, the Create Lines From process on Invoice windows has bad performance and to be improved waa needed to add a new index in C_ORDERLINE_ID and C_INVOICELINE_ID columns taking into account those records where C_INVOICELINE_ID IS NOT NULL. details: https://code.openbravo.com/erp/devel/main/rev/4887e05c89dc changeset: 34268:4887e05c89dc user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Jun 25 14:52:03 2018 +0200 summary: Fixes issue 38828: TriggerHandler.enable no longer leaves triggers disabled The problem was that if the flush indie TriggerHandler.enable (invoked when retrieving DAL's connection) failed, the clear method was not invoked, and the ThreadLocal was not reset. The next time the thread was reused, it would work with disabled triggers. Now that doesn't happen anymore because the flush is done inside the try block. details: https://code.openbravo.com/erp/devel/main/rev/72eebae99400 changeset: 34269:72eebae99400 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Jun 25 18:16:41 2018 +0200 summary: Related with issue 38828: Fixes log details: https://code.openbravo.com/erp/devel/main/rev/fceb99795039 changeset: 34270:fceb99795039 user: Armaignac <collazoandy4 <at> gmail.com> date: Mon Jun 25 15:28:36 2018 -0400 summary: Fixed issue 38879:The process "Create price list" increases the product price The process Create Price List was increasing the product price when the price list schema have two or more lines at product level. Now the price list schema lines defined at product level is take into account in the Create Price List process. A new JUnit test was added to properly check this behavior. A new preference was created to calculate the product price in a hierarchical way details: https://code.openbravo.com/erp/devel/main/rev/d0cc6cddbf69 changeset: 34271:d0cc6cddbf69 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Jul 04 09:22:23 2018 +0200 summary: related to issue 38879 added modulescript with default value of preference added modulescript with default value of hierarchical price list preference depends on the openbravo version. details: https://code.openbravo.com/erp/devel/main/rev/a3c948281b97 changeset: 34272:a3c948281b97 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jul 05 09:10:01 2018 +0200 summary: fixes issue 38898: not necessary to include jaxws-api library details: https://code.openbravo.com/erp/devel/main/rev/25ee153d674c changeset: 34273:25ee153d674c user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Jul 05 10:04:26 2018 +0200 summary: fixes issue 38900: jaxbl-impl library should be included in the classpath details: https://code.openbravo.com/erp/devel/main/rev/3f281a901fbb changeset: 34274:3f281a901fbb user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Jul 06 13:28:36 2018 +0000 summary: Update AD_MODULE version to 3.0PR18Q2.1 details: https://code.openbravo.com/erp/devel/main/rev/faeac12b1aad changeset: 34275:faeac12b1aad user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Jul 06 13:28:36 2018 +0000 summary: Added tag 3.0PR18Q2.1 for changeset 3f281a901fbb details: https://code.openbravo.com/erp/devel/main/rev/43fa1a805571 changeset: 34276:43fa1a805571 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Jul 06 13:28:36 2018 +0000 summary: Added signature for changeset faeac12b1aad details: https://code.openbravo.com/erp/devel/main/rev/44104c330893 changeset: 34277:44104c330893 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jul 12 08:26:10 2018 +0000 summary: Merge temporary head for 3.0PR18Q2.1 diffstat: .hgsigs | 4 + .hgtags | 4 + build.xml | 32 +- config/Openbravo.properties.template | 9 +- legal/Licensing.txt | 2 +- lib/runtime/postgresql-42.2.2.jre7.jar | Bin lib/runtime/postgresql-9.4.1207.jre6.jar | Bin modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 12 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml | 5 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java | 44 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java | 49 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanHookCaller.java | 45 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java | 22 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java | 24 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 72 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java | 76 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 52 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 11 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMApplicationInitializer.java | 88 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMSQLFunctionRegister.java | 99 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 21 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 1 + modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/JdbcExternalConnectionPool.java | 6 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 28 +- modules/org.openbravo.base.weld/src/META-INF/beans.xml | 4 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_DATA_POOL_SEL.xml | 55 + modules/org.openbravo.client.application/src-db/database/model/views/OBUIAPP_POOL_REPORT_V.xml | 4 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 773 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 42 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 168 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml | 16 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 28 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 33 - modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml | 13 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REFERENCE.xml | 28 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml | 12 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml | 31 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml | 49 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml | 23 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml | 17 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 19 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 47 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java | 2 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 7 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java | 7 + modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopUpComponent.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 206 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/DataPoolSelectionEventHandler.java | 96 + modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoComponent.java | 35 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 54 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 16 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 42 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 21 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/CompiledReportManager.java | 157 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/JmxReportCache.java | 59 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/JmxReportCacheMBean.java | 50 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportCompiler.java | 168 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportFiller.java | 134 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 395 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 59 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/hooks/DataPoolSelectionWindowInjector.java | 79 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/callback/ob-extra-window-settings-actions.js | 33 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 16 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-encrypted.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 48 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 44 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 27 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 15 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 29 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 56 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelSQLFunctionRegister.java | 55 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java | 12 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 13 - modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 61 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 19 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 21 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 46 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- 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 | 15 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 23 - modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java | 29 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 37 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 11 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- referencedata/sampledata/F_B_International_Group/AD_ORG.xml | 24 + referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml | 560 - referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml | 1410 +- referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 74 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 216 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3872 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8864 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4338 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2286 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 10170 ++ referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3689 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 48052 +++++++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1302 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1854 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2122 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 928 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 600 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2302 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1300 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 62 +- referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 82 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml | 90 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 2479 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1602 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4715 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1482 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2964 + referencedata/sampledata/F_B_International_Group/M_MOVEMENT.xml | 6 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 362 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 54 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 6228 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3825 + referencedata/sampledata/QA_Testing/AD_ORG.xml | 8 + referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 168 - referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml | 20 + referencedata/sampledata/QA_Testing/AD_USER.xml | 4 +- referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml | 168 + referencedata/sampledata/QA_Testing/C_BPARTNER.xml | 74 +- referencedata/sampledata/QA_Testing/FIN_FINANCIAL_ACCOUNT.xml | 7 + referencedata/sampledata/QA_Testing/M_INOUT.xml | 32 + referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 52 + referencedata/sampledata/QA_Testing/M_PRODUCTPRICE.xml | 36 + referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml | 34 + referencedata/sampledata/QA_Testing/OBUIAPP_PROCESS_ACCESS.xml | 84 + src-db/database/build-create.xml | 8 +- src-db/database/build.xml | 10 +- src-db/database/lib/dbsourcemanager.jar | Bin src-db/database/model/excludeFilter.xml | 5 + src-db/database/model/functions/AD_GET_ORG_LE_BU.xml | 100 +- src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml | 101 + src-db/database/model/functions/AD_ISTRIGGERENABLED.xml | 40 - src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml | 60 +- src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml | 77 + src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml | 42 +- src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml | 65 + src-db/database/model/functions/AD_ORG_READY.xml | 94 +- src-db/database/model/functions/A_ASSET_CREATE.xml | 35 +- src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml | 6 +- src-db/database/model/functions/C_CASH_POST.xml | 78 +- src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml | 10 +- src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml | 7 +- src-db/database/model/functions/C_CURRENCY_CONVERT.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml | 3 +- src-db/database/model/functions/C_CURRENCY_RATE.xml | 3 +- src-db/database/model/functions/C_GETWITHHOLDING.xml | 15 +- src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml | 3 +- src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml | 11 +- src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml | 3 +- src-db/database/model/functions/C_INVOICETAX_ADJUSTMENT.xml | 18 +- src-db/database/model/functions/C_INVOICE_CREATE.xml | 11 +- src-db/database/model/functions/C_INVOICE_CREATE0.xml | 3 +- src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml | 3 +- src-db/database/model/functions/C_INVOICE_POST.xml | 41 +- src-db/database/model/functions/C_ORDERTAX_ADJUSTMENT.xml | 18 +- src-db/database/model/functions/C_ORDER_POST1.xml | 40 +- src-db/database/model/functions/C_PROJECT_WON.xml | 8 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 8 +- src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml | 3 +- src-db/database/model/functions/MA_PRODUCTION_COST.xml | 28 + src-db/database/model/functions/MRP_PURCHASEPLAN.xml | 5 +- src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 5 +- src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 8 +- src-db/database/model/functions/M_GETJSONDESCRIPTION.xml | 71 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 3 +- src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml | 3 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 6 +- src-db/database/model/functions/M_INOUT_CREATE0.xml | 3 +- src-db/database/model/functions/M_INOUT_POST.xml | 1 - src-db/database/model/functions/M_MOVEMENT_POST.xml | 1 + src-db/database/model/functions/M_RESERVATION_POST.xml | 4 +- src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml | 3 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 3 +- src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml | 3 +- src-db/database/model/prescript-Oracle.sql | 105 + src-db/database/model/prescript-PostgreSql.sql | 82 + src-db/database/model/tables/AD_HEARTBEAT_LOG.xml | 4 - src-db/database/model/tables/AD_MODULE.xml | 8 - src-db/database/model/tables/AD_MODULE_INSTALL.xml | 8 - src-db/database/model/tables/AD_ORG.xml | 35 + src-db/database/model/tables/AD_PROCESS_REQUEST.xml | 4 + src-db/database/model/tables/AD_ROLE.xml | 4 +- src-db/database/model/tables/AD_SESSION_STATUS.xml | 49 - src-db/database/model/tables/AD_SYSTEM_INFO.xml | 12 - src-db/database/model/tables/C_INVOICELINE.xml | 1 + src-db/database/model/tables/M_INOUT.xml | 2 +- src-db/database/model/tables/M_MATCHPO.xml | 5 + src-db/database/model/tables/M_MOVEMENTLINE.xml | 1 + src-db/database/model/tables/M_PRODUCT.xml | 8 + src-db/database/model/tables/M_PRODUCT_STATUS.xml | 98 + src-db/database/model/tables/M_PRODUCT_STATUS_TRL.xml | 74 + src-db/database/model/tables/M_WAREHOUSE.xml | 6 +- src-db/database/model/triggers/AD_CALLOUT_TRG.xml | 21 +- src-db/database/model/triggers/AD_MODULE_TRG.xml | 81 +- src-db/database/model/triggers/AD_MODULE_TRG2.xml | 4 +- src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml | 14 +- src-db/database/model/triggers/AD_ROLE_CHECK_TRG.xml | 6 + src-db/database/model/triggers/AD_ROLE_TRG.xml | 5 +- src-db/database/model/triggers/C_CONVERSION_RATE_DOCUMENT_TRG.xml | 7 +- src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 15 +- src-db/database/model/triggers/C_PERIOD_TRG.xml | 9 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 3 +- src-db/database/model/triggers/M_TRANSACTION_TRG.xml | 127 +- src-db/database/model/triggers/M_TRANSACTION_TRG2.xml | 24 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 38 + src-db/database/sourcedata/AD_CALLOUT.xml | 20 - src-db/database/sourcedata/AD_COLUMN.xml | 2181 +- src-db/database/sourcedata/AD_DATASET_COLUMN.xml | 11 - src-db/database/sourcedata/AD_DATASET_TABLE.xml | 14 + src-db/database/sourcedata/AD_ELEMENT.xml | 276 +- src-db/database/sourcedata/AD_EXTENSION_POINTS.xml | 10 + src-db/database/sourcedata/AD_FIELD.xml | 1087 +- src-db/database/sourcedata/AD_FIELDGROUP.xml | 10 + src-db/database/sourcedata/AD_MENU.xml | 14 + src-db/database/sourcedata/AD_MESSAGE.xml | 232 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 48 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 1700 - src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 93 - src-db/database/sourcedata/AD_REFERENCE.xml | 41 +- src-db/database/sourcedata/AD_REF_LIST.xml | 48 +- src-db/database/sourcedata/AD_TAB.xml | 63 +- src-db/database/sourcedata/AD_TABLE.xml | 75 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 477 - src-db/database/sourcedata/AD_TREENODE.xml | 113 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 4 +- src-db/database/sourcedata/AD_WINDOW.xml | 16 + src-db/database/sourcedata/M_PRODUCT_STATUS.xml | 93 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 37 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 176 + src-db/database/sourcedata/referencedData/C_COUNTRY.xml | 20 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 18 +- src-test/src/org/openbravo/test/AllQuickAntTaskTests.java | 6 +- src-test/src/org/openbravo/test/AllTests.java | 6 +- src-test/src/org/openbravo/test/AllWebserviceTests.java | 4 +- src-test/src/org/openbravo/test/AntTaskTests.java | 6 +- src-test/src/org/openbravo/test/base/OBBaseTest.java | 91 +- src-test/src/org/openbravo/test/base/TestConstants.java | 44 + src-test/src/org/openbravo/test/costing/TestCostingLandedCost.java | 308 +- src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java | 147 +- src-test/src/org/openbravo/test/costing/utils/TestCostingUtils.java | 336 +- src-test/src/org/openbravo/test/dal/DalComplexQueryRequisitionTest.java | 67 +- src-test/src/org/openbravo/test/dal/DalComplexQueryTestOrderLine.java | 22 +- src-test/src/org/openbravo/test/dal/DalQueryTest.java | 11 +- src-test/src/org/openbravo/test/dal/IssuesTest.java | 32 +- src-test/src/org/openbravo/test/datasource/DatasourceTestUtil.java | 2 +- src-test/src/org/openbravo/test/datasource/FICTest.java | 35 +- src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoConstants.java | 57 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoCornerCaseOrgTest.java | 59 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoSetReadyTest.java | 109 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoTestSuite.java | 28 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoUtility.java | 294 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistOrgInfoComplexOrgTreeTest.java | 142 + src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java | 9 +- src-test/src/org/openbravo/test/productStatus/ProductStatusTest.java | 223 + src-test/src/org/openbravo/test/reporting/AllJrxmlCompilation.java | 60 +- src-test/src/org/openbravo/test/reporting/CompiledReportsCacheTest.java | 92 + src-test/src/org/openbravo/test/security/AccessLevelTest.java | 33 +- src-test/src/org/openbravo/test/security/AllowedOrganizationsTest.java | 17 +- src-test/src/org/openbravo/test/security/PasswordStrengthCheckerTest.java | 78 + src-test/src/org/openbravo/test/security/WritableReadableOrganizationClientTest.java | 53 +- src-test/src/org/openbravo/test/selector/TestSelectorDefaultFilterActionHandler.java | 66 + src-test/src/org/openbravo/test/system/ErrorTextParserTest.java | 20 +- src-test/src/org/openbravo/test/views/GCSequenceNumberTests.java | 17 +- src-test/src/org/openbravo/test/views/GridConfigurationTest.java | 57 + src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java | 23 +- src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 24 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.class | Bin src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMergeData.class | Bin src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.class | Bin src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValueData.class | Bin src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge.java | 245 +- src-util/buildvalidation/src/org/openbravo/buildvalidation/CheckUpdateConnectionPoolMerge_data.xsql | 32 - src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.java | 62 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue_data.xsql | 49 + src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateIsCompletelyInvoicedData.class | Bin src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfo.class | Bin src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfoData.class | Bin src-util/modulescript/src/org/openbravo/modulescript/UpdateIsCompletelyInvoiced_data.xsql | 4 +- src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo.java | 61 + src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo_data.xsql | 123 + src/build.xml | 50 +- src/index.jsp | 8 +- src/org/openbravo/authentication/AuthenticationManager.java | 11 + src/org/openbravo/authentication/ChangePasswordException.java | 41 + src/org/openbravo/authentication/basic/AutologonAuthenticationManager.java | 7 +- src/org/openbravo/base/ServerVersionChecker.java | 30 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 27 +- src/org/openbravo/base/secureApp/LoginHandler.java | 85 +- src/org/openbravo/base/secureApp/LoginUtils.java | 13 +- src/org/openbravo/base/secureApp/OrgTree_data.xsql | 32 - src/org/openbravo/base/secureApp/UserLock.java | 72 +- src/org/openbravo/base/session/SessionFactoryController.java | 21 +- src/org/openbravo/base/structure/BaseOBObject.java | 10 +- src/org/openbravo/common/actionhandler/CashflowForecastReportActionHandler.java | 11 +- src/org/openbravo/common/hooks/ConvertQuotationIntoOrderHook.java | 40 + src/org/openbravo/common/hooks/ConvertQuotationIntoOrderHookManager.java | 78 + src/org/openbravo/costing/AverageAlgorithm.java | 5 +- src/org/openbravo/costing/AverageCostAdjustment.java | 255 +- src/org/openbravo/costing/CostAdjustmentProcess.java | 50 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 65 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 44 +- src/org/openbravo/costing/CostingMigrationProcess.java | 9 +- src/org/openbravo/costing/CostingUtils.java | 30 +- src/org/openbravo/costing/PriceDifferenceByDateProcess.java | 3 +- src/org/openbravo/dal/core/DalLayerInitializer.java | 42 +- src/org/openbravo/dal/core/DalSessionFactoryController.java | 39 +- src/org/openbravo/dal/core/OBContext.java | 4 +- src/org/openbravo/dal/core/SQLFunctionRegister.java | 39 + src/org/openbravo/dal/core/TriggerHandler.java | 70 +- src/org/openbravo/dal/service/DataPoolChecker.java | 144 + src/org/openbravo/dal/service/OBDal.java | 107 +- src/org/openbravo/dal/service/OBQuery.java | 78 +- src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java | 10 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 41 +- src/org/openbravo/erpCommon/ad_callouts/SE_Calendar_For_Org.java | 99 - src/org/openbravo/erpCommon/ad_callouts/SE_Locator_Activate.java | 27 +- src/org/openbravo/erpCommon/ad_callouts/SE_Years_For_Calendar.java | 100 - src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator.java | 94 - src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator_data.xsql | 65 - src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 36 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Tax.java | 96 - src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_MovementAll_Locator.java | 97 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts.java | 214 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts_data.xsql | 53 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType.java | 93 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType_data.xsql | 49 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_No_Verify.java | 105 - src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.java | 88 - src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.xsql | 37 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 3 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 3 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 3 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 8 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat.html | 5 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat.java | 28 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat_data.xsql | 38 - src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 267 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.xml | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.xml | 4 +- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 18 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 12 + src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 14 +- src/org/openbravo/erpCommon/ad_process/SystemInfo_data.xsql | 9 +- src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java | 31 +- src/org/openbravo/erpCommon/ad_reports/AgingDao_data.xsql | 27 + src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 14 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java | 48 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java | 17 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java | 12 +- src/org/openbravo/erpCommon/businessUtility/Heartbeat_data.xsql | 33 - src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 4 +- src/org/openbravo/erpCommon/businessUtility/Preferences.java | 52 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 38 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 413 +- src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 29 +- src/org/openbravo/erpCommon/security/Error.html | 1 + src/org/openbravo/erpCommon/security/Login.html | 6 +- src/org/openbravo/erpCommon/security/Login.java | 71 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 5 +- src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java | 42 +- src/org/openbravo/erpCommon/utility/ErrorTextParserPOSTGRE.java | 22 +- src/org/openbravo/erpCommon/utility/PrintJR.java | 10 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 9 +- src/org/openbravo/erpCommon/utility/StringCollectionUtils.java | 15 + src/org/openbravo/erpCommon/utility/SystemInfo.java | 27 +- src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql | 26 +- src/org/openbravo/erpCommon/utility/Utility.java | 4 +- src/org/openbravo/erpCommon/utility/poc/EmailManager.java | 7 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 2 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR.jrxml | 2 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml | 2 +- src/org/openbravo/erpReports/RptC_Remittance.java | 11 +- src/org/openbravo/erpReports/RptC_Settlement.fo | 39 - src/org/openbravo/erpReports/RptC_Settlement.java | 96 - src/org/openbravo/erpReports/RptC_Settlement.xml | 29 - src/org/openbravo/erpReports/RptC_SettlementHeader.fo | 81 - src/org/openbravo/erpReports/RptC_SettlementHeader.xml | 33 - src/org/openbravo/erpReports/RptC_SettlementLines.fo | 91 - src/org/openbravo/erpReports/RptC_SettlementLines.xml | 33 - src/org/openbravo/erpReports/RptC_Settlement_Header_data.xsql | 48 - src/org/openbravo/erpReports/RptC_Settlement_Lines_data.xsql | 47 - src/org/openbravo/erpReports/RptC_Settlement_data.xsql | 49 - src/org/openbravo/erpReports/RptM_Inout.fo | 42 - src/org/openbravo/erpReports/RptM_Inout.java | 97 - src/org/openbravo/erpReports/RptM_Inout.xml | 29 - src/org/openbravo/erpReports/RptM_InoutHeader.fo | 130 - src/org/openbravo/erpReports/RptM_InoutHeader.xml | 38 - src/org/openbravo/erpReports/RptM_InoutLines.fo | 141 - src/org/openbravo/erpReports/RptM_InoutLines.xml | 32 - src/org/openbravo/erpReports/RptM_Inout_Header_data.xsql | 47 - src/org/openbravo/erpReports/RptM_Inout_Lines_data.xsql | 47 - src/org/openbravo/erpReports/RptM_Inout_data.xsql | 62 - src/org/openbravo/erpReports/RptM_Movement.fo | 31 - src/org/openbravo/erpReports/RptM_Movement.java | 81 - src/org/openbravo/erpReports/RptM_Movement.xml | 28 - src/org/openbravo/erpReports/RptM_MovementLines.fo | 261 - src/org/openbravo/erpReports/RptM_MovementLines.xml | 43 - src/org/openbravo/erpReports/RptM_Movement_data.xsql | 79 - src/org/openbravo/erpReports/RptM_Requisition.java | 24 +- src/org/openbravo/erpReports/RptM_Requisition.jrxml | 3 +- src/org/openbravo/erpReports/RptPromissoryNote.fo | 66 - src/org/openbravo/erpReports/RptPromissoryNote.java | 218 - src/org/openbravo/erpReports/RptPromissoryNote.xml | 38 - src/org/openbravo/erpReports/RptPromissoryNoteAfter.fo | 61 - src/org/openbravo/erpReports/RptPromissoryNoteAfter.xml | 74 - src/org/openbravo/erpReports/RptPromissoryNoteAfter_data.xsql | 110 - src/org/openbravo/erpReports/RptPromissoryNoteError.fo | 23 - src/org/openbravo/erpReports/RptPromissoryNoteError.xml | 32 - src/org/openbravo/erpReports/RptPromissoryNoteError_data.xsql | 31 - src/org/openbravo/erpReports/RptPromissoryNoteHeader.fo | 86 - src/org/openbravo/erpReports/RptPromissoryNoteHeader.xml | 39 - src/org/openbravo/erpReports/RptPromissoryNoteHeader_data.xsql | 89 - src/org/openbravo/erpReports/RptPromissoryNoteTree_data.xsql | 37 - src/org/openbravo/erpReports/RptPromissoryNote_data.xsql | 56 - src/org/openbravo/financial/ResetAccounting.java | 296 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 248 +- src/org/openbravo/materialmgmt/ManageVariantsDS.java | 15 +- src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java | 14 +- src/org/openbravo/materialmgmt/ReservationUtils.java | 4 +- src/org/openbravo/scheduling/OBScheduler.java | 10 +- src/org/openbravo/scheduling/ProcessMonitor.java | 19 +- src/org/openbravo/scheduling/ProcessRequest_data.xsql | 18 +- src/org/openbravo/scheduling/ProcessRunner.java | 4 +- src/org/openbravo/service/password/PasswordStrengthChecker.java | 117 + src/org/openbravo/service/system/DatabaseValidator.java | 3 +- src/org/openbravo/test/system/ErrorTextParserTest_data.xsql | 16 +- 505 files changed, 132268 insertions(+), 14141 deletions(-) diffs (truncated from 197970 to 300 lines): diff -r 307b23f7635f -r 44104c330893 .hgsigs --- a/.hgsigs Tue May 08 09:30:18 2018 +0000 +++ b/.hgsigs Thu Jul 12 08:26:10 2018 +0000 @@ -228,3 +228,7 @@ f06ec509f2bf413f13d422e937ec12531fe1821a 0 iEYEABECAAYFAlqzgcwACgkQCX/oGf+2qkP/EACeJH+QthNIdldCdTvfnllHXTXDo24AnRVV1DveMhhNbgb50zu8ETDZ1WVT b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb +9bad88c00b5da708f3e9c1abacd25ea6e6cfd664 0 iEUEABECAAYFAlrXODoACgkQCX/oGf+2qkOblACg0WOwH27TgkH75iKw2Y9tNYxSL8oAl3j0FbjQF6F05ESzZC0l3Uv2Nfg= +dc2ef98dc38f7c32c888dcf1f1adb37c6afb4d14 0 iEYEABECAAYFAlrxbisACgkQCX/oGf+2qkMMCwCdFeF47f2MY7Pq3cdsyHon64EYekwAoPYllLnhYETGsUEqtiKSxvj9Mgxb +2121d856284cf0c4f26faef336bd2aa41ada151f 0 iEYEABECAAYFAlr8AykACgkQCX/oGf+2qkPKhQCfeQ+9S16IA3wZMgnoJjRRZRvG8SUAoIgKQPopjsjObnB6Qu1DyNgCByRt +faeac12b1aad3dc7fb53f8ffda3ada9e3b7deaeb 0 iEYEABECAAYFAls/boQACgkQCX/oGf+2qkNdfACfaNh5oqLf0LzgGAYLmRWa97kbFj4AoL3KPdVDG0Mf6qKcxejAl7Kl12cd diff -r 307b23f7635f -r 44104c330893 .hgtags --- a/.hgtags Tue May 08 09:30:18 2018 +0000 +++ b/.hgtags Thu Jul 12 08:26:10 2018 +0000 @@ -239,3 +239,7 @@ 7b0d4c95c2b308cd1b12dcfbe2a36c7f77fb49a4 3.0PR17Q4.2 46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1 03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1 +650aaadd6b6c5fda4f7ad957701face4fa4c3317 3.0PR18Q1.2 +307b23f7635f3e92dd8fc8e7d55d09b7c914384c 3.0PR18Q2 +63c5e173ffdca0828d75476e5a48e2fae42ad9e9 3.0PR18Q1.3 +3f281a901fbbde5103faebca4df0c22b94ac5535 3.0PR18Q2.1 diff -r 307b23f7635f -r 44104c330893 build.xml --- a/build.xml Tue May 08 09:30:18 2018 +0000 +++ b/build.xml Thu Jul 12 08:26:10 2018 +0000 @@ -96,12 +96,19 @@ <property name="buildValidation" value="true"/> <property name="modules" value=""/> - <available file=".hg" property="is.hg" /> - <condition property="xdoclint.missing" value="" else="-Xdoclint:-missing"> <equals arg1="${ant.java.version}" arg2="1.7"/> </condition> + <condition property="html.version" value="-html5" else=""> + <not> + <or> + <equals arg1="${ant.java.version}" arg2="1.7"/> + <equals arg1="${ant.java.version}" arg2="1.8"/> + </or> + </not> + </condition> + <condition property="calculate.core.rev"> <istrue value="${calculate.core.revision}"/> </condition> @@ -347,7 +354,7 @@ <taskdef resource="axis-tasks.properties" classpathref="project.class.path" /> - <target name="init" depends="code.rev"> + <target name="init"> <fail if="root.user" message="Don't run ant tasks with the root user" /> <fail if="no.java.home" message="The environment variable JAVA_HOME is not set." /> <fail message="Unsupported Java version ${ant.java.version}. Minimum required is 7 (1.7)."> @@ -366,19 +373,6 @@ </fail> </target> - <target name="code.rev" depends="set.code.rev"> - <condition property="code.revision" value="${hg.id}" else="0"> - <isset property="hg.id" /> - </condition> - </target> - - <target name="set.code.rev" if="is.hg"> - <exec executable="hg" outputproperty="hg.id" failifexecutionfails="false"> - <arg value="id"/> - <arg value="-i"/> - </exec> - </target> - <target name="compile.complete" depends="init, core.lib, wad.lib, trl.lib"> <ant dir="${base.src}" target="compile.complete" inheritAll="true" inheritRefs="true" /> </target> @@ -540,7 +534,7 @@ </target> <target name="generate.java.doc"> - <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" additionalparam="${xdoclint.missing}"> + <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" additionalparam="${xdoclint.missing} ${html.version}"> <sourcepath> <pathelement path="${base.src}" /> <pathelement path="${base.src.test}/src" /> @@ -964,8 +958,6 @@ replace="\1${core.rev}\3" byline="true"/> - <echo message="${hg.id}" file="${tmpdir}/config/instance.revision"/> - <delete includeEmptyDirs="true"> <fileset dir="${tmpdir}/modules" includes="**/*" defaultexcludes="no"/> </delete> @@ -1025,7 +1017,7 @@ <pathelement path="${base.lib}/runtime/log4j-1.2.16.jar" /> <pathelement path="${base.lib}/runtime/commons-pool-1.5.6.jar" /> <pathelement path="${base.lib}/runtime/commons-dbcp-1.4.jar" /> - <pathelement path="${base.lib}/runtime/postgresql-9.4.1207.jre6.jar" /> + <pathelement path="${base.lib}/runtime/postgresql-42.2.2.jre7.jar" /> <pathelement path="${base.lib}/runtime/ojdbc6.jar" /> <pathelement path="${base.lib}/runtime/commons-collectionsi-3.2.1.jar" /> <pathelement path="${base.lib}/runtime/ant-1.9.2.jar" /> diff -r 307b23f7635f -r 44104c330893 config/Openbravo.properties.template --- a/config/Openbravo.properties.template Tue May 08 09:30:18 2018 +0000 +++ b/config/Openbravo.properties.template Thu Jul 12 08:26:10 2018 +0000 @@ -10,7 +10,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) 2007-2017 Openbravo SLU +# * All portions are Copyright (C) 2007-2018 Openbravo SLU # * All Rights Reserved. # * Contributor(s): ______________________________________. # ************************************************************************ @@ -197,13 +197,10 @@ # If these properties are set, after a failed login the response time # will be delayed, and the user account can be blocked. -login.trial.delay.increment=0 -login.trial.delay.max=0 +login.trial.delay.increment=0.2 +login.trial.delay.max=3 login.trial.user.lock=0 -# Prevents concurrent sessions for same user. -login.limit.user.session=false - ########## # Others # ########## diff -r 307b23f7635f -r 44104c330893 legal/Licensing.txt --- a/legal/Licensing.txt Tue May 08 09:30:18 2018 +0000 +++ b/legal/Licensing.txt Thu Jul 12 08:26:10 2018 +0000 @@ -129,7 +129,7 @@ All files under Apache Software License 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 -# postgresql-9.4.1207.jre6.jar +# postgresql-42.2.2.jre7.jar Under the BSD license, also available at http://jdbc.postgresql.org/license.html # xstream-1.3.1.jar diff -r 307b23f7635f -r 44104c330893 lib/runtime/postgresql-42.2.2.jre7.jar Binary file lib/runtime/postgresql-42.2.2.jre7.jar has changed diff -r 307b23f7635f -r 44104c330893 lib/runtime/postgresql-9.4.1207.jre6.jar Binary file lib/runtime/postgresql-9.4.1207.jre6.jar has changed diff -r 307b23f7635f -r 44104c330893 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Tue May 08 09:30:18 2018 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Thu Jul 12 08:26:10 2018 +0000 @@ -657,7 +657,8 @@ v_ConvertedAmount := COALESCE(V_OutstandingAmount, 0) * v_creditmultiplier; end if; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Automatic creation of payment and financial transaction @@ -999,7 +1000,8 @@ v_ConvertedAmount := (COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * v_creditmultiplier); end if; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; END IF; -- Automatic creation of financial transaction @@ -1070,8 +1072,6 @@ ELSIF (p_docaction = 'RE') THEN DECLARE - v_count NUMBER; - v_documentno VARCHAR2(40); v_PaymentPlanExpectedTotal NUMBER:= 0; BEGIN SELECT count(*), max(p.documentno) @@ -1148,7 +1148,8 @@ v_ConvertedAmount := ((v_PaymentPlanExpectedTotal - v_PaidAmount) * v_creditmultiplier); END IF; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Delete C_InvoiceTax_CashVAT records for this invoice @@ -1168,7 +1169,6 @@ ELSIF (p_docaction = 'RC') THEN DECLARE - v_count NUMBER; v_prepaymentamt NUMBER; BEGIN v_delete_paymentplan := TRUE; diff -r 307b23f7635f -r 44104c330893 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Tue May 08 09:30:18 2018 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Thu Jul 12 08:26:10 2018 +0000 @@ -16,7 +16,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-2015 Openbravo SLU +* All portions are Copyright (C) 2013-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -97,7 +97,6 @@ DECLARE v_payment_schedule_order VARCHAR2(32); - v_count NUMBER; v_pendingamount NUMBER; cur_invoicepayments RECORD; BEGIN diff -r 307b23f7635f -r 44104c330893 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Tue May 08 09:30:18 2018 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Thu Jul 12 08:26:10 2018 +0000 @@ -19,7 +19,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) 2011-2016 Openbravo SLU +* All portions are Copyright (C) 2011-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -106,6 +106,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_ispaymentconfirmed exception'); RAISE; + RETURN NULL; END APRM_ISPAYMENTCONFIRMED ]]></body> </function> diff -r 307b23f7635f -r 44104c330893 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Tue May 08 09:30:18 2018 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Thu Jul 12 08:26:10 2018 +0000 @@ -22,7 +22,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) 2015 Openbravo SLU +* All portions are Copyright (C) 2015-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -43,6 +43,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_seqnumberinvoicepaidstatus exception'); RAISE; + RETURN NULL; END APRM_SEQNOINVPAIDSTATUS ]]></body> </function> diff -r 307b23f7635f -r 44104c330893 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Tue May 08 09:30:18 2018 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Thu Jul 12 08:26:10 2018 +0000 @@ -16,7 +16,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): ______________________________________. ************************************************************************/ @@ -49,6 +49,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_seqnumberpaymentstatus exception'); RAISE; + RETURN NULL; END APRM_SEQNUMBERPAYMENTSTATUS ]]></body> </function> diff -r 307b23f7635f -r 44104c330893 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Tue May 08 09:30:18 2018 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Thu Jul 12 08:26:10 2018 +0000 @@ -16,7 +16,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-2014 Openbravo SLU +* All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -175,7 +175,8 @@ WHERE C_TAXPAYMENT_ID = p_record_id; -- Updating SO_CREDITUSED when PAYMENT OCCUR UPDATE C_BPARTNER - SET SO_CREDITUSED = SO_CREDITUSED - COALESCE(p_amount, 0) + SET SO_CREDITUSED = SO_CREDITUSED - COALESCE(p_amount, 0), + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Automatic creation of financial transaction diff -r 307b23f7635f -r 44104c330893 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml ------------------------------------------------------------------------------ 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
