details: https://code.openbravo.com/erp/devel/pi/rev/4a27e27689bc changeset: 18289:4a27e27689bc user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Oct 25 12:26:13 2012 +0200 summary: CI: update AD_MODULE to version 18279
details: https://code.openbravo.com/erp/devel/pi/rev/ddbaeda9b48e changeset: 18290:ddbaeda9b48e user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Oct 25 12:37:21 2012 +0200 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 8 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 18 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/GeneralLedgerOrganizationHandler.java | 101 +++ modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 8 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 2 +- 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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 26 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/tables/AD_ORG.xml | 7 + src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 + src-db/database/sourcedata/AD_COLUMN.xml | 183 ++++-- src-db/database/sourcedata/AD_ELEMENT.xml | 48 +- src-db/database/sourcedata/AD_FIELD.xml | 255 +++++---- src-db/database/sourcedata/AD_MENU.xml | 4 +- src-db/database/sourcedata/AD_MESSAGE.xml | 11 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS_PARA.xml | 42 +- src-db/database/sourcedata/AD_TAB.xml | 20 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 66 -- src-db/database/sourcedata/AD_WINDOW.xml | 6 +- src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeGeneralLedgerOrganization.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeGeneralLedgerOrganizationData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/InitializeGeneralLedgerOrganization.java | 42 + src-util/modulescript/src/org/openbravo/modulescript/InitializeGeneralLedgerOrganization_data.xsql | 52 ++ src/org/openbravo/dal/core/SessionHandler.java | 20 + src/org/openbravo/erpCommon/ad_callouts/SE_Period_Control.java | 4 + src/org/openbravo/erpCommon/ad_callouts/SE_Period_Control_data.xsql | 22 + src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_legacy.java | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 2 +- src/org/openbravo/erpCommon/businessUtility/COAUtility.java | 71 +- src/org/openbravo/erpCommon/info/AccountElementValue.html | 2 +- 75 files changed, 770 insertions(+), 448 deletions(-) diffs (truncated from 3058 to 300 lines): diff -r 391e1978c9f6 -r ddbaeda9b48e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 25 12:37:21 2012 +0200 @@ -1342,8 +1342,8 @@ <!--3F41C500ECEB40D09089FEA4C3793F29--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--3F41C500ECEB40D09089FEA4C3793F29--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--3F41C500ECEB40D09089FEA4C3793F29--> <NAME><![CDATA[Accounting Schema]]></NAME> -<!--3F41C500ECEB40D09089FEA4C3793F29--> <DESCRIPTION><![CDATA[The structure used in accounting including costing methods, currencies, and the calendar.]]></DESCRIPTION> -<!--3F41C500ECEB40D09089FEA4C3793F29--> <HELP><![CDATA[An Accounting Schema defines the rules used in accounting such as costing method, currency and calendar]]></HELP> +<!--3F41C500ECEB40D09089FEA4C3793F29--> <DESCRIPTION><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></DESCRIPTION> +<!--3F41C500ECEB40D09089FEA4C3793F29--> <HELP><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></HELP> <!--3F41C500ECEB40D09089FEA4C3793F29--> <COLUMNNAME><![CDATA[C_Acctschema_ID]]></COLUMNNAME> <!--3F41C500ECEB40D09089FEA4C3793F29--> <AD_TABLE_ID><![CDATA[FF80808130BB89090130BB8E3D7E0012]]></AD_TABLE_ID> <!--3F41C500ECEB40D09089FEA4C3793F29--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> @@ -4926,8 +4926,8 @@ <!--96221416E24540059B9BEFEC5F09D3FF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--96221416E24540059B9BEFEC5F09D3FF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--96221416E24540059B9BEFEC5F09D3FF--> <NAME><![CDATA[Accounting Schema]]></NAME> -<!--96221416E24540059B9BEFEC5F09D3FF--> <DESCRIPTION><![CDATA[The structure used in accounting including costing methods, currencies, and the calendar.]]></DESCRIPTION> -<!--96221416E24540059B9BEFEC5F09D3FF--> <HELP><![CDATA[An Accounting Schema defines the rules used in accounting such as costing method, currency and calendar]]></HELP> +<!--96221416E24540059B9BEFEC5F09D3FF--> <DESCRIPTION><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></DESCRIPTION> +<!--96221416E24540059B9BEFEC5F09D3FF--> <HELP><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></HELP> <!--96221416E24540059B9BEFEC5F09D3FF--> <COLUMNNAME><![CDATA[C_Acctschema_ID]]></COLUMNNAME> <!--96221416E24540059B9BEFEC5F09D3FF--> <AD_TABLE_ID><![CDATA[1BAA61D216CB4A62838AA785658EE092]]></AD_TABLE_ID> <!--96221416E24540059B9BEFEC5F09D3FF--> <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> diff -r 391e1978c9f6 -r ddbaeda9b48e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Oct 25 12:37:21 2012 +0200 @@ -143,9 +143,9 @@ <!--0244498E99414EA6A709CD3D5A7951D1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--0244498E99414EA6A709CD3D5A7951D1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--0244498E99414EA6A709CD3D5A7951D1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--0244498E99414EA6A709CD3D5A7951D1--> <NAME><![CDATA[Accounting Schema]]></NAME> -<!--0244498E99414EA6A709CD3D5A7951D1--> <DESCRIPTION><![CDATA[The structure used in accounting including costing methods, currencies, and the calendar.]]></DESCRIPTION> -<!--0244498E99414EA6A709CD3D5A7951D1--> <HELP><![CDATA[An Accounting Schema defines the rules used in accounting such as costing method, currency and calendar]]></HELP> +<!--0244498E99414EA6A709CD3D5A7951D1--> <NAME><![CDATA[General Ledger]]></NAME> +<!--0244498E99414EA6A709CD3D5A7951D1--> <DESCRIPTION><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></DESCRIPTION> +<!--0244498E99414EA6A709CD3D5A7951D1--> <HELP><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></HELP> <!--0244498E99414EA6A709CD3D5A7951D1--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--0244498E99414EA6A709CD3D5A7951D1--> <AD_TAB_ID><![CDATA[FF80808130BB89090130BB9A3A2B0043]]></AD_TAB_ID> <!--0244498E99414EA6A709CD3D5A7951D1--> <AD_COLUMN_ID><![CDATA[3F41C500ECEB40D09089FEA4C3793F29]]></AD_COLUMN_ID> @@ -6291,9 +6291,9 @@ <!--804882C210C03922E040007F01004FC0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--804882C210C03922E040007F01004FC0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--804882C210C03922E040007F01004FC0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--804882C210C03922E040007F01004FC0--> <NAME><![CDATA[Accounting Schema]]></NAME> -<!--804882C210C03922E040007F01004FC0--> <DESCRIPTION><![CDATA[The structure used in accounting including costing methods, currencies, and the calendar.]]></DESCRIPTION> -<!--804882C210C03922E040007F01004FC0--> <HELP><![CDATA[An Accounting Schema defines the rules used in accounting such as costing method, currency and calendar]]></HELP> +<!--804882C210C03922E040007F01004FC0--> <NAME><![CDATA[General Ledger]]></NAME> +<!--804882C210C03922E040007F01004FC0--> <DESCRIPTION><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></DESCRIPTION> +<!--804882C210C03922E040007F01004FC0--> <HELP><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></HELP> <!--804882C210C03922E040007F01004FC0--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--804882C210C03922E040007F01004FC0--> <AD_TAB_ID><![CDATA[9380E9AFB1074FB98030E5549D7FF346]]></AD_TAB_ID> <!--804882C210C03922E040007F01004FC0--> <AD_COLUMN_ID><![CDATA[804880D7B0EC1126E040007F01004F9E]]></AD_COLUMN_ID> @@ -15150,9 +15150,9 @@ <!--EDD729A0C5F448F0AE9749490A293571--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--EDD729A0C5F448F0AE9749490A293571--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--EDD729A0C5F448F0AE9749490A293571--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--EDD729A0C5F448F0AE9749490A293571--> <NAME><![CDATA[Accounting Schema]]></NAME> -<!--EDD729A0C5F448F0AE9749490A293571--> <DESCRIPTION><![CDATA[The structure used in accounting including costing methods, currencies, and the calendar.]]></DESCRIPTION> -<!--EDD729A0C5F448F0AE9749490A293571--> <HELP><![CDATA[An Accounting Schema defines the rules used in accounting such as costing method, currency and calendar]]></HELP> +<!--EDD729A0C5F448F0AE9749490A293571--> <NAME><![CDATA[General Ledger]]></NAME> +<!--EDD729A0C5F448F0AE9749490A293571--> <DESCRIPTION><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></DESCRIPTION> +<!--EDD729A0C5F448F0AE9749490A293571--> <HELP><![CDATA[The book containing all financial transactions recorded for the legal entity.]]></HELP> <!--EDD729A0C5F448F0AE9749490A293571--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--EDD729A0C5F448F0AE9749490A293571--> <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID> <!--EDD729A0C5F448F0AE9749490A293571--> <AD_COLUMN_ID><![CDATA[96221416E24540059B9BEFEC5F09D3FF]]></AD_COLUMN_ID> diff -r 391e1978c9f6 -r ddbaeda9b48e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 25 12:37:21 2012 +0200 @@ -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.18258]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.18279]]></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 391e1978c9f6 -r ddbaeda9b48e 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 Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 25 12:37:21 2012 +0200 @@ -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.18258]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.18279]]></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.18258]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.18279]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 391e1978c9f6 -r ddbaeda9b48e 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 Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 25 12:37:21 2012 +0200 @@ -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.18258]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.18279]]></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 391e1978c9f6 -r ddbaeda9b48e 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 Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 25 12:37:21 2012 +0200 @@ -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.18258]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.18279]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 391e1978c9f6 -r ddbaeda9b48e modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 25 12:37:21 2012 +0200 @@ -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.18258]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.18279]]></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 391e1978c9f6 -r ddbaeda9b48e modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 25 12:37:21 2012 +0200 @@ -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.18258]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.18279]]></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.18258]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.18279]]></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.18258]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.18279]]></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.18258]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.18279]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 391e1978c9f6 -r ddbaeda9b48e modules/org.openbravo.client.application/src/org/openbravo/client/application/event/GeneralLedgerOrganizationHandler.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/GeneralLedgerOrganizationHandler.java Thu Oct 25 12:37:21 2012 +0200 @@ -0,0 +1,101 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * 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 Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************* + */ + +package org.openbravo.client.application.event; + +import java.util.ArrayList; +import java.util.List; + +import javax.enterprise.event.Observes; + +import org.apache.log4j.Logger; +import org.hibernate.criterion.Restrictions; +import org.openbravo.base.model.Entity; +import org.openbravo.base.model.ModelProvider; +import org.openbravo.base.provider.OBProvider; +import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; +import org.openbravo.client.kernel.event.EntityUpdateEvent; +import org.openbravo.dal.service.OBCriteria; +import org.openbravo.dal.service.OBDal; +import org.openbravo.model.common.enterprise.Organization; +import org.openbravo.model.common.enterprise.OrganizationAcctSchema; +import org.openbravo.model.financialmgmt.accounting.coa.AcctSchema; + +public class GeneralLedgerOrganizationHandler extends EntityPersistenceEventObserver { + + private static Entity[] entities = { ModelProvider.getInstance().getEntity( + Organization.ENTITY_NAME) }; + protected Logger logger = Logger.getLogger(this.getClass()); + + @Override + protected Entity[] getObservedEntities() { + return entities; + } + + public void onSave(@Observes + EntityUpdateEvent event) { + if (!isValidEvent(event)) { + return; + } + + final Organization organization = (Organization) event.getTargetInstance(); + if (organization != null) { + final AcctSchema generalLedger = organization.getGeneralLedger(); + + OBCriteria<OrganizationAcctSchema> orgSchema = OBDal.getInstance().createCriteria( + OrganizationAcctSchema.class); + orgSchema.setFilterOnReadableOrganization(false); + orgSchema.setFilterOnActive(false); + orgSchema.add(Restrictions.eq(OrganizationAcctSchema.PROPERTY_ORGANIZATION, organization)); + List<OrganizationAcctSchema> orgSchemalist = orgSchema.list(); + ArrayList<String> idlist = new ArrayList<String>(); + + boolean exist = false; + + for (OrganizationAcctSchema oas : orgSchemalist) { + idlist.add(oas.getId()); + } + for (String ids : idlist) { + OrganizationAcctSchema orgAcctSchema = OBDal.getInstance().get( + OrganizationAcctSchema.class, ids); + if (generalLedger != null + && generalLedger.getId() == orgAcctSchema.getAccountingSchema().getId()) { + orgAcctSchema.setActive(true); + exist = true; + continue; + } + if (orgAcctSchema.getOrganizationClosingList().size() == 0) { + OBDal.getInstance().remove(orgAcctSchema); + } else { + orgAcctSchema.setActive(false); + OBDal.getInstance().save(orgAcctSchema); + } + } + + if ((generalLedger != null) && !exist) { + final OrganizationAcctSchema orgAcctSchema = OBProvider.getInstance().get( + OrganizationAcctSchema.class); + orgAcctSchema.setOrganization(organization); + orgAcctSchema.setAccountingSchema(generalLedger); + OBDal.getInstance().save(orgAcctSchema); + } + + } + } +} diff -r 391e1978c9f6 -r ddbaeda9b48e modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl Thu Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl Thu Oct 25 12:37:21 2012 +0200 @@ -154,6 +154,7 @@ initWidget: function() { this.prepareFields(); this.dataSource = ${tabComponent.dataSourceJavaScript}; + this.dataSource.potentiallyShared = true; this.viewForm = isc.OBViewForm.create(isc.clone(OB.ViewFormProperties), ${tabComponent.viewForm}); this.viewGrid = ${tabComponent.viewGrid}; this.Super('initWidget', arguments); diff -r 391e1978c9f6 -r ddbaeda9b48e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Oct 25 00:30:23 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Oct 25 12:37:21 2012 +0200 @@ -732,6 +732,11 @@ editorProperties, len = fields.length, ds, dataSources = []; + if (this.getDataSource()) { + // will get destroyed in the super class then ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_sfd2d_oct _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
