details: https://code.openbravo.com/erp/devel/pi/rev/e78ccbaf0186 changeset: 23869:e78ccbaf0186 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jun 24 23:19:20 2014 +0000 summary: CI: update AD_MODULE to version 23865
details: https://code.openbravo.com/erp/devel/pi/rev/d26b9aed00c3 changeset: 23870:d26b9aed00c3 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jun 24 23:35:14 2014 +0000 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 23 ++++++-- 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-number.js | 4 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.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/sourcedata/AD_MODULE.xml | 2 +- src/org/openbravo/costing/CostingRuleProcess.java | 4 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 16 +++++- 45 files changed, 114 insertions(+), 95 deletions(-) diffs (truncated from 979 to 300 lines): diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Tue Jun 24 23:35:14 2014 +0000 @@ -33,7 +33,8 @@ TYPE RECORD IS REF CURSOR; Cur_Dbprefix RECORD; v_invoicepaidstatus VARCHAR2(32); - v_fin_payment_schedule_invoice VARCHAR2(32); + v_fin_payment_schedule_invoice VARCHAR(32); + v_p_fin_psd_id VARCHAR(32); BEGIN -- Check if the status exists SELECT count(*) INTO v_count FROM DUAL @@ -44,17 +45,25 @@ IF (v_count = 0) THEN RETURN 'N'; END IF; + + v_p_fin_psd_id := p_fin_psd_id; + IF (v_p_fin_psd_id='') THEN + v_p_fin_psd_id := NULL; + END IF; + + IF (v_p_fin_psd_id is not null ) THEN select isinvoicepaid , fin_payment_schedule_invoice into v_isinvoicepaid , v_fin_payment_schedule_invoice from fin_payment_scheduledetail - where fin_payment_scheduledetail_id=p_fin_psd_id; - - IF (((p_fin_psd_id <> '') or (p_fin_psd_id is not null)) AND (v_fin_payment_schedule_invoice is not null))THEN + where fin_payment_scheduledetail_id=v_p_fin_psd_id; + END IF; + + IF (v_fin_payment_schedule_invoice is not null)THEN IF(v_isinvoicepaid='Y')THEN - -- core intermediate statuses - v_isPaymentConfirmed := 'Y'; + -- core intermediate statuses + v_isPaymentConfirmed := 'Y'; ELSE - -- core intermediate statuses + -- core intermediate statuses v_isPaymentConfirmed := 'N'; END IF; ELSE diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:35:14 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.23851]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.23865]]></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 01ad2c4839e0 -r d26b9aed00c3 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 Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:35:14 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.23851]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.23865]]></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.23851]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.23865]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 01ad2c4839e0 -r d26b9aed00c3 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 Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:35:14 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.23851]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.23865]]></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 01ad2c4839e0 -r d26b9aed00c3 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 Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:35:14 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.23851]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.23865]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 01ad2c4839e0 -r d26b9aed00c3 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 Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:35:14 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.23851]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.23865]]></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 01ad2c4839e0 -r d26b9aed00c3 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 Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:35:14 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.23851]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.23865]]></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.23851]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.23865]]></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.23851]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.23865]]></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.23851]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.23865]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js Tue Jun 24 23:35:14 2014 +0000 @@ -435,7 +435,7 @@ if (isc.isA.String(this.getValue())) { //if the string is a math expression do not perform rounding yet. if (this.getValue().indexOf('=') === -1) { - value = OB.Utilities.Number.OBPlainToOBMasked(this.getValue(), this.typeInstance.maskNumeric, this.typeInstance.decSeparator, this.typeInstance.groupSeparator); + value = OB.Utilities.Number.OBPlainToOBMasked(this.getValue(), this.typeInstance.maskNumeric, this.typeInstance.decSeparator, this.typeInstance.groupSeparator, OB.Format.defaultGroupingSize); } else { value = this.getValue(); } @@ -467,7 +467,7 @@ // first check if the number is valid if (!isc.isA.String(value)) { // format the value to be displayed. - value = OB.Utilities.Number.OBPlainToOBMasked(value, this.typeInstance.maskNumeric, this.typeInstance.decSeparator, this.typeInstance.groupSeparator); + value = OB.Utilities.Number.OBPlainToOBMasked(value, this.typeInstance.maskNumeric, this.typeInstance.decSeparator, this.typeInstance.groupSeparator, OB.Format.defaultGroupingSize); this.setElementValue(this.mapValueToDisplay(value)); } } diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:35:14 2014 +0000 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.23851]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.23865]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:35:14 2014 +0000 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.23851]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.23865]]></STARTVERSION> <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:35:14 2014 +0000 @@ -6,7 +6,7 @@ <!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client Kernel]]></NAME> -<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.23851]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.23865]]></VERSION> <!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION> <!--4B828F4D03264080AA1D2057B13F613C--> <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP> <!--4B828F4D03264080AA1D2057B13F613C--> <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:35:14 2014 +0000 @@ -7,7 +7,7 @@ <!--26B041893E844A53AFA58BC326C4F0D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.23851]]></STARTVERSION> +<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.23865]]></STARTVERSION> <!--26B041893E844A53AFA58BC326C4F0D7--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID> -<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <STARTVERSION><![CDATA[1.1.23851]]></STARTVERSION> +<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <STARTVERSION><![CDATA[1.1.23865]]></STARTVERSION> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID> -<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <STARTVERSION><![CDATA[2.0.23851]]></STARTVERSION> +<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <STARTVERSION><![CDATA[2.0.23865]]></STARTVERSION> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:35:14 2014 +0000 @@ -6,7 +6,7 @@ <!--2758CD25B2704AF6BBAD10365FC82C06--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--2758CD25B2704AF6BBAD10365FC82C06--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--2758CD25B2704AF6BBAD10365FC82C06--> <NAME><![CDATA[Workspace & Widgets]]></NAME> -<!--2758CD25B2704AF6BBAD10365FC82C06--> <VERSION><![CDATA[2.1.23851]]></VERSION> +<!--2758CD25B2704AF6BBAD10365FC82C06--> <VERSION><![CDATA[2.1.23865]]></VERSION> <!--2758CD25B2704AF6BBAD10365FC82C06--> <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION> <!--2758CD25B2704AF6BBAD10365FC82C06--> <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP> <!--2758CD25B2704AF6BBAD10365FC82C06--> <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:35:14 2014 +0000 @@ -7,7 +7,7 @@ <!--15F51F03882F444CAB6593B4566DC929--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15F51F03882F444CAB6593B4566DC929--> <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID> <!--15F51F03882F444CAB6593B4566DC929--> <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID> -<!--15F51F03882F444CAB6593B4566DC929--> <STARTVERSION><![CDATA[2.1.23851]]></STARTVERSION> +<!--15F51F03882F444CAB6593B4566DC929--> <STARTVERSION><![CDATA[2.1.23865]]></STARTVERSION> <!--15F51F03882F444CAB6593B4566DC929--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15F51F03882F444CAB6593B4566DC929--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME> <!--15F51F03882F444CAB6593B4566DC929--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--E71B28FC949D481D9F59C17D01E46EF9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E71B28FC949D481D9F59C17D01E46EF9--> <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID> <!--E71B28FC949D481D9F59C17D01E46EF9--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--E71B28FC949D481D9F59C17D01E46EF9--> <STARTVERSION><![CDATA[3.0.23851]]></STARTVERSION> +<!--E71B28FC949D481D9F59C17D01E46EF9--> <STARTVERSION><![CDATA[3.0.23865]]></STARTVERSION> <!--E71B28FC949D481D9F59C17D01E46EF9--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E71B28FC949D481D9F59C17D01E46EF9--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--E71B28FC949D481D9F59C17D01E46EF9--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:35:14 2014 +0000 @@ -6,7 +6,7 @@ <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <NAME><![CDATA[Query/List Widget]]></NAME> -<!--0A060B2AF1974E8EAA8DB61388E9AECC--> <VERSION><![CDATA[1.0.23851]]></VERSION> +<!--0A060B2AF1974E8EAA8DB61388E9AECC--> <VERSION><![CDATA[1.0.23865]]></VERSION> <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION> <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP> <!--0A060B2AF1974E8EAA8DB61388E9AECC--> <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 24 23:35:14 2014 +0000 @@ -7,7 +7,7 @@ <!--26558497C31140BFAB067BA4BC47D799--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--26558497C31140BFAB067BA4BC47D799--> <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID> <!--26558497C31140BFAB067BA4BC47D799--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--26558497C31140BFAB067BA4BC47D799--> <STARTVERSION><![CDATA[2.1.23851]]></STARTVERSION> +<!--26558497C31140BFAB067BA4BC47D799--> <STARTVERSION><![CDATA[2.1.23865]]></STARTVERSION> <!--26558497C31140BFAB067BA4BC47D799--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--26558497C31140BFAB067BA4BC47D799--> <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME> <!--26558497C31140BFAB067BA4BC47D799--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 01ad2c4839e0 -r d26b9aed00c3 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 19:05:24 2014 +0530 +++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 24 23:35:14 2014 +0000 ------------------------------------------------------------------------------ Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
