details: https://code.openbravo.com/erp/devel/main/rev/8f1931e3114a changeset: 19145:8f1931e3114a user: Naiara Garcia <naiara.garcia <at> openbravo.com> date: Wed Jan 02 16:26:58 2013 +0100 summary: Added tag 1.0.10 for changeset 6735d51a4790
details: https://code.openbravo.com/erp/devel/main/rev/42f163d092a5 changeset: 19146:42f163d092a5 user: Naiara Garcia <naiara.garcia <at> openbravo.com> date: Wed Jan 02 16:29:40 2013 +0100 summary: Removed tag 1.0.10 details: https://code.openbravo.com/erp/devel/main/rev/bf2bb9e85e41 changeset: 19147:bf2bb9e85e41 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Wed Jan 02 18:30:33 2013 +0100 summary: Fixes issue 22718: pending goods receipt, generate m_matchpo entry details: https://code.openbravo.com/erp/devel/main/rev/e673ef0ebd97 changeset: 19148:e673ef0ebd97 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Wed Jan 02 18:34:15 2013 +0100 summary: Related to issue 22718: improve indentantion, use spaces details: https://code.openbravo.com/erp/devel/main/rev/ca8bcb666d94 changeset: 19149:ca8bcb666d94 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Wed Jan 02 18:52:00 2013 +0100 summary: Fixes issue 22719: update sampledata (new columns) details: https://code.openbravo.com/erp/devel/main/rev/34495b8f0646 changeset: 19150:34495b8f0646 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Wed Jan 02 19:13:40 2013 +0100 summary: Related to issue 22678: update new docaction column in m_inout_post details: https://code.openbravo.com/erp/devel/main/rev/a0b3c498d406 changeset: 19151:a0b3c498d406 user: Gorka Gil <gorka.gil <at> openbravo.com> date: Wed Jan 02 20:00:23 2013 +0100 summary: Clean up .hgtags file details: https://code.openbravo.com/erp/devel/main/rev/ae1c846b6f3f changeset: 19152:ae1c846b6f3f user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu Jan 03 12:02:52 2013 +0530 summary: Fixes Issue 22665 : Wrong error when completing the shipment without lines details: https://code.openbravo.com/erp/devel/main/rev/f6193ba3eb10 changeset: 19153:f6193ba3eb10 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Jan 03 10:42:10 2013 +0100 summary: Related to issue 22665 Code Review details: https://code.openbravo.com/erp/devel/main/rev/43409b2738c4 changeset: 19154:43409b2738c4 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Jan 03 11:00:14 2013 +0100 summary: Fixes issue 5202: Implemented display logic for tabs Now the tabs can define display logic, based on the values of its ancestor tabs fields. Summary of the changes: -DynamicExpressionParser.java: Adds a new attribute called inpColumnNames, that is only used in the tabs display logic and that will be used to convert the tok ens to its inp column format. This needs to be done because the display logic is going to feed from the view context, and there the ancestor tab fields are sto red using its inp column name. -ob-view-tab.js.ftl: Adds to the view description of the tab the showTabIf property, but only if the tab has a display logic defined. -OBViewTab.java: Adds the getShowIf method, that is used in ob-view-tab.js.ftl to retrieve the display logic of the tabs -ob-view-form.js: Calls the updateSubTabVisibility (defined in ob-standard-view.js) whenever a fields changes and loses focus. -ob-standard-view.js: In the first chunk it wraps the tab display logic in a try block to prevent errors if the display logic is not defined properly (this same thing is done for the fields display logic). The second chunk defines and uses the updateSubTabVisibility function, that based on a view will be used to determine the visibility of all its subtabs. The function is called whenever a new record is selected. If a subtab that was active in its tabBar is hidden, the first visible tab of that tabBar will be selected, if any. If there are not any remaining visible subt abs, the whole tabBar will be made invisible. -ob-standard-window.js: Changes have been made in the functions to move among tabs to take into account that it should not be possible to move to a hidden tab. details: https://code.openbravo.com/erp/devel/main/rev/28a417e350b0 changeset: 19155:28a417e350b0 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 03 13:05:45 2013 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/7165387824d3 changeset: 19156:7165387824d3 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Jan 03 13:41:56 2013 +0100 summary: Fixes bug 22717 details: https://code.openbravo.com/erp/devel/main/rev/eea37a82abc2 changeset: 19157:eea37a82abc2 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Jan 04 09:30:34 2013 +0100 summary: CI: update AD_MODULE to version 19156 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/DynamicExpressionParser.java | 22 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl | 6 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 17 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 65 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 44 +- 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.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 +- referencedata/sampledata/F_B_International_Group.xml | 1575 +++-- referencedata/sampledata/QA_Testing.xml | 2816 +++++++++- src-db/database/model/functions/M_INOUT_POST.xml | 103 +- src-db/database/model/tables/AD_TAB.xml | 4 + src-db/database/sourcedata/AD_COLUMN.xml | 35 + src-db/database/sourcedata/AD_FIELD.xml | 28 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/User1Ready.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/User1ReadyData.class | 0 src-util/buildvalidation/src/org/openbravo/buildvalidation/User1Ready.java | 47 + src-util/buildvalidation/src/org/openbravo/buildvalidation/User1Ready_data.xsql | 63 + 57 files changed, 4138 insertions(+), 855 deletions(-) diffs (truncated from 20707 to 300 lines): diff -r 6735d51a4790 -r eea37a82abc2 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Jan 04 09:30:34 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.19106]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19156]]></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 6735d51a4790 -r eea37a82abc2 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 Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Jan 04 09:30:34 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.19106]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19156]]></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.19106]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19156]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 6735d51a4790 -r eea37a82abc2 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 Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Jan 04 09:30:34 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.19106]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19156]]></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 6735d51a4790 -r eea37a82abc2 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 Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Jan 04 09:30:34 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.19106]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19156]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 6735d51a4790 -r eea37a82abc2 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 Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Jan 04 09:30:34 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.19106]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.19156]]></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 6735d51a4790 -r eea37a82abc2 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 Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Jan 04 09:30:34 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.19106]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.19156]]></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.19106]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.19156]]></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.19106]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.19156]]></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.19106]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.19156]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 6735d51a4790 -r eea37a82abc2 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 Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Fri Jan 04 09:30:34 2013 +0100 @@ -32,6 +32,7 @@ import org.openbravo.client.kernel.reference.UIDefinition; import org.openbravo.client.kernel.reference.UIDefinitionController; import org.openbravo.client.kernel.reference.YesNoUIDefinition; +import org.openbravo.data.Sqlc; import org.openbravo.erpCommon.utility.DimensionDisplayUtility; import org.openbravo.model.ad.ui.AuxiliaryInput; import org.openbravo.model.ad.ui.Field; @@ -71,8 +72,16 @@ private Tab tab; private Field field; private StringBuffer jsCode; + private boolean inpColumnNames = false; private ApplicationDictionaryCachedStructures cachedStructures; + public DynamicExpressionParser(String code, Tab tab, boolean inpColumnNames) { + this.code = code; + this.tab = tab; + this.inpColumnNames = inpColumnNames; + parse(); + } + public DynamicExpressionParser(String code, Tab tab) { this.code = code; this.tab = tab; @@ -298,9 +307,18 @@ return new DisplayLogicElement(TOKEN_PREFIX + auxIn.getName(), false); } } - sessionAttributesInExpression.add(token); + + String convertedToken = token; + // Sometimes (i.e. for the tab display logic, see issue + // https://issues.openbravo.com/view.php?id=5202), + // the token needs to be converted to its inp column name + if (inpColumnNames) { + convertedToken = "inp" + Sqlc.TransformaNombreColumna(token); + } + sessionAttributesInExpression.add(convertedToken); return new DisplayLogicElement(TOKEN_PREFIX - + (token.startsWith("#") ? token.replace("#", "_") : token), false); + + (convertedToken.startsWith("#") ? convertedToken.replace("#", "_") : convertedToken), + false); } /* diff -r 6735d51a4790 -r eea37a82abc2 modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl Fri Jan 04 09:30:34 2013 +0100 @@ -34,6 +34,12 @@ moduleId: '${tabComponent.moduleId}', </#if> + <#if tabComponent.showIf != "" > + showTabIf: function(context) { + return (${tabComponent.showIf}); + }, + </#if> + <#if tabComponent.defaultEditMode> defaultEditMode: ${tabComponent.defaultEditMode?string}, </#if> diff -r 6735d51a4790 -r eea37a82abc2 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java Fri Jan 04 09:30:34 2013 +0100 @@ -514,6 +514,22 @@ return ""; } + public String getShowIf() { + + String jsExpression = null; + if (tab.getDisplayLogic() != null && !tab.getDisplayLogic().isEmpty()) { + boolean inpColumnNames = true; + final DynamicExpressionParser parser = new DynamicExpressionParser(tab.getDisplayLogic(), + tab, inpColumnNames); + jsExpression = parser.getJSExpression(); + } + if (jsExpression != null) { + return jsExpression; + } else { + return ""; + } + } + public class ButtonField { private static final String AD_DEF_ERROR = "AD definition error: process parameter (%s) is using %s reference without %s"; private String id; @@ -894,5 +910,6 @@ public boolean getSession() { return session; } + } } diff -r 6735d51a4790 -r eea37a82abc2 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 Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Fri Jan 04 09:30:34 2013 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2012 Openbravo SLU + * All portions are Copyright (C) 2010-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -1192,6 +1192,8 @@ if (item._hasChanged) { this.itemChangeActions(item); + this.view.updateSubtabVisibility(); + if (!this.isNew) { this.view.statusBar.mode = "EDIT"; this.view.statusBar.setContentLabel(this.view.statusBar.editIcon, 'OBUIAPP_Editing', this.getStatusBarFields()); diff -r 6735d51a4790 -r eea37a82abc2 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Mon Dec 31 13:13:24 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Fri Jan 04 09:30:34 2013 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2012 Openbravo SLU + * All portions are Copyright (C) 2010-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -211,6 +211,24 @@ OB.TestRegistry.register('org.openbravo.client.application.ViewGrid_' + this.tabId, this.viewGrid); OB.TestRegistry.register('org.openbravo.client.application.ViewForm_' + this.tabId, this.viewForm); + if (this.showTabIf && !this.originalShowTabIf) { + this.originalShowTabIf = this.showTabIf; + this.showTabIf = function (context) { + var originalShowTabIfValue = false; + + try { + if (isc.isA.Function(this.originalShowTabIf)) { + originalShowTabIfValue = this.originalShowTabIf(context); + } else { + originalShowTabIfValue = isc.JSON.decode(this.originalShowTabIf); + } + } catch (_exception) { + isc.warn(_exception + ' ' + _exception.message + ' ' + _exception.stack); + } + return originalShowTabIfValue; + }; + } + if (this.actionToolbarButtons) { length = this.actionToolbarButtons.length; for (i = 0; i < length; i++) { @@ -1270,6 +1288,8 @@ var tabViewPane = null, i; + this.updateSubtabVisibility(); + // refresh the tabs if (this.childTabSet && (differentRecordId || !this.isOpenDirectModeParent)) { length = this.childTabSet.tabs.length; @@ -1287,6 +1307,49 @@ delete this.isOpenDirectModeParent; }, + updateSubtabVisibility: function () { + var i, length, tabViewPane, activeTab, activeTabNum, activeTabPane, indexFirstNotHiddenTab; + if (this.childTabSet) { + length = this.childTabSet.tabs.length; + for (i = 0; i < length; i++) { + tabViewPane = this.childTabSet.tabs[i].pane; + if (tabViewPane.showTabIf && !(tabViewPane.showTabIf(tabViewPane.getContextInfo()))) { + this.childTabSet.tabBar.members[i].hide(); + tabViewPane.hidden = true; + } else { + if (this.childTabSet.visibility === 'hidden') { + this.childTabSet.show(); + } + this.childTabSet.tabBar.members[i].show(); + tabViewPane.hidden = false; + tabViewPane.updateSubtabVisibility(); + } + } + + // If the active tab of the tabset is now hidden, another tab has to to be selected + // If there are no visible tabs left, maximize the current view + activeTab = this.childTabSet.getSelectedTab(); + activeTabNum = this.childTabSet.getTabNumber(activeTab); ------------------------------------------------------------------------------ Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and much more. Get web development skills now with LearnDevNow - 350+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122812 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
