details: https://code.openbravo.com/erp/devel/pi/rev/12811c036202 changeset: 22269:12811c036202 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Feb 26 18:25:20 2014 +0000 summary: CI: update AD_MODULE to version 22143
details: https://code.openbravo.com/erp/devel/pi/rev/1c99c1317aaa changeset: 22270:1c99c1317aaa user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Feb 26 18:42:44 2014 +0000 summary: CI: merge back from main 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.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml | 2 +- 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_MESSAGE.xml | 12 + 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/calendar/ob-calendar.js | 352 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js | 37 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 25 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 111 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js | 29 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 35 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 20 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-help-about-widget.js | 41 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 16 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js | 30 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/calendar/iconDayLanesToggle.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/dateChooser-arrow_left.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/dateChooser-arrow_right.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/dateChooser-doubleArrow_left.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/dateChooser-doubleArrow_right.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/statusbar/iconButton-add.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/statusbar/iconButton-add_Disabled.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/statusbar/iconButton-add_Down.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/statusbar/iconButton-add_Over.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-application-menu-styles.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-application-styles.js | 6 - modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-calendar-styles.css | 8 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-calendar-styles.js | 45 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css | 54 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 35 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.css | 5 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-toolbar-styles.css | 10 +- 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/CSSMinimizer.java | 114 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.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/DataToJsonConverter.java | 8 +- 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_MESSAGE.xml | 6 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 26891 +++------ modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js | 94 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient-labels.js | 4 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 88 - modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/CubeGrid/rowHeaderSelected.gif | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/DynamicForm/checkbox_sprite.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/DynamicForm/drop.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/DynamicForm/drop_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/DynamicForm/partialcheck_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/DynamicForm/partialcheck_Down.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/DynamicForm/partialcheck_Over.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/DynamicForm/spinner_control_sprite.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/big_header.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/big_header_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/big_header_Down.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/big_header_Over.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/big_header_Selected.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/big_header_Selected_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/big_header_Selected_Over.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/header2.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/header2_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/header2_Down.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/header2_Over.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/header2_Selected.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/header2_Selected_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/header2_Selected_Over.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/row_collapsed_rtl.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/ListGrid/row_expanded_rtl.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/Menu/submenu_down_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/Menu/submenu_down_Over.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/bullet_blue.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/bullet_green.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/bullet_purple.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/bullet_red.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/indent.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/indent_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/outdent.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/outdent_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/text_list_bullets.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/text_list_edit.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/RichTextEditor/text_list_numbers.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/Scrollbar/hscroll_sprite.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/Scrollbar/hthumb_grip_Over.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/Scrollbar/vscroll_sprite.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/Scrollbar/vthumb_grip_Over.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/SectionHeader/opener_Disabled_closed.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/SectionHeader/opener_Disabled_opened.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/TabSet/tabset_sprite.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/actions/clock_Disabled.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/loadingSmallFrozen.gif | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/images/pickers/pickers_sprite.png | 0 modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/load_skin.js | 564 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/skin_styles.css | 2047 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/unsupported_browser.html | 51 +- 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/functions/C_INVOICE_CREATE.xml | 13 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-util/buildvalidation/build.xml | 6 +- src-util/modulescript/build.xml | 6 +- src/index.jsp | 1 - 140 files changed, 13510 insertions(+), 17494 deletions(-) diffs (truncated from 38111 to 300 lines): diff -r d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 26 18:42:44 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.22139]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.22143]]></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 d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Feb 26 18:42:44 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.22139]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.22143]]></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.22139]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.22143]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Wed Feb 26 18:42:44 2014 +0000 @@ -222,7 +222,7 @@ <!--8ED43FD56EE041F2BBC1C0AE0A56D632--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID> <!--8ED43FD56EE041F2BBC1C0AE0A56D632--> <COLUMNNAME><![CDATA[paymentDate]]></COLUMNNAME> <!--8ED43FD56EE041F2BBC1C0AE0A56D632--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> -<!--8ED43FD56EE041F2BBC1C0AE0A56D632--> <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH> +<!--8ED43FD56EE041F2BBC1C0AE0A56D632--> <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> <!--8ED43FD56EE041F2BBC1C0AE0A56D632--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--8ED43FD56EE041F2BBC1C0AE0A56D632--> <ISRANGE><![CDATA[N]]></ISRANGE> <!--8ED43FD56EE041F2BBC1C0AE0A56D632--> <AD_ELEMENT_ID><![CDATA[256AB5C3D6144B2C9884CF0FA4D81911]]></AD_ELEMENT_ID> diff -r d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 26 18:42:44 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.22139]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.22143]]></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 d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Feb 26 18:42:44 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.22139]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.22143]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 26 18:42:44 2014 +0000 @@ -1675,6 +1675,18 @@ <!--EE57AA334D6846718FBA9E042EA4F5EF--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--EE57AA334D6846718FBA9E042EA4F5EF--></AD_MESSAGE> +<!--EE5B54ACE057403B8436E84C9A409F2F--><AD_MESSAGE> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <AD_MESSAGE_ID><![CDATA[EE5B54ACE057403B8436E84C9A409F2F]]></AD_MESSAGE_ID> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <VALUE><![CDATA[OBUIAPP_CalendarShowHideLanes]]></VALUE> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <MSGTEXT><![CDATA[Show/Hide lanes in Day View]]></MSGTEXT> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--EE5B54ACE057403B8436E84C9A409F2F--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--EE5B54ACE057403B8436E84C9A409F2F--></AD_MESSAGE> + <!--EE6743B612B74EF5A934923ED8405B07--><AD_MESSAGE> <!--EE6743B612B74EF5A934923ED8405B07--> <AD_MESSAGE_ID><![CDATA[EE6743B612B74EF5A934923ED8405B07]]></AD_MESSAGE_ID> <!--EE6743B612B74EF5A934923ED8405B07--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 26 18:42:44 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.22139]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.22143]]></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 d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Feb 26 18:42:44 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.22139]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.22143]]></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.22139]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.22143]]></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.22139]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.22143]]></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.22139]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.22143]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r d3337dfe6180 -r 1c99c1317aaa modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js Wed Feb 26 10:05:46 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js Wed Feb 26 18:42:44 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) 2013 Openbravo SLU + * All portions are Copyright (C) 2013-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -29,6 +29,7 @@ var calendar = this.creator, currentStart = this.currentStart, currentEnd = this.currentEnd, + currentLane = this.currentLane, event = this.event; if (calendar.OBEventEditor) { @@ -36,6 +37,7 @@ calendar: calendar, currentStart: currentStart, currentEnd: currentEnd, + currentLane: currentLane, event: event }); calendar.OBEventEditor.initComponents(); @@ -49,6 +51,7 @@ // Hack to allow calendar TabSet style personalization isc.ClassFactory.defineClass('OBCalendarTabSet', isc.TabSet); + // == OBClientClassCanvasItem == // Extends Calendar, with some customizations (most of them styling related) isc.ClassFactory.defineClass('OBCalendar', isc.Calendar); @@ -56,12 +59,14 @@ isc.OBCalendar.addProperties({ autoFetchData: true, + mainViewConstructor: isc.OBCalendarTabSet, + useEventCanvasRolloverControls: false, + eventDialogConstructor: isc.OBCalendar_EventDialogBridge, + eventsAdaptationRequired: true, initWidget: function () { var calendar = this, multiCalendar = this.multiCalendar; - this.eventWindowStyle = OB.Styles.OBCalendar.eventWindowStyle; - if (!this.eventIdField) { this.eventIdField = 'eventId'; } @@ -75,148 +80,185 @@ this.OBEventEditor = isc[this.OBEventEditorClass].create({}); } - this.dataSource = OB.Datasource.create({ - dataURL: this.dataSourceProps.dataURL, - fields: [{ - name: this.eventIdField, - primaryKey: true - }, { - name: this.nameField - }, { - name: this.descriptionField - }, { - name: this.startDateField, - type: "datetime" - }, { - name: this.endDateField, - type: "datetime" - }], - - // these are read extra from the server with the events - additionalProperties: this.dataSourceProps.additionalProperties, - - dataSourceProps: this.dataSourceProps, - - transformRequest: function (dsRequest) { - dsRequest.params = dsRequest.params || {}; - dsRequest.params._extraProperties = this.additionalProperties; - dsRequest.willHandleError = true; - - return this.Super('transformRequest', arguments); - }, - transformResponse: function (dsResponse, dsRequest, data) { - var showDSAlert, records = data && data.response && data.response.data, - i, j; - - showDSAlert = function (text) { - if (calendar.OBEventEditor && calendar.OBEventEditor.messageBar) { - // Display message in event editor - calendar.OBEventEditor.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, OB.I18N.getLabel('OBUIAPP_Error'), text); - } else { - // there is no message bar in editor, showing a popup warn - isc.warn(text, function () { - return true; - }, { - icon: '[SKINIMG]Dialog/error.png', - title: OB.I18N.getLabel('OBUIAPP_Error') - }); - } - if (calendar.OBEventEditor) { - // needs to keep the popup open once, because data is refreshed - calendar.OBEventEditor.keepOpen = true; - } - }; - - // handle error - if (data && data.response && data.response.error) { - showDSAlert(data.response.error.message); - calendar.filterData(); - } else if (data && data.response && data.response.errors) { - showDSAlert(JSON.stringify(data.response.errors)); - calendar.filterData(); - } else { - if (records) { - for (i = 0; i < records.getLength(); i++) { - if (typeof records[i][calendar.nameField] === 'undefined') { - //To avoid the event displays 'undefined' when no name has been set - records[i][calendar.nameField] = ''; - } - if (typeof records[i][calendar.descriptionField] === 'undefined') { - records[i][calendar.descriptionField] = ''; - } - if (multiCalendar && multiCalendar.showCustomEventsBgColor) { - records[i].eventWindowStyle = multiCalendar.eventStyles[records[i][calendar.legendIdField]] + ' ' + OB.Styles.OBCalendar.eventWindowStyle; - } - if (typeof calendar.customTransformResponse === 'function') { - records[i] = calendar.customTransformResponse(records[i], calendar); - } - if (multiCalendar && multiCalendar.calendarData.hasCustomFilters) { - for (j = 0; j < multiCalendar.calendarData.customFilters.length; j++) { - if (typeof multiCalendar.calendarData.customFilters[j].handler.transformResponse === 'function') { - records[i] = multiCalendar.calendarData.customFilters[j].handler.transformResponse(records[i], calendar, multiCalendar.calendarData.customFilters[j]); - } - } - } + this.adaptEvents = function (events) { + var i, j; + for (i = 0; i < events.getLength(); i++) { + if (typeof events[i][calendar.startDateField] === 'string') { + events[i][calendar.startDateField] = new Date(events[i][calendar.startDateField]); + } + if (typeof events[i][calendar.endDateField] === 'string') { + events[i][calendar.endDateField] = new Date(events[i][calendar.endDateField]); + } + if (typeof events[i][calendar.nameField] === 'undefined') { + //To avoid the event displays 'undefined' when no name has been set + events[i][calendar.nameField] = ''; + } + if (typeof events[i][calendar.descriptionField] === 'undefined') { + events[i][calendar.descriptionField] = ''; + } + if (multiCalendar && multiCalendar.showCustomEventsBgColor) { + events[i].eventWindowStyle = multiCalendar.eventStyles[events[i][calendar.legendIdField]] + ' ' + calendar.eventWindowStyle; + } ------------------------------------------------------------------------------ Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis & security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
