details: https://code.openbravo.com/erp/devel/pi/rev/b878bb51dc09 changeset: 21676:b878bb51dc09 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Dec 19 11:28:03 2013 +0000 summary: CI: promote changesets from pi to main
details: https://code.openbravo.com/erp/devel/pi/rev/8909c0775e65 changeset: 21677:8909c0775e65 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Dec 19 11:29:41 2013 +0000 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/model/functions/OBUIAPP_UPDATE_ACCESS.xml | 21 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_FIELD.xml | 83 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml | 74 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml | 77 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 1573 ++++++++++ modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 161 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 892 +++++ modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml | 26 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 24 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REFERENCE.xml | 36 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml | 192 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml | 87 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml | 72 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml | 26 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml | 34 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 45 + modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 22 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 54 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-grid.js.ftl | 3 + modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl | 3 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 56 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 50 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js | 15 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 135 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 185 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 43 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js | 13 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 30 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/grid/applyPendingChanges.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/grid/applyPendingChanges_Disabled.png | 0 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BinaryUIDefinition.java | 9 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java | 22 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java | 22 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TextUIDefinition.java | 16 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 238 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 69 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataResolvingMode.java | 11 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 9 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 88 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 44 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/functions/C_GETTAX.xml | 22 +- src-db/database/model/functions/C_GET_PRODUCT_TAXCATEGORY.xml | 69 + src-db/database/model/functions/C_INVOICE_POST.xml | 26 +- src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml | 8 +- src-db/database/model/functions/M_GET_PRODUCT_PRICE_DATE.xml | 2 +- src-db/database/model/tables/M_OFFER_TRL.xml | 75 + src-db/database/model/tables/M_OFFER_TYPE_TRL.xml | 75 + src-db/database/model/tables/M_PRODUCT_CATEGORY_TRL.xml | 78 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 + src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 1399 ++++++++- src-db/database/sourcedata/AD_ELEMENT.xml | 36 + src-db/database/sourcedata/AD_FIELD.xml | 737 ++++ src-db/database/sourcedata/AD_MESSAGE.xml | 36 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REF_LIST.xml | 11 + src-db/database/sourcedata/AD_TAB.xml | 87 + src-db/database/sourcedata/AD_TABLE.xml | 68 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 44 + src-db/database/sourcedata/AD_TREENODE.xml | 6 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 8 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 12 +- src-test/org/openbravo/test/AllAntTaskTests.java | 3 +- src-test/org/openbravo/test/AllTests.java | 2 + src-test/org/openbravo/test/model/TrlColumnsOraTypeTest.java | 100 + src/org/openbravo/costing/CostingBackground.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Costing_Currency.java | 61 + src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 4 + src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 10 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 2 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 5 + src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 1 + src/org/openbravo/erpCommon/ad_forms/RequisitionToOrderCreate.html | 7 + src/org/openbravo/erpCommon/ad_forms/RequisitionToOrderCreate.xml | 1 + src/org/openbravo/erpCommon/ad_help/DisplayHelp.html | 99 +- src/org/openbravo/erpCommon/ad_help/DisplayHelp.xml | 13 +- src/org/openbravo/erpCommon/ad_help/HelpWindow.java | 226 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html | 13 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 10 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 7 +- src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 38 +- src/org/openbravo/erpCommon/security/Login.html | 2 +- src/org/openbravo/erpCommon/security/Login_F1.html | 2 +- src/org/openbravo/erpCommon/utility/DocumentNo_data.xsql | 2 +- web/js/default/DateTextBox.js | 37 +- web/js/dojo/dojo.js | 122 +- web/js/utils.js | 4 +- 142 files changed, 8058 insertions(+), 401 deletions(-) diffs (truncated from 12230 to 300 lines): diff -r 23b1bb065c5c -r 8909c0775e65 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 19 04:12:26 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Dec 19 11:29:41 2013 +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.21543]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.21509]]></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> @@ -25,7 +25,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time. Fixed issue 15305.]]></UPDATEINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[MP30]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r 23b1bb065c5c -r 8909c0775e65 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 19 04:12:26 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Dec 19 11:29:41 2013 +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.21543]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.21509]]></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.21543]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.21509]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 23b1bb065c5c -r 8909c0775e65 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html Thu Dec 19 04:12:26 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html Thu Dec 19 11:29:41 2013 +0000 @@ -250,7 +250,7 @@ function updateEndingBalance() { var frm = document.frmMain; - frm.inpCalcEndingBalance.value = frm.inpEndBalance.value; + frm.inpCalcEndingBalance.value = applyFormat(frm.inpEndBalance.value); document.getElementById('paramTxtEndingBalance').innerHTML = frm.inpCalcEndingBalance.value; frm.inpCalcDifferenceToClear.value = subtract(frm.inpCalcEndingBalance.value, frm.inpCalcBeginnigBalance.value); diff -r 23b1bb065c5c -r 8909c0775e65 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 19 04:12:26 2013 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Dec 19 11:29:41 2013 +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.21543]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.21509]]></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> @@ -22,7 +22,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--C70732EA90A14EC0916078B85CC33D2D--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> <!--C70732EA90A14EC0916078B85CC33D2D--> <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION_LABEL><![CDATA[MP30]]></VERSION_LABEL> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE> diff -r 23b1bb065c5c -r 8909c0775e65 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 19 04:12:26 2013 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Dec 19 11:29:41 2013 +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.21543]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.21509]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 23b1bb065c5c -r 8909c0775e65 modules/org.openbravo.client.application/src-db/database/model/functions/OBUIAPP_UPDATE_ACCESS.xml --- a/modules/org.openbravo.client.application/src-db/database/model/functions/OBUIAPP_UPDATE_ACCESS.xml Thu Dec 19 04:12:26 2013 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/model/functions/OBUIAPP_UPDATE_ACCESS.xml Thu Dec 19 11:29:41 2013 +0000 @@ -16,7 +16,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) 2012 Openbravo SLU +* All portions are Copyright (C) 2012-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -46,6 +46,25 @@ FROM OBUIAPP_Process_Access WHERE OBUIAPP_Process_ID = P.OBUIAPP_Process_ID AND AD_ROLE_ID = R.AD_ROLE_ID); + + --update view access + INSERT INTO OBUIAPP_View_Role_Access + ( + OBUIAPP_View_Role_Access_ID, OBUIAPP_View_Impl_ID, AD_Role_ID, AD_Client_ID, + AD_Org_ID, IsActive, Created, + CreatedBy, Updated, UpdatedBy + ) + SELECT get_uuid(), V.OBUIAPP_View_Impl_ID, R.AD_ROLE_ID, R.AD_CLIENT_ID, + R.AD_ORG_ID, 'Y', now(), + '0', now(), '0' + FROM OBUIAPP_View_Impl V, AD_Role R + WHERE R.isManual = 'N' + AND V.isActive = 'Y' + AND NOT EXISTS (SELECT 1 + FROM OBUIAPP_View_Role_Access + WHERE OBUIAPP_View_Impl_ID = V.OBUIAPP_View_Impl_ID + AND AD_ROLE_ID = R.AD_ROLE_ID + AND (R.ISADVANCED = 'Y' OR V.ISADVANCEDFEATURE = 'N')); END OBUIAPP_UPDATE_ACCESS ]]></body> </function> diff -r 23b1bb065c5c -r 8909c0775e65 modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_FIELD.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_FIELD.xml Thu Dec 19 11:29:41 2013 +0000 @@ -0,0 +1,83 @@ +<?xml version="1.0"?> + <database name="TABLE OBUIAPP_GC_FIELD"> + <table name="OBUIAPP_GC_FIELD" primaryKey="OBUIAPP_GC_FIELD_KEY"> + <column name="OBUIAPP_GC_FIELD_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="OBUIAPP_GC_TAB_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="AD_FIELD_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="FILTERABLE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"> + <default><![CDATA[D]]></default> + <onCreateDefault/> + </column> + <column name="SORTABLE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"> + <default><![CDATA[D]]></default> + <onCreateDefault/> + </column> + <column name="TEXT_FILTER_BEHAVIOR" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"> + <default><![CDATA[D]]></default> + <onCreateDefault/> + </column> + <column name="FILTERONCHANGE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"> + <default><![CDATA[D]]></default> + <onCreateDefault/> + </column> + <column name="THRESHOLD_TO_FILTER" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_FIELD_CLIENT"> + <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> + </foreign-key> + <foreign-key foreignTable="AD_FIELD" name="OBUIAPP_GC_FIELD_FIELD"> + <reference local="AD_FIELD_ID" foreign="AD_FIELD_ID"/> + </foreign-key> + <foreign-key foreignTable="AD_ORG" name="OBUIAPP_GC_FIELD_ORG"> + <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> + </foreign-key> + <foreign-key foreignTable="OBUIAPP_GC_TAB" name="OBUIAPP_GC_FIELD_TAB"> + <reference local="OBUIAPP_GC_TAB_ID" foreign="OBUIAPP_GC_TAB_ID"/> + </foreign-key> + <index name="OBUIAPP_GC_FIELD_TAB_IDX" unique="false"> + <index-column name="OBUIAPP_GC_TAB_ID"/> + </index> + <unique name="OBUIAPP_GC_FIELD_UNIQUE_FIELD"> + <unique-column name="AD_FIELD_ID"/> + </unique> + </table> + </database> diff -r 23b1bb065c5c -r 8909c0775e65 modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml Thu Dec 19 11:29:41 2013 +0000 @@ -0,0 +1,74 @@ +<?xml version="1.0"?> + <database name="TABLE OBUIAPP_GC_SYSTEM"> + <table name="OBUIAPP_GC_SYSTEM" primaryKey="OBUIAPP_GC_SYSTEM_KEY"> + <column name="OBUIAPP_GC_SYSTEM_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="ISFILTERABLE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <column name="ISSORTABLE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <column name="TEXT_FILTER_BEHAVIOR" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"> + <default><![CDATA[IC]]></default> + <onCreateDefault/> + </column> + <column name="THRESHOLD_TO_FILTER" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"> + <default><![CDATA[500]]></default> + <onCreateDefault/> + </column> + <column name="ISLAZYFILTERING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> + <column name="FILTERONCHANGE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_GC_SYSTEM_CLIENT"> + <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> + </foreign-key> + <foreign-key foreignTable="AD_ORG" name="OBUIAPP_GC_SYSTEM_ORG"> + <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> + </foreign-key> + <unique name="OBUIAPP_GC_SYS_UNIQUE_CLIENT"> + <unique-column name="AD_CLIENT_ID"/> + </unique> + <check name="OBUIAPP_GC_SYS_ISFILT_CHK"><![CDATA[ISFILTERABLE IN ('Y', 'N')]]></check> + <check name="OBUIAPP_GC_SYS_ISLAZY_CHK"><![CDATA[ISLAZYFILTERING IN ('Y', 'N')]]></check> + <check name="OBUIAPP_GC_SYS_ISSORT_CHK"><![CDATA[ISSORTABLE IN ('Y', 'N')]]></check> + <check name="OBUIAPP_GC_SYS_ONCHNG_CHK"><![CDATA[FILTERONCHANGE IN ('Y', 'N')]]></check> + </table> + </database> diff -r 23b1bb065c5c -r 8909c0775e65 modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml Thu Dec 19 11:29:41 2013 +0000 @@ -0,0 +1,77 @@ +<?xml version="1.0"?> + <database name="TABLE OBUIAPP_GC_TAB"> + <table name="OBUIAPP_GC_TAB" primaryKey="OBUIAPP_GC_TAB_KEY"> + <column name="OBUIAPP_GC_TAB_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
