details: https://code.openbravo.com/erp/devel/pi/rev/ccc97aa145a6 changeset: 14904:ccc97aa145a6 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 01 17:08:26 2011 +0100 summary: [ws-prof] Moved createDB to AuthenticationManager
details: https://code.openbravo.com/erp/devel/pi/rev/bd7fc563294f changeset: 14905:bd7fc563294f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 01 17:31:34 2011 +0100 summary: [ws-prof] BaseWebServiceServlet.service and isLoggedIn are now final details: https://code.openbravo.com/erp/devel/pi/rev/38be51614735 changeset: 14906:38be51614735 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 02 10:12:36 2011 +0100 summary: [ws-prof] License manager reads ws limitations details: https://code.openbravo.com/erp/devel/pi/rev/89c403dca75b changeset: 14907:89c403dca75b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 02 10:13:24 2011 +0100 summary: [ws-prof] AuthenticationManager authenticates ws and connectors details: https://code.openbravo.com/erp/devel/pi/rev/c6f94e932d0f changeset: 14908:c6f94e932d0f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 02 14:38:24 2011 +0100 summary: [ws-prof] Centralized AuthenticationManager obtention details: https://code.openbravo.com/erp/devel/pi/rev/01d4fcc3896f changeset: 14909:01d4fcc3896f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 02 15:05:03 2011 +0100 summary: [ws-prof] Preventing ws usage in case of qouta exceeded details: https://code.openbravo.com/erp/devel/pi/rev/a3ea39b59bfa changeset: 14910:a3ea39b59bfa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 02 15:38:33 2011 +0100 summary: [ws-prof] Renamed property to prevent warn details: https://code.openbravo.com/erp/devel/pi/rev/f05d3c3e55c2 changeset: 14911:f05d3c3e55c2 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 02 17:04:41 2011 +0100 summary: [ws-prof] Allowing some days exceeding details: https://code.openbravo.com/erp/devel/pi/rev/1ae4612d8e36 changeset: 14912:1ae4612d8e36 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 13 10:54:12 2011 +0100 summary: [ws-prof] Fixed initial exceeded days count details: https://code.openbravo.com/erp/devel/pi/rev/eeffe1520f42 changeset: 14913:eeffe1520f42 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 13 13:10:20 2011 +0100 summary: [ws-prof] Show warn message when ws calls are exceeded details: https://code.openbravo.com/erp/devel/pi/rev/075101860b8a changeset: 14914:075101860b8a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 13 13:27:44 2011 +0100 summary: [ws-prof] Using exitent check for msg details: https://code.openbravo.com/erp/devel/pi/rev/2abff83e30f1 changeset: 14915:2abff83e30f1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 13 16:06:55 2011 +0100 summary: [ws-prof] Automatic refresh license on login details: https://code.openbravo.com/erp/devel/pi/rev/c2068cbf3db7 changeset: 14916:c2068cbf3db7 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 13 16:51:08 2011 +0100 summary: [ws-prof] Show WS call info in about box details: https://code.openbravo.com/erp/devel/pi/rev/00169df43597 changeset: 14917:00169df43597 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 13 17:55:02 2011 +0100 summary: [ws-prof] Send ws calls info to heartbeat details: https://code.openbravo.com/erp/devel/pi/rev/b9453ecf375f changeset: 14918:b9453ecf375f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 14 09:03:54 2011 +0100 summary: [ws-prof] Mark rejected session ws calls details: https://code.openbravo.com/erp/devel/pi/rev/b60b88aa7a1c changeset: 14919:b60b88aa7a1c user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 14 11:07:10 2011 +0100 summary: [ws-prof] Sending ws info in beats details: https://code.openbravo.com/erp/devel/pi/rev/c3a23d5d65f0 changeset: 14920:c3a23d5d65f0 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 14 11:39:41 2011 +0100 summary: [ws-prof] Send beat in case of ws rejected details: https://code.openbravo.com/erp/devel/pi/rev/509f3d8ef1b0 changeset: 14921:509f3d8ef1b0 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Dec 14 11:44:13 2011 +0100 summary: [ws-prof] No need to refresh in case of old license details: https://code.openbravo.com/erp/devel/pi/rev/87ebe6e75602 changeset: 14922:87ebe6e75602 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 08:25:59 2011 +0100 summary: [ws-prof] Renamed beat type details: https://code.openbravo.com/erp/devel/pi/rev/fd30d3c84d44 changeset: 14923:fd30d3c84d44 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 08:29:49 2011 +0100 summary: [ws-prof] Save username in ws sessions details: https://code.openbravo.com/erp/devel/pi/rev/2ceff43a633b changeset: 14924:2ceff43a633b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 08:54:34 2011 +0100 summary: [ws-prof] Implemented ws authentication based on user password details: https://code.openbravo.com/erp/devel/pi/rev/cd6cc8b06281 changeset: 14925:cd6cc8b06281 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 09:36:48 2011 +0100 summary: [ws-prof] Renew license if needed when checking ws access details: https://code.openbravo.com/erp/devel/pi/rev/6680ead2731c changeset: 14926:6680ead2731c user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 09:37:33 2011 +0100 summary: pi merge details: https://code.openbravo.com/erp/devel/pi/rev/9422319f1bec changeset: 14927:9422319f1bec user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 10:40:23 2011 +0100 summary: [ws-prof] Defaulting trial and golden to limited ws access details: https://code.openbravo.com/erp/devel/pi/rev/949dcee756bc changeset: 14928:949dcee756bc user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 11:13:21 2011 +0100 summary: [ws-prof] message details: https://code.openbravo.com/erp/devel/pi/rev/d2e490ce7ab0 changeset: 14929:d2e490ce7ab0 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 13:00:04 2011 +0100 summary: [ws-prof] Counter was restricting 1 call less than in should details: https://code.openbravo.com/erp/devel/pi/rev/894a2f079c01 changeset: 14930:894a2f079c01 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 13:11:14 2011 +0100 summary: [ws-prof] Updated messages details: https://code.openbravo.com/erp/devel/pi/rev/f8787278e7a2 changeset: 14931:f8787278e7a2 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 17:54:30 2011 +0100 summary: [ws-prof] Fixed initial counter on tomcat start details: https://code.openbravo.com/erp/devel/pi/rev/c10e32dce6ef changeset: 14932:c10e32dce6ef user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Dec 15 18:22:50 2011 +0100 summary: [ws-prof] If license expires, ws is not allowed details: https://code.openbravo.com/erp/devel/pi/rev/79f6b17d4a50 changeset: 14933:79f6b17d4a50 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 16 09:26:50 2011 +0100 summary: [ws-prof] Display number of days pending within the period details: https://code.openbravo.com/erp/devel/pi/rev/93fb6a42baf4 changeset: 14934:93fb6a42baf4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 16 09:46:21 2011 +0100 summary: [ws-prof] Force admin mode to refresh license details: https://code.openbravo.com/erp/devel/pi/rev/eb57afe69276 changeset: 14935:eb57afe69276 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 16 10:15:57 2011 +0100 summary: [ws-prof] Fixed CWSR beat content details: https://code.openbravo.com/erp/devel/pi/rev/abbbace7b012 changeset: 14936:abbbace7b012 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 16 10:32:43 2011 +0100 summary: [ws-prof] Sending instance id in ws reject beat details: https://code.openbravo.com/erp/devel/pi/rev/4a555d2b1c64 changeset: 14937:4a555d2b1c64 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 16 15:31:20 2011 +0100 summary: [ws-prof] Log connector beat info details: https://code.openbravo.com/erp/devel/pi/rev/634c7786e9aa changeset: 14938:634c7786e9aa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 16 15:31:44 2011 +0100 summary: [ws-prof] Do not try to refresh trial nor golden details: https://code.openbravo.com/erp/devel/pi/rev/eea226b392fe changeset: 14939:eea226b392fe user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Dec 19 10:39:35 2011 +0100 summary: [ws-prof] Flush when refreshing license to prevent NPE details: https://code.openbravo.com/erp/devel/pi/rev/7c115f7f0581 changeset: 14940:7c115f7f0581 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Dec 19 11:50:03 2011 +0100 summary: [ws-prof] Intialize counter for old licenses details: https://code.openbravo.com/erp/devel/pi/rev/e0499eab997c changeset: 14941:e0499eab997c user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Dec 19 11:50:42 2011 +0100 summary: [ws-prof] typo details: https://code.openbravo.com/erp/devel/pi/rev/1a558f8e1b33 changeset: 14942:1a558f8e1b33 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Dec 19 11:52:21 2011 +0100 summary: [ws-prof] Added index to ad_session.created column to improve perfomance details: https://code.openbravo.com/erp/devel/pi/rev/f19c8c2d260b changeset: 14943:f19c8c2d260b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Dec 19 13:06:38 2011 +0100 summary: pi merge details: https://code.openbravo.com/erp/devel/pi/rev/101c39b35037 changeset: 14944:101c39b35037 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 20 08:07:59 2011 +0100 summary: [ws-prof] Do not flush on DalConnecectionProvider details: https://code.openbravo.com/erp/devel/pi/rev/02b1c160d9eb changeset: 14945:02b1c160d9eb user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Dec 20 08:10:26 2011 +0100 summary: Merged back ws-prof project diffstat: .hgsigs | 2 + .hgtags | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 24 +- 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 | 4 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 4 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 16 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-base-view.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 1 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js | 56 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 52 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css | 8 + 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.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.css | 10 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-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.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.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 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.userinterface.selector/src-db/database/sourcedata/AD_FIELD.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 1 + 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/js/ob-smartclient.js | 42 +- modules/org.openbravo.v3.datasets/referencedata/standard/V3_Roles.xml | 727 +++++---- 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/configScript.xml | 6 +- 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 +- referencedata/sampledata/F_B_International_Group.xml | 20 +- src-db/database/model/functions/C_ORDER_POST1.xml | 7 +- src-db/database/model/functions/C_VALIDCOMBINATION_INSERT.xml | 2 +- src-db/database/model/tables/AD_HEARTBEAT_LOG.xml | 24 + src-db/database/model/tables/AD_SESSION.xml | 3 + src-db/database/model/tables/S_TIMEEXPENSE.xml | 4 + src-db/database/model/triggers/C_PERIOD_TRG2.xml | 10 +- src-db/database/sourcedata/AD_COLUMN.xml | 242 +++- src-db/database/sourcedata/AD_ELEMENT.xml | 84 + src-db/database/sourcedata/AD_FIELD.xml | 162 ++ src-db/database/sourcedata/AD_MESSAGE.xml | 69 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 26 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + src-test/org/openbravo/test/webservice/BaseWSTest.java | 2 +- src-test/org/openbravo/test/webservice/WSReadTest.java | 17 +- src-wad/src/org/openbravo/wad/ActionButton_Relation_data.xsql | 9 +- src/index.jsp | 17 +- src/org/openbravo/authentication/AuthenticationManager.java | 282 +++ src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 42 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 23 +- src/org/openbravo/base/secureApp/LoginHandler.java | 50 +- src/org/openbravo/dal/core/OBInterceptor.java | 24 + src/org/openbravo/erpCommon/ad_forms/About.html | 3 + src/org/openbravo/erpCommon/ad_forms/About.java | 1 + src/org/openbravo/erpCommon/ad_forms/About.xml | 3 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 2 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 46 + src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportProductionCost_data.xsql | 2 +- src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 1 + src/org/openbravo/erpCommon/obps/ActivationKey.java | 406 ++++- src/org/openbravo/erpCommon/security/SessionLogin.java | 4 +- src/org/openbravo/erpCommon/utility/SystemInfo.java | 91 +- src/org/openbravo/scheduling/OBScheduler.java | 9 +- src/org/openbravo/scheduling/Trigger_data.xsql | 4 +- src/org/openbravo/service/web/BaseWebServiceServlet.java | 106 +- 103 files changed, 2242 insertions(+), 787 deletions(-) diffs (truncated from 6445 to 300 lines): diff -r 27caa9812cd1 -r 02b1c160d9eb .hgsigs --- a/.hgsigs Thu Dec 01 10:54:12 2011 +0100 +++ b/.hgsigs Tue Dec 20 08:10:26 2011 +0100 @@ -50,3 +50,5 @@ e3386a2cd54020855bb2b3efa1c0afcfdf30a2b4 0 iEYEABECAAYFAk67/uoACgkQCX/oGf+2qkPXfQCg3lQiuBbJnVsPfnL8LWukEVG5CsIAoKsRfoVp93C1SY2N0iMl1LqT7CmB 9bb62accddbd9114aa4562816ab5b0234b01b1fa 0 iEYEABECAAYFAk7Gf8IACgkQCX/oGf+2qkMwUACfbNSWszDOxciN14aA09Oe8da52TIAn3xc3Kgek0jmetz0q+lzPVxdAjjk 1421ed09d86c5034375386393db18b2dc8866f77 0 iEYEABECAAYFAk7c/wQACgkQCX/oGf+2qkPZnwCfdfdLV/fHXKEXL0S+g9ip2PZuc5gAoL89Tv+s7FGS6g9HCfZSAkm76AF3 +29635597c9b7110b66a4cde8e0cb0ece277f7407 0 iEYEABECAAYFAk7l05YACgkQCX/oGf+2qkNbCACgoK+bQ83JFW2GQb4j+YBkkBkrMOYAoKDSHPagp61WCcrPkCS7IEtmVI0E +bc63869ec25d6771e0b3d3b65ddd630873663fc2 0 iEYEABECAAYFAk7h3vAACgkQCX/oGf+2qkP/HwCgt39R5/w8cF35rRoORikICeXQuDYAn347sM4ST4OvagS5ke9c6whsBYud diff -r 27caa9812cd1 -r 02b1c160d9eb .hgtags --- a/.hgtags Thu Dec 01 10:54:12 2011 +0100 +++ b/.hgtags Tue Dec 20 08:10:26 2011 +0100 @@ -61,3 +61,5 @@ bee1528a5966a4681a86ed0c9f7129f8f8818ab1 3.0MP5 5752cade8b792f72e160c7b5870f03b3e5f8bd40 3.0MP5.1 dae8c968fb85db1920332150543459a147e5fde3 3.0MP5.2 +efa17c6fbb3b286f790ea5b029b1f6fd2b1e5195 3.0MP5.3 +1b8d2b0f0c3f8af08af1d86f0f3f3c252319b0fa 3.0MP6 diff -r 27caa9812cd1 -r 02b1c160d9eb modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Tue Dec 20 08:10:26 2011 +0100 @@ -238,8 +238,10 @@ FROM ( SELECT line, percentage, onremainder, excludetax, COALESCE(paymentrule, v_paymentrule) AS paymentrule, - fixmonthday, fixmonthday2, fixmonthday3, netdays, - fixmonthoffset, netday, isnextbusinessday + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday END) AS fixmonthday, + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday2 END) AS Fixmonthday2, + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday3 END) AS fixmonthday3, + netdays, fixmonthoffset, netday, isnextbusinessday FROM c_paymenttermline WHERE c_paymentterm_id=v_paymentterm AND isactive = 'Y' @@ -247,16 +249,20 @@ -- Header of paymentTerm is processed at last SELECT 9999 AS line, 100 AS percentage, 'Y' AS onremainder, 'N' AS excludetax, v_paymentRule AS paymentrule, - fixmonthday, fixmonthday2, fixmonthday3, netdays, - fixmonthoffset, netday, isnextbusinessday + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday END) AS fixmonthday, + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday2 END) AS Fixmonthday2, + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday3 END) AS fixmonthday3, + netdays, fixmonthoffset, netday, isnextbusinessday FROM c_paymentterm WHERE c_paymentterm_id=v_paymentterm) a; FOR cur_payments IN ( SELECT line, percentage, onremainder, excludetax, COALESCE(paymentrule, v_paymentrule) AS paymentrule, - fixmonthday, fixmonthday2, fixmonthday3, netdays, - fixmonthoffset, netday, isnextbusinessday + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday END) AS fixmonthday, + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday2 END) AS Fixmonthday2, + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday3 END) AS fixmonthday3, + netdays, fixmonthoffset, netday, isnextbusinessday FROM c_paymenttermline WHERE c_paymentterm_id=v_paymentterm AND isactive = 'Y' @@ -264,8 +270,10 @@ -- Header of paymentTerm is processed at last SELECT 9999 AS line, 100 AS percentage, 'Y' AS onremainder, 'N' AS excludetax, v_paymentRule AS paymentrule, - fixmonthday, fixmonthday2, fixmonthday3, netdays, - fixmonthoffset, netday, isnextbusinessday + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday END) AS fixmonthday, + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday2 END) AS Fixmonthday2, + (CASE isduefixed WHEN 'N' THEN null ELSE fixmonthday3 END) AS fixmonthday3, + netdays, fixmonthoffset, netday, isnextbusinessday FROM c_paymentterm WHERE c_paymentterm_id=v_paymentterm ORDER BY line diff -r 27caa9812cd1 -r 02b1c160d9eb modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Dec 20 08:10:26 2011 +0100 @@ -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.14821]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.14891]]></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 27caa9812cd1 -r 02b1c160d9eb 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 Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Dec 20 08:10:26 2011 +0100 @@ -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.14821]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.14891]]></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.14821]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.14891]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 27caa9812cd1 -r 02b1c160d9eb 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 Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Dec 20 08:10:26 2011 +0100 @@ -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.14821]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.14891]]></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 27caa9812cd1 -r 02b1c160d9eb 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 Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Dec 20 08:10:26 2011 +0100 @@ -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.14821]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.14891]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 27caa9812cd1 -r 02b1c160d9eb 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 Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Dec 20 08:10:26 2011 +0100 @@ -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.14821]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.14891]]></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 27caa9812cd1 -r 02b1c160d9eb 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 Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Dec 20 08:10:26 2011 +0100 @@ -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.14821]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.14891]]></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.14821]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.14891]]></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.14821]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.14891]]></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.14821]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.14891]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 27caa9812cd1 -r 02b1c160d9eb 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 Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Tue Dec 20 08:10:26 2011 +0100 @@ -930,6 +930,10 @@ continue; } String column = field.getColumn().getDBColumnName(); + String columninp = "inp" + Sqlc.TransformaNombreColumna(column); + if (column.equalsIgnoreCase("Ad_Org_Id") && !changeEventCols.contains(columninp)) { + changeEventCols.add(columninp); + } if (columnsInValidation.get(column) != null && columnsInValidation.get(column).size() > 0) { for (String colInVal : columnsInValidation.get(column)) { final String columnName = "inp" + Sqlc.TransformaNombreColumna(colInVal); diff -r 27caa9812cd1 -r 02b1c160d9eb modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java Tue Dec 20 08:10:26 2011 +0100 @@ -380,10 +380,6 @@ statusBarFields.add(property.getName()); - if (field.isDisplayed()) { - continue; - } - final OBViewField viewField = new OBViewField(); viewField.setField(field); viewField.setProperty(property); diff -r 27caa9812cd1 -r 02b1c160d9eb modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js Tue Dec 20 08:10:26 2011 +0100 @@ -25,10 +25,10 @@ isc.OBClientClassCanvasItem.addProperties({ autoDestroy: true, - // if the canvas is used somewhere else then - // don't redraw it + // if the canvas is used somewhere else (in the statusbar) then + // don't do placeCanvas. placeCanvas: function() { - if (this.canvas && this.canvas.parentElement === this.form) { + if (this.canvas && !this.canvas.inStatusBar) { this.Super('placeCanvas', arguments); } }, diff -r 27caa9812cd1 -r 02b1c160d9eb modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js Tue Dec 20 08:10:26 2011 +0100 @@ -25,6 +25,7 @@ operator: 'equals', validateOnExit: true, showHint: false, + timeFormatter: 'to24HourTime', displayFormat: 'to24HourTime', short24TimeFormat: 'HH:MM:SS', shortTimeFormat: 'HH:MM:SS', @@ -43,13 +44,22 @@ if (characterValue || keyName === 'Backspace' || keyName === 'Delete') { f.setHasChanged(true); f.view.messageBar.hide(); - for (i = 0; i < toolBarButtons.leftMembers.length; i++) { - if (toolBarButtons.leftMembers[i].updateState) { - toolBarButtons.leftMembers[i].updateState(); + for (i = 0; i < toolBarButtons.length; i++) { + if (toolBarButtons[i].updateState) { + toolBarButtons[i].updateState(); } } } this.Super('keyPress', arguments); + }, + + // SmartClient's TimeItem doesn't keep time zone. Preserve it in case the + // string contains time zone. So time in this format is kept: 12:00+01:00 + setValue: function(value){ + if (isc.isA.String(value) && (value.contains('+') || value.contains('-'))) { + value = isc.Time.parseInput(value,null,null,true); + } + return this.Super('setValue', arguments); } }); diff -r 27caa9812cd1 -r 02b1c160d9eb modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js Tue Dec 20 08:10:26 2011 +0100 @@ -391,6 +391,7 @@ arrayTitleField[1][i]._value = arrayTitleField[1][i].contents; arrayTitleField[1][i].show(); + arrayTitleField[1][i].inStatusBar = true; this.content.addMember(arrayTitleField[1][i]); continue; } diff -r 27caa9812cd1 -r 02b1c160d9eb 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 Thu Dec 01 10:54:12 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Tue Dec 20 08:10:26 2011 +0100 @@ -1655,6 +1655,8 @@ ret = this.Super('startEditing', [rowNum, colNum, suppressFocus, eCe, suppressWarning]); + this.recomputeCanvasComponents(rowNum); + return ret; }, @@ -1676,9 +1678,23 @@ } this.createNewRecordForEditing(insertRow); this.startEditing(insertRow); + this.recomputeCanvasComponents(insertRow); this.view.refreshChildViews(); }, + // recompute recordcomponents + recomputeCanvasComponents: function(rowNum) { + var i, fld, length = this.getFields().length; + + // remove client record components in edit mode + for (i = 0; i < length; i++) { + fld = this.getFields()[i]; ------------------------------------------------------------------------------ Write once. Port to many. Get the SDK and tools to simplify cross-platform app development. Create new or port existing apps to sell to consumers worldwide. Explore the Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join http://p.sf.net/sfu/intel-appdev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
