details: https://code.openbravo.com/erp/devel/main/rev/2830602a10aa changeset: 29977:2830602a10aa user: Ander Iraceburu <ander.iraceburu <at> openbravo.com> date: Thu Sep 01 10:56:17 2016 +0200 summary: Related to issue 32967: Fixed logger
details: https://code.openbravo.com/erp/devel/main/rev/5fd9b28bbb78 changeset: 29978:5fd9b28bbb78 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 01 10:10:52 2016 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/321a74b76ac7 changeset: 29979:321a74b76ac7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Sep 01 13:06:11 2016 +0200 summary: fixes issue 33775: Create New is not working with saved views marked as default When using Create New menu entry, the opening of the form is deferred until the window is loaded (including the load of the saved views, if any). Together with this, now the grid data is not loaded when using Create New. This has two main advantages: - Better performance: the data will not be loaded when opening the window. If desired, the user can load it after saving/canceling the edition. - Homogeneus behavior: this feature will now work as the direct record opening, where the grid is filtered to show just the record being opened. details: https://code.openbravo.com/erp/devel/main/rev/6b95b859ada6 changeset: 29980:6b95b859ada6 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Aug 31 10:57:20 2016 +0200 summary: Fixed issue 33843: There where some useless queries in linked items The sql method selectKeyValue was doing some useless queries and, as they were useless and potentialy heavy, the code which was invoking the method and the method itself have been deleted. details: https://code.openbravo.com/erp/devel/main/rev/00c493919c46 changeset: 29981:00c493919c46 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Tue Aug 30 23:25:40 2016 +0530 summary: Fixes issue 33817: No error shown when voiding an invoice and period is closed Error message shown in this case "An error occurred when processing the payment: The Period does not exist or it is not opened" details: https://code.openbravo.com/erp/devel/main/rev/9a7c89992e60 changeset: 29982:9a7c89992e60 user: Mark <markmm82 <at> gmail.com> date: Mon Aug 29 13:14:09 2016 -0400 summary: Fixes issue 32806: Can void a receipt if role doesn't have Client window access Allow to void a goods receipt even the role does not have access to Client window. The OB Context is configured as Admin mode to avoid access validations when getClientInformationList() method of ADClient class is invoked. details: https://code.openbravo.com/erp/devel/main/rev/992caa87c40b changeset: 29983:992caa87c40b user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed Aug 31 15:02:29 2016 +0200 summary: Fixed issue 33210.Related to issue 32950. Use import entry instead of ProcessBundle Performance fixes on EventHandler. - Use import entry instead of ProcessBundle. details: https://code.openbravo.com/erp/devel/main/rev/bb58b51ad6f7 changeset: 29984:bb58b51ad6f7 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Sep 02 09:03:51 2016 +0200 summary: related to issue 33775: take into account case when license is not professional details: https://code.openbravo.com/erp/devel/main/rev/0f7167eecae1 changeset: 29985:0f7167eecae1 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Sep 02 12:12:46 2016 +0000 summary: CI: update AD_MODULE to version 29984 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/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 5 + modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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_MESSAGE.xml | 24 ++ 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-db/database/sourcedata/AD_REF_LIST.xml | 12 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 16 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 24 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 5 +- 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.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.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.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.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.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.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.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 | 22 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REF_LIST.xml | 11 + src/org/openbravo/costing/CostingUtils.java | 10 + src/org/openbravo/erpCommon/ad_actionButton/ProcessGoods.java | 6 +- src/org/openbravo/erpCommon/utility/UsedByLink.java | 14 +- src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql | 15 - src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 59 ++---- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 5 +- src/org/openbravo/materialmgmt/VariantChDescUpdateProcessor.java | 83 ++++++++++ 63 files changed, 318 insertions(+), 167 deletions(-) diffs (truncated from 1568 to 300 lines): diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 02 12:12:46 2016 +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.29953]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.29984]]></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 30b52bc9bfbd -r 0f7167eecae1 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 Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 02 12:12:46 2016 +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.29953]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.29984]]></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.29953]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.29984]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java Fri Sep 02 12:12:46 2016 +0000 @@ -54,7 +54,7 @@ */ public class FundsTransferActionHandler extends BaseProcessActionHandler { private static final String ERROR_IN_PROCESS = "Error in process"; - private static final Logger log = LoggerFactory.getLogger(AddPaymentActionHandler.class); + private static final Logger log = LoggerFactory.getLogger(FundsTransferActionHandler.class); private static final String BP_DEPOSIT = "BPD"; private static final String BP_WITHDRAWAL = "BPW"; private static final String BANK_FEE = "BF"; diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Fri Sep 02 12:12:46 2016 +0000 @@ -345,6 +345,11 @@ message.setMessage(OBMessageUtils.messageBD("PaymentError") + " " + message.getMessage()); vars.setMessage(strTabId, message); + String strWindowPath = Utility.getTabURL(strTabId, "R", true); + if (strWindowPath.equals("")) + strWindowPath = strDefaultServlet; + printPageClosePopUp(response, vars, strWindowPath); + return; } } } catch (final Exception e) { diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 02 12:12:46 2016 +0000 @@ -6,7 +6,7 @@ <!--8A098711BB324335A19833286BDB093D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8A098711BB324335A19833286BDB093D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8A098711BB324335A19833286BDB093D--> <NAME><![CDATA[Apache External Connection Pool]]></NAME> -<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.29953]]></VERSION> +<!--8A098711BB324335A19833286BDB093D--> <VERSION><![CDATA[1.0.29984]]></VERSION> <!--8A098711BB324335A19833286BDB093D--> <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION> <!--8A098711BB324335A19833286BDB093D--> <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP> <!--8A098711BB324335A19833286BDB093D--> <TYPE><![CDATA[M]]></TYPE> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 02 12:12:46 2016 +0000 @@ -7,7 +7,7 @@ <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID> -<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.29953]]></STARTVERSION> +<!--1467C397BC5F4999A5606F39CD6FF8A4--> <STARTVERSION><![CDATA[2.1.29984]]></STARTVERSION> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME> <!--1467C397BC5F4999A5606F39CD6FF8A4--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 02 12:12:46 2016 +0000 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.29953]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.29984]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 02 12:12:46 2016 +0000 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.29953]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.29984]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Fri Sep 02 12:12:46 2016 +0000 @@ -458,6 +458,18 @@ <!--2C8A8843F1E04317AD38623A3C52F978--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--2C8A8843F1E04317AD38623A3C52F978--></AD_MESSAGE> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--><AD_MESSAGE> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <AD_MESSAGE_ID><![CDATA[2EEFD14AC47C4C2ABB4218DFB2F12564]]></AD_MESSAGE_ID> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <VALUE><![CDATA[OBUIAPP_GridFilterNewRecord]]></VALUE> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <MSGTEXT><![CDATA[New record filter applied. Click to clear.]]></MSGTEXT> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--2EEFD14AC47C4C2ABB4218DFB2F12564--></AD_MESSAGE> + <!--30C2B55E35744A9182219A8B4091A6E3--><AD_MESSAGE> <!--30C2B55E35744A9182219A8B4091A6E3--> <AD_MESSAGE_ID><![CDATA[30C2B55E35744A9182219A8B4091A6E3]]></AD_MESSAGE_ID> <!--30C2B55E35744A9182219A8B4091A6E3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1172,6 +1184,18 @@ <!--839DDEEC373B4151BC1C721AB90FB5AC--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--839DDEEC373B4151BC1C721AB90FB5AC--></AD_MESSAGE> +<!--86043443EEC547A3814372EA43D69BF5--><AD_MESSAGE> +<!--86043443EEC547A3814372EA43D69BF5--> <AD_MESSAGE_ID><![CDATA[86043443EEC547A3814372EA43D69BF5]]></AD_MESSAGE_ID> +<!--86043443EEC547A3814372EA43D69BF5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--86043443EEC547A3814372EA43D69BF5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--86043443EEC547A3814372EA43D69BF5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--86043443EEC547A3814372EA43D69BF5--> <VALUE><![CDATA[OBUIAPP_NewRecordFilterMsg]]></VALUE> +<!--86043443EEC547A3814372EA43D69BF5--> <MSGTEXT><![CDATA[The window has been opened to create a new record in form view. Click on the refresh button to load the data using the current grid filters.]]></MSGTEXT> +<!--86043443EEC547A3814372EA43D69BF5--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--86043443EEC547A3814372EA43D69BF5--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--86043443EEC547A3814372EA43D69BF5--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--86043443EEC547A3814372EA43D69BF5--></AD_MESSAGE> + <!--888D0AF770AE4037B85120FB775FE038--><AD_MESSAGE> <!--888D0AF770AE4037B85120FB775FE038--> <AD_MESSAGE_ID><![CDATA[888D0AF770AE4037B85120FB775FE038]]></AD_MESSAGE_ID> <!--888D0AF770AE4037B85120FB775FE038--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 02 12:12:46 2016 +0000 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.29953]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.29984]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 02 12:12:46 2016 +0000 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.29953]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.29984]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.29953]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.29984]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.29953]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.29984]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.29953]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.29984]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml Fri Sep 02 12:12:46 2016 +0000 @@ -447,6 +447,18 @@ <!--F45C2509CCF14629906DE44B542D903F--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--F45C2509CCF14629906DE44B542D903F--></AD_REF_LIST> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--><AD_REF_LIST> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <AD_REF_LIST_ID><![CDATA[F8A1CEF24CD44C8491ACE015BBD5F83A]]></AD_REF_LIST_ID> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <VALUE><![CDATA[OBUIAPP_ShowNewRecordFilterMsg]]></VALUE> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <NAME><![CDATA[Show New Record Filter Message]]></NAME> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <DESCRIPTION><![CDATA[If true, shows a message when newly created record filter is applied]]></DESCRIPTION> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--F8A1CEF24CD44C8491ACE015BBD5F83A--></AD_REF_LIST> + <!--FF8080812DE1CD58012DE1FC1FB9002F--><AD_REF_LIST> <!--FF8080812DE1CD58012DE1FC1FB9002F--> <AD_REF_LIST_ID><![CDATA[FF8080812DE1CD58012DE1FC1FB9002F]]></AD_REF_LIST_ID> <!--FF8080812DE1CD58012DE1FC1FB9002F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Fri Sep 02 12:12:46 2016 +0000 @@ -271,7 +271,7 @@ editNewRecord: function (preventFocus) { var grid = this.view.viewGrid; this.clearValues(); - if (grid.lazyFiltering && !isc.isA.ResultSet(grid.data)) { + if ((grid.lazyFiltering || this.view.deferOpenNewEdit) && !isc.isA.ResultSet(grid.data)) { OB.Utilities.createResultSetManually(grid); } var ret = this.Super('editNewRecord', arguments); @@ -1584,6 +1584,13 @@ // back to grid this.view.viewGrid.setSingleRecordFilterMessage(); } + if (this.view.deferOpenNewEdit) { + // create new opens form view without loading grid data, set message in toolbar + // and show the funnel icon when switching back to grid + this.view.viewGrid.filterImage.prompt = OB.I18N.getLabel('OBUIAPP_GridFilterNewRecord'); + this.view.viewGrid.filterImage.show(true); + this.view.viewGrid.setNewRecordFilterMessage(); + } this.view.standardWindow.setDirtyEditForm(null); this.view.clearTargetRecordInWindow(); diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Fri Sep 02 12:12:46 2016 +0000 @@ -816,7 +816,7 @@ // forcing fetch from server in case default filters are removed, in other // cases adaptive filtering can be used if possible if (this.data) { - forceRefresh = this.filterClause || this.sqlFilterClause; + forceRefresh = this.filterClause || this.sqlFilterClause || (this.view && this.view.deferOpenNewEdit); groupState = this.getGroupState(); if (forceRefresh && groupState && groupState.groupByFields) { @@ -859,6 +859,9 @@ if (this.view && this.view.directNavigation) { delete this.view.directNavigation; } + if (this.view && this.view.deferOpenNewEdit) { + delete this.view.deferOpenNewEdit; + } }, showSummaryRow: function () { @@ -1022,6 +1025,17 @@ return fkFilterAuxCache; }, + setNewRecordFilterMessage: function () { + var showMessageProperty, showMessage; + + showMessageProperty = OB.PropertyStore.get('OBUIAPP_ShowNewRecordFilterMsg'); + showMessage = showMessageProperty !== 'N' && showMessageProperty !== '"N"'; + if (showMessage) { + this.view.messageBar.setMessage(isc.OBMessageBar.TYPE_INFO, '<div><div style="float: left;">' + OB.I18N.getLabel('OBUIAPP_NewRecordFilterMsg') + '<br/>' + OB.I18N.getLabel('OBUIAPP_ClearFilters') + '</div><div style="float: right; padding-top: 15px;"><a href="#" style="font-weight:normal; color:inherit;" onclick="' + 'window[\'' + this.view.messageBar.ID + '\'].hide(); OB.PropertyStore.set(\'OBUIAPP_ShowNewRecordFilterMsg\', \'N\');">' + OB.I18N.getLabel('OBUIAPP_NeverShowMessageAgain') + '</a></div></div>', ' '); + this.view.messageBar.hasFilterMessage = true; + } + }, + setSingleRecordFilterMessage: function () { var showMessageProperty, showMessage; diff -r 30b52bc9bfbd -r 0f7167eecae1 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Sep 01 07:09:44 2016 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Fri Sep 02 12:12:46 2016 +0000 @@ -505,7 +505,9 @@ } } - if (this.lazyFiltering) { + if (this.view && this.view.deferOpenNewEdit) { + this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUIAPP_GridFilterNoResults') + '</span>' + '<span onclick="window[\'' + this.ID + '\'].clearFilter();" class="' + this.emptyMessageLinkStyle + '">' + OB.I18N.getLabel('OBUIAPP_GridClearFilter') + '</span>'; + } else if (this.lazyFiltering) { this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUIAPP_LazyFilteringNoFetch') + '</span>'; ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
