details: https://code.openbravo.com/erp/devel/main/rev/9fa863bf7f35 changeset: 23026:9fa863bf7f35 user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon May 12 11:45:41 2014 +0200 summary: Related to issue 24705: Add some comments/help
details: https://code.openbravo.com/erp/devel/main/rev/be00599a33b8 changeset: 23027:be00599a33b8 user: Rafa de Miguel <rafael.demiguel <at> openbravo.com> date: Mon May 12 12:26:29 2014 +0200 summary: Fixed issue: 26509: Is not possible to modify a external module field on table FIN_PAYMENT_DETAIL details: https://code.openbravo.com/erp/devel/main/rev/b96c7d42fc3e changeset: 23028:b96c7d42fc3e user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Mon May 12 13:37:00 2014 +0200 summary: Fixed issue 26505:Reference AD_Language does not show any results Use left join instead an inner join if the property allows null values. details: https://code.openbravo.com/erp/devel/main/rev/c231790422b7 changeset: 23029:c231790422b7 user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Mon May 12 17:03:21 2014 +0200 summary: Fixed issue 25808:Filtering the * organization does not work properly wildCard removed to avoid strange behavior on filtering '*' * character was used as wildCard, on filtering by * org instead of using ==* it was using /glob/* details: https://code.openbravo.com/erp/devel/main/rev/bf8e3af7ae0f changeset: 23030:bf8e3af7ae0f user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon May 12 15:34:49 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/592598efcef0 changeset: 23031:592598efcef0 user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Mon May 12 18:29:49 2014 +0200 summary: Related to issue 26505:AD_Language does not show any results If the path contains a field separator use the previous query details: https://code.openbravo.com/erp/devel/main/rev/e334e962ffca changeset: 23032:e334e962ffca user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon May 12 20:46:03 2014 +0200 summary: Modified Smartclient 10.0d 2014-02-13 SNAPSHOT to fix issue 26515 details: https://code.openbravo.com/erp/devel/main/rev/71ac85d89457 changeset: 23033:71ac85d89457 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue May 13 15:00:15 2014 +0200 summary: Fixed issue 26471: Absolute DateTime Time DatePicker now works ok details: https://code.openbravo.com/erp/devel/main/rev/e7aee54e4fb2 changeset: 23034:e7aee54e4fb2 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon May 12 17:45:19 2014 +0200 summary: Fixed issue 26193 Error while computing auxiliary input showAddPayment details: https://code.openbravo.com/erp/devel/main/rev/786cd7cf325a changeset: 23035:786cd7cf325a user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue May 13 09:54:28 2014 +0200 summary: Fixed issue 26513 Return to Vendor P&E is not working properly details: https://code.openbravo.com/erp/devel/main/rev/0e4ee8136bfb changeset: 23036:0e4ee8136bfb user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Wed May 14 10:09:44 2014 +0200 summary: Fixed issue 26109:SelectorDataSourceFilter-Error evaluating filter expression Filter expression was failing details: https://code.openbravo.com/erp/devel/main/rev/e44119bb1d49 changeset: 23037:e44119bb1d49 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed May 14 13:26:15 2014 +0200 summary: Fixes issue 26544: Auxiliary inputs are not properly calculated in grid view The problem was that: - The FIC needed all the columns used in the auxiliary inputs sent in the FIC request - If those columns where not shown in the grid they were not being sent in the FIC request, so the FIC was not able to compute the auxiliary inputs properly To fix this, all the columns used in the auxiliary inputs of a tab are included as required grid properties. details: https://code.openbravo.com/erp/devel/main/rev/4aa336cd9e83 changeset: 23038:4aa336cd9e83 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu May 15 09:36:00 2014 +0200 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/8d6658b982c0 changeset: 23039:8d6658b982c0 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu May 15 15:18:04 2014 +0000 summary: CI: update AD_MODULE to version 23038 diffstat: .hgsigs | 1 + .hgtags | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml | 15 ++- 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/OBViewGridComponent.java | 59 ++++++++++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 13 ++ 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.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 19 ++- 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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 2 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 9 +- 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_AUXILIARINPUT.xml | 16 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 1 - src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java | 3 +- 53 files changed, 208 insertions(+), 104 deletions(-) diffs (truncated from 1179 to 300 lines): diff -r 086489414e20 -r 8d6658b982c0 .hgsigs --- a/.hgsigs Mon May 12 09:19:51 2014 +0200 +++ b/.hgsigs Thu May 15 15:18:04 2014 +0000 @@ -145,4 +145,5 @@ 2cbbd8417ae97c721014374b56300f9359801fc2 0 iEYEABECAAYFAlLX0sMACgkQCX/oGf+2qkPBDgCeOEYN+sAUu4baZ1tz3jNaubocaCcAoL/oSf0PxmUybuQg3kMSTINTsbOt 43f6f77b25a9c7d51084945606d9047edc330fd9 0 iEYEABECAAYFAlL8iUMACgkQCX/oGf+2qkNl7ACfSjVPsngbBzCPO8LvR265DeT4c/QAni8NT/G2mfMPQIToawozPiOKNtQl 798fae4fdaf127b043499f76df3decadaf36ba62 0 iEYEABECAAYFAlMOzmsACgkQCX/oGf+2qkOFaACeNhkWHX9QfZ2zhxYiyjgbjenzvnkAoIb5zBld70lqFa7N0rOsf32Rb0Lo +54ac6316c5c34c5eb2c4dfa95a504b3ecd5a33cb 0 iEYEABECAAYFAlNw/70ACgkQCX/oGf+2qkMO1wCfbXNv+SWd0NrkIw75mUSyu31zi6cAnRgI/Rj3MoUIu7VDDBhLbZnq21OR 82edc3e63e3d23403efb378924c8e8f991c73cfc 0 iEYEABECAAYFAlNjfr0ACgkQCX/oGf+2qkPLVwCgowJ6SZ7/i3HJzN7KzIEqRxY60+MAoJbXOSIqx3xHRoG/yeZSdSST8zIV diff -r 086489414e20 -r 8d6658b982c0 .hgtags --- a/.hgtags Mon May 12 09:19:51 2014 +0200 +++ b/.hgtags Thu May 15 15:18:04 2014 +0000 @@ -156,4 +156,5 @@ e6661b2604e820c2df1269029e688e49d611a1e7 3.0MP31 510340c73c5073cf20afd52a02e411cebdc017f6 3.0MP31.1 3044ba5dda0c5f188fbea125287005ef4b06ee76 3.0MP31.2 +70267e407fec28ae0268e89686dfe6e551614d16 3.0MP31.3 2dac23c5332cf7fab337385841dcd65e9eaf78c0 3.0PR14Q2 diff -r 086489414e20 -r 8d6658b982c0 modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml Mon May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml Thu May 15 15:18:04 2014 +0000 @@ -41,9 +41,18 @@ WHERE FIN_Payment_ID=v_FIN_Payment_ID; IF (UPDATING) THEN - IF (v_Processed='Y') THEN - RAISE_APPLICATION_ERROR(-20000, '@20501@'); - END IF; + IF(v_Processed='Y' AND ((COALESCE(:OLD.FIN_PAYMENT_ID, '0') <> COALESCE(:NEW.FIN_PAYMENT_ID, '0')) + OR(COALESCE(:OLD.AMOUNT, 0) <> COALESCE(:NEW.AMOUNT, 0)) + OR(COALESCE(:OLD.REFUND, '.') <> COALESCE(:NEW.REFUND, '.')) + OR(COALESCE(:OLD.WRITEOFFAMT, 0) <> COALESCE(:NEW.WRITEOFFAMT, 0)) + OR(COALESCE(:OLD.C_GLITEM_ID, '0') <> COALESCE(:NEW.C_GLITEM_ID, '0')) + OR(COALESCE(:OLD.ISPREPAYMENT, '.') <> COALESCE(:NEW.ISPREPAYMENT, '.')) + OR(COALESCE(:OLD.FIN_PAYMENT_DETAIL_ID, '0') <> COALESCE(:NEW.FIN_PAYMENT_DETAIL_ID, '0')) + OR(COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0')) + OR(COALESCE(:OLD.AD_CLIENT_ID, '0') <> COALESCE(:NEW.AD_CLIENT_ID, '0')) + )) THEN + RAISE_APPLICATION_ERROR(-20000, '@20501@') ; + END IF; END IF; IF((DELETING OR INSERTING) AND v_Processed='Y') THEN diff -r 086489414e20 -r 8d6658b982c0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu May 15 15:18:04 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.23002]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.23038]]></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 086489414e20 -r 8d6658b982c0 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 May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 15 15:18:04 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.23002]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.23038]]></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.23002]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.23038]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 086489414e20 -r 8d6658b982c0 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 May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu May 15 15:18:04 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.23002]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.23038]]></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 086489414e20 -r 8d6658b982c0 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 May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 15 15:18:04 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.23002]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.23038]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 086489414e20 -r 8d6658b982c0 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 May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu May 15 15:18:04 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.23002]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.23038]]></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 086489414e20 -r 8d6658b982c0 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 May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 15 15:18:04 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.23002]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.23038]]></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.23002]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.23038]]></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.23002]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.23038]]></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.23002]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.23038]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 086489414e20 -r 8d6658b982c0 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java Mon May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java Thu May 15 15:18:04 2014 +0000 @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; +import org.hibernate.criterion.Restrictions; import org.openbravo.base.model.Entity; import org.openbravo.base.model.ModelProvider; import org.openbravo.base.model.Property; @@ -37,9 +38,11 @@ import org.openbravo.client.kernel.Template; import org.openbravo.dal.core.DalUtil; import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.dal.service.OBQuery; import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.model.ad.ui.AuxiliaryInput; import org.openbravo.model.ad.ui.Tab; import org.openbravo.model.common.order.Order; import org.openbravo.model.common.order.OrderLine; @@ -306,6 +309,12 @@ requiredGridProperties.add(storedInSessionProperty); } + // Include the properties used in the auxiliary inputs of this tab + List<String> propertiesUsedInAuxiliaryInputs = getPropertiesUsedInAuxiliaryInputs(); + for (String propertyUsedInAuxiliaryInputs : propertiesUsedInAuxiliaryInputs) { + requiredGridProperties.add(propertyUsedInAuxiliaryInputs); + } + // Include the Processing and Processed propertes, required by doc action buttons (see // https://issues.openbravo.com/view.php?id=25460) if (getViewTab().getFieldHandler().hasProcessNowProperty()) { @@ -318,6 +327,56 @@ return requiredGridProperties; } + /** + * @return the list of properties that belong to this entity and that are used in auxiliary inputs + * declared for this tab + */ + private List<String> getPropertiesUsedInAuxiliaryInputs() { + OBCriteria<AuxiliaryInput> criteria = OBDal.getInstance().createCriteria(AuxiliaryInput.class); + criteria.add(Restrictions.eq(AuxiliaryInput.PROPERTY_TAB, tab)); + List<AuxiliaryInput> auxInputs = criteria.list(); + boolean throwExceptionIfNotExists = false; + List<String> propertiesUsedInAuxiliaryInputs = new ArrayList<String>(); + for (AuxiliaryInput auxInput : auxInputs) { + List<String> possibleColumns = parseAuxInputCode(auxInput.getValidationCode()); + for (String columnName : possibleColumns) { + Property property = entity.getPropertyByColumnName(columnName, throwExceptionIfNotExists); + if (property != null) { + propertiesUsedInAuxiliaryInputs.add(property.getName()); + } + } + } + return propertiesUsedInAuxiliaryInputs; + } + + /** + * Returns the list of tokens that appear between '@' in a validation code + * + * @param validationCode + * the validation code where the '@' token '@' substrings will be looked for in + * @return the list of tokens that appear between '@' in a validation code + */ + private List<String> parseAuxInputCode(String validationCode) { + List<String> possibleProperties = new ArrayList<String>(); + String token = validationCode; + int i = token.indexOf("@"); + while (i != -1) { + token = token.substring(i + 1); + if (!token.startsWith("SQL")) { + i = token.indexOf("@"); + if (i != -1) { + String strAux = token.substring(0, i); + token = token.substring(i + 1); + if (!possibleProperties.contains(strAux)) { + possibleProperties.add(strAux); + } + } + } + i = token.indexOf("@"); + } + return possibleProperties; + } + private String getLinkToParentPropertyName() { Tab parentTab = KernelUtils.getInstance().getParentTab(tab); if (parentTab == null) { diff -r 086489414e20 -r 8d6658b982c0 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 Mon May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js Thu May 15 15:18:04 2014 +0000 @@ -328,10 +328,11 @@ }, getPickerData: function () { - var date = this.getValue(), - utcDate, utcMonth, utcFullYear, utcHours, utcMinutes, utcSeconds; + var dateValue = this.getValue(), + date, utcDate, utcMonth, utcFullYear, utcHours, utcMinutes, utcSeconds; // To visualize in the calendar the displayed value instead of internal value, since due to the GMT difference it can be in a different day - if (this.isAbsoluteDateTime && isc.isA.Date(date)) { + if (this.isAbsoluteDateTime && isc.isA.Date(dateValue)) { + date = new Date(dateValue); utcDate = date.getUTCDate(); utcMonth = date.getUTCMonth(); utcFullYear = date.getUTCFullYear(); @@ -349,6 +350,8 @@ date.setHours(utcHours); date.setMinutes(utcMinutes); date.setSeconds(utcSeconds); + } else { + date = dateValue; } if (isc.isA.Date(date)) { return date; diff -r 086489414e20 -r 8d6658b982c0 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 May 12 09:19:51 2014 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Thu May 15 15:18:04 2014 +0000 @@ -680,8 +680,13 @@ this.standardWindow.addView(childView); if (this.childTabSet.tabs.length > 0) { + // If it is a child tab that is not in the first position, load a basic child view + // to ensure a lazy inizialitazion of the contents. + // Once the tab be selected, the proper content will be loaded. this.prepareBasicChildView(childView); } else { + // If the child tab is in first position, the content needs to be displayed immediately + // once the parent view is loaded. this.prepareFullChildView(childView); } @@ -692,6 +697,11 @@ OB.TestRegistry.register('org.openbravo.client.application.ChildTab_' + this.tabId + '_' + childView.tabId, childView.tab); }, + // ** {{{ prepareBasicChildView }}} ** + // It adds a tab with a basic layout. Once the tab is selected/set as active + // a call to 'prepareFullChildView' is performed. The purpose of this view + // is have a lazy initialization of the tab, so the proper content is + // loaded only when it is required. prepareBasicChildView: function (childView) { var me = this; ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
