details: https://code.openbravo.com/erp/devel/main/rev/be9160ee5ece changeset: 19436:be9160ee5ece user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Jan 25 10:14:44 2013 +0100 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/6b54a51472fa changeset: 19437:6b54a51472fa user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Jan 25 10:47:05 2013 +0100 summary: Fixes issue 22309: The Process Expenses button label and pop-up message should be more generic details: https://code.openbravo.com/erp/devel/main/rev/265cf4899bab changeset: 19438:265cf4899bab user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Jan 25 13:15:38 2013 +0100 summary: 22309: The Process Expenses button label and pop-up message should be more generic details: https://code.openbravo.com/erp/devel/main/rev/87bffc7d1561 changeset: 19439:87bffc7d1561 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Jan 25 13:32:04 2013 +0100 summary: 22309: The Process Expenses button label and pop-up message should be more generic details: https://code.openbravo.com/erp/devel/main/rev/61cde4f78074 changeset: 19440:61cde4f78074 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 18 14:22:33 2013 +0100 summary: [pw] retryExecution can be a boolean details: https://code.openbravo.com/erp/devel/main/rev/a0d95d50e44c changeset: 19441:a0d95d50e44c user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Jan 25 11:29:52 2013 +0100 summary: [pw] Adds display logic to the process parameters Summary of the changes: - OBUIAPP_PARAMETER.xml: Creation of the displaylogic column in the database - AD_COLUMN.xml, AD_FIELD.xml: Definition of the new column and field in the application dictionary - DynamicExpressionParser.java: Adapts the expression parser to work with process parameters. As opposed with other fields, the parsing of process parameter e xpression require the Process instead of the Tab. - ob-param-window-parameter.ftl: Adds the showIf and the redrawOnChange properties to the process parameters. The parameters used by other parameters in their display logic will have redrawOnChange=true, so every time they are modified the showIf expressions are evaluated. - OBViewParameterHandler.java: Processes the display logic of the parameters, and determine if parameters are referenced in other parameters' display logic. - ob-parameter-window-view.js: Adds evaluation of the display logic of the process parameters in the client. - ob-smartclient.js: Adds some checks in the changed function to prevent executing a function in an undefined object. details: https://code.openbravo.com/erp/devel/main/rev/c4774bddcb28 changeset: 19442:c4774bddcb28 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 11:51:46 2013 +0100 summary: [pw] merge details: https://code.openbravo.com/erp/devel/main/rev/27e73be3a035 changeset: 19443:27e73be3a035 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 12:22:01 2013 +0100 summary: [pw] fixed jslint issues details: https://code.openbravo.com/erp/devel/main/rev/c569fd9845b3 changeset: 19444:c569fd9845b3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 12:35:59 2013 +0100 summary: [pw] startrow is properly concatenated to other properties details: https://code.openbravo.com/erp/devel/main/rev/0c20f07af2ca changeset: 19445:0c20f07af2ca user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 13:07:15 2013 +0100 summary: [pw] don't show error icons details: https://code.openbravo.com/erp/devel/main/rev/f33f976cadf8 changeset: 19446:f33f976cadf8 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 13:33:51 2013 +0100 summary: [pw][ms] setting required style to multi selector details: https://code.openbravo.com/erp/devel/main/rev/01e80562effa changeset: 19447:01e80562effa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 13:37:56 2013 +0100 summary: [pw] evaluate display logic with default values details: https://code.openbravo.com/erp/devel/main/rev/2188907844eb changeset: 19448:2188907844eb user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 14:20:51 2013 +0100 summary: [pw] synchronize terminology for display logic details: https://code.openbravo.com/erp/devel/main/rev/17b59edeb944 changeset: 19449:17b59edeb944 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 14:23:32 2013 +0100 summary: [pw] merged back display logic in param windows details: https://code.openbravo.com/erp/devel/main/rev/d0d2ca046bbb changeset: 19450:d0d2ca046bbb user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Jan 25 14:31:21 2013 +0100 summary: Fixes issue 22885: Dates in filters are serialized as Date, and not DateTime The problem was that the Date was being serialized as a DateTime, and javascript was converting the resulting datetime to the UTC format. I.e. if the user entered 24-01-2013, the date sent to the server for filtering was 23-01-2013 23:00:00. This conversion was being done when smartclient serialized the date. If the date had the logicalDate property set to true, then the conversion was done properly. The change has been done only in the ob-formitem-minidaterange.js to ensure that the DateTime fields are serialized with both its date and time parts. details: https://code.openbravo.com/erp/devel/main/rev/98f945713fd4 changeset: 19451:98f945713fd4 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Jan 25 15:26:55 2013 +0100 summary: Fixes issue 22521: In P&E the selection is not removed when sorting the grid When a record was selected by clicking on an area other than the checkbox, the record was deselected when a column was sorted. This was caused because the selectionUpdated function, that was in charge of keeping the list of selected records, was only being called when the record was clicked on its checkbox. This has been fixed by executing that function inside the selectionChanged function, that is executed when a record is selected, regardless if the click has been done in the checkbox. details: https://code.openbravo.com/erp/devel/main/rev/81e70c75d9a8 changeset: 19452:81e70c75d9a8 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Jan 26 02:05:27 2013 +0100 summary: CI: update AD_MODULE to version 19451 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/model/tables/OBUIAPP_PARAMETER.xml | 4 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 39 ++++- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 30 +++- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java | 86 ++++++--- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl | 8 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 55 ++++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 19 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 29 +++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 2 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 8 +- 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.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.userinterface.selector/ob-selector-item-styles.js | 9 +- 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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 8 +- 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/model/functions/S_TIMEEXPENSE_POST.xml | 4 +- src-db/database/sourcedata/AD_FIELD.xml | 8 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 7 +- 57 files changed, 350 insertions(+), 130 deletions(-) diffs (truncated from 1490 to 300 lines): diff -r e8c62023c5ba -r 81e70c75d9a8 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Jan 26 02:05:27 2013 +0100 @@ -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.19434]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19451]]></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 e8c62023c5ba -r 81e70c75d9a8 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Jan 26 02:05:27 2013 +0100 @@ -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.19434]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19451]]></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.19434]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19451]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e8c62023c5ba -r 81e70c75d9a8 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 Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sat Jan 26 02:05:27 2013 +0100 @@ -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.19434]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19451]]></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 e8c62023c5ba -r 81e70c75d9a8 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 Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Jan 26 02:05:27 2013 +0100 @@ -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.19434]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19451]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e8c62023c5ba -r 81e70c75d9a8 modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml --- a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml Sat Jan 26 02:05:27 2013 +0100 @@ -105,6 +105,10 @@ <default><![CDATA[N]]></default> <onCreateDefault><![CDATA['N']]></onCreateDefault> </column> + <column name="DISPLAYLOGIC" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_PARAMETER_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> diff -r e8c62023c5ba -r 81e70c75d9a8 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Sat Jan 26 02:05:27 2013 +0100 @@ -1630,7 +1630,7 @@ <!--4983D4CEABA94A208017768A1CEAA032--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--4983D4CEABA94A208017768A1CEAA032--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--4983D4CEABA94A208017768A1CEAA032--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> -<!--4983D4CEABA94A208017768A1CEAA032--> <POSITION><![CDATA[26]]></POSITION> +<!--4983D4CEABA94A208017768A1CEAA032--> <POSITION><![CDATA[25]]></POSITION> <!--4983D4CEABA94A208017768A1CEAA032--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--4983D4CEABA94A208017768A1CEAA032--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--4983D4CEABA94A208017768A1CEAA032--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -2279,6 +2279,41 @@ <!--6B89B4DC342B48F989E55D70BB2CC9B0--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--6B89B4DC342B48F989E55D70BB2CC9B0--></AD_COLUMN> +<!--6D0A663C73C646E3808A2D00D63BC55E--><AD_COLUMN> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <AD_COLUMN_ID><![CDATA[6D0A663C73C646E3808A2D00D63BC55E]]></AD_COLUMN_ID> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <NAME><![CDATA[Display Logic]]></NAME> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <DESCRIPTION><![CDATA[A specification of statements which, when evaluated as false, cause the field to appear hidden.]]></DESCRIPTION> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <HELP><![CDATA[A specification of statements which, when evaluated as false, cause the field to appear hidden.]]></HELP> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <COLUMNNAME><![CDATA[Displaylogic]]></COLUMNNAME> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <AD_TABLE_ID><![CDATA[30123B1001FC4E82BB4CB9725E069B48]]></AD_TABLE_ID> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISKEY><![CDATA[N]]></ISKEY> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <SEQNO><![CDATA[280]]></SEQNO> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <AD_ELEMENT_ID><![CDATA[283]]></AD_ELEMENT_ID> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <POSITION><![CDATA[28]]></POSITION> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--6D0A663C73C646E3808A2D00D63BC55E--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--6D0A663C73C646E3808A2D00D63BC55E--></AD_COLUMN> + <!--6DCC7505E5C04403A7AA24E1A45824DA--><AD_COLUMN> <!--6DCC7505E5C04403A7AA24E1A45824DA--> <AD_COLUMN_ID><![CDATA[6DCC7505E5C04403A7AA24E1A45824DA]]></AD_COLUMN_ID> <!--6DCC7505E5C04403A7AA24E1A45824DA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -6871,7 +6906,7 @@ <!--FC60C911562841BEADBC6715FA919941--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--FC60C911562841BEADBC6715FA919941--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--FC60C911562841BEADBC6715FA919941--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> -<!--FC60C911562841BEADBC6715FA919941--> <POSITION><![CDATA[27]]></POSITION> +<!--FC60C911562841BEADBC6715FA919941--> <POSITION><![CDATA[26]]></POSITION> <!--FC60C911562841BEADBC6715FA919941--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--FC60C911562841BEADBC6715FA919941--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--FC60C911562841BEADBC6715FA919941--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r e8c62023c5ba -r 81e70c75d9a8 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml Sat Jan 26 02:05:27 2013 +0100 @@ -2122,7 +2122,7 @@ <!--865E6707D439406D8F3C60819C372B9E--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--865E6707D439406D8F3C60819C372B9E--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--865E6707D439406D8F3C60819C372B9E--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--865E6707D439406D8F3C60819C372B9E--> <SEQNO><![CDATA[180]]></SEQNO> +<!--865E6707D439406D8F3C60819C372B9E--> <SEQNO><![CDATA[190]]></SEQNO> <!--865E6707D439406D8F3C60819C372B9E--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--865E6707D439406D8F3C60819C372B9E--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--865E6707D439406D8F3C60819C372B9E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -3057,6 +3057,34 @@ <!--CCED14831FE14A749725EF00A2DC5FC6--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--CCED14831FE14A749725EF00A2DC5FC6--></AD_FIELD> +<!--CD0E9652F46441AA9A75A0A2FC467706--><AD_FIELD> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <AD_FIELD_ID><![CDATA[CD0E9652F46441AA9A75A0A2FC467706]]></AD_FIELD_ID> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <NAME><![CDATA[Display Logic]]></NAME> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <DESCRIPTION><![CDATA[A specification of statements which, when evaluated as false, cause the field to appear hidden.]]></DESCRIPTION> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <HELP><![CDATA[A specification of statements which, when evaluated as false, cause the field to appear hidden.]]></HELP> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <AD_TAB_ID><![CDATA[FF80818132D8C36D0132D8C4936F0006]]></AD_TAB_ID> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <AD_COLUMN_ID><![CDATA[6D0A663C73C646E3808A2D00D63BC55E]]></AD_COLUMN_ID> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <DISPLAYLENGTH><![CDATA[2000]]></DISPLAYLENGTH> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <SEQNO><![CDATA[180]]></SEQNO> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--CD0E9652F46441AA9A75A0A2FC467706--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--CD0E9652F46441AA9A75A0A2FC467706--></AD_FIELD> + <!--D6FC282E5E614AED8C301C8FEC0436FB--><AD_FIELD> <!--D6FC282E5E614AED8C301C8FEC0436FB--> <AD_FIELD_ID><![CDATA[D6FC282E5E614AED8C301C8FEC0436FB]]></AD_FIELD_ID> <!--D6FC282E5E614AED8C301C8FEC0436FB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r e8c62023c5ba -r 81e70c75d9a8 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 Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sat Jan 26 02:05:27 2013 +0100 @@ -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.19434]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.19451]]></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 e8c62023c5ba -r 81e70c75d9a8 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 Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Jan 26 02:05:27 2013 +0100 @@ -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.19434]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.19451]]></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.19434]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.19451]]></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.19434]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.19451]]></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.19434]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.19451]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e8c62023c5ba -r 81e70c75d9a8 modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Fri Jan 25 09:58:13 2013 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Sat Jan 26 02:05:27 2013 +0100 @@ -65,6 +65,7 @@ } private List<Field> fieldsInExpression = new ArrayList<Field>(); + private List<Parameter> parametersInExpression = new ArrayList<Parameter>(); private List<AuxiliaryInput> auxInputsInExpression = new ArrayList<AuxiliaryInput>(); private List<String> sessionAttributesInExpression = new ArrayList<String>(); @@ -73,8 +74,18 @@ private Field field; private StringBuffer jsCode; private boolean tabLevelDisplayLogic = false; + private boolean parameterDisplayLogic = false; + Process process; + private ApplicationDictionaryCachedStructures cachedStructures; + public DynamicExpressionParser(String code, Process process, boolean parameterDisplayLogic) { + this.code = code; + this.process = process; + this.parameterDisplayLogic = parameterDisplayLogic; + parse(); + } + public DynamicExpressionParser(String code, Tab tab, boolean tabLevelDisplayLogic) { this.code = code; this.tab = tab; @@ -198,6 +209,14 @@ } /** + * Returns the list of Parameters used in the dynamic expression + * + */ + public List<Parameter> getParameters() { + return parametersInExpression; + } + + /** * Returns the list of session attribute names used in the dynamic expression * */ @@ -276,37 +295,52 @@ return new DisplayLogicElement("", false); List<Field> fields; List<AuxiliaryInput> auxIns; - try { - if (cachedStructures == null) { - cachedStructures = WeldUtils - .getInstanceFromStaticBeanManager(ApplicationDictionaryCachedStructures.class); + if (parameterDisplayLogic) { + List<Parameter> parameters = process.getOBUIAPPParameterList(); + for (Parameter parameter : parameters) { + if (token.equalsIgnoreCase(parameter.getDBColumnName())) { + parametersInExpression.add(parameter); + UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition( + parameter.getReference()); + + return new DisplayLogicElement("OB.Utilities.getValue(currentValues,'" + token + "')", + uiDef instanceof YesNoUIDefinition); + } } - fields = cachedStructures.getFieldsOfTab(tab.getId()); - auxIns = cachedStructures.getAuxiliarInputList(tab.getId()); - } catch (NullPointerException e) { ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
