details: https://code.openbravo.com/erp/devel/main/rev/0b033ca5bd1b changeset: 22294:0b033ca5bd1b user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Feb 20 18:24:02 2014 +0100 summary: Fixed bug 23412 Stock reservation pick&edit with manual datasource
details: https://code.openbravo.com/erp/devel/main/rev/2fc504a99106 changeset: 22295:2fc504a99106 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Feb 20 18:38:37 2014 +0100 summary: Fixed bug 25814 Return to vendor pick&edit with manual datasource details: https://code.openbravo.com/erp/devel/main/rev/bda5291496b8 changeset: 22296:bda5291496b8 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Feb 21 11:02:09 2014 +0100 summary: Related to issue 23412, related to issue 25814 details: https://code.openbravo.com/erp/devel/main/rev/3e2ab0ee70e8 changeset: 22297:3e2ab0ee70e8 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Feb 24 16:56:34 2014 +0100 summary: Related to issue 23412, related to issue 25814 details: https://code.openbravo.com/erp/devel/main/rev/67b8e22d232e changeset: 22298:67b8e22d232e user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Feb 27 18:22:52 2014 +0100 summary: Fixed bug 25861 Return from customer pick&edit with manual datasource details: https://code.openbravo.com/erp/devel/main/rev/5ce718ea6472 changeset: 22299:5ce718ea6472 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Feb 28 10:56:20 2014 +0100 summary: Related to issue 25861 details: https://code.openbravo.com/erp/devel/main/rev/162d8aefb9f2 changeset: 22300:162d8aefb9f2 user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Feb 14 12:57:58 2014 +1200 summary: [absref] Added 'Absolute Time' and 'Absolute DateTime' references details: https://code.openbravo.com/erp/devel/main/rev/c1a87b90ba8a changeset: 22301:c1a87b90ba8a user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Feb 17 08:48:01 2014 +1200 summary: [absref] Improved logic in fixedTime + isAbsoluteDateTime cases details: https://code.openbravo.com/erp/devel/main/rev/3982a419b1d8 changeset: 22302:3982a419b1d8 user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Feb 17 08:50:22 2014 +1200 summary: [absref] Removed not used *fixedTime: '24:00:00'* case details: https://code.openbravo.com/erp/devel/main/rev/5c74223303e2 changeset: 22303:5c74223303e2 user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Feb 17 08:53:12 2014 +1200 summary: [absref] Moved all 'fixedTime' logic to 'parseEditorValue' and 'formatEditorValue' details: https://code.openbravo.com/erp/devel/main/rev/dc5a65376ade changeset: 22304:dc5a65376ade user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Feb 25 06:50:53 2014 +1200 summary: [absref] 'fixedTime' and 'showTime' now work ok details: https://code.openbravo.com/erp/devel/main/rev/7e4e3bc22b97 changeset: 22305:7e4e3bc22b97 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Feb 25 07:40:23 2014 +1200 summary: [absref] Added a couple of comments details: https://code.openbravo.com/erp/devel/main/rev/09d852389fd3 changeset: 22306:09d852389fd3 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Feb 25 12:30:07 2014 +0100 summary: [absref] Fixed problem displaying the Abs DateTime in grid view details: https://code.openbravo.com/erp/devel/main/rev/495de4ac663b changeset: 22307:495de4ac663b user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Feb 25 16:43:23 2014 +0100 summary: [absref] Now FIC response takes into account the absolute datetime details: https://code.openbravo.com/erp/devel/main/rev/088159df9f6a changeset: 22308:088159df9f6a user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Feb 25 17:27:23 2014 +0100 summary: [absref] Moved timezoneOffset operations to ob-utilities-date details: https://code.openbravo.com/erp/devel/main/rev/64c552c0fa62 changeset: 22309:64c552c0fa62 user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Feb 26 17:18:43 2014 +0100 summary: [absref] Removed patch until the issue with 'DateTime' be fixed details: https://code.openbravo.com/erp/devel/main/rev/5b164f77150b changeset: 22310:5b164f77150b user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Feb 26 17:46:23 2014 +0100 summary: [absref] Merge from pi details: https://code.openbravo.com/erp/devel/main/rev/7aef5632c511 changeset: 22311:7aef5632c511 user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Feb 26 18:08:41 2014 +0100 summary: [absref] Merge from pi details: https://code.openbravo.com/erp/devel/main/rev/c4dddc513484 changeset: 22312:c4dddc513484 user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Feb 26 20:27:53 2014 +0100 summary: [scupgrade] Removed black border in date picker details: https://code.openbravo.com/erp/devel/main/rev/540a5f7132b6 changeset: 22313:540a5f7132b6 user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Feb 26 20:29:14 2014 +0100 summary: [absref][scupgrade] Adapted 'DateTime' and 'Absolute DateTime' references to work with Smartclient 10.0d details: https://code.openbravo.com/erp/devel/main/rev/92a27c51d892 changeset: 22314:92a27c51d892 user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 27 01:41:08 2014 +0100 summary: [absref][scupgrade] Adapted 'Time' and 'Absolute Time' references to work with Smartclient 10.0d details: https://code.openbravo.com/erp/devel/main/rev/b463ba39b5a5 changeset: 22315:b463ba39b5a5 user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 27 21:44:25 2014 +0100 summary: [absref] Merge from pi details: https://code.openbravo.com/erp/devel/main/rev/662d40935aa4 changeset: 22316:662d40935aa4 user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 27 21:52:49 2014 +0100 summary: [absref] Prevented potential issue while managing dates details: https://code.openbravo.com/erp/devel/main/rev/45f7ebd803e2 changeset: 22317:45f7ebd803e2 user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Feb 28 00:48:42 2014 +0100 summary: [absref] Fixed problem with the 'Absolute DateTime' and the grid filter details: https://code.openbravo.com/erp/devel/main/rev/1458a9c2ea3b changeset: 22318:1458a9c2ea3b user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Feb 28 01:45:14 2014 +0100 summary: [absref] Fixed problem with the 'Absolute DateTime' and the grid filter - part2 details: https://code.openbravo.com/erp/devel/main/rev/fd4e16b2417a changeset: 22319:fd4e16b2417a user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Feb 28 15:05:48 2014 +0100 summary: [absref] Merge from pi details: https://code.openbravo.com/erp/devel/main/rev/47e4fc11f404 changeset: 22320:47e4fc11f404 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Feb 28 18:48:33 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/75f848b61c97 changeset: 22321:75f848b61c97 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Feb 06 14:23:45 2014 +0530 summary: Fixes Issue 25447: isNull filter expression is not working properly for table reference If the operator is isNull or notNull comparison should be done at the object level and not at the field value level details: https://code.openbravo.com/erp/devel/main/rev/d83edb2bcfe7 changeset: 22322:d83edb2bcfe7 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Mar 03 10:59:20 2014 +0530 summary: Fixes Issue 24651, Fixes Issue 25868: Wrong Balance Sheet information randomly details: https://code.openbravo.com/erp/devel/main/rev/3cdbbbf58782 changeset: 22323:3cdbbbf58782 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 03 09:30:34 2014 +0100 summary: fixed bug 25862: NPE serializing to JSON a non persisted Order Computed columns is null when object is not persisted yet, it should return null instead of failing details: https://code.openbravo.com/erp/devel/main/rev/e7a2966e5278 changeset: 22324:e7a2966e5278 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 03 09:35:08 2014 +0100 summary: related to bug 25862: added test case details: https://code.openbravo.com/erp/devel/main/rev/52f5288bc3dd changeset: 22325:52f5288bc3dd user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 03 09:40:29 2014 +0100 summary: related to bug 25862: removed debug code details: https://code.openbravo.com/erp/devel/main/rev/8d1e52794b1e changeset: 22326:8d1e52794b1e user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Mar 03 16:20:19 2014 +0000 summary: CI: update AD_MODULE to version 22325 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/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 78 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js | 108 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 59 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 32 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 38 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css | 6 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 3 +- 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-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 20 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/AbsoluteDateTimeUIDefinition.java | 78 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/AbsoluteTimeUIDefinition.java | 155 + 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 | 37 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 19 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 26 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java | 5 +- 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/tables/C_ORDER.xml | 4 + src-db/database/model/views/C_RM_ORDER_PICK_EDIT_LINES.xml | 4 - src-db/database/model/views/M_RESERVATION_PICK_EDIT.xml | 4 - src-db/database/sourcedata/AD_COLUMN.xml | 4357 ++++++--- src-db/database/sourcedata/AD_ELEMENT.xml | 40 +- src-db/database/sourcedata/AD_FIELD.xml | 2894 ++++-- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 58 + src-db/database/sourcedata/AD_TAB.xml | 41 +- src-db/database/sourcedata/AD_TABLE.xml | 109 +- src-db/database/sourcedata/AD_WINDOW.xml | 15 + src-db/database/sourcedata/OBSERDS_DATASOURCE.xml | 36 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 42 + src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 32 + src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 18 + src-test/org/openbravo/test/dal/ComputedColumnsTest.java | 21 +- src/org/openbravo/base/gen/entity.ftl | 7 +- src/org/openbravo/base/model/Property.java | 5 + src/org/openbravo/base/model/domaintype/AbsoluteDateTimeDomainType.java | 71 + src/org/openbravo/base/model/domaintype/AbsoluteTimeDomainType.java | 67 + src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 31 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 3 +- src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java | 437 + src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineRow.java | 133 + src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java | 744 + src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java | 1188 ++ src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java | 12 +- 83 files changed, 8112 insertions(+), 3124 deletions(-) diffs (truncated from 13954 to 300 lines): diff -r 627fb422fbe8 -r 8d1e52794b1e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Feb 28 11:23:32 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 03 16:20:19 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.22143]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.22325]]></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 627fb422fbe8 -r 8d1e52794b1e 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 Feb 28 11:23:32 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 03 16:20:19 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.22143]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.22325]]></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.22143]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.22325]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 627fb422fbe8 -r 8d1e52794b1e 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 Feb 28 11:23:32 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 03 16:20:19 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.22143]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.22325]]></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 627fb422fbe8 -r 8d1e52794b1e 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 Feb 28 11:23:32 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 03 16:20:19 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.22143]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.22325]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 627fb422fbe8 -r 8d1e52794b1e 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 Feb 28 11:23:32 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 03 16:20:19 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.22143]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.22325]]></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 627fb422fbe8 -r 8d1e52794b1e 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 Feb 28 11:23:32 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 03 16:20:19 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.22143]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.22325]]></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.22143]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.22325]]></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.22143]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.22325]]></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.22143]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.22325]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 627fb422fbe8 -r 8d1e52794b1e 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 Fri Feb 28 11:23:32 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js Mon Mar 03 16:20:19 2014 +0000 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011-2013 Openbravo SLU + * All portions are Copyright (C) 2011-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -76,7 +76,7 @@ doInit: function () { this.setDateParams(); - this.Super('init', arguments); + var ret = this.Super('init', arguments); if (this.textField) { if (this.length) { @@ -120,6 +120,8 @@ if (this.showDisabled === false) { this.textField.showDisabled = false; } + + return ret; }, // compare while ignoring milli difference @@ -175,7 +177,8 @@ parts[i] = this.expandPart(parts[i], i); } } - return parts[0] + this.dateSeparator + parts[1] + this.dateSeparator + parts[2]; + result = parts[0] + this.dateSeparator + parts[1] + this.dateSeparator + parts[2]; + return result; }, expandPart: function (part, index) { @@ -264,22 +267,11 @@ init: function () { // this call super.init - this.doInit(); - }, - - getDateWithNewTime: function (date, time) { - var newDate, newTime, ret = date; - if (time === '24:00:00') { - time = '00:00:00'; + if (typeof this.doInit === 'function') { + return this.doInit(); + } else { + return this.Super('init', arguments); } - if (time) { - newTime = isc.Time.parseInput(time); - } - if (date && isc.isA.Date(date) && newTime && isc.isA.Date(newTime)) { - date.setHours(newTime.getHours(), newTime.getMinutes(), newTime.getSeconds()); - ret = date; - } - return ret; }, setValue: function (value) { @@ -290,10 +282,6 @@ newArguments[0] = oldValue; } - if (this.fixedTime && newArguments[0] && isc.isA.Date(newArguments[0])) { - newArguments[0] = this.getDateWithNewTime(newArguments[0], this.fixedTime); - } - //Setting the value to the textual value in case text field is changed. Fixes Issue https://issues.openbravo.com/view.php?id=22381 if (this.textField._textChanged && this.textField.getValue() && (this.textField.getValue() !== value)) { value = OB.Utilities.Date.OBToJS(this.textField.getValue(), (this.showTime ? OB.Format.dateTime : OB.Format.date)); @@ -301,15 +289,6 @@ ret = this.Super('setValue', newArguments); - // If fixed time (if exists) is '24:00:00', here is the logic to show in the input the day before of the real value of the component. - // This logic applies only in the case the time is not shown. - if (!this.showTime && this.fixedTime && this.fixedTime === '24:00:00' && newArguments[0] && isc.isA.Date(newArguments[0])) { - newArguments[0].setDate(newArguments[0].getDate() - 1); - dateText = OB.Utilities.Date.JSToOB(newArguments[0], (this.showTime ? OB.Format.dateTime : OB.Format.date)); - newArguments[0].setDate(newArguments[0].getDate() + 1); - this.dateTextField.setValue(dateText); - } - return ret; }, @@ -325,7 +304,7 @@ // update the value in update value as this is called from cellEditEnd in the // grid, after losing the focus on the form and when autosaving updateValue: function () { - var savingWithShortcut, value; + var savingWithShortcut; if (this.grid && this.grid.view && this.grid.view.savingWithShortcut) { savingWithShortcut = this.grid.view.savingWithShortcut; } else { @@ -337,15 +316,6 @@ if (this.textField._textChanged) { this.expandValue(); this.Super('updateValue', arguments); - value = this.getValue(); - if (this.fixedTime && value && isc.isA.Date(value)) { - if (this.fixedTime === '24:00:00' && (!this.showTime || !this.isAPickerDataChange)) { - // If fixed time (if exists) is '24:00:00', we need to add a day to the entered date, since we really want the 00:00:00 of the next day - // Later, the setValue function will manage the proper displayed value by substracting a day again - value.setDate(value.getDate() + 1); - } - this.setValue(value); // To force change the time with the fixed time (if exists) after expandValue - } // when the date field has a callout and all the mandatory fields have been entered, // the grid does not save the value before making the FIC call, so the value has to // be saved explicitly @@ -359,16 +329,22 @@ getPickerData: function () { var date = this.getValue(); - // If fixed time (if exists) is '24:00:00', we need to substract a day to the real date value, - // to view in the date-picker the same date as in the input - if (this.fixedTime === '24:00:00' && date !== null) { - if (!isc.isA.Date(date)) { - date = new Date(date); - } - if (isc.isA.Date(date) && !isNaN(date.getTime())) { - date.setDate(date.getDate() - 1); - return date; - } + // 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)) { + // Set the month initially to January to prevent error like this + // provided date: 15/02/2014 + // today: 31/03/2014 + // date.setDate(today.getDate()) would result in Mon Mar 02 2014 18:00:00 GMT+0100 (CET), because February does not have 31 days + date.setMonth(0); + date.setDate(date.getUTCDate()); + date.setMonth(date.getUTCMonth()); + date.setFullYear(date.getUTCFullYear()); + date.setHours(date.getUTCHours()); + date.setMinutes(date.getUTCMinutes()); + date.setSeconds(date.getUTCSeconds()); + } + if (isc.isA.Date(date)) { + return date; } else { return this.Super('getPickerData', arguments); } diff -r 627fb422fbe8 -r 8d1e52794b1e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js Fri Feb 28 11:23:32 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js Mon Mar 03 16:20:19 2014 +0000 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011-2013 Openbravo SLU + * All portions are Copyright (C) 2011-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -128,27 +128,29 @@ showTime: true, fixedTime: null, - blurValue: function () { + doInit: function () { + if (Object.prototype.toString.call(this.fixedTime) === '[object String]') { + this.fixedTime = isc.Time.parseInput(this.fixedTime); + } if (this.showTime) { - var value = OB.Utilities.Date.OBToJS(this.dateTextField.getElementValue(), OB.Format.dateTime); - this.setValue(value); - return value; + this.showPickerTimeItem = true; } else { - return this.Super('blurValue', arguments); + this.showPickerTimeItem = false; } + return this.Super('doInit', arguments); }, parseValue: function () { - if (this.showTime) { - return this.dateTextField.getElementValue(); - } else { - return this.Super('parseValue', arguments); + var parseVal = this.Super('parseValue', arguments); + if (this.showTime && parseVal.indexOf(' ') === -1) { ------------------------------------------------------------------------------ Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce. With Perforce, you get hassle-free workflows. Merge that actually works. Faster operations. Version large binaries. Built-in WAN optimization and the freedom to use Git, Perforce or both. Make the move to Perforce. http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
