details: https://code.openbravo.com/erp/devel/main/rev/a9321acaca4e changeset: 22696:a9321acaca4e user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Mar 13 11:43:10 2014 +0530 summary: Fixes Issue 22797: Pick and Execute in Payment Proposal window is not working properly
In case of large data, if data is not available in allRows, it is checked if localData contains data. details: https://code.openbravo.com/erp/devel/main/rev/6e9494ef95ff changeset: 22697:6e9494ef95ff user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Mar 13 11:57:47 2014 +0530 summary: Related to issue 25475, issue 22797: Backed out changeset a9321acaca4e Backing out the changeset as the commit has been incorrectly commited to issue 22797 instead of 25475. details: https://code.openbravo.com/erp/devel/main/rev/b1b07d0d1e14 changeset: 22698:b1b07d0d1e14 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Mar 13 12:02:15 2014 +0530 summary: Fixes issue 25475: Pick and Execute in Payment Proposal window is not filtering properly In case of large data, if data is not available in allRows, it is checked if localData contains data. details: https://code.openbravo.com/erp/devel/main/rev/6eec2bc4a068 changeset: 22699:6eec2bc4a068 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu Mar 13 00:52:59 2014 +0530 summary: Fixes Issue 25757: Impossible to choose empty option in non variant product characteristics details: https://code.openbravo.com/erp/devel/main/rev/555a041a6d17 changeset: 22700:555a041a6d17 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu Mar 13 13:49:10 2014 +0530 summary: Fixes Issue 25756: Impossible to choose a non variant product characteristic details: https://code.openbravo.com/erp/devel/main/rev/30526fccbd10 changeset: 22701:30526fccbd10 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Tue Mar 11 15:31:35 2014 +0530 summary: Fixes issue 24488: It is not possible to filter by "Parent" field in Manufacturing Plan Lines tab Changed table reference to UI Selector. details: https://code.openbravo.com/erp/devel/main/rev/83952b65ffe7 changeset: 22702:83952b65ffe7 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Mar 13 10:13:41 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/7858157f0182 changeset: 22703:7858157f0182 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Mar 13 16:45:59 2014 +0530 summary: Related to issue 24488 : Synchronized selector fields details: https://code.openbravo.com/erp/devel/main/rev/2ac8f9165769 changeset: 22704:2ac8f9165769 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Mar 13 13:47:53 2014 +0100 summary: Fixes bug 25951:Auxiliary inputs are executed when FIC is called in CHANGE mode Before this change, the FIC did not execute the auxiliary inputs when it was called in CHANGE mode. This was done to prevent resetting auxiliary inputs that ha d been modified in callouts. This made impossible to use auxiliary inputs in display logic, because they would not be updated until the records was refreshed. To fix this while allowing to overwrite auxiliary inputs from callouts, this has been done: - The list of auxiliary inputs modified in callouts is persisted. This list is reset when the FIC is called in a mode other than CHANGE (originally in this cas e all the auxiliary inputs were being updated, regardless of whether they had been modified by a callout). - If the FIC is called in CHANGE mode, then only the auxiliary inputs that have not been modified by callouts are recalculated. - The auxiliary inputs are now executed after the callouts are run, in order to be able to use the updated data in the auxiliary input calculation. details: https://code.openbravo.com/erp/devel/main/rev/15994dc74cd8 changeset: 22705:15994dc74cd8 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Mar 13 15:32:33 2014 +0100 summary: Fixes issue 25935: JS Error when opening TreeGrid selector A function was being executed on the tree grid data before it was properly initialized. details: https://code.openbravo.com/erp/devel/main/rev/f8fcc834d0c1 changeset: 22706:f8fcc834d0c1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Mar 13 18:06:12 2014 +0100 summary: fixed bug 25986: notes datasources are leaked details: https://code.openbravo.com/erp/devel/main/rev/0630b904462c changeset: 22707:0630b904462c user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Mar 13 18:44:57 2014 +0100 summary: Fixes issue 25988: The ignoreCase method of AdvancedQueryBuilder does not work The ignoreCase method is not working properly, because it is returning true for some operators that should not ignore the text casing. The contains, startsWith and endWith operators have been excluded from the list of operators that ignore the text casing. details: https://code.openbravo.com/erp/devel/main/rev/eb415e9bc94f changeset: 22708:eb415e9bc94f user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Mar 13 19:04:19 2014 +0100 summary: Fixes issue 25190: Error when searching for characters like ß, in grid view This happened because when a text field was filtered ignoring the case, the left part of the expression was uppercased using a database method while the right part was uppercased using the String.toUpperCase() java method. details: https://code.openbravo.com/erp/devel/main/rev/31ec6d0191e3 changeset: 22709:31ec6d0191e3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Mar 14 15:53:10 2014 +0100 summary: fixed bug 25919, fixed bug 25972 Preventing double request when in direct navigation to a window with a default saved view. This case cause after SC upgrade not to navigate to form view (nor to show grid) because datasource was in an incorrecte status. details: https://code.openbravo.com/erp/devel/main/rev/d8f328c5d332 changeset: 22710:d8f328c5d332 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Mar 14 17:25:28 2014 +0100 summary: Fixes issue 26008: Problem while picking a business partner using a selector The problem was that the overwrittenAuxiliaryInputs parameter (a string array) was being returned in the getContextInfo function, and sent to all action handlers. Some action handlers assume that the parameters do not contain arrays, and where having problems trying to convert the string array to a plain string. The overwrittenAuxiliaryInputs parameter is only used in the FIC, and only when it is called in CHANGE mode. For all other modes, the paramater is reset to an empty string array in the FIC. To fix this, the overwrittenAuxiliaryInputs parameter is only sent to the FIC, and only in CHANGE mode. details: https://code.openbravo.com/erp/devel/main/rev/d7843bd87a36 changeset: 22711:d7843bd87a36 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Mar 14 19:34:23 2014 +0100 summary: Fixes issue 26010: Fixes int-full-oracle/pgsql-compile-all tests The problem was that three tabs had been added that did not have an organization field. details: https://code.openbravo.com/erp/devel/main/rev/8396ec753aec changeset: 22712:8396ec753aec user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Mar 15 01:47:56 2014 +0000 summary: CI: update AD_MODULE to version 22711 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.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java | 2 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 60 ++++-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 8 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 10 +- 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.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 26 +- 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.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 | 18 +- src-db/database/sourcedata/AD_COLUMN.xml | 4 +- src-db/database/sourcedata/AD_FIELD.xml | 84 ++++++++++ src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 22 ++ web/js/productCharacteristicsProcess.js | 8 +- 56 files changed, 310 insertions(+), 130 deletions(-) diffs (truncated from 1438 to 300 lines): diff -r e74230fb5c88 -r 8396ec753aec modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Mar 15 01:47:56 2014 +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.22689]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.22711]]></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 e74230fb5c88 -r 8396ec753aec 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 Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Mar 15 01:47:56 2014 +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.22689]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.22711]]></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.22689]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.22711]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e74230fb5c88 -r 8396ec753aec 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 Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sat Mar 15 01:47:56 2014 +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.22689]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.22711]]></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 e74230fb5c88 -r 8396ec753aec 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 Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Mar 15 01:47:56 2014 +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.22689]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.22711]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e74230fb5c88 -r 8396ec753aec 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 Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sat Mar 15 01:47:56 2014 +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.22689]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.22711]]></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 e74230fb5c88 -r 8396ec753aec 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 Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Mar 15 01:47:56 2014 +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.22689]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.22711]]></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.22689]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.22711]]></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.22689]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.22711]]></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.22689]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.22711]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e74230fb5c88 -r 8396ec753aec modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java Sat Mar 15 01:47:56 2014 +0000 @@ -108,6 +108,8 @@ List<CharacteristicValue> values = characteristic.getCharacteristic() .getCharacteristicValueList(); JSONObject productCharValuesValueMap = new JSONObject(); + // adding empty value to map to allow selecting empty value to delete the characteristic + productCharValuesValueMap.put("", ""); for (CharacteristicValue value : values) { productCharValuesValueMap.put(value.getId(), value.getIdentifier()); } diff -r e74230fb5c88 -r 8396ec753aec modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Sat Mar 15 01:47:56 2014 +0000 @@ -174,6 +174,15 @@ gridVisibleProperties = convertJSONArray(jsContent.getJSONArray("_gridVisibleProperties")); } + List<String> overwrittenAuxiliaryInputs = new ArrayList<String>(); + // The provided overwrittenAuxiliaryInputs only have to be persisted when calling the FIC in + // CHANGE mode. In the rest of the modes all auxiliary inputs are computed regardless of + // whether a callout have modified them in a previous request + if (jsContent.has("overwrittenAuxiliaryInputs") && "CHANGE".equals(mode)) { + overwrittenAuxiliaryInputs = convertJSONArray(jsContent + .getJSONArray("overwrittenAuxiliaryInputs")); + } + // If the table is based in a datasource, don't try to create a BaseOBObject if (!dataSourceBasedTable) { // create the row from the json content then @@ -239,7 +248,7 @@ // Computation of the Auxiliary Input values long t4 = System.currentTimeMillis(); - computeAuxiliaryInputs(mode, tab, columnValues); + computeAuxiliaryInputs(mode, tab, columnValues, overwrittenAuxiliaryInputs); // Computation of Column Values (using UIDefinition, so including combo values and all // relevant additional information) @@ -248,17 +257,19 @@ changedColumn, jsContent, changeEventCols, calloutsToCall, lastfieldChanged, visibleProperties, gridVisibleProperties); - if (mode.equals("NEW")) { - // In the case of NEW mode, we compute auxiliary inputs again to take into account that - // auxiliary inputs could depend on a default value - computeAuxiliaryInputs(mode, tab, columnValues); - } - // Execution of callouts long t6 = System.currentTimeMillis(); List<String> changedCols = executeCallouts(mode, tab, columnValues, changedColumn, calloutsToCall, lastfieldChanged, calloutMessages, changeEventCols, jsExcuteCode, - hiddenInputs); + hiddenInputs, overwrittenAuxiliaryInputs); + + // Compute the auxiliary inputs after executing the callout to ensure they use the updated + // parameters + if (mode.equals("NEW") || mode.equals("CHANGE")) { + // In the case of NEW mode, we compute auxiliary inputs again to take into account that + // auxiliary inputs could depend on a default value + computeAuxiliaryInputs(mode, tab, columnValues, overwrittenAuxiliaryInputs); + } if (changedCols.size() > 0) { RequestContext.get().setRequestParameter("donotaddcurrentelement", "true"); @@ -276,7 +287,8 @@ // Construction of the final JSONObject long t9 = System.currentTimeMillis(); JSONObject finalObject = buildJSONObject(mode, tab, columnValues, row, changeEventCols, - calloutMessages, attachments, jsExcuteCode, hiddenInputs, noteCount); + calloutMessages, attachments, jsExcuteCode, hiddenInputs, noteCount, + overwrittenAuxiliaryInputs); analyzeResponse(tab, columnValues); long t10 = System.currentTimeMillis(); log.debug("Elapsed time: " + (System.currentTimeMillis() - iniTime) + "(" + (t2 - t1) + "," @@ -387,7 +399,7 @@ private JSONObject buildJSONObject(String mode, Tab tab, Map<String, JSONObject> columnValues, BaseOBObject row, List<String> changeEventCols, List<JSONObject> calloutMessages, List<JSONObject> attachments, List<String> jsExcuteCode, Map<String, Object> hiddenInputs, - int noteCount) { + int noteCount, List<String> overwrittenAuxiliaryInputs) { JSONObject finalObject = new JSONObject(); try { if (mode.equals("NEW") || mode.equals("CHANGE")) { @@ -427,6 +439,7 @@ columnValues.get("inp" + Sqlc.TransformaNombreColumna(auxIn.getName()))); } finalObject.put("auxiliaryInputValues", jsonAuxiliaryInputValues); + finalObject.put("overwrittenAuxiliaryInputs", new JSONArray(overwrittenAuxiliaryInputs)); if (mode.equals("NEW") || mode.equals("EDIT") || mode.equals("SETSESSION")) { // We also include information related to validation dependencies @@ -844,15 +857,15 @@ } - private void computeAuxiliaryInputs(String mode, Tab tab, Map<String, JSONObject> columnValues) { - if (mode.equals("CHANGE")) { - // Auxiliary Inputs are not computed in CHANGE mode, only in the initial request in NEW or - // EDIT mode. This is done to prevent accidental overwriting of auxiliary input values which - // have been set by callouts - // See issue 17239 for more information - return; - } + private void computeAuxiliaryInputs(String mode, Tab tab, Map<String, JSONObject> columnValues, + List<String> overwrittenAuxiliaryInputs) { for (AuxiliaryInput auxIn : getAuxiliaryInputList(tab.getId())) { + if (mode.equals("CHANGE")) { + // Don't compute the auxiliary inputs that have been overwritten by callouts + if (overwrittenAuxiliaryInputs.contains(auxIn.getName())) { + continue; + } + } Object value = computeAuxiliaryInput(auxIn, tab.getWindow().getId()); log.debug("Final Computed Value. Name: " + auxIn.getName() + " Value: " + value); JSONObject jsonObj = new JSONObject(); @@ -1290,7 +1303,7 @@ private List<String> executeCallouts(String mode, Tab tab, Map<String, JSONObject> columnValues, String changedColumn, List<String> calloutsToCall, List<String> lastfieldChanged, List<JSONObject> messages, List<String> dynamicCols, List<String> jsExecuteCode, - Map<String, Object> hiddenInputs) { + Map<String, Object> hiddenInputs, List<String> overwrittenAuxiliaryInputs) { // In CHANGE mode, we will add the initial callout call for the changed column, if there is // one @@ -1312,14 +1325,14 @@ return new ArrayList<String>(); } return runCallouts(columnValues, tab, calledCallouts, calloutsToCall, lastfieldChanged, - messages, dynamicCols, jsExecuteCode, hiddenInputs); + messages, dynamicCols, jsExecuteCode, hiddenInputs, overwrittenAuxiliaryInputs); } private List<String> runCallouts(Map<String, JSONObject> columnValues, Tab tab, List<String> calledCallouts, List<String> calloutsToCall, List<String> lastfieldChangedList, List<JSONObject> messages, List<String> dynamicCols, List<String> jsExecuteCode, - Map<String, Object> hiddenInputs) { + Map<String, Object> hiddenInputs, List<String> overwrittenAuxiliaryInputs) { HashMap<String, Object> calloutInstances = new HashMap<String, Object>(); // flush&commit to release lock in db which otherwise interfere with callouts which run in their @@ -1544,6 +1557,11 @@ obj.put("value", el); obj.put("classicValue", el); columnValues.put(name, obj); + // Add the auxiliary input to the list of auxiliary inputs modified by + // callouts + if (!overwrittenAuxiliaryInputs.contains(aux.getName())) { + overwrittenAuxiliaryInputs.add(aux.getName()); + } } } if (!columnValues.containsKey(name)) { diff -r e74230fb5c88 -r 8396ec753aec 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 Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Sat Mar 15 01:47:56 2014 +0000 @@ -746,6 +746,7 @@ var columnValues = data.columnValues, calloutMessages = data.calloutMessages, auxInputs = data.auxiliaryInputValues, + overwrittenAuxiliaryInputs = data.overwrittenAuxiliaryInputs, prop, value, i, j, dynamicCols = data.dynamicCols, sessionAttributes = data.sessionAttributes, editValues, item, section, retHiddenInputs = data.hiddenInputs; @@ -816,6 +817,10 @@ } } + if (overwrittenAuxiliaryInputs) { + this.overwrittenAuxiliaryInputs = overwrittenAuxiliaryInputs; + } + if (sessionAttributes) { this.sessionAttributes = sessionAttributes; } @@ -1338,6 +1343,9 @@ requestParams.CHANGED_COLUMN = item.inpColumnName; } allProperties._entityName = this.view.entity; + if (this.overwrittenAuxiliaryInputs) { + allProperties.overwrittenAuxiliaryInputs = this.overwrittenAuxiliaryInputs; + } // disable with a delay to allow the focus to be moved to a new field // before disabling diff -r e74230fb5c88 -r 8396ec753aec modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js Wed Mar 12 20:26:41 2014 -0300 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js Sat Mar 15 01:47:56 2014 +0000 @@ -129,7 +129,10 @@ ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
