details: https://code.openbravo.com/erp/devel/main/rev/09939d0a339c changeset: 21976:09939d0a339c user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Feb 12 16:10:18 2014 +0100 summary: Fixes issue 25581: Display logic is not working fine using auxiliary input
The problem was that the display logic was using an auxiliary input defined for the parent tab, but its value was being wrongly overwritten by the subtab (the tab being hidden/shown). I t has been fixed by adding the subtab session properties only if they are not an auxiliary input in the parent tab. details: https://code.openbravo.com/erp/devel/main/rev/4988331796f2 changeset: 21977:4988331796f2 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Feb 12 16:37:31 2014 +0100 summary: Related to issue 25581: Prevents refreshing the views redundantly details: https://code.openbravo.com/erp/devel/main/rev/ed6df2f35307 changeset: 21978:ed6df2f35307 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Feb 07 12:46:29 2014 +0100 summary: related to bug 25684: solves case a don't compute unneeded combos on CHANGE mode when visibleProperties is null details: https://code.openbravo.com/erp/devel/main/rev/6198177e1c61 changeset: 21979:6198177e1c61 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Feb 07 13:00:18 2014 +0100 summary: related to issue 25684: solves case b do not compute inactive combos if they are not required details: https://code.openbravo.com/erp/devel/main/rev/82bb222117bc changeset: 21980:82bb222117bc user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Feb 07 13:01:43 2014 +0100 summary: related to issue 25684: solves case 3 don't generate complete JSON for combos when only one value is required details: https://code.openbravo.com/erp/devel/main/rev/001ce480684b changeset: 21981:001ce480684b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Feb 11 10:55:13 2014 +0100 summary: related to issue 25684: solves case 3 details: https://code.openbravo.com/erp/devel/main/rev/9fe6f07fed7d changeset: 21982:9fe6f07fed7d user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Feb 12 17:25:36 2014 +0100 summary: Related to issue 25581: Only refresh if the tabset was hidden Otherwise the refresh is done automatically details: https://code.openbravo.com/erp/devel/main/rev/248a450b13a8 changeset: 21983:248a450b13a8 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Feb 12 17:27:15 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/9d50bf45a6c9 changeset: 21984:9d50bf45a6c9 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Feb 12 18:42:08 2014 +0100 summary: Fixes issue 25710: Big numbers are not properly managed in amount fields The problem was that the OB.Utilities.Number.OBMaskedToOBPlain function was removing the '0's after the decimal dot even if the number was being expressed in decimal notation. This way, '1.12E10' was being converted to '1.12E1'. This has been fixed by not removing the lasting '0's if the number is expressed in decmial notation. details: https://code.openbravo.com/erp/devel/main/rev/99c58f9b3fe1 changeset: 21985:99c58f9b3fe1 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed Feb 05 15:11:08 2014 +0530 summary: Fixes Issue 25445 Error when using Manage Variants under some circumstances details: https://code.openbravo.com/erp/devel/main/rev/9da401159803 changeset: 21986:9da401159803 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Tue Feb 04 14:58:17 2014 +0530 summary: Fixes Issue 25114 RequisitionToOrder maintains order of requisition lines details: https://code.openbravo.com/erp/devel/main/rev/c32dee722007 changeset: 21987:c32dee722007 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon Feb 10 18:05:01 2014 +0530 summary: Fixes Issue 25262: Account filter in trial balance is not working as expected details: https://code.openbravo.com/erp/devel/main/rev/083d67ea235a changeset: 21988:083d67ea235a user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed Feb 12 23:36:09 2014 +0530 summary: Fixes Issue 25587 PendingGoodsReceipt fails if warehouse is not set in OrgWH tab details: https://code.openbravo.com/erp/devel/main/rev/76fb3237bc3a changeset: 21989:76fb3237bc3a user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Feb 13 05:59:42 2014 +0000 summary: CI: update AD_MODULE to version 21988 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/window/FormInitializationComponent.java | 60 +++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 2 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 22 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js | 9 +- 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/FKComboUIDefinition.java | 11 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 12 + 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 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java | 5 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 21 ++- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 6 +- src/org/openbravo/erpCommon/info/AccountElementValue.java | 4 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 85 +++++++++- src/org/openbravo/event/ProductEventHandler.java | 33 +++- 53 files changed, 319 insertions(+), 115 deletions(-) diffs (truncated from 1452 to 300 lines): diff -r 5fe5e1c482f1 -r 76fb3237bc3a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 13 05:59:42 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.21816]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.21988]]></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 5fe5e1c482f1 -r 76fb3237bc3a 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 Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Feb 13 05:59:42 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.21816]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.21988]]></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.21816]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.21988]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5fe5e1c482f1 -r 76fb3237bc3a 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 Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 13 05:59:42 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.21816]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.21988]]></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 5fe5e1c482f1 -r 76fb3237bc3a 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 Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Feb 13 05:59:42 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.21816]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.21988]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5fe5e1c482f1 -r 76fb3237bc3a 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 Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 13 05:59:42 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.21816]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.21988]]></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 5fe5e1c482f1 -r 76fb3237bc3a 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 Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Feb 13 05:59:42 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.21816]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.21988]]></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.21816]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.21988]]></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.21816]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.21988]]></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.21816]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.21988]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5fe5e1c482f1 -r 76fb3237bc3a 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 Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Thu Feb 13 05:59:42 2014 +0000 @@ -545,6 +545,18 @@ } + private boolean isNotActiveOrVisible(Field field, List<String> visibleProperties) { + return ((visibleProperties == null || !visibleProperties.contains("inp" + + Sqlc.TransformaNombreColumna(field.getColumn().getDBColumnName()))) + && !field.isDisplayed() && !field.isShowInGridView() && !field.isShownInStatusBar()) + || !field.isActive(); + } + + private boolean isNotActiveOrVisibleAndNotNeeded(Field field, List<String> visibleProperties) { + return isNotActiveOrVisible(field, visibleProperties) + && field.getColumn().getDefaultValue() == null && !field.getColumn().isMandatory(); + } + private void computeColumnValues(String mode, Tab tab, List<String> allColumns, Map<String, JSONObject> columnValues, BaseOBObject parentRecord, String parentId, String changedColumn, JSONObject jsContent, List<String> changeEventCols, @@ -554,6 +566,7 @@ if (mode.equals("CHANGE") && changedColumn != null) { RequestContext.get().setRequestParameter("donotaddcurrentelement", "true"); } + log.debug("computeColumnValues - forceComboReload: " + forceComboReload); HashMap<String, Field> columnsOfFields = new HashMap<String, Field>(); for (Field field : getADFieldList(tab.getId())) { if (field.getColumn() == null) { @@ -595,17 +608,20 @@ value = uiDef.getFieldProperties(field, true); } else { // Else, the default is used - if (visibleProperties != null - && !visibleProperties.contains("inp" + Sqlc.TransformaNombreColumna(col)) - && !field.isDisplayed() && !field.isShowInGridView() && !field.isShownInStatusBar() - && field.getColumn().getDefaultValue() == null && !field.getColumn().isMandatory()) { + if (isNotActiveOrVisibleAndNotNeeded(field, visibleProperties)) { // If the column is not currently visible, and its not mandatory, we don't need to // compute the combo. // If a column is mandatory then the combo needs to be computed, because the selected // value can depend on the computation if there is no default value + log.debug("Not calculating combo in " + mode + " mode for column " + col); value = uiDef.getFieldPropertiesWithoutCombo(field, false); } else { - value = uiDef.getFieldProperties(field, false); + if (isNotActiveOrVisible(field, visibleProperties)) { + log.debug("Only first combo record in " + mode + " mode for column " + col); + value = uiDef.getFieldPropertiesFirstRecord(field, false); + } else { + value = uiDef.getFieldProperties(field, false); + } } } } else if (mode.equals("EDIT") @@ -614,17 +630,41 @@ // On EDIT mode, the values are computed through the UIDefinition (the values have been // previously set in the RequestContext) // This is also done this way on CHANGE mode where a combo reload is needed - if (visibleProperties != null - && !visibleProperties.contains("inp" + Sqlc.TransformaNombreColumna(col)) - && !field.isDisplayed() && !field.isShowInGridView() && !field.isShownInStatusBar() - && field.getColumn().getDefaultValue() == null && !field.getColumn().isMandatory()) { + if (isNotActiveOrVisibleAndNotNeeded(field, visibleProperties)) { // If the column is not currently visible, and its not mandatory, we don't need to // compute the combo. // If a column is mandatory then the combo needs to be computed, because the selected // value can depend on the computation if there is no default value + log.debug("field: " + + field + + " - getFieldPropertiesWithoutCombo: hasVisibleProperties: " + + (visibleProperties != null) + + ", &contains: " + + (visibleProperties != null && visibleProperties.contains("inp" + + Sqlc.TransformaNombreColumna(col))) + ", isDisplayed=" + field.isDisplayed() + + ", isShowInGridView=" + field.isShowInGridView() + ", isShownInStatusBar=" + + field.isShowInGridView() + ", hasDefaultValue=" + + (field.getColumn().getDefaultValue() != null) + ", isMandatory=" + + field.getColumn().isMandatory()); uiDef.getFieldPropertiesWithoutCombo(field, true); } else { - value = uiDef.getFieldProperties(field, true); + log.debug("field: " + + field + + " - getFieldProperties: hasVisibleProperties: " + + (visibleProperties != null) + + ", &contains: " + + (visibleProperties != null && visibleProperties.contains("inp" + + Sqlc.TransformaNombreColumna(col))) + ", isDisplayed=" + field.isDisplayed() + + ", isShowInGridView=" + field.isShowInGridView() + ", isShownInStatusBar=" + + field.isShowInGridView() + ", hasDefaultValue=" + + (field.getColumn().getDefaultValue() != null) + ", isMandatory=" + + field.getColumn().isMandatory()); + if (isNotActiveOrVisible(field, visibleProperties)) { + log.debug("Only first combo record in " + mode + " mode for column " + col); + value = uiDef.getFieldPropertiesFirstRecord(field, true); + } else { + value = uiDef.getFieldProperties(field, true); + } } } else if (mode.equals("CHANGE") || mode.equals("SETSESSION")) { // On CHANGE and SETSESSION mode, the values are read from the request diff -r 5fe5e1c482f1 -r 76fb3237bc3a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Wed Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Feb 13 05:59:42 2014 +0000 @@ -1537,6 +1537,8 @@ this.selectionUpdated(); } + delete this.view.refreshingData; + // no data and the grid is not visible, only do this is if the // form is not in new mode if (this.data && this.data.getLength() === 0 && !this.isVisible() && !this.view.viewForm.isNew) { diff -r 5fe5e1c482f1 -r 76fb3237bc3a 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 Wed Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Thu Feb 13 05:59:42 2014 +0000 @@ -1383,13 +1383,18 @@ // Calling getContextInfo with (false, true, true) in order to obtain also the value of the // session attributes of the form contextInfo = this.getContextInfo(false, true, true); - isc.addProperties(contextInfo, tabViewPane.sessionAttributes); + this.addSessionAttributes(contextInfo, tabViewPane); if (tabViewPane.showTabIf && !(tabViewPane.showTabIf(contextInfo))) { this.childTabSet.tabBar.members[i].hide(); tabViewPane.hidden = true; } else { if (this.childTabSet.visibility === 'hidden') { this.childTabSet.show(); + if (tabViewPane.showTabIf && !tabViewPane.data && !tabViewPane.refreshingData && tabViewPane.isVisible()) { + // If the child tab does not have data yet, refresh it + tabViewPane.refreshingData = true; + tabViewPane.refresh(); + } } this.childTabSet.tabBar.members[i].show(); tabViewPane.hidden = false; @@ -1421,6 +1426,21 @@ } }, + // Adds to contextInfo the session attributes of the childView, + // unless the session attribute is an auxiliary input of its parent tab + addSessionAttributes: function (contextInfo, childView) { + var auxInputs = {}, + p; + if (this.viewForm && this.viewForm.auxInputs) { + auxInputs = this.viewForm.auxInputs; + } + for (p in childView.sessionAttributes) { + if (childView.sessionAttributes.hasOwnProperty(p) && !auxInputs.hasOwnProperty(p)) { + contextInfo[p] = childView.sessionAttributes[p]; + } + } + }, + // set childs to refresh when they are made visible setChildsToRefresh: function () { var length, i; diff -r 5fe5e1c482f1 -r 76fb3237bc3a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js Wed Feb 12 10:57:29 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js Thu Feb 13 05:59:42 2014 +0000 @@ -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) 2011-2012 Openbravo SLU + * All portions are Copyright (C) 2011-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -51,7 +51,8 @@ // * The plain OB number OB.Utilities.Number.OBMaskedToOBPlain = function (number, decSeparator, groupSeparator) { number = number.toString(); - var plainNumber = number; + var plainNumber = number, + decimalNotation = (number.indexOf('E') !== -1); // Remove group separators if (groupSeparator) { @@ -69,8 +70,8 @@ plainNumber = plainNumber.substring(1, number.length); } - // Remove ending decimal '0' - if (plainNumber.indexOf(decSeparator) !== -1) { + // Remove ending decimal '0' if the number is not expressed in decimal notation + if (plainNumber.indexOf(decSeparator) !== -1 && !decimalNotation) { while (plainNumber.substring(plainNumber.length - 1, plainNumber.length) === '0') { plainNumber = plainNumber.substring(0, plainNumber.length - 1); ------------------------------------------------------------------------------ Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
