details: https://code.openbravo.com/erp/devel/main/rev/5fdf47cc9185 changeset: 13629:5fdf47cc9185 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Aug 31 12:03:48 2011 +0200 summary: Fixed issue 18397. False changes will no longer be shown on export.config.script
details: https://code.openbravo.com/erp/devel/main/rev/073bf9bf00fe changeset: 13630:073bf9bf00fe user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Aug 31 15:28:11 2011 +0200 summary: Fixed issue 15728. The following changes have been made: - The logic which gets the image and sends it to the client has been moved to a series of methods in the new ImageUtils class - ShowImage and ShowImageLogo now use this class - An ETag is now calculated when an image is sent. This ETag is based on the audit information of the image object. - If the ETag is sent in the request, and is equal to the current ETag of the image, then the image is now sent, because it hasn't changed. details: https://code.openbravo.com/erp/devel/main/rev/14d6a595b956 changeset: 13631:14d6a595b956 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Aug 31 15:51:58 2011 +0200 summary: Related to issue 15728. Added admin mode. Made new class non-public (because it's only needed in the Image servlets) details: https://code.openbravo.com/erp/devel/main/rev/48e8f481dcfc changeset: 13632:48e8f481dcfc user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Aug 31 16:36:41 2011 +0200 summary: Fixed some code formatting details: https://code.openbravo.com/erp/devel/main/rev/153b8abe678a changeset: 13633:153b8abe678a user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Aug 31 17:19:02 2011 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/16d51ad008c0 changeset: 13634:16d51ad008c0 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Aug 31 17:56:10 2011 +0200 summary: Fixed jslint problem details: https://code.openbravo.com/erp/devel/main/rev/b9c2bbdb1ae6 changeset: 13635:b9c2bbdb1ae6 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Aug 31 17:58:02 2011 +0200 summary: Fixed issue 16919. Now the number of notes in a record will be shown. details: https://code.openbravo.com/erp/devel/main/rev/0324c4da6bd2 changeset: 13636:0324c4da6bd2 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Aug 31 18:05:14 2011 +0200 summary: Related to issue 15728. Added information about the contributor (Francois Le Roux) details: https://code.openbravo.com/erp/devel/main/rev/144538d99c98 changeset: 13637:144538d99c98 user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Aug 31 20:06:35 2011 +0200 summary: Fixed issue 18395: Now date is right calculated also the 31th of each month details: https://code.openbravo.com/erp/devel/main/rev/8608083895a6 changeset: 13638:8608083895a6 user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Aug 31 20:54:22 2011 +0200 summary: Fixes issue 18381: Forms personalization does not persist personalized layout Store personalization on window class level and update when the user changes the layout details: https://code.openbravo.com/erp/devel/main/rev/ecb8f9e371a5 changeset: 13639:ecb8f9e371a5 user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Aug 31 23:13:41 2011 +0200 summary: Related to issue 18227: Closing a tab doesn't release all objects Workaround for not cleaning date range item content details: https://code.openbravo.com/erp/devel/main/rev/f486e74d6d83 changeset: 13640:f486e74d6d83 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Aug 31 10:53:40 2011 +0200 summary: Fixes issue 18270: User Contact shown instead of Sales Representative. details: https://code.openbravo.com/erp/devel/main/rev/7f5542d9f0b5 changeset: 13641:7f5542d9f0b5 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Aug 31 13:05:48 2011 +0200 summary: Fixes issue 18272: It would be nice to have default values in mandatory fields. details: https://code.openbravo.com/erp/devel/main/rev/6b7e3ac301b9 changeset: 13642:6b7e3ac301b9 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Sep 01 14:26:26 2011 +0200 summary: CI: update AD_MODULE to version 13641 diffstat: CONTRIBUTORS | 1 + 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 | 24 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 47 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 15 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 19 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js | 22 +- 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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 20 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 4 +- 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/lib/dbsourcemanager.jar | 0 src-db/database/sourcedata/AD_MODULE.xml | 4 +- src/org/openbravo/erpCommon/utility/ImageUtils.java | 183 ++++++++++ src/org/openbravo/erpCommon/utility/ShowImage.java | 42 +-- src/org/openbravo/erpCommon/utility/ShowImageLogo.java | 68 +--- 56 files changed, 421 insertions(+), 238 deletions(-) diffs (truncated from 1661 to 300 lines): diff -r 3b5f56734bca -r 6b7e3ac301b9 CONTRIBUTORS --- a/CONTRIBUTORS Wed Aug 31 10:40:02 2011 +0200 +++ b/CONTRIBUTORS Thu Sep 01 14:26:26 2011 +0200 @@ -13,3 +13,4 @@ Sreedhar Sirigiri TDS - provided deep linking with filter clause Mallikarjun M TDS - provided deep linking with filter clause Shankar Balachandran <[email protected]> - Bug fixing +Francois Le Roux - <[email protected]> - Bug fixing and documentation diff -r 3b5f56734bca -r 6b7e3ac301b9 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 01 14:26:26 2011 +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.13622]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.13641]]></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 3b5f56734bca -r 6b7e3ac301b9 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 Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 01 14:26:26 2011 +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.13622]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.13641]]></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.13622]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.13641]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b5f56734bca -r 6b7e3ac301b9 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 Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 01 14:26:26 2011 +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.13622]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.13641]]></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 3b5f56734bca -r 6b7e3ac301b9 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 Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 01 14:26:26 2011 +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.13622]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.13641]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b5f56734bca -r 6b7e3ac301b9 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 Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 01 14:26:26 2011 +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.13622]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.13641]]></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 3b5f56734bca -r 6b7e3ac301b9 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 Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 01 14:26:26 2011 +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.13622]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.13641]]></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.13622]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.13641]]></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.13622]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.13641]]></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.13622]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.13641]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b5f56734bca -r 6b7e3ac301b9 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 Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Thu Sep 01 14:26:26 2011 +0200 @@ -49,6 +49,7 @@ import org.openbravo.base.structure.ClientEnabled; import org.openbravo.base.structure.OrganizationEnabled; import org.openbravo.client.application.DynamicExpressionParser; +import org.openbravo.client.application.Note; import org.openbravo.client.application.window.servlet.CalloutHttpServletResponse; import org.openbravo.client.application.window.servlet.CalloutServletConfig; import org.openbravo.client.kernel.BaseActionHandler; @@ -247,14 +248,18 @@ long t7 = System.currentTimeMillis(); List<JSONObject> attachments = attachmentForRows(tab, rowId, multipleRowIds); + // Notes information + long t8 = System.currentTimeMillis(); + int noteCount = computeNoteCount(tab, rowId); + // Construction of the final JSONObject - long t8 = System.currentTimeMillis(); + long t9 = System.currentTimeMillis(); JSONObject finalObject = buildJSONObject(mode, tab, columnValues, row, changeEventCols, - calloutMessages, attachments, jsExcuteCode, hiddenInputs); - long t9 = System.currentTimeMillis(); + calloutMessages, attachments, jsExcuteCode, hiddenInputs, noteCount); + long t10 = System.currentTimeMillis(); log.debug("Elapsed time: " + (System.currentTimeMillis() - iniTime) + "(" + (t2 - t1) + "," + (t3 - t2) + "," + (t4 - t3) + "," + (t5 - t4) + "," + (t6 - t5) + "," + (t7 - t6) + "," - + (t8 - t7) + "," + (t9 - t8) + ")"); + + (t8 - t7) + "," + (t9 - t8) + "," + (t10 - t9) + ")"); log.debug("Attachment exists: " + finalObject.getBoolean("attachmentExists")); return finalObject; } catch (Throwable t) { @@ -271,6 +276,13 @@ return null; } + private int computeNoteCount(Tab tab, String rowId) { + OBCriteria<Note> criteria = OBDao.getFilteredCriteria(Note.class, + Restrictions.eq("table.id", (String) DalUtil.getId(tab.getTable())), + Restrictions.eq("record", rowId)); + return criteria.count(); + } + private List<String> convertJSONArray(JSONArray jsonArray) { List<String> visibleProperties = new ArrayList<String>(); for (int i = 0; i < jsonArray.length(); i++) { @@ -312,7 +324,8 @@ private JSONObject buildJSONObject(String mode, Tab tab, Map<String, JSONObject> columnValues, BaseOBObject row, List<String> changeEventCols, List<JSONObject> calloutMessages, - List<JSONObject> attachments, List<String> jsExcuteCode, Map<String, Object> hiddenInputs) { + List<JSONObject> attachments, List<String> jsExcuteCode, Map<String, Object> hiddenInputs, + int noteCount) { JSONObject finalObject = new JSONObject(); try { if (mode.equals("NEW") || mode.equals("CHANGE")) { @@ -407,6 +420,7 @@ finalObject.put("_readOnly", true); } } + finalObject.put("noteCount", noteCount); } finalObject.put("attachments", new JSONArray(attachments)); finalObject.put("attachmentExists", attachments.size() > 0); diff -r 3b5f56734bca -r 6b7e3ac301b9 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js Wed Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js Thu Sep 01 14:26:26 2011 +0200 @@ -175,9 +175,7 @@ } }; -isc.OBDateItem.addProperties(OB.DateItemProperties, - { - +isc.OBDateItem.addProperties(OB.DateItemProperties, { validateOnExit: true, init: function() { @@ -205,28 +203,27 @@ }, validateOBDateItem: function(value){ - var dateValue = OB.Utilities.Date.OBToJS(value, this.dateFormat); - var isValid = true; - if (this.getValue() && dateValue === null) { - isValid = false; - } - var isRequired = this.required; - if (isValid === false) { - return false; - } else if (isRequired === true && value === null) { - return false; - } - return true; - }, - - validators: [{ - type: 'custom', - condition: function(item, validator, value){ - return item.validateOBDateItem(value); - } - }] - } -); + var dateValue = OB.Utilities.Date.OBToJS(value, this.dateFormat); + var isValid = true; + if (this.getValue() && dateValue === null) { + isValid = false; + } + var isRequired = this.required; + if (isValid === false) { + return false; + } else if (isRequired === true && value === null) { + return false; + } + return true; + }, + + validators: [{ + type: 'custom', + condition: function(item, validator, value){ + return item.validateOBDateItem(value); + } + }] +}); OB.I18N.getLabel('OBUIAPP_InvalidValue', null, isc.OBDateItem, 'invalidValueLabel'); OB.I18N.getLabel('OBUISC_Validator.requiredField', null, isc.OBDateItem, 'requiredValueLabel'); diff -r 3b5f56734bca -r 6b7e3ac301b9 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js Wed Aug 31 10:40:02 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js Thu Sep 01 14:26:26 2011 +0200 @@ -149,7 +149,13 @@ rangeDialogDefaults: { _constructor: 'DateRangeDialog', autoDraw: false, - destroyOnClose: false + destroyOnClose: false, + clear: function() { + if (this.destroying) { + return; + } + this.Super('clear', arguments); + } }, fromDateOnlyPrefix: OB.I18N.getLabel('OBUIAPP_fromDateOnlyPrefix'), toDateOnlyPrefix: OB.I18N.getLabel('OBUIAPP_toDateOnlyPrefix'), @@ -197,7 +203,9 @@ this.rangeItem.name = this.name; // this call super.init - this.doInit(); + if (this.doInit) { + this.doInit(); + } }, blurValue: function() { @@ -436,5 +444,27 @@ formatDate: function(dt) { return OB.Utilities.Date.JSToOB(dt, OB.Format.date); + }, + + // TODO: the destroy and clear can be removed + // after upgrading to a SC release after mid-august 2011 + destroy: function() { + this.destroying = true; + if (this.rangeDialog) { + this.rangeDialog.rangeForm.destroy(); + this.rangeDialog.mainLayout.destroy(); + this.rangeDialog.destroying = true; + this.rangeDialog.destroy(); + this.rangeDialog.destroying = false; + } + this.Super('destroy', arguments); + this.destroying = false; + }, + + clear: function() { + if (this.destroying) { + return; + } ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
