details: https://code.openbravo.com/erp/devel/main/rev/fe9b93ae554e changeset: 20226:fe9b93ae554e user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Apr 29 12:02:57 2013 +0200 summary: Fixed issue 23602: Now 'Del' key in grid performs the same action than Toolbat 'Eliminate' button (if exists)
details: https://code.openbravo.com/erp/devel/main/rev/9b5623c3aaf6 changeset: 20227:9b5623c3aaf6 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Mon Apr 29 14:05:40 2013 +0200 summary: Fixes issue 23269: Sales Dimensional Report should show weight UOM details: https://code.openbravo.com/erp/devel/main/rev/2fbca6442d49 changeset: 20228:2fbca6442d49 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Mon Apr 29 14:17:57 2013 +0200 summary: fix int-inc details: https://code.openbravo.com/erp/devel/main/rev/481da426bf53 changeset: 20229:481da426bf53 user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Apr 29 22:08:56 2013 +0800 summary: [calendar] Added customParseCalendarData capabilities details: https://code.openbravo.com/erp/devel/main/rev/23cf0735e7c3 changeset: 20230:23cf0735e7c3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 06 16:17:45 2013 +0200 summary: fixed bug 23653: Incorrect execution time for daily processes scheduled PM - Date format to retrieve next fire time from DB was incorrect (java format instead of SQL one): as this is queried to be consumed internally don't use any configurable formatting but a hardcoded one. - Do not remove next fire time from DB when a process is scheduled. - Added debugging log. details: https://code.openbravo.com/erp/devel/main/rev/fe9816e90756 changeset: 20231:fe9816e90756 user: Martin Taal <martin.taal <at> openbravo.com> date: Mon Apr 29 17:01:03 2013 +0200 summary: Fixes issue 23530: Filtering with a multiple value is not working properly If the reference is a table ref with a display column then use the display column (or in fact its property) as the property to show in the combo box of the filter item, also do the filtering in the grid using this displaycolumn. details: https://code.openbravo.com/erp/devel/main/rev/aae254b2941b changeset: 20232:aae254b2941b user: Jon Alegría <jon.alegria <at> openbravo.com> date: Mon Apr 29 18:10:06 2013 +0200 summary: Fixes issue 0023629: currency order lines does not update its value regarding currency order header details: https://code.openbravo.com/erp/devel/main/rev/64fe941faa56 changeset: 20233:64fe941faa56 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Mon Apr 29 18:19:42 2013 +0200 summary: Fixes issue 23519: In Trial Balance Report 'Page x of y' could not be translated details: https://code.openbravo.com/erp/devel/main/rev/934faa344e9e changeset: 20234:934faa344e9e user: Jon Alegría <jon.alegria <at> openbravo.com> date: Mon Apr 29 18:53:21 2013 +0200 summary: Fixes issue 0022939: Organization of warehouse and organization of storage bins can be different details: https://code.openbravo.com/erp/devel/main/rev/7e9e1cbf3fb3 changeset: 20235:7e9e1cbf3fb3 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Apr 29 19:36:30 2013 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/5521f678e840 changeset: 20236:5521f678e840 user: Martin Taal <martin.taal <at> openbravo.com> date: Mon Apr 29 23:38:48 2013 +0200 summary: Fixes issue 22602: Problem when using the property . _identifier Prevent error if value is already a string details: https://code.openbravo.com/erp/devel/main/rev/467113d4c37a changeset: 20237:467113d4c37a user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Apr 30 10:39:37 2013 +0200 summary: issue 23519: In Trial Balance Report 'Page x of y' could not be translated details: https://code.openbravo.com/erp/devel/main/rev/c29fbfed2534 changeset: 20238:c29fbfed2534 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Apr 30 11:09:35 2013 +0200 summary: backed out changest related to issue 23538 All values for paramters are treated as String, as it is not possible at this point to determine the type they should be. Converting "true" and "false" literals to boolean values can fail in case the property they are compared to is not a boolean. details: https://code.openbravo.com/erp/devel/main/rev/a7efc1231554 changeset: 20239:a7efc1231554 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue Apr 30 11:27:05 2013 +0200 summary: Fixes issue 23675: OBContext initializes properly the user default warehouse If the user did not have a default warehouse defined, OBContext was not initializing the warehouse properly. Instead of using the previosly obtained default organization to fetch the warehouse, it was using any organization in the user accessible tree. This way, the default warehouse could belong to a organization differente than the default organization. To fix this, if a default organization is available, it will use it. If there is no default organization available or if there a no warehouses that belong to the default organization, the user accessible organization tree will be used. details: https://code.openbravo.com/erp/devel/main/rev/235fc11e60ab changeset: 20240:235fc11e60ab user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Apr 30 11:59:49 2013 +0200 summary: Fixes issue 23209: Incorrect State Name loaded in the Region table plus Canada should also include abbreviation values details: https://code.openbravo.com/erp/devel/main/rev/3ea22ca7a348 changeset: 20241:3ea22ca7a348 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Apr 30 20:47:49 2013 +0200 summary: CI: update AD_MODULE to version 20240 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 | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 53 +++- 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/DateUIDefinition.java | 3 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java | 1 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java | 5 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TimeUIDefinition.java | 5 + 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 | 50 ++-- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataEntityQueryService.java | 37 ++- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 53 ++++- 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/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml | 2 +- src-db/database/model/triggers/M_WAREHOUSE_TRG.xml | 3 + src-db/database/sourcedata/AD_MESSAGE.xml | 12 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + src-db/database/sourcedata/referencedData/C_REGION.xml | 40 +- src/org/openbravo/base/secureApp/LoginUtils.java | 12 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql | 31 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 1 + src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml | 15 +- src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml | 96 ++++---- src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml | 110 +++++---- src/org/openbravo/scheduling/OBScheduler.java | 37 +- src/org/openbravo/scheduling/ProcessMonitor.java | 22 +- src/org/openbravo/scheduling/ProcessRequest_data.xsql | 21 +- src/org/openbravo/scheduling/Trigger_data.xsql | 11 +- 67 files changed, 505 insertions(+), 315 deletions(-) diffs (truncated from 2710 to 300 lines): diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Apr 30 20:47:49 2013 +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.20221]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.20240]]></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 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Apr 30 20:47:49 2013 +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.20221]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.20240]]></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.20221]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.20240]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Apr 30 20:47:49 2013 +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.20221]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.20240]]></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 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Apr 30 20:47:49 2013 +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.20221]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.20240]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Apr 30 20:47:49 2013 +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.20221]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.20240]]></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 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Apr 30 20:47:49 2013 +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.20221]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.20240]]></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.20221]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.20240]]></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.20221]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.20240]]></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.20221]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.20240]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Tue Apr 30 20:47:49 2013 +0200 @@ -1056,7 +1056,7 @@ } } } catch (Exception e) { - log.error("Couldn't get the value for column " + columnName); + log.error("Couldn't get the value for column " + columnName, e); } } diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js Tue Apr 30 20:47:49 2013 +0200 @@ -594,6 +594,9 @@ } } } + if (typeof this.calendarProps.customParseCalendarData === 'function') { + calendarData = this.calendarProps.customParseCalendarData(calendarData); + } return calendarData; }, diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js Tue Apr 30 20:47:49 2013 +0200 @@ -58,8 +58,8 @@ // the data from the datasource will contain the id and the identifier // the value for the filter and the display are the same: the identifier - this.displayField = OB.Constants.IDENTIFIER; - this.valueField = OB.Constants.IDENTIFIER; + this.displayField = this.criteriaDisplayField || OB.Constants.IDENTIFIER; + this.valueField = this.criteriaDisplayField || OB.Constants.IDENTIFIER; this.pickListProperties = { @@ -82,12 +82,12 @@ var i, values = this.formItem.getValue(); if (values.length) { for (i = 0; i < values.length; i++) { - if (record[OB.Constants.IDENTIFIER] === values[i]) { + if (record[me.displayField] === values[i]) { return true; } } } - return record[OB.Constants.IDENTIFIER] === values; + return record[me.displayField] === values; }, // override data arrived to prevent the first entry from being @@ -109,7 +109,7 @@ } for (rowNum = startRow; rowNum < (endRow + 1); rowNum++) { record = this.getRecord(rowNum); - if (record && values.contains(record[OB.Constants.IDENTIFIER])) { + if (record && values.contains(record[me.displayField])) { this.selectRecord(record, true); } } @@ -122,11 +122,7 @@ requestProperties: { params: { // distinct forces the distinct query on the server side - _distinct: gridField.valueField || gridField.name, - // identifier is not listed here as it is always send, actually - // the id is also always send, but setting _selectedProperties - // prevents other fields from coming over - _selectedProperties: 'id' + _distinct: gridField.valueField || gridField.name } }, fields: this.pickListFields @@ -240,7 +236,7 @@ }, canEditCriterion: function (criterion) { - return criterion && criterion.fieldName === this.name; + return criterion && (criterion.fieldName === this.name || criterion.fieldName === this.criteriaField); }, getCriterion: function (textMatchStyle) { @@ -291,7 +287,7 @@ // see also the setValuesAsCriteria in ob-grid-js which again translates // back getCriteriaFieldName: function () { - return this.name + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER; + return this.criteriaField || this.name + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER; }, // solve a small bug in the value expressions diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Tue Apr 30 20:47:49 2013 +0200 @@ -1348,9 +1348,8 @@ OB.KeyboardManager.Shortcuts.set('ViewGrid_CancelEditing', ['OBViewGrid.body', 'OBViewGrid.editForm'], ksAction_CancelEditing); ksAction_DeleteSelectedRecords = function () { - var isDeletingEnabled = !me.view.toolBar.getLeftMember(isc.OBToolbar.TYPE_DELETE).disabled; - if (me.getSelectedRecords().length > 0 && isDeletingEnabled) { - me.view.deleteSelectedRows(); + var isRecordDeleted = me.deleteSelectedRowsByToolbarIcon(); + if (isRecordDeleted) { return false; // To avoid keyboard shortcut propagation } else { return true; @@ -2178,29 +2177,43 @@ title: OB.I18N.getLabel('OBUIAPP_Delete'), keyTitle: OB.KeyboardManager.Shortcuts.getProperty('keyComb.text', 'ToolBar_Eliminate', 'id'), click: function () { - // The click action should be the same than the toolbar button, so if this last one is overwritten, this click should perform the same action. - var isToolbarButtonFound = false, - i; - if (grid.view.toolBar && grid.view.toolBar.leftMembers && isc.OBToolbar.TYPE_DELETE) { - for (i = 0; i < grid.view.toolBar.leftMembers.length; i++) { - if (grid.view.toolBar.leftMembers[i].buttonType === isc.OBToolbar.TYPE_DELETE) { - isToolbarButtonFound = true; - grid.view.toolBar.leftMembers[i].action(); - break; - } - } - } - // But if the toolbar button is not found, do the default action - if (!isToolbarButtonFound) { - grid.view.deleteSelectedRows(); - } + grid.deleteSelectedRowsByToolbarIcon(); } }); } - return menuItems; }, + deleteSelectedRowsByToolbarIcon: function () { + // The deleteSelectedRows action trigger should be the same than the toolbar button, so if this last one is overwritten, + // this delete rows logic should perform the same action than the toolbar button. + var grid = this, + isToolbarButtonFound = false, + toolbarButton, i; + if (grid.getSelectedRecords().length < 1) { + return false; + } + if (grid.view.toolBar && grid.view.toolBar.leftMembers && isc.OBToolbar.TYPE_DELETE) { + for (i = 0; i < grid.view.toolBar.leftMembers.length; i++) { + if (grid.view.toolBar.leftMembers[i].buttonType === isc.OBToolbar.TYPE_DELETE) { + isToolbarButtonFound = true; + toolbarButton = grid.view.toolBar.leftMembers[i]; + if (!toolbarButton.disabled) { + toolbarButton.action(); + return true; + } + break; + } + } + } + // But if the toolbar button is not found, do the default action + if (!isToolbarButtonFound) { + grid.view.deleteSelectedRows(); + return true; + } + return false; + }, + // +++++++++++++++++++++++++++++ Record Selection Handling +++++++++++++++++++++++ updateSelectedCountDisplay: function () { var selection = this.getSelection(), diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Tue Apr 30 20:47:49 2013 +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.20221]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.20240]]></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> diff -r 5e5dd4a8b5c0 -r 3ea22ca7a348 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 Sun Apr 28 12:45:45 2013 +0530 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Apr 30 20:47:49 2013 +0200 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.20221]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.20240]]></STARTVERSION> <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> ------------------------------------------------------------------------------ Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET Get 100% visibility into your production application - at no cost. Code-level diagnostics for performance bottlenecks with <2% overhead Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
