details: https://code.openbravo.com/erp/devel/pi/rev/b10d1c33cb91 changeset: 16947:b10d1c33cb91 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Jun 22 23:56:47 2012 +0200 summary: Fixes issue 20844: Implement computed column/property Implement computed property functionality
details: https://code.openbravo.com/erp/devel/pi/rev/faf4c7e94fe0 changeset: 16948:faf4c7e94fe0 user: Martin Taal <martin.taal <at> openbravo.com> date: Mon Jun 25 16:20:17 2012 +0200 summary: Related to issue 20844: Implement computed column/property details: https://code.openbravo.com/erp/devel/pi/rev/384c5639ce4e changeset: 16949:384c5639ce4e user: Martin Taal <martin.taal <at> openbravo.com> date: Mon Jun 25 16:20:34 2012 +0200 summary: Merged heads details: https://code.openbravo.com/erp/devel/pi/rev/aaf48c671a31 changeset: 16950:aaf48c671a31 user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Jun 26 10:20:43 2012 +0200 summary: Related to issue 20844: Implement computed column/property details: https://code.openbravo.com/erp/devel/pi/rev/7b8c50784095 changeset: 16951:7b8c50784095 user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Jun 26 10:20:57 2012 +0200 summary: Merged heads details: https://code.openbravo.com/erp/devel/pi/rev/f9fc2716d896 changeset: 16952:f9fc2716d896 user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Jun 26 16:02:34 2012 +0200 summary: Merged Heads details: https://code.openbravo.com/erp/devel/pi/rev/890545ef63e0 changeset: 16953:890545ef63e0 user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Jun 26 20:21:46 2012 +0200 summary: Merged heads details: https://code.openbravo.com/erp/devel/pi/rev/fc754bb05af2 changeset: 16954:fc754bb05af2 user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Jun 27 08:56:17 2012 +0200 summary: Merged heads diffstat: .hgsigs | 1 + .hgtags | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 3 +- 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 | 3 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 3 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/FieldHandler.java | 10 + modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 27 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 3 +- 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 | 3 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl | 96 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 3 +- 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 | 3 +- 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 | 3 +- 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 | 3 +- 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 | 3 +- 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 | 3 +- 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 | 3 +- 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 | 3 +- 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 | 3 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 3 +- 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 | 3 +- 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 | 3 +- 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 | 3 +- 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 | 3 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/configScript.xml | 4 - modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 3 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 2 +- src-db/database/model/functions/GL_JOURNAL_POST.xml | 10 +- src-db/database/model/tables/AD_COLUMN.xml | 4 + src-db/database/model/tables/AD_MODULE.xml | 5 + src-db/database/model/tables/AD_MODULE_INSTALL.xml | 5 + src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml | 1 + src-db/database/sourcedata/AD_COLUMN.xml | 105 +++- src-db/database/sourcedata/AD_ELEMENT.xml | 24 + src-db/database/sourcedata/AD_FIELD.xml | 53 + src-db/database/sourcedata/AD_MODULE.xml | 3 +- src-test/org/openbravo/test/dal/DalPerformanceExampleTest.java | 30 + src/org/openbravo/base/model/Column.hbm.xml | 1 + src/org/openbravo/base/model/Column.java | 10 + src/org/openbravo/base/model/ModelProvider.java | 3 +- src/org/openbravo/base/model/Property.java | 11 + src/org/openbravo/dal/core/DalMappingGenerator.java | 23 +- src/org/openbravo/dal/core/TriggerHandler.java | 4 +- src/org/openbravo/dal/security/OrganizationStructureProvider.java | 81 ++ src/org/openbravo/erpCommon/obps/ActivationKey.java | 10 + src/org/openbravo/financial/FinancialUtils.java | 273 ++++++++++ 70 files changed, 841 insertions(+), 147 deletions(-) diffs (truncated from 2274 to 300 lines): diff -r d41c49f86b66 -r fc754bb05af2 .hgsigs --- a/.hgsigs Fri Jun 22 23:24:09 2012 +0200 +++ b/.hgsigs Wed Jun 27 08:56:17 2012 +0200 @@ -72,3 +72,4 @@ 80da674a77f9339af5985c3ca3aa7fb7f817a114 0 iEYEABECAAYFAk+qnzoACgkQCX/oGf+2qkPyuQCfaHkf4c4QgZar7nuCzp84iUkxWPsAoOQyyXYJaWZwwbjUBzoPNbRIBLLE a34b12cbb8a43db069a8ea2caab186b90ab2b8b5 0 iEYEABECAAYFAk++B4UACgkQCX/oGf+2qkNwWQCg2FdpFCBmDEU/VvuZskSHu1WB7A0AoNL6MUMZcwO8Uy37kn1kfliFCFyF 358b14e92651ccf4e020a1420bd0b25b662f35ba 0 iEYEABECAAYFAk+0CeUACgkQCX/oGf+2qkMSIQCg8m8XwFqk/oFw5Cq1odJNq3ZiHIEAn2MHDVw5hRV7eD+c/zNOnQnAnp1n +3680c0f596f2fe0f97d8bb1aeb84e2c314124542 0 iEYEABECAAYFAk/ipvEACgkQCX/oGf+2qkNetgCgyHS5dvbLKKKbSN/Qo4Psv2PvI80AmwQczT1lS/sxnlMJV/RDtj+2y4U+ diff -r d41c49f86b66 -r fc754bb05af2 .hgtags --- a/.hgtags Fri Jun 22 23:24:09 2012 +0200 +++ b/.hgtags Wed Jun 27 08:56:17 2012 +0200 @@ -83,3 +83,4 @@ 35a1ec14c74d970e083b2d195ea2eed784d5ac1c 3.0MP10.2 40c4dd7ff48945d073007753a5f296207c0c0f22 3.0MP10.3 f96fd5be357082854f418944e69fb406ae0dcda6 3.0MP11 +2781e1fb77af40758a1e18d97f609c05a130a4e6 3.0MP12 diff -r d41c49f86b66 -r fc754bb05af2 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Jun 27 08:56:17 2012 +0200 @@ -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.16731]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.16943]]></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> @@ -27,6 +27,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> </data> diff -r d41c49f86b66 -r fc754bb05af2 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 Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jun 27 08:56:17 2012 +0200 @@ -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.16731]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.16943]]></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.16731]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.16943]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r d41c49f86b66 -r fc754bb05af2 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 Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Jun 27 08:56:17 2012 +0200 @@ -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.16731]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16943]]></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> @@ -24,6 +24,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO> <!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> +<!--C70732EA90A14EC0916078B85CC33D2D--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE> </data> diff -r d41c49f86b66 -r fc754bb05af2 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 Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jun 27 08:56:17 2012 +0200 @@ -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.16731]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16943]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r d41c49f86b66 -r fc754bb05af2 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 Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Wed Jun 27 08:56:17 2012 +0200 @@ -5865,7 +5865,7 @@ <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> -<!--CD3A95C8A05D45A0A2B6D250E9C83170--> <POSITION><![CDATA[50]]></POSITION> +<!--CD3A95C8A05D45A0A2B6D250E9C83170--> <POSITION><![CDATA[51]]></POSITION> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r d41c49f86b66 -r fc754bb05af2 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 Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Jun 27 08:56:17 2012 +0200 @@ -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.16731]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16943]]></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> @@ -24,6 +24,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE> </data> diff -r d41c49f86b66 -r fc754bb05af2 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 Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jun 27 08:56:17 2012 +0200 @@ -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.16731]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.16943]]></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.16731]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.16943]]></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.16731]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.16943]]></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.16731]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.16943]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r d41c49f86b66 -r fc754bb05af2 modules/org.openbravo.client.application/src/org/openbravo/client/application/event/FieldHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/FieldHandler.java Fri Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/FieldHandler.java Wed Jun 27 08:56:17 2012 +0200 @@ -50,6 +50,7 @@ return; } setColumn(event); + setIgnoreInWad(event); } public void onNew(@Observes EntityNewEvent event) { @@ -57,6 +58,15 @@ return; } setColumn(event); + setIgnoreInWad(event); + } + + // must be called after setcolumn + private void setIgnoreInWad(EntityPersistenceEvent event) { + final Column column = (Column) event.getCurrentState(getColumnProperty()); + if (column.getSqllogic() != null) { + event.setCurrentState(getIgnoreInWadProperty(), true); + } } private void setColumn(EntityPersistenceEvent event) { diff -r d41c49f86b66 -r fc754bb05af2 modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java Fri Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java Wed Jun 27 08:56:17 2012 +0200 @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -352,14 +353,25 @@ languageId = pickLanguage(); } final boolean isDefault; + String defaultRoleProperty = null; + boolean setOnlyRole = false; if (json.has("default")) { isDefault = json.getBoolean("default"); + if (json.has("defaultRoleProperty")) { + setOnlyRole = true; + defaultRoleProperty = json.getString("defaultRoleProperty"); + } } else { isDefault = false; } + if (StringUtils.isEmpty(defaultRoleProperty)) { + defaultRoleProperty = User.PROPERTY_DEFAULTROLE; + } + new UserSessionSetter().resetSession(request, isDefault, OBContext.getOBContext().getUser() - .getId(), roleId, clientId, orgId, languageId, warehouseId); + .getId(), roleId, clientId, orgId, languageId, warehouseId, defaultRoleProperty, + setOnlyRole); return ApplicationConstants.ACTION_RESULT_SUCCESS; } @@ -397,8 +409,8 @@ private static final long serialVersionUID = 1L; private void resetSession(HttpServletRequest request, boolean isDefault, String userId, - String roleId, String clientId, String organizationId, String languageId, String warehouseId) - throws Exception { + String roleId, String clientId, String organizationId, String languageId, + String warehouseId, String defaultRoleProperty, boolean setOnlyRole) throws Exception { final VariablesSecureApp vars = new VariablesSecureApp(request); // refresh final Language language = OBDal.getInstance().get(Language.class, languageId); if (language.isRTLLanguage()) { @@ -409,10 +421,13 @@ if (isDefault) { final User user = OBDal.getInstance().get(User.class, userId); - user.setDefaultClient(OBDal.getInstance().get(Client.class, clientId)); - user.setDefaultOrganization(OBDal.getInstance().get(Organization.class, organizationId)); - user.setDefaultRole(OBDal.getInstance().get(Role.class, roleId)); + user.set(defaultRoleProperty, OBDal.getInstance().get(Role.class, roleId)); user.setDefaultLanguage(OBDal.getInstance().get(Language.class, languageId)); + if (!setOnlyRole) { + user.setDefaultClient(OBDal.getInstance().get(Client.class, clientId)); + user.setDefaultOrganization(OBDal.getInstance().get(Organization.class, organizationId)); + } + if (warehouseId != null) { user.setDefaultWarehouse(OBDal.getInstance().get(Warehouse.class, warehouseId)); } diff -r d41c49f86b66 -r fc754bb05af2 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java Fri Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java Wed Jun 27 08:56:17 2012 +0200 @@ -1064,6 +1064,9 @@ if (field.getProperty() != null && field.getProperty().contains(".")) { return true; } + if (field.getColumn().getSqllogic() != null) { + return true; + } return getParentProperty() || field.isReadOnly(); } diff -r d41c49f86b66 -r fc754bb05af2 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js Fri Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js Wed Jun 27 08:56:17 2012 +0200 @@ -193,7 +193,7 @@ } } if (alertRuleIds !== '') { - whereClause += ' and alertRule.id in (' + alertRuleIds + ')'; + whereClause += ' and e.alertRule.id in (' + alertRuleIds + ')'; } else { whereClause += ' and 1=2'; } diff -r d41c49f86b66 -r fc754bb05af2 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Fri Jun 22 23:24:09 2012 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Wed Jun 27 08:56:17 2012 +0200 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16731]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16943]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> @@ -23,6 +23,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> <!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> +<!--D393BE6F22BB44B7B728259B34FC795A--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE> </data> diff -r d41c49f86b66 -r fc754bb05af2 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Jun 22 23:24:09 2012 +0200 ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
