details: /erp/devel/pi/rev/3b6cc2a1e2da
changeset: 8158:3b6cc2a1e2da
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Tue Aug 03 21:29:48 2010 +0200
summary: Fixes issue 12682: About window gives error when users has limited
privileges
details: /erp/devel/pi/rev/5d63734f029e
changeset: 8159:5d63734f029e
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Wed Aug 04 08:48:58 2010 +0200
summary: merging
details: /erp/devel/pi/rev/f97ae5e3da28
changeset: 8160:f97ae5e3da28
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Tue Aug 10 21:10:37 2010 +0200
summary: Fixes issue 13718: Auto-generated template doesn't depend on Core
details: /erp/devel/pi/rev/4cca68d5dd50
changeset: 8161:4cca68d5dd50
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Tue Aug 10 22:26:24 2010 +0200
summary: merging
details: /erp/devel/pi/rev/b66824cd6033
changeset: 8162:b66824cd6033
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Fri Aug 13 12:44:11 2010 +0200
summary: Merging with PI
details: /erp/devel/pi/rev/52747cb9a65a
changeset: 8163:52747cb9a65a
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Fri Aug 13 16:05:11 2010 +0200
summary: Fixes issue 13718: Auto-generated template doesn't depend on Core
details: /erp/devel/pi/rev/4ff0f4a349b6
changeset: 8164:4ff0f4a349b6
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Aug 16 09:55:16 2010 +0200
summary: merge
diffstat:
build.xml
| 1 +
config/licenseRestrictions
| 1 +
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/functions/C_INVOICE_CREATE.xml
| 2 +-
src-db/database/model/functions/C_ORDER_POST1.xml
| 6 +
src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml
| 6 -
src-db/database/model/tables/AD_MODULE.xml
| 11 +
src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml
| 12 +
src-db/database/model/tables/AD_MODULE_DEPENDENCY_INST.xml
| 8 +
src-db/database/model/tables/AD_MODULE_INSTALL.xml
| 8 +
src-db/database/model/tables/I_ORDER.xml
| 11 +
src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml
| 20 +-
src-db/database/model/triggers/AD_MODULE_TRG.xml
| 5 +-
src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml
| 12 +-
src-db/database/model/triggers/AD_SYSTEM_INFO_TRG2.xml
| 21 +-
src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml
| 5 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 467 ++++++-
src-db/database/sourcedata/AD_DATASET_COLUMN.xml
| 22 +
src-db/database/sourcedata/AD_ELEMENT.xml
| 151 +-
src-db/database/sourcedata/AD_FIELD.xml
| 650 +++++++--
src-db/database/sourcedata/AD_FORM.xml
| 7 +-
src-db/database/sourcedata/AD_MENU.xml
| 12 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 501 +++++-
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 4 +-
src-db/database/sourcedata/AD_MODULE.xml
| 1 +
src-db/database/sourcedata/AD_PROCESS.xml
| 6 +-
src-db/database/sourcedata/AD_PROCESS_PARA.xml
| 4 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 75 +-
src-db/database/sourcedata/AD_REF_LIST.xml
| 157 ++
src-db/database/sourcedata/AD_TABLE.xml
| 146 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 385 ++++-
src-db/database/sourcedata/AD_WINDOW.xml
| 16 +-
src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java
| 3 +
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedJavaPackage.class
| 0
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedJavaPackageData.class
| 0
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedJavaPackage.java
| 54 +
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedJavaPackage_data.xsql
| 34 +
src-wad/src/org/openbravo/wad/ActionButtonJava_Responser.javaxml
| 18 +-
src-wad/src/org/openbravo/wad/ActionButton_Responser.javaxml
| 18 +-
src-wad/src/org/openbravo/wad/TemplateSortTab_Relation.html
| 2 +-
src-wad/src/org/openbravo/wad/Template_ActionButton.html
| 2 +-
src-wad/src/org/openbravo/wad/Template_Edition.html
| 2 +-
src-wad/src/org/openbravo/wad/Template_Relation.html
| 2 +-
src/build.xml
| 2 +-
src/org/openbravo/base/secureApp/Error.html
| 1 +
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 150 ++-
src/org/openbravo/base/secureApp/LoginHandler.java
| 4 +-
src/org/openbravo/base/secureApp/LoginUtils.java
| 1 +
src/org/openbravo/base/secureApp/PopUp_Close.html
| 4 +-
src/org/openbravo/base/secureApp/PopUp_Close_And_Refresh.html
| 4 +-
src/org/openbravo/base/secureApp/PopUp_Close_Refresh.html
| 4 +-
src/org/openbravo/base/secureApp/PopUp_Response.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/ActionButtonDefault.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/ActionButtonResponse.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
| 27 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
| 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
| 125 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt.html
| 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment.html
| 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_DPManagement.html
| 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_F0.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Settlement.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/EncryptedButtons.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html
| 1 -
src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.html
| 2 +-
src/org/openbravo/erpCommon/ad_actionButton/RequestAction.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/About.html
| 43 +-
src/org/openbravo/erpCommon/ad_forms/About.java
| 100 +-
src/org/openbravo/erpCommon/ad_forms/About.xml
| 15 +-
src/org/openbravo/erpCommon/ad_forms/About_data.xsql
| 52 -
src/org/openbravo/erpCommon/ad_forms/AlertManagement.html
| 3 +-
src/org/openbravo/erpCommon/ad_forms/CallAcctServer.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/DebtPaymentUnapply.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/EdiFileImport.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/FileImport.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/InformeInOut.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.html
| 3 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html
| 56 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java
| 182 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html
| 56 +-
src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline_Lines.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/MaturityLevel.java
| 6 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 298 ++++-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementAdd.html
| 3 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementDetails.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html
| 8 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
| 44 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementSettings.html
| 103 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementSettings.xml
| 17 +
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallLocal.html
| 3 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP2.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP4.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/RemittanceCancel.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html
| 3 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrderCreate.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql
| 11 +-
src/org/openbravo/erpCommon/ad_forms/Resultado.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/Role.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/Role.java
| 4 +-
src/org/openbravo/erpCommon/ad_forms/SQLExecutor.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/ShowSessionVariables.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/Translation.html
| 1 -
src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.html
| 3 +-
src/org/openbravo/erpCommon/ad_process/COrderLine_data.xsql
| 8 +-
src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.html
| 1 -
src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.html
| 1 -
src/org/openbravo/erpCommon/ad_process/CreateAccountingReportPopUp.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/CreateCashFlowStatement.html
| 1 -
src/org/openbravo/erpCommon/ad_process/CreateTaxReport.html
| 1 -
src/org/openbravo/erpCommon/ad_process/CreateTaxReportPopUp.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/DeleteClient.html
| 1 -
src/org/openbravo/erpCommon/ad_process/GenerateHelp.html
| 1 -
src/org/openbravo/erpCommon/ad_process/ImportOrder.java
| 145 ++
src/org/openbravo/erpCommon/ad_process/ImportOrder_data.xsql
| 146 ++-
src/org/openbravo/erpCommon/ad_process/PriceListCreateAll.html
| 1 -
src/org/openbravo/erpCommon/ad_process/PrintInvoices.html
| 1 -
src/org/openbravo/erpCommon/ad_process/RequestReOpen.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/SendMailText.html
| 1 -
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/GenerateModel347.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesEdition.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.html
| 10 +-
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.java
| 76 +-
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.xml
| 7 +-
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance_data.xsql
| 7 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportAssetDepreciationSchedule.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportBank.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportBankEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportBankJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html
| 1 -
src/org/openbravo/erpCommon/ad_reports/ReportCash.html
| 1 -
src/org/openbravo/erpCommon/ad_reports/ReportCashEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportCashFlow.html
| 1 -
src/org/openbravo/erpCommon/ad_reports/ReportCashFlowPopUp.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportCashFlowReload.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportCashJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportDebtPaymentTrack.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportExpense.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportExpenseEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
| 1 -
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
| 34 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalDetail.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInventory.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInventoryEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesEdition.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerEdition.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerFilterJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountEdit.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorFilterJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoices.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoicesEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoicesJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEdition.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportNotPosted.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceFilterJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportParetoProduct.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportPendingProductionEditJr.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportPendingProductionJr.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProduction.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProductionCost.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProductionJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProductionRunJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSite.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSitePop.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectProgress.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html
| 1 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalysesEdition.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalysesFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesEdition.html
| 6 +-
src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html
| 1 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItem.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItemJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportShipmentEditionJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportShipmentFilterJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportShipper.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportStandardCostJRFilter.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignment.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignmentJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportTotalProductTemplate.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportTotalProductTemplateEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseDetailInventoryJR.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.html
| 2 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnvEdit.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR.html
| 2 -
src/org/openbravo/erpCommon/ad_workflow/WorkflowControl.java
| 16 +-
src/org/openbravo/erpCommon/ad_workflow/WorkflowControl_Redirect.html
| 4 +-
src/org/openbravo/erpCommon/ad_workflow/WorkflowControl_Response.html
| 4 +-
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopup.java
| 48 +-
src/org/openbravo/erpCommon/businessUtility/Buscador.html
| 2 +-
src/org/openbravo/erpCommon/businessUtility/PrinterReports.html
| 4 +-
src/org/openbravo/erpCommon/businessUtility/TabAttachments_F1.html
| 1 -
src/org/openbravo/erpCommon/businessUtility/TabFilter.html
| 4 +-
src/org/openbravo/erpCommon/businessUtility/WindowTabs.java
| 6 +-
src/org/openbravo/erpCommon/businessUtility/WindowTabs_data.xsql
| 8 +-
src/org/openbravo/erpCommon/info/Account.html
| 3 +-
src/org/openbravo/erpCommon/info/AttributeSetInstance.html
| 3 +-
src/org/openbravo/erpCommon/info/SearchUniqueKeyResponse.html
| 4 +-
src/org/openbravo/erpCommon/modules/ImportModule.java
| 102 +-
src/org/openbravo/erpCommon/modules/ImportModule_data.xsql
| 9 +-
src/org/openbravo/erpCommon/modules/ModuleTree.java
| 34 +-
src/org/openbravo/erpCommon/modules/ModuleTree_data.xsql
| 28 +-
src/org/openbravo/erpCommon/modules/VersionUtility.java
| 82 +-
src/org/openbravo/erpCommon/modules/VersionUtility_data.xsql
| 11 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java
| 409 +++++-
src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java
| 39 +-
src/org/openbravo/erpCommon/obps/CheckCleanCache.java
| 3 +-
src/org/openbravo/erpCommon/obps/DisabledModules.java
| 130 ++
src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html
| 8 +-
src/org/openbravo/erpCommon/obps/GetOpenbravoLogo.java
| 3 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 4 +-
src/org/openbravo/erpCommon/security/Login_Options_F1.html
| 2 +-
src/org/openbravo/erpCommon/utility/GenericTree.srpt
| 2 +-
src/org/openbravo/erpCommon/utility/GenericTree.xml
| 1 +
src/org/openbravo/erpCommon/utility/Home.html
| 4 +-
src/org/openbravo/erpCommon/utility/Menu_data.xsql
| 11 +-
src/org/openbravo/erpCommon/utility/OBVersion.java
| 72 +
src/org/openbravo/erpCommon/utility/OpenPentaho.html
| 5 +-
src/org/openbravo/erpCommon/utility/PoolStatus.html
| 4 +-
src/org/openbravo/erpCommon/utility/PopupLoading.html
| 4 +-
src/org/openbravo/erpCommon/utility/SetPriority.html
| 3 +-
src/org/openbravo/erpCommon/utility/SystemInfo.java
| 5 +-
src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql
| 10 +-
src/org/openbravo/erpCommon/utility/TaskDefault.html
| 4 +-
src/org/openbravo/erpCommon/utility/ToolBar_Button.java
| 2 +-
src/org/openbravo/erpCommon/utility/ToolBar_Image.java
| 2 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.html
| 6 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.java
| 26 +-
src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html
| 6 +-
src/org/openbravo/erpCommon/utility/WindowTree.html
| 2 +-
src/org/openbravo/erpCommon/utility/reporting/printing/EmailOptions.html
| 6 +-
src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html
| 10 +-
src/org/openbravo/erpCommon/utility/reporting/printing/PrintStatus.html
| 5 +-
src/org/openbravo/erpReports/ReportPaymentFilter.html
| 2 -
src/org/openbravo/erpReports/ReportRegisterFilter.html
| 2 -
web/js/genericTree.js
| 15 +-
web/js/messages.js
| 36 +-
web/js/shortcuts.js
| 16 +-
web/js/utils.js
| 39 +-
web/skins/Default/Openbravo_ERP_250.css
| 16 +
287 files changed, 4815 insertions(+), 1469 deletions(-)
diffs (truncated from 14657 to 300 lines):
diff -r 38158faa4a84 -r 4ff0f4a349b6 build.xml
--- a/build.xml Tue Aug 03 14:54:55 2010 +0200
+++ b/build.xml Mon Aug 16 09:55:16 2010 +0200
@@ -446,6 +446,7 @@
</target>
<target name="compile.deploy" depends="compile.war, compile.development">
+ <updatesystemstatus v="RB51"/>
</target>
<target name="compile.development" depends="init" unless="mode.war">
diff -r 38158faa4a84 -r 4ff0f4a349b6 config/licenseRestrictions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/config/licenseRestrictions Mon Aug 16 09:55:16 2010 +0200
@@ -0,0 +1,1 @@
+IeqpfXkoobemyDLAJHNBi3JrTdjgnU0BnGiX9k78CBHK1Eqdek/Lsi/HpeBev9c8sNQPOf9nwq8jWE4j7X4e6TUzdPX5xukYcTshjeB3wKh9Y6LE5rgEw+OqUm8bcaKH6Nm5Efg2yQnwsHqqTyjFQPXa9IdijkazSRrAEVg/X0WPMPEYYQRikHlz1CDJPiqEeQIhMejebxNmHa/VTLN5Hmhc+lyBfRVseGdJeJaf2Nh1YMwunKFAGMNKwPFFhqLyAXoGsNFs2BK5yPTgOEWaFRS+5Dei4fewUm7GI5k+a4xZ1qDrjYl+C/p6vod1oYf+KFsfH1P07v2k7J4VQ71XBANYXXDM81bgEWZJzz5F9mhUtabroQdejQdcTqGQPpX2ZOhmEfgelzN7WINpIF8rQHiMeVty8m3TG+zSTkc/Tj53UJaV8mjZ+cWSUAI7PFwIDbxeUcktfwV85yzpxAxu6Fln6h6fpxlmzy3DYhjBNTpMKYmjJX0ilomTCAivh31pfCMDOkoLwMmDQoov/bCPJfLej9RlhmC0Y1EswNL/IAbuINX3DNk2+G8i7yXUOE6FsUtDJ6WdVhSKw0BvCH/28oJ38rfx3aCcuLHjAJI23L5RjlQlqnVsGOZsDeJ5UWQGeBotYJWdfz1mSRAiPB4RE6dv9Ap0X90Y0MDYrJP2jW2FmIrY1R5UTh2XcvAomsToZdwLrolZIWe26RIn1yYRpGEf2wqg5sGQaOxQ39BB11Xhj2bzz96mnnqSP6GZiv52/cibVcp8VtErmClvF4OByPuKsswTUD8Fs9FYMNv+myfJ928PxuHmpjT99igMw7NNtbSD+lPckVSM9kKvUIuWxUgnSaly9FG2oP1DM2alkI9Vdc77EHW8Vjz5eID0EjM04rDKNvsbJygMCPF3XWaA2rpnUgcRB5Or0lCDe/z/zOoWK3p9N19TguH8y74cl0xd+jpkdfqfVEyUxqtTIG4/+0DZ8+VzPmOPArrFM51piby1Ym2L/J3Uuugiw1r8+RpRVdiTMLHKbe15KpuECf8W9KMpaYc7hzXo94aJXKvWuui1Y1vcrJhAXdN0ib8Wjz8473ecV/STAt5njB4dJiSjBfek+JYeXZz/Ft/fkPlvzW1DVbHx9RCmu068DWefuNvWMqJLr69pKCrea8PZXBJpit9tx/JSj454C1FOwigR+qsi24FOaaQ5Zy6m3VReW0cZ+9sQXLDwkjOfjvzJPFQ9A7kDTYOYzorjHPbCwy0JyXAxkHQ+wlV5+52WeM9uiTxAWtoyqcr+OhBb1btFqiaDhetH6LqxcGXm+0iLckp+cu4FY2t4eYY81PRKBUUCrdh8N0+N68P8XMht4rWIzeRzLVlY1PnFz0BDZa6IecwK2egOPmlH+xG8uhOYgIbbUE7nhcz8b1MDllGTOpTSG1e9UDJj8wBTWzeVIrVpJRztWjldY45skuAohNh7PxxDubeUv7701GVBqlg1mO2rb19evzDAMLUHF4i5exoWEy9uQqrF/qMT+W4I0zwJbgFHTs1HIpgQelm/gSysdnbnbQs14YceXv+BYMYurafh7N2lkUMnmkVkHpPk/08R0hCeOtKjkbSUCuOy9XPg153iJmxE3NCBeZl/gY2mmsMNtaswMEN05HKSkRqlu/CKedv/HrYYhXtdbaqkL8Ay0mcRtXimQCvr3aNQ9fcQLuLpmqJh5Uo=
\ No newline at end of file
diff -r 38158faa4a84 -r 4ff0f4a349b6 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/functions/C_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/C_INVOICE_CREATE.xml Tue Aug 03
14:54:55 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml Mon Aug 16
09:55:16 2010 +0200
@@ -630,7 +630,7 @@
v_gBillTo_ID VARCHAR2(32) ;
v_gBPartner_Location_ID VARCHAR2(32) ;
v_gSalesRep_ID VARCHAR2(32) ;
- v_gPaymentRule CHAR(1) ;
+ v_gPaymentRule VARCHAR2(60) ;
v_gPaymentTerm_ID VARCHAR2(32) ;
v_gCurrency_ID VARCHAR2(32) ;
v_gCampaign_ID VARCHAR2(32) ;
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/functions/C_ORDER_POST1.xml
--- a/src-db/database/model/functions/C_ORDER_POST1.xml Tue Aug 03 14:54:55
2010 +0200
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml Mon Aug 16 09:55:16
2010 +0200
@@ -276,6 +276,12 @@
Updated=now(),
UpdatedBy=v_User
WHERE C_Order_ID=v_Record_ID;
+ UPDATE M_INOUTLINE SET C_ORDERLINE_ID = NULL
+ WHERE (SELECT DISTINCT A.DOCSTATUS FROM M_INOUT A, M_INOUTLINE B,
C_ORDERLINE C
+ WHERE A.M_INOUT_ID = B.M_INOUT_ID AND B.C_ORDERLINE_ID =
C.C_ORDERLINE_ID
+ AND C.C_ORDER_DISCOUNT_ID IS NOT NULL AND C.C_ORDER_ID =
v_Record_ID) = 'VO'
+ AND C_ORDERLINE_ID IN (SELECT C_ORDERLINE_ID FROM C_ORDERLINE WHERE
C_ORDER_DISCOUNT_ID IS NOT NULL
+ AND C_ORDER_ID = v_Record_ID);
DELETE
FROM C_ORDERLINE
WHERE C_ORDER_DISCOUNT_ID IS NOT NULL
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml
--- a/src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml Tue Aug
03 14:54:55 2010 +0200
+++ b/src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml Mon Aug
16 09:55:16 2010 +0200
@@ -273,12 +273,6 @@
(SELECT M_PRODUCT_CATEGORY_ID
FROM M_RAPPEL_PRODUCTCATEGORY RC
WHERE RC.M_RAPPEL_ID=R.M_RAPPEL_ID
- ))
- OR(COALESCE(R.INCLUDE_PRODUCT_CATEGORY, 'Y')='Y'
- AND P.M_PRODUCT_CATEGORY_ID NOT IN
- (SELECT M_PRODUCT_CATEGORY_ID
- FROM M_RAPPEL_PRODUCTCATEGORY RC
- WHERE RC.M_RAPPEL_ID=R.M_RAPPEL_ID
)))
UNION
SELECT M_PRODUCT_ID
diff -r 38158faa4a84 -r 4ff0f4a349b6 src-db/database/model/tables/AD_MODULE.xml
--- a/src-db/database/model/tables/AD_MODULE.xml Tue Aug 03 14:54:55
2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE.xml Mon Aug 16 09:55:16
2010 +0200
@@ -145,6 +145,14 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="COMMERCIAL_TIER" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
+ <default><![CDATA[NA]]></default>
+ <onCreateDefault><![CDATA[CASE WHEN ISCOMMERCIAL='N' THEN 'NA' ELSE
'1' END]]></onCreateDefault>
+ </column>
+ <column name="ENABLED" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_MODULE_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -154,6 +162,9 @@
<foreign-key foreignTable="AD_ORG" name="AD_MODULE_AD_ORG">
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
</foreign-key>
+ <unique name="AD_MODULE_JAVAPACKAGE_UN">
+ <unique-column name="JAVAPACKAGE"/>
+ </unique>
<check name="AD_MODULE_INDEVELOPMENT_CHK"><![CDATA[ISINDEVELOPMENT IN
('Y', 'N')]]></check>
<check name="AD_MODULE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
<check name="AD_MODULE_ISCOMMERCIAL_CHCK"><![CDATA[ISCOMMERCIAL IN ('Y',
'N')]]></check>
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml
--- a/src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml Tue Aug 03
14:54:55 2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE_DEPENDENCY.xml Mon Aug 16
09:55:16 2010 +0200
@@ -57,6 +57,18 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="DEPENDENCY_ENFORCEMENT" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
+ <default><![CDATA[MAJOR]]></default>
+ <onCreateDefault><![CDATA['MAJOR']]></onCreateDefault>
+ </column>
+ <column name="USER_EDITABLE_ENFORCEMENT" primaryKey="false"
required="true" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault><![CDATA['N']]></onCreateDefault>
+ </column>
+ <column name="INSTANCE_ENFORCEMENT" primaryKey="false" required="false"
type="VARCHAR" size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT"
name="AD_MODULE_DEPENDENCY_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/tables/AD_MODULE_DEPENDENCY_INST.xml
--- a/src-db/database/model/tables/AD_MODULE_DEPENDENCY_INST.xml Tue Aug
03 14:54:55 2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE_DEPENDENCY_INST.xml Mon Aug
16 09:55:16 2010 +0200
@@ -61,6 +61,14 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="DEPENDENCY_ENFORCEMENT" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
+ <default><![CDATA[MAJOR]]></default>
+ <onCreateDefault><![CDATA['MAJOR']]></onCreateDefault>
+ </column>
+ <column name="USER_EDITABLE_ENFORCEMENT" primaryKey="false"
required="true" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[N]]></default>
+ <onCreateDefault><![CDATA['N']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT"
name="AD_MODULE_DEPENDENCY_INST_AD_C">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/tables/AD_MODULE_INSTALL.xml
--- a/src-db/database/model/tables/AD_MODULE_INSTALL.xml Tue Aug 03
14:54:55 2010 +0200
+++ b/src-db/database/model/tables/AD_MODULE_INSTALL.xml Mon Aug 16
09:55:16 2010 +0200
@@ -145,6 +145,14 @@
<default><![CDATA[N]]></default>
<onCreateDefault><![CDATA['N']]></onCreateDefault>
</column>
+ <column name="COMMERCIAL_TIER" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
+ <default><![CDATA[NA]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="ENABLED" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="AD_MODULE_INSTALL_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 38158faa4a84 -r 4ff0f4a349b6 src-db/database/model/tables/I_ORDER.xml
--- a/src-db/database/model/tables/I_ORDER.xml Tue Aug 03 14:54:55 2010 +0200
+++ b/src-db/database/model/tables/I_ORDER.xml Mon Aug 16 09:55:16 2010 +0200
@@ -285,6 +285,14 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false"
required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ATTRIBUTESETIDENT" primaryKey="false" required="false"
type="NVARCHAR" size="100" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="I_ORDER_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -345,6 +353,9 @@
<foreign-key foreignTable="C_UOM" name="I_ORDER_C_UOM">
<reference local="C_UOM_ID" foreign="C_UOM_ID"/>
</foreign-key>
+ <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE"
name="I_ORDER_M_ATTRIBUTESETINST">
+ <reference local="M_ATTRIBUTESETINSTANCE_ID"
foreign="M_ATTRIBUTESETINSTANCE_ID"/>
+ </foreign-key>
<foreign-key foreignTable="M_PRICELIST" name="I_ORDER_M_PRICELIST">
<reference local="M_PRICELIST_ID" foreign="M_PRICELIST_ID"/>
</foreign-key>
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml Tue Aug
03 14:54:55 2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml Mon Aug
16 09:55:16 2010 +0200
@@ -59,7 +59,8 @@
COALESCE(:NEW.StartVersion , '.') != COALESCE(:OLD.StartVersion , '.')
OR
COALESCE(:NEW.EndVersion , '.') != COALESCE(:OLD.EndVersion , '.') OR
COALESCE(:NEW.IsIncluded , '.') != COALESCE(:OLD.IsIncluded , '.') OR
- 1=2) THEN
+ COALESCE(:NEW.Dependency_Enforcement , '.') !=
COALESCE(:OLD.Dependency_Enforcement , '.') OR
+ COALESCE(:NEW.User_Editable_Enforcement , '.') !=
COALESCE(:OLD.User_Editable_Enforcement , '.')) THEN
RAISE_APPLICATION_ERROR(-20000, '@20532@');
END IF;
END IF;
@@ -67,6 +68,23 @@
IF (INSERTING AND devModule='N') THEN
RAISE_APPLICATION_ERROR(-20000, '@20533@');
END IF;
+
+ --Check the only updated column is instanceEnforcement. In this case maitin
updated
+ --column as it was to prevent changes detection when trying to update
database
+ IF (UPDATING) THEN
+ IF (COALESCE(:NEW.ISACTIVE ,'.') = COALESCE(:OLD.ISACTIVE
,'.') AND
+ COALESCE(:NEW.AD_MODULE_ID ,'.') =
COALESCE(:OLD.AD_MODULE_ID ,'.') AND
+ COALESCE(:NEW.AD_DEPENDENT_MODULE_ID ,'.') =
COALESCE(:OLD.AD_DEPENDENT_MODULE_ID ,'.') AND
+ COALESCE(:NEW.STARTVERSION ,'.') =
COALESCE(:OLD.STARTVERSION ,'.') AND
+ COALESCE(:NEW.ENDVERSION ,'.') =
COALESCE(:OLD.ENDVERSION ,'.') AND
+ COALESCE(:NEW.ISINCLUDED ,'.') =
COALESCE(:OLD.ISINCLUDED ,'.') AND
+ COALESCE(:NEW.DEPENDANT_MODULE_NAME ,'.') =
COALESCE(:OLD.DEPENDANT_MODULE_NAME ,'.') AND
+ COALESCE(:NEW.DEPENDENCY_ENFORCEMENT ,'.') =
COALESCE(:OLD.DEPENDENCY_ENFORCEMENT ,'.') AND
+ COALESCE(:NEW.USER_EDITABLE_ENFORCEMENT,'.') =
COALESCE(:OLD.USER_EDITABLE_ENFORCEMENT,'.') AND
+ COALESCE(:NEW.INSTANCE_ENFORCEMENT,'.') !=
COALESCE(:OLD.INSTANCE_ENFORCEMENT,'.')) THEN
+ :NEW.UPDATED := :OLD.UPDATED;
+ END IF;
+ END IF;
END AD_MODULE_DEPENDENCY_MOD_TRG
]]></body>
</trigger>
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/triggers/AD_MODULE_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_TRG.xml Tue Aug 03 14:54:55
2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_TRG.xml Mon Aug 16 09:55:16
2010 +0200
@@ -14,7 +14,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2008 Openbravo SLU
+ * All portions are Copyright (C) 2008-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
@@ -25,6 +25,9 @@
IF AD_isTriggerEnabled()='N' THEN RETURN;
END IF;
+ IF :new.ENABLED = 'N' AND :new.AD_Module_ID = '0' THEN
+ RAISE_APPLICATION_ERROR(-20000, '@CannotDisableCore@');
+ END IF;
--Tranlsation management
IF INSERTING THEN
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml Tue Aug 03
14:54:55 2010 +0200
+++ b/src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml Mon Aug 16
09:55:16 2010 +0200
@@ -15,7 +15,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2009 Openbravo SLU
+* All portions are Copyright (C) 2009-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): Valery Lezhebokov.
************************************************************************/
@@ -29,6 +29,16 @@
IF AD_isTriggerEnabled()='N' THEN RETURN;
END IF;
+
+ IF UPDATING THEN
+ IF :new.IsCommercial = 'N' and :old.IsCommercial ='Y' THEN
+ :new.commercial_Tier := 'NA';
+ END IF;
+ END IF;
+
+ IF :new.IsCommercial='Y' AND :new.commercial_Tier NOT IN ('1','2') THEN
+ RAISE_APPLICATION_ERROR(-20000, '@AD_MODULE_TIER_CHK@');
+ END IF;
IF instr(:new.VERSION,'.') <= 0 OR instr(:new.VERSION,'.',1,2) <= 0 OR
instr(:new.VERSION,'.',1,3) > 0 THEN
RAISE_APPLICATION_ERROR(-20104, 'The version has to be formatted like
x.y.z where x, y and z are integers.');
diff -r 38158faa4a84 -r 4ff0f4a349b6
src-db/database/model/triggers/AD_SYSTEM_INFO_TRG2.xml
--- a/src-db/database/model/triggers/AD_SYSTEM_INFO_TRG2.xml Tue Aug 03
14:54:55 2010 +0200
+++ b/src-db/database/model/triggers/AD_SYSTEM_INFO_TRG2.xml Mon Aug 16
09:55:16 2010 +0200
@@ -23,6 +23,8 @@
exist NUMBER:= 0;
indTempName NVARCHAR2(50) := 'System Customization';
indTempPackage NVARCHAR2(50) := 'mySystem.CustomizationTemplate';
+idCustomizationModule NVARCHAR2(50);
+coreVersion NVARCHAR2(10);
BEGIN
@@ -41,6 +43,7 @@
if (exist > 0) then
RAISE_APPLICATION_ERROR(-20631,'There is already an active Industry
Template.');
else
+ idCustomizationModule:=get_uuid();
Insert into AD_MODULE (
AD_MODULE_ID,AD_CLIENT_ID,AD_ORG_ID,ISACTIVE,CREATED,CREATEDBY,UPDATED,UPDATEDBY,
NAME,VERSION,DESCRIPTION,
@@ -50,13 +53,29 @@
LICENSETYPE,AUTHOR,STATUS,UPDATE_AVAILABLE,ISTRANSLATIONREQUIRED,AD_LANGUAGE,HASCHARTOFACCOUNTS,
ISTRANSLATIONMODULE,HASREFERENCEDATA,ISREGISTERED,UPDATEINFO,UPDATE_VER_ID)
values (
- get_uuid(),'0','0','Y',now(),'0',now(),'0',
+ to_char(idCustomizationModule),'0','0','Y',now(),'0',now(),'0',
to_char(indTempName),'1.0.0', to_char(indTempName) || ' is an
autogenerated industry template to store all the customizations made to module
core.',
to_char(indTempName) || ' is an autogenerated industry template to
store all the customizations made to module core. Only one industry template
can be active at the same time.',
null,'T','The Openbravo Public License Version 1.1 ("OBPL") consists
of the Mozilla Public License Version 1.1, modified to be specific to
Openbravo, with the Additional Terms in Exhibit B. The original Mozilla Public
License 1.1 can be found at: http://www.mozilla.org/MPL/MPL-1.1.html',
'Y','N',null,to_char(indTempPackage),
'OtherOS',null,null,null,'Y','en_US','N',
'N','N',null,null,null);
+
+ -- add dependency on the core module
+ select version into coreVersion
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
