details: https://code.openbravo.com/erp/devel/pi/rev/aa165ef81792 changeset: 27069:aa165ef81792 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri May 08 12:39:56 2015 +0200 summary: Related with bug 29612:New grid configuration to improve population of fk combo
The new grid configuration allows to change the way the foreign key filter drop downs are populated. Usually the rows shown in a fk filter drop down are only those that are being used in the referencing table. But that can be very slow if the referenced table has only a few records and the referenced tablas has a huge volume. To address this problem, this new grid configuration allows to show all the records of the referenced table, even if they are not being used in the referencing table. When the queryService is being created to populate the filter drop down, the main entity is changed to the referenced table, and the criteria is updated. Also the where clause of the referencing table is now ignored. details: https://code.openbravo.com/erp/devel/pi/rev/e684c73bb502 changeset: 27070:e684c73bb502 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon May 11 13:18:57 2015 +0200 summary: Fixes bug 29732: Get rid of coalesce(to_char()) when possible to improve query We sometimes use the coalesce(to_char(value),'') functions to prevent passing null values in a where clause, replacing the null value with an empty string. The problem is that if those functions are used, then it will not be possible benefit from the indexes defined in the database. In this issue we have made a distintion between mandatory and non-mandatory columns. Mandatory columns will no longer use the coalesce and to_char functions in the AdvancedQueryBuilder.createIdentifierLeftClause method. We can do that safely as it is not possible that those columns have null values. details: https://code.openbravo.com/erp/devel/pi/rev/e65e148f179c changeset: 27071:e65e148f179c user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon May 11 13:45:43 2015 +0200 summary: Fixes issue 29612: Adds grid configuration to disable fk filter dropdown Sometime the cost of populating a foreign key filter dropdown is much higher than filtering its column using its identifier, like a standard text column. This changeset adds a grid configuration to allow disabling the dropdown of foreign key filters. If the configuration is activated the use will not be able to open the dropdown, not even using keyboard shortcuts. Saved views created before enabling this configuration will keep working after activating it. details: https://code.openbravo.com/erp/devel/pi/rev/5a4a2606f285 changeset: 27072:5a4a2606f285 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue May 12 13:13:23 2015 +0200 summary: Related with bug 29612: Applies properly the client/organizations filter If the column being filtered referenced the Client or Organization entity, then the resulting query was not including the where clause to filter the readable clients and organizations, respectively. This is a known issue, reported here [1]. This issue cannot be easily fixed, so this project address it by adding manually the readable client or organization filter if the entity being filtered is client or organization and if the query is being built as a result of opening the dropdown of one of the new unfiltered foreign key filters. [1] https://issues.openbravo.com/view.php?id=29846 details: https://code.openbravo.com/erp/devel/pi/rev/f9b82970014e changeset: 27073:f9b82970014e user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue May 12 16:08:36 2015 +0200 summary: Related with issue 29612: Updates name to use Combo instead of Dropdown details: https://code.openbravo.com/erp/devel/pi/rev/322841d09c06 changeset: 27074:322841d09c06 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon May 18 09:51:00 2015 +0200 summary: Related with issue 29612: Update Copyright year details: https://code.openbravo.com/erp/devel/pi/rev/cf34375332d2 changeset: 27075:cf34375332d2 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon May 18 10:49:53 2015 +0200 summary: Related with issue 29612: to_char needed in non-textual identifier properties When filtering a foreign key whose identifier is a column that does not use a text/string reference, using the to_char function is still needed. details: https://code.openbravo.com/erp/devel/pi/rev/c8311f845ea4 changeset: 27076:c8311f845ea4 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon May 18 12:28:44 2015 +0200 summary: Related with issue 29612: handle properly fk filter properties > > If the disableFkDropdown grid configuration is enabled, then the > allowFkFilterByIdentifier and showFkDropdownUnfiltered should not be taken > into account. Otherwise the user could configure the grid in a way that the > fintering of a column is enabled, but non functional details: https://code.openbravo.com/erp/devel/pi/rev/a9a39c837d3b changeset: 27077:a9a39c837d3b user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon May 18 18:13:47 2015 +0200 summary: Related with issue 29612: Adds display logic to Grid Configuration Adds display logic to the Field tab of the Grid Configuration: - If the Allow Filter field is set to No, the following fields are hidden: Text Field Filter Behavior, Field On Change, Threshold to Trigger Filter on Text Field, Disable Foreign Key Combo, Allow Filtering FOreign Keys by its identifier and Unfiltered Foreign Key Combo - If the Disable Foreign Key Combo field is set to Yes, the following fields are hidden: Allow Filtering FOreign Keys by its identifier and Unfiltered Foreign Key Combo details: https://code.openbravo.com/erp/devel/pi/rev/e9ae17759f2f changeset: 27078:e9ae17759f2f user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue Jun 23 11:50:57 2015 +0200 summary: Fixes issue 29612: FK filters with drop down disable behave like text filters If the "Disable Foreign Key Combo" grid configuration is enabled, then the filters of foreign key fields will not include a dropdown. In this case the filter will look like a standard text filter, so it ha s been decided that is should act like one. This mean the following grid properties should work: - Text Field Filter Behaviour. Allows to specify the default operator, no change was needed - Threashold to Trigger Filter on Text Field. Prevents executing several requests to the datasource in short time span. No change was needed - Filter On Change: Allows to specify if a filter datasource request should be done when the user types, before the filter editor loses the focus. The changes done in this changeset fix the third case. The actOnKeypress property is set to true if the FilterOnChange grid config is enabled, otherwise the filter was only done when the filter editor lost the focus. For this to work properly, another change was needed: the symbol of the default operator should not be shown in the filter editor. details: https://code.openbravo.com/erp/devel/pi/rev/809bf54dbb34 changeset: 27079:809bf54dbb34 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Jul 06 09:12:10 2015 +0200 summary: Related with issue 29612: Merge with pi diffstat: .classpath.template | 2 - .hgsigs | 4 + .hgtags | 4 + legal/Apache_poi_license.txt | 507 + legal/Licensing.txt | 28 +- legal/iTextpdf_license.txt | 452 + lib/runtime/iText-2.1.7.jar | 0 lib/runtime/itext-pdfa-5.5.0.jar | 0 lib/runtime/itextpdf-5.5.0.jar | 0 lib/runtime/jackson-annotations-2.1.4.jar | 0 lib/runtime/jackson-core-2.1.4.jar | 0 lib/runtime/jackson-databind-2.1.4.jar | 0 lib/runtime/jasperreports-4.0.1.jar | 0 lib/runtime/jasperreports-6.0.0.jar | 0 lib/runtime/jasperreports-fonts-4.0.1.jar | 0 lib/runtime/jasperreports-fonts-6.0.0.jar | 0 lib/runtime/poi-3.10.1.jar | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class | 0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 28 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 9 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml | 49 + modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml | 4 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 51 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml | 14 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 289 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 24 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml | 14 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 40 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml | 17 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 52 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 20 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 9 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders_data.xsql | 4 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java | 150 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java | 4 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java | 3 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ReceivedFromPaymentMethodActionHandler.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 1 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingDeposit.jrxml | 262 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingPayment.jrxml | 262 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java | 10 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml | 114 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/UnreconciledBankStatement.jrxml | 262 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 1 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java | 4 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java | 10 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java | 22 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java | 3 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 57 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 5 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 21 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/lib/runtime/guice-2.0.jar | 0 modules/org.openbravo.client.application/lib/runtime/httpclient-4.0.jar | 0 modules/org.openbravo.client.application/lib/runtime/httpcore-4.0.1.jar | 0 modules/org.openbravo.client.application/lib/runtime/httpmime-4.1.jar | 0 modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_FIELD.xml | 8 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml | 10 + modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml | 8 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 220 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 28 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 176 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 72 + 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/ApplicationComponentProvider.java | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MultipleDeleteActionHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java | 29 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ElementValueEventHandler.java | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TableTreeEventHandler.java | 18 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 1327 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 12 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java | 3 - modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 1 - modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java | 29 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java | 53 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 200 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 28 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js | 39 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 56 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservation.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 37 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js | 218 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 39 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js | 14 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/GetLabelActionHandler.java | 2 - modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 50 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java | 10 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java | 8 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SetContextInfoActionHandler.java | 3 - modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/freemarker/FreemarkerTemplateProcessor.java | 1 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java | 24 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 4 +- modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/ui-test-suite/index.html | 1 + 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.myob/src/org/openbravo/client/myob/CalendarWidgetProvider.java | 3 - modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java | 6 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js | 12 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/test/ob-myopenbravo-test.js | 5 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 4 +- 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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 26 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml | 141 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml | 355 +- 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.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml | 146 +- 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.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 64 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java | 2 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java | 4 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 7 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java | 6 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 164 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java | 1 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/NoteDataSource.java | 2 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 2 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java | 6 +- modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml | 47 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_EP_PROCEDURES.xml | 13 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_FIELD.xml | 197 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MENU.xml | 31 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml | 103 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 16 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 13 - 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.google/src-db/database/sourcedata/AD_TAB.xml | 32 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TREENODE.xml | 25 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml | 19 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_MENU_PARAMETERS.xml | 27 - modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml | 14 - modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java | 282 - modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleIntegrationComponentProvider.java | 60 - modules/org.openbravo.service.integration.google/web/images/google.png | 0 modules/org.openbravo.service.integration.google/web/org.openbravo.service.integration.google/js/obsegi-account-association-view.js | 63 - modules/org.openbravo.service.integration.openid/lib/runtime/guice-2.0.jar | 0 modules/org.openbravo.service.integration.openid/lib/runtime/httpclient-4.0.jar | 0 modules/org.openbravo.service.integration.openid/lib/runtime/httpcore-4.0.1.jar | 0 modules/org.openbravo.service.integration.openid/lib/runtime/httpmime-4.1.jar | 0 modules/org.openbravo.service.integration.openid/lib/runtime/openid4java-0.9.6.jar | 0 modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_FIELD.xml | 168 - 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.integration.openid/src-db/database/sourcedata/AD_TAB.xml | 32 - modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java | 255 - 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/AdvancedQueryBuilder.java | 25 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 186 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java | 3 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 8 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java | 2 - modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 68 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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 | 20 +- referencedata/sampledata/F_B_International_Group/AD_CLIENT_ACCTDIMENSION.xml | 12 +- referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml | 71274 - referencedata/sampledata/F_B_International_Group/AD_PINSTANCE_PARA.xml | 31200 - referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml | 140 + referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 62 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml | 522 +- referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 66 +- referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 3958 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 9687 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4698 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2232 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 10396 + referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 4029 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 415514 +-------- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 46 +- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1008 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1608 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 1812 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 896 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 660 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 2370 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1332 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 116 + referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 216 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 78 + referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1512 + referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml | 120 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 1976 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1548 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 5178 + referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1482 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2964 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 248 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 88 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 6750 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3825 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 280 + referencedata/sampledata/F_B_International_Group/OBUIAPP_VIEW_ROLE_ACCESS.xml | 130 - referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml | 42 - referencedata/sampledata/QA_Testing/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/QA_Testing/C_CONVERSION_RATE_DOCUMENT.xml | 19 + referencedata/sampledata/QA_Testing/C_INVOICE.xml | 171 +- referencedata/sampledata/QA_Testing/C_INVOICELINE.xml | 74 + referencedata/sampledata/QA_Testing/C_INVOICELINETAX.xml | 54 + referencedata/sampledata/QA_Testing/C_INVOICETAX.xml | 85 + referencedata/sampledata/QA_Testing/C_ORDER.xml | 113 + referencedata/sampledata/QA_Testing/C_ORDERLINE.xml | 46 + referencedata/sampledata/QA_Testing/C_ORDERLINETAX.xml | 17 + referencedata/sampledata/QA_Testing/C_ORDERTAX.xml | 16 + referencedata/sampledata/QA_Testing/C_UOM.xml | 1 + referencedata/sampledata/QA_Testing/FACT_ACCT.xml | 3969 +- referencedata/sampledata/QA_Testing/FIN_FINACC_PAYMENTMETHOD.xml | 30 + referencedata/sampledata/QA_Testing/FIN_PAYMENT.xml | 118 +- referencedata/sampledata/QA_Testing/FIN_PAYMENTMETHOD.xml | 26 + referencedata/sampledata/QA_Testing/FIN_PAYMENT_DETAIL.xml | 48 + referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULE.xml | 66 + referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULEDETAIL.xml | 75 + referencedata/sampledata/QA_Testing/M_INOUT.xml | 41 + referencedata/sampledata/QA_Testing/M_INOUTLINE.xml | 21 + referencedata/sampledata/QA_Testing/M_MATCHINV.xml | 19 + referencedata/sampledata/QA_Testing/M_MATCHPO.xml | 38 + referencedata/sampledata/QA_Testing/M_PRICELIST.xml | 18 + referencedata/sampledata/QA_Testing/M_PRICELIST_VERSION.xml | 17 + referencedata/sampledata/QA_Testing/M_PRODUCTPRICE.xml | 18 + referencedata/sampledata/QA_Testing/M_STORAGE_DETAIL.xml | 130 +- referencedata/sampledata/QA_Testing/M_STORAGE_PENDING.xml | 17 + referencedata/sampledata/QA_Testing/M_TRANSACTION.xml | 27 + referencedata/sampledata/QA_Testing/OBUIAPP_VIEW_ROLE_ACCESS.xml | 39 - src-core/src/org/openbravo/base/VariablesBase.java | 91 +- src-core/src/org/openbravo/base/filter/NumberFilter.java | 1 + src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java | 1 - src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/AD_TABLE_IMPORT.xml | 6 +- src-db/database/model/functions/C_CHANGEPROJECTSTATUSTOORDER.xml | 4 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 2 +- src-db/database/model/functions/C_GENERATESOFROMPROJECTPHASE.xml | 8 +- src-db/database/model/functions/C_INVOICE_POST.xml | 16 +- src-db/database/model/functions/GL_JOURNAL_POST.xml | 11 +- src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml | 5 +- src-db/database/model/functions/M_GET_NO_TRX_PRODUCT_COST.xml | 26 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 13 +- src-db/database/model/functions/M_INOUT_POST.xml | 57 + src-db/database/model/functions/M_PRICELIST_CREATE.xml | 229 +- src-db/database/model/functions/M_PRODUCTION_RUN.xml | 74 +- src-db/database/model/functions/M_RESERVATION_POST.xml | 33 +- src-db/database/model/tables/C_IMPORT_ENTRY.xml | 19 +- src-db/database/model/tables/C_IMPORT_ENTRY_ARCHIVE.xml | 11 +- src-db/database/model/tables/M_PRODUCT_PO.xml | 6 + src-db/database/model/tables/M_TRANSACTION.xml | 6 + src-db/database/model/triggers/AD_PACKAGE_JP_TRG.xml | 5 +- src-db/database/model/triggers/C_ORDERLINE2_TRG.xml | 21 +- src-db/database/model/triggers/M_WAREHOUSE_TRG.xml | 12 +- src-db/database/model/views/M_CREATEPOLINES_PE_V.xml | 2 +- src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 66 + src-db/database/sourcedata/AD_COLUMN.xml | 285 +- src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml | 160 +- src-db/database/sourcedata/AD_ELEMENT.xml | 50 +- src-db/database/sourcedata/AD_FIELD.xml | 1770 +- src-db/database/sourcedata/AD_MENU.xml | 14 + src-db/database/sourcedata/AD_MESSAGE.xml | 50 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 28 +- src-db/database/sourcedata/AD_PROCESS_PARA.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 15 +- src-db/database/sourcedata/AD_REF_LIST.xml | 15 +- src-db/database/sourcedata/AD_TAB.xml | 84 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 +- src-db/database/sourcedata/AD_TREENODE.xml | 13 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 18 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 22 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 134 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 13 +- src-test/src/org/openbravo/test/AllQuickAntTaskTests.java | 4 + src-test/src/org/openbravo/test/AllWebserviceTests.java | 4 +- src-test/src/org/openbravo/test/AntTaskTests.java | 4 + src-test/src/org/openbravo/test/accounting/PostDocumentTest.java | 255 + src-test/src/org/openbravo/test/costing/TestCosting.java | 12 +- src-test/src/org/openbravo/test/dal/ADCachedMultiThreadTest.java | 2 +- src-test/src/org/openbravo/test/dal/DalPerformanceExampleTest.java | 1 - src-test/src/org/openbravo/test/scheduling/ProcessSchedulingTest.java | 87 + src-test/src/org/openbravo/test/system/ImportEntrySizeTest.java | 114 + src-test/src/org/openbravo/test/system/Issue29934Test.java | 67 + src-test/src/org/openbravo/test/webservice/JSONWebServices.java | 2 +- src-test/src/org/openbravo/test/webservice/WebServicesWithNoActiveFilterTest.java | 152 + src-test/src/org/openbravo/test/xml/EntityXMLIssues.java | 2 +- src-trl/src/org/openbravo/translate/RTLSkin.java | 9 +- src-trl/src/org/openbravo/translate/Translate.java | 18 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseDecimalNumberCheckData.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheck.class | 0 src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheckData.class | 0 src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck.java | 55 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseDecimalNumberCheck_data.xsql | 30 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck.java | 120 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck_data.xsql | 37 + src-util/buildvalidation/src/org/openbravo/buildvalidation/GLJournalAccountingCheck_data.xsql | 4 +- src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentBPClientDimension.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentBPClientDimensionData.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlan.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlanData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentBPClientDimension.java | 41 + src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentBPClientDimension_data.xsql | 72 + src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan.java | 4 +- src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql | 44 +- src-wad/src/org/openbravo/wad/Wad.java | 45 +- src-wad/src/org/openbravo/wad/WadUtility.java | 9 +- src-wad/src/org/openbravo/wad/controls/WADControl.java | 3 +- src-wad/src/org/openbravo/wad/controls/WADImage.java | 6 +- src-wad/src/org/openbravo/wad/controls/WADNumber.java | 10 +- src-wad/src/org/openbravo/wad/controls/WADSearch.java | 6 +- src-wad/src/org/openbravo/wad/javasource.javaxml | 14 +- src-wad/src/org/openbravo/wad/validation/WADValidator.java | 2 + src/org/openbravo/base/model/Column.java | 2 +- src/org/openbravo/base/model/ModelProvider.java | 3 +- src/org/openbravo/base/model/Property.java | 14 +- src/org/openbravo/base/provider/OBProviderConfigReader.java | 2 - src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 145 +- src/org/openbravo/base/secureApp/LoginUtils.java | 5 +- src/org/openbravo/base/secureApp/OrgTree.java | 9 - src/org/openbravo/base/session/HostNameTask.java | 2 +- src/org/openbravo/base/session/OBYesNoType.java | 4 +- src/org/openbravo/base/structure/IdentifierProvider.java | 3 +- src/org/openbravo/common/actionhandler/KillProcess.java | 12 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 3 - src/org/openbravo/common/actionhandler/RMShipmentPickEditLines.java | 3 - src/org/openbravo/common/datasource/ResultMapCriteriaUtils.java | 2 +- src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java | 10 +- src/org/openbravo/configuration/ConfigurationApp.java | 26 +- src/org/openbravo/configuration/ConfigureOption.java | 2 - src/org/openbravo/costing/AverageCostAdjustment.java | 49 +- src/org/openbravo/costing/CostAdjustmentProcess.java | 3 +- src/org/openbravo/costing/CostingAlgorithm.java | 2 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 8 + src/org/openbravo/costing/CostingBackground.java | 117 +- src/org/openbravo/costing/CostingMigrationProcess.java | 2 +- src/org/openbravo/costing/CostingRuleProcess.java | 2 +- src/org/openbravo/costing/CostingRuleProcessOnProcessHandler.java | 2 +- src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 4 +- src/org/openbravo/costing/LCMatchingProcess.java | 40 +- src/org/openbravo/costing/LandedCostDistributionByAmount.java | 37 +- src/org/openbravo/costing/LandedCostProcess.java | 51 +- src/org/openbravo/costing/PriceDifferenceProcess.java | 1 + src/org/openbravo/costing/StandardCostAdjustment.java | 36 +- src/org/openbravo/dal/core/SessionHandler.java | 8 + src/org/openbravo/dal/security/EntityAccessChecker.java | 21 +- src/org/openbravo/dal/security/SecurityChecker.java | 3 +- src/org/openbravo/dal/service/OBDal.java | 18 + src/org/openbravo/dal/service/OBDao.java | 2 +- src/org/openbravo/dal/xml/EntityExcelXMLConverter.java | 2 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 1 - src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters_data.xsql | 18 +- src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues.java | 1 - src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Asset_Product.java | 1 - src/org/openbravo/erpCommon/ad_callouts/SL_PC_Case_Product.java | 1 - src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product_Attribute.java | 2 +- src/org/openbravo/erpCommon/ad_forms/About.java | 2 - src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 6 +- src/org/openbravo/erpCommon/ad_forms/DocAmortizationTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocBankTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocCashTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocDPManagementTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocDoubtfulDebt.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocDoubtfulDebtTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java | 2 - src/org/openbravo/erpCommon/ad_forms/DocFINBankStatementTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransactionTemplate.java | 4 - src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINPaymentTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocFINReconciliationTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocGLJournalTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocInOutTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocInventoryTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 25 +- src/org/openbravo/erpCommon/ad_forms/DocInvoiceTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_forms/DocLCCostTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocLandedCostTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocLine_FINPayment.java | 2 - src/org/openbravo/erpCommon/ad_forms/DocMatchInvTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocMovementTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocOrderTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocPaymentTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/DocProductionTemplate.java | 1 - src/org/openbravo/erpCommon/ad_forms/Fact.java | 18 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html | 2 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 23 +- src/org/openbravo/erpCommon/ad_forms/Registration.java | 10 - src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java | 37 +- src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_forms/TranslationManager.java | 1 - src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java | 6 +- src/org/openbravo/erpCommon/ad_process/DeleteClient.java | 2 - src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 2 - src/org/openbravo/erpCommon/ad_process/JasperProcess.java | 117 +- src/org/openbravo/erpCommon/ad_process/MRPPurchaseCreateReservations.java | 5 +- src/org/openbravo/erpCommon/ad_process/RegisterModule.java | 2 +- src/org/openbravo/erpCommon/ad_process/ResetAccountingProcess.java | 4 - src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java | 2 +- src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml | 180 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.jrxml | 71 +- src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.jrxml | 106 +- src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml | 107 +- src/org/openbravo/erpCommon/ad_reports/ReportAssetDepreciationSchedule.jrxml | 70 +- src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml | 110 +- src/org/openbravo/erpCommon/ad_reports/ReportCashJR.jrxml | 122 +- src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.java | 11 +- src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.jrxml | 132 +- src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast_perDay.jrxml | 128 +- src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast_sub.jrxml | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.jrxml | 125 +- src/org/openbravo/erpCommon/ad_reports/ReportDebtPaymentTracker.jrxml | 86 +- src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_BankAcc.jrxml | 134 +- src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP.jrxml | 126 +- src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP_BankAcc.jrxml | 127 +- src/org/openbravo/erpCommon/ad_reports/ReportExpense.jrxml | 201 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 1 - src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.jrxml | 171 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml | 68 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml | 146 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalExcel.jrxml | 54 +- src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.jrxml | 61 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml | 1017 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR_legacy.jrxml | 7374 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 10 - src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_legacy.java | 10 - src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeExtendedJR.jrxml | 6465 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesMultiComparativeJR.jrxml | 4815 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesNoComparativeJR.jrxml | 607 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesNoComparativeJR_legacy.jrxml | 607 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.jrxml | 104 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerJR.jrxml | 167 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountJR.jrxml | 187 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.jrxml | 56 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorJR.jrxml | 154 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoicesEditJR.jrxml | 220 +- src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.jrxml | 106 +- src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.jrxml | 255 +- src/org/openbravo/erpCommon/ad_reports/ReportPendingProductionJr.jrxml | 95 +- src/org/openbravo/erpCommon/ad_reports/ReportProductionJR.java | 9 +- src/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml | 175 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.jrxml | 167 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.jrxml | 313 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProgress.jrxml | 228 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml | 164 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.jrxml | 157 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.jrxml | 183 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.jrxml | 155 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesPartnerProduct.jrxml | 55 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesPartnerProduct_srpt.jasper | 0 src/org/openbravo/erpCommon/ad_reports/ReportSalesPartnerProduct_srpt.jrxml | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentEdition.jrxml | 103 +- src/org/openbravo/erpCommon/ad_reports/ReportStandardCostJR.java | 12 +- src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR.jrxml | 126 +- src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_srptcosts.jrxml | 50 +- src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_subreport0.jrxml | 49 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.jrxml | 55 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java | 9 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchase.jrxml | 76 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchaseForeign.jrxml | 76 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSale.jrxml | 76 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml | 77 +- src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignmentJR.jrxml | 164 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 67 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceExcel.jrxml | 82 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml | 200 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql | 206 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.html | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.jrxml | 113 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java | 7 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEdit.jrxml | 93 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR.jrxml | 140 +- src/org/openbravo/erpCommon/ad_reports/SimpleDimensionalComparative.jrxml | 350 +- src/org/openbravo/erpCommon/ad_reports/SimpleDimensionalNoComparative.jrxml | 230 +- src/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily.jrxml | 15 +- src/org/openbravo/erpCommon/ad_reports/SubreportWorkRequirementDaily2.jrxml | 11 +- src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml | 954 +- src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml | 623 +- src/org/openbravo/erpCommon/ad_reports/productionReport.jrxml | 909 +- src/org/openbravo/erpCommon/ad_reports/productionSubReport.jrxml | 252 +- src/org/openbravo/erpCommon/businessUtility/AuditTrailDeletedRecords.java | 2 +- src/org/openbravo/erpCommon/businessUtility/COAUtility.java | 1 - src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java | 3 +- src/org/openbravo/erpCommon/info/AccountElementValue.java | 8 +- src/org/openbravo/erpCommon/info/ImageInfoBLOB.java | 3 +- src/org/openbravo/erpCommon/info/Locator.java | 5 +- src/org/openbravo/erpCommon/modules/ImportModule.java | 9 +- src/org/openbravo/erpCommon/modules/ModuleTree.java | 3 - src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java | 2 - src/org/openbravo/erpCommon/modules/VersionUtility.java | 2 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 3 - src/org/openbravo/erpCommon/security/Login.html | 6 +- src/org/openbravo/erpCommon/security/Login.java | 83 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 2 - src/org/openbravo/erpCommon/utility/DateTime_data.xsql | 7 + src/org/openbravo/erpCommon/utility/DownloadReport.java | 2 + src/org/openbravo/erpCommon/utility/GenericTree.java | 6 +- src/org/openbravo/erpCommon/utility/GridBO.java | 108 +- src/org/openbravo/erpCommon/utility/GridReportVO.java | 2 +- src/org/openbravo/erpCommon/utility/LeftTabsBar.java | 2 - src/org/openbravo/erpCommon/utility/NavigationBar.java | 2 - src/org/openbravo/erpCommon/utility/PrintJR.java | 9 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 52 +- src/org/openbravo/erpCommon/utility/ReportDesignBO.java | 7 +- src/org/openbravo/erpCommon/utility/ToolBar.java | 2 - src/org/openbravo/erpCommon/utility/UsedByLink.java | 2 - src/org/openbravo/erpCommon/utility/Utility.java | 43 +- src/org/openbravo/erpCommon/utility/plantilla.jrxml | 325 +- src/org/openbravo/erpCommon/utility/poc/EmailManager.java | 4 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 112 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 200 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintInvoices.java | 2 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintOrders.java | 2 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintQuotations.java | 2 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintShipments.java | 2 - src/org/openbravo/erpReports/C_OrderJR.jrxml | 827 +- src/org/openbravo/erpReports/C_OrderJR_new.jrxml | 97 +- src/org/openbravo/erpReports/C_OrderLinesJR.jrxml | 94 +- src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml | 60 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR.jrxml | 84 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml | 54 +- src/org/openbravo/erpReports/C_QuotationJR.jrxml | 87 +- src/org/openbravo/erpReports/C_RMOrderJR.jrxml | 84 +- src/org/openbravo/erpReports/C_RMOrderLinesJR.jrxml | 102 +- src/org/openbravo/erpReports/ReportRegisterByVatJR.jrxml | 186 +- src/org/openbravo/erpReports/ReportRegisterLineJR.jrxml | 89 +- src/org/openbravo/erpReports/ReportVatRegisterJR.java | 2 +- src/org/openbravo/erpReports/RptC_Invoice.java | 12 +- src/org/openbravo/erpReports/RptC_Invoice.jrxml | 71 +- src/org/openbravo/erpReports/RptC_Invoice_Lines.jrxml | 81 +- src/org/openbravo/erpReports/RptC_Invoice_Lines_new.jrxml | 60 +- src/org/openbravo/erpReports/RptC_Invoice_TaxLines.jrxml | 37 +- src/org/openbravo/erpReports/RptC_Invoice_TaxLines_new.jrxml | 28 +- src/org/openbravo/erpReports/RptC_Invoice_new.jrxml | 971 +- src/org/openbravo/erpReports/RptC_Order.java | 9 +- src/org/openbravo/erpReports/RptC_OrderPO.java | 9 +- src/org/openbravo/erpReports/RptC_OrderPO.jrxml | 73 +- src/org/openbravo/erpReports/RptC_OrderPO_Lines.jrxml | 64 +- src/org/openbravo/erpReports/RptC_Order_TaxLines.jrxml | 23 +- src/org/openbravo/erpReports/RptC_Order_TaxLines_new.jrxml | 18 +- src/org/openbravo/erpReports/RptC_ProposalJr.java | 9 +- src/org/openbravo/erpReports/RptC_ProposalJr.jrxml | 69 +- src/org/openbravo/erpReports/RptC_Remittance.java | 5 +- src/org/openbravo/erpReports/RptC_Remittance.jrxml | 104 +- src/org/openbravo/erpReports/RptC_Remittance_Lines.jrxml | 42 +- src/org/openbravo/erpReports/RptFIN_Payment.jrxml | 72 +- src/org/openbravo/erpReports/RptFIN_PaymentLines.jrxml | 56 +- src/org/openbravo/erpReports/RptMA_ProcessPlan.jrxml | 140 +- src/org/openbravo/erpReports/RptM_InOut.jrxml | 54 +- src/org/openbravo/erpReports/RptM_InOut_new.jrxml | 61 +- src/org/openbravo/erpReports/RptM_RMInOut.jrxml | 62 +- src/org/openbravo/erpReports/RptM_RMInOut_Lines.jrxml | 64 +- src/org/openbravo/erpReports/RptM_Requisition.java | 9 +- src/org/openbravo/erpReports/RptM_Requisition.jrxml | 53 +- src/org/openbravo/erpReports/RptM_Requisition_Lines.jrxml | 56 +- src/org/openbravo/erpReports/Rptm_InOut_Lines.jrxml | 64 +- src/org/openbravo/erpReports/Rptm_InOut_Lines_new.jrxml | 52 +- src/org/openbravo/erpReports/SubreportLines.jrxml | 53 +- src/org/openbravo/event/CharacteristicValueEventHandler.java | 60 +- src/org/openbravo/event/GLJournalEventHandler.java | 12 +- src/org/openbravo/event/InvoiceLineEventHandler.java | 15 +- src/org/openbravo/event/MInOutLineEventHandler.java | 22 +- src/org/openbravo/event/OrderLineEventHandler.java | 69 + src/org/openbravo/event/RoleEventHandler.java | 173 + src/org/openbravo/materialmgmt/InventoryCountProcess.java | 4 +- src/org/openbravo/materialmgmt/VariantAutomaticGenerationProcess.java | 8 +- src/org/openbravo/materialmgmt/VariantChDescUpdateProcess.java | 4 +- src/org/openbravo/scheduling/DefaultJob.java | 21 +- src/org/openbravo/scheduling/KillableProcess.java | 11 +- src/org/openbravo/scheduling/OBScheduler.java | 6 - src/org/openbravo/scheduling/Process.java | 2 + src/org/openbravo/scheduling/ProcessMonitor.java | 21 +- src/org/openbravo/service/db/CallProcess.java | 2 +- src/org/openbravo/service/db/DalBaseProcess.java | 18 +- src/org/openbravo/service/db/DataImportService.java | 3 +- src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java | 36 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 396 +- src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 599 +- src/org/openbravo/service/importprocess/ImportProcessUtils.java | 64 +- src/org/openbravo/service/importprocess/ImportReprocessErrorEntries.java | 66 + src/org/openbravo/service/importprocess/ProcessImportEntriesProcessActionHandler.java | 92 + src/org/openbravo/service/rest/DalWebService.java | 10 +- src/org/openbravo/service/rest/bo.xslt | 30 +- src/org/openbravo/service/system/ApplicationDictionaryValidator.java | 3 - src/org/openbravo/service/web/WebServiceUtil.java | 13 +- web/images/gSignInButtonDemo.png | 0 656 files changed, 152210 insertions(+), 497821 deletions(-) diffs (truncated from 768166 to 300 lines): diff -r e8b37e1f8639 -r 809bf54dbb34 .classpath.template --- a/.classpath.template Mon May 11 19:21:58 2015 +0200 +++ b/.classpath.template Mon Jul 06 09:12:10 2015 +0200 @@ -19,8 +19,6 @@ <classpathentry kind="src" path="modules/org.openbravo.userinterface.selector/src"/> <classpathentry kind="src" path="modules/org.openbravo.userinterface.smartclient/src"/> <classpathentry kind="src" path="modules/org.openbravo.service.datasource/src"/> - <classpathentry kind="src" path="modules/org.openbravo.service.integration.openid/src"/> - <classpathentry kind="src" path="modules/org.openbravo.service.integration.google/src"/> <classpathentry kind="src" path="modules/org.openbravo.utility.cleanup.log/src"/> <classpathentry including="quartz.properties" kind="src" path="config"/> <classpathentry kind="src" path="src-gen"/> diff -r e8b37e1f8639 -r 809bf54dbb34 .hgsigs --- a/.hgsigs Mon May 11 19:21:58 2015 +0200 +++ b/.hgsigs Mon Jul 06 09:12:10 2015 +0200 @@ -168,4 +168,8 @@ 831f7c3e542951b324cd9880b198bb4751bfd251 0 iEYEABECAAYFAlTm9ToACgkQCX/oGf+2qkPpFgCgzIKSAc1CMJoGRySzaUNdjoiyXyUAn2N/WoGlO000oJ6LcEcBldIz3+iT 295e0a259f619311101efee9f1d31aede5bdaa95 0 iEYEABECAAYFAlUZK3oACgkQCX/oGf+2qkOrywCdFORG9mDgA9SMY95tQrtMYtUftS0AoK6d8rFNeUz9xDvAP/y0B+2myvoN 4d63b001f63758b1b79b9502621754878acdfdff 0 iEYEABECAAYFAlUwx7cACgkQCX/oGf+2qkOn2gCcCxKfDDCR1P8qYR9bNtxTIs81JY8AniiMcNvRgeOQ6DOF+jHHVksUM4eO +ac3537eef819b48dc9888d5ab0d4fec470158bef 0 iEYEABECAAYFAlVbMyIACgkQCX/oGf+2qkPRzwCfYI94AYb2DYsvojxmVtqMVqKjGiQAoIfADynxGuktv9GHEwfJOnnLCxv3 +370bc533058038007007c659c47de628c4bdcfd6 0 iEYEABECAAYFAlWCjH4ACgkQCX/oGf+2qkP10wCgmhrDxV+DCix0YGwG3nzoCyoug9kAoMoxktPF74eqwpkmVy3uyn5RYT5O ac761ac78f576cee64046e115ac42d2a3b227682 0 iEYEABECAAYFAlVItlgACgkQCX/oGf+2qkPgSACeNz58xoUWpTvMywmncbWx7+r7bnUAn1Ba1al80Q9HMY/wiMNu1Vfpd9Jo +fdb1e0cd936d09381ae1aa87be98cc4f0f334f31 0 iEYEABECAAYFAlVbM8QACgkQCX/oGf+2qkO+wACfTbKub/UT0e2V2iyIB21716NAn/oAoIHu7PYZ7w/BkTQDZWR0PXDdYkty +bd0e758ae44eb624d8af403fb4764629c1a45b21 0 iEYEABECAAYFAlWChbsACgkQCX/oGf+2qkM6xACfXP4M7zXaih+uqkIpGHMqGPTzxD8An0r58zI1YN3gKOT9t0kZ3IdaNA7c diff -r e8b37e1f8639 -r 809bf54dbb34 .hgtags --- a/.hgtags Mon May 11 19:21:58 2015 +0200 +++ b/.hgtags Mon Jul 06 09:12:10 2015 +0200 @@ -179,4 +179,8 @@ 39f3bed2ed0eaa2a7e69a46d7bf417c346e25a6a 3.0PR15Q1.1 31dfe7896f8fcd9390b979d7c6972f5aea00d199 3.0PR15Q1.2 ad409516bfa0b1c6f7ab128cab4526dd5058c787 3.0PR15Q1.3 +d5ec99ff8e8e301cf4bf673f37b9c04ea1758f98 3.0PR15Q1.4 +d2f1dd0d0b4c2e493c26a4b9cbdb20fdc50c5f13 3.0PR15Q1.5 4239774eb8de8f0740bfbd6e3e36c075ee2a5a91 3.0PR15Q2 +e861122b0b1d2aa2ca6e177bfbb9ddf939e33dd7 3.0PR15Q2.1 +a28a880b5aeb9208eaf0ce569fd51b7a5fc2b48e 3.0PR15Q2.2 diff -r e8b37e1f8639 -r 809bf54dbb34 legal/Apache_poi_license.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/legal/Apache_poi_license.txt Mon Jul 06 09:12:10 2015 +0200 @@ -0,0 +1,507 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +APACHE POI SUBCOMPONENTS: + +Apache POI includes subcomponents with separate copyright notices and +license terms. Your use of these subcomponents is subject to the terms +and conditions of the following licenses: + + +Office Open XML schemas (ooxml-schemas-1.0.jar) + + The Office Open XML schema definitions used by Apache POI are + a part of the Office Open XML ECMA Specification (ECMA-376, [1]). + As defined in section 9.4 of the ECMA bylaws [2], this specification + is available to all interested parties without restriction: + + 9.4 All documents when approved shall be made available to + all interested parties without restriction. + + Furthermore, both Microsoft and Adobe have granted patent licenses + to this work [3,4,5]. + + [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm + [2] http://www.ecma-international.org/memento/Ecmabylaws.htm + [3] http://www.microsoft.com/interop/osp/ + [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ECMA-376%20Edition%201%20Microsoft%20Patent%20Declaration.pdf + [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ga-2006-191.pdf + + +DOM4J library (dom4j-1.6.1.jar) + + Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. + + Redistribution and use of this software and associated documentation + ("Software"), with or without modification, are permitted provided + that the following conditions are met: + + 1. Redistributions of source code must retain copyright + statements and notices. Redistributions must also contain a + copy of this document. + + 2. Redistributions in binary form must reproduce the + above copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + + 3. The name "DOM4J" must not be used to endorse or promote + products derived from this Software without prior written + permission of MetaStuff, Ltd. For written permission, + please contact dom4j-i...@metastuff.com. + + 4. Products derived from this Software may not be called "DOM4J" + nor may "DOM4J" appear in their names without prior written + permission of MetaStuff, Ltd. DOM4J is a registered + trademark of MetaStuff, Ltd. + + 5. Due credit should be given to the DOM4J Project - + http://www.dom4j.org ------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
