details: /erp/devel/pi/rev/5224213157be
changeset: 6678:5224213157be
user: Salvador Zapata <salvador.zapata <at> openbravo.com>
date: Thu Mar 11 19:26:24 2010 +0100
summary: Fixed bug 12510: Group by project identifier instead of by name
details: /erp/devel/pi/rev/be90e4dff316
changeset: 6679:be90e4dff316
user: Salvador Zapata <salvador.zapata <at> openbravo.com>
date: Thu Mar 11 19:32:32 2010 +0100
summary: Merge
diffstat:
.hgsigs
| 2 +
.hgtags
| 2 +
build.xml
| 5 +-
referencedata/sampledata/Accounting_Test.xml
| 95 +-
referencedata/sampledata/SmallBazaar.xml
| 4415 ++++++++++
src-core/src/org/openbravo/base/ConfigParameters.java
| 10 +-
src-db/database/build.xml
| 8 +-
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/functions/AD_GET_DOCTYPE_EXPENSES.xml
| 59 +
src-db/database/model/functions/AD_TAB_COPY.xml
| 8 +-
src-db/database/model/functions/AD_TAB_IMPORT.xml
| 25 +-
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
| 16 +
src-db/database/model/functions/C_BUDGET_COPY.xml
| 10 +-
src-db/database/model/functions/C_CURRENCY_CONVERT.xml
| 18 +-
src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml
| 67 +
src-db/database/model/functions/C_GETTAX.xml
| 11 +
src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml
| 52 +
src-db/database/model/functions/C_INVOICE_POST.xml
| 13 +
src-db/database/model/functions/M_BOM_PRICELIMIT.xml
| 2 +-
src-db/database/model/functions/M_BOM_PRICELIST.xml
| 2 +-
src-db/database/model/functions/M_BOM_PRICESTD.xml
| 2 +-
src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml
| 98 +-
src-db/database/model/functions/M_GET_PRODUCT_COST.xml
| 2 +-
src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml
| 2 +-
src-db/database/model/postscript-Oracle.sql
| 29 +-
src-db/database/model/tables/AD_FIELD.xml
| 4 +
src-db/database/model/tables/AD_ORGINFO.xml
| 12 +
src-db/database/model/tables/AD_REFERENCE.xml
| 4 +
src-db/database/model/tables/AD_REF_LIST.xml
| 4 +
src-db/database/model/tables/C_BUDGETLINE.xml
| 6 -
src-db/database/model/tables/C_DOCTYPE.xml
| 4 +
src-db/database/model/tables/C_PROJECT.xml
| 8 +
src-db/database/model/tables/C_TAX.xml
| 4 +
src-db/database/model/tables/C_VALIDCOMBINATION.xml
| 6 -
src-db/database/model/tables/FACT_ACCT.xml
| 6 -
src-db/database/model/tables/GL_JOURNAL.xml
| 22 +
src-db/database/model/tables/I_GLJOURNAL.xml
| 6 -
src-db/database/model/triggers/AD_ORGINFO_TRG.xml
| 39 +
src-db/database/model/triggers/AD_PROCESS_TRG.xml
| 5 +-
src-db/database/model/triggers/AD_REF_LIST_MOD_TRG.xml
| 4 +-
src-db/database/model/triggers/AD_WINDOW_TRG2.xml
| 10 +-
src-db/database/model/triggers/C_TAX_TRG.xml
| 8 +
src-db/database/model/triggers/M_INOUTLINE_TRG.xml
| 40 +-
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
| 11 -
src-db/database/sourcedata/AD_CALLOUT.xml
| 9 +
src-db/database/sourcedata/AD_COLUMN.xml
| 475 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 71 +-
src-db/database/sourcedata/AD_FIELD.xml
| 393 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 116 +-
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 1200 +--
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 1550 +---
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-db/database/sourcedata/AD_PROCESS.xml
| 4 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 347 +
src-db/database/sourcedata/AD_TAB.xml
| 28 +
src-db/database/sourcedata/AD_TABLE.xml
| 3 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 22 +
src-db/database/sourcedata/AD_VAL_RULE.xml
| 25 +-
src-diagnostics/build.xml
| 1 +
src-diagnostics/config/log4j.properties
| 22 +
src-diagnostics/src/Test.java
| 29 +
src-diagnostics/src/org/openbravo/utils/ServerConnection.java
| 7 +-
src-test/org/openbravo/test/AllAntTaskTests.java
| 4 +
src-test/org/openbravo/test/AllQuickAntTaskTests.java
| 2 +
src-test/org/openbravo/test/AllTests.java
| 4 +
src-test/org/openbravo/test/AntTaskTests.java
| 4 +
src-test/org/openbravo/test/base/BaseTest.java
| 14 +
src-test/org/openbravo/test/dal/IssuesTest.java
| 32 +-
src-test/org/openbravo/test/dal/ReadByNameTest.java
| 148 +
src-test/org/openbravo/test/model/ClassLoaderTest.java
| 88 +
src-test/org/openbravo/test/system/ErrorTextParserTest.java
| 130 +
src-wad/src/org/openbravo/wad/TemplateSortTab_Relation.html
| 4 +-
src-wad/src/org/openbravo/wad/Template_ActionButton.html
| 2 +-
src-wad/src/org/openbravo/wad/Template_Edition.html
| 4 +-
src-wad/src/org/openbravo/wad/Template_Relation.html
| 8 +-
src-wad/src/org/openbravo/wad/Wad.java
| 47 +-
src-wad/src/org/openbravo/wad/controls/WADList.java
| 12 +-
src/index.html
| 9 +-
src/org/openbravo/base/gen/GenerateEntitiesTask.java
| 1 -
src/org/openbravo/base/gen/entity.xpt
| 10 +-
src/org/openbravo/base/model/ModelProvider.java
| 11 +-
src/org/openbravo/base/model/NamingUtil.java
| 1 -
src/org/openbravo/base/model/Property.java
| 20 +-
src/org/openbravo/base/model/domaintype/BasePrimitiveDomainType.java
| 14 +-
src/org/openbravo/base/provider/OBConfigFileProvider.java
| 12 +
src/org/openbravo/base/secureApp/Advise.html
| 10 +-
src/org/openbravo/base/secureApp/Advise.xml
| 4 +-
src/org/openbravo/base/secureApp/AdvisePopUp.html
| 10 +-
src/org/openbravo/base/secureApp/AdvisePopUp.xml
| 5 +-
src/org/openbravo/base/secureApp/AdvisePopUpRefresh.html
| 10 +-
src/org/openbravo/base/secureApp/AdvisePopUpRefresh.xml
| 5 +-
src/org/openbravo/base/secureApp/Error.html
| 10 +-
src/org/openbravo/base/secureApp/Error.xml
| 4 +-
src/org/openbravo/base/secureApp/ErrorPopUp.html
| 10 +-
src/org/openbravo/base/secureApp/ErrorPopUp.xml
| 5 +-
src/org/openbravo/base/secureApp/HtmlErrorLogin.html
| 6 +-
src/org/openbravo/base/secureApp/PopUp_Close_And_Refresh.html
| 2 +-
src/org/openbravo/base/secureApp/PopUp_Download.html
| 6 +-
src/org/openbravo/base/secureApp/VariablesSecureApp.java
| 29 +-
src/org/openbravo/base/session/SessionFactoryController.java
| 17 +-
src/org/openbravo/base/structure/IdentifierProvider.java
| 7 +-
src/org/openbravo/dal/core/DalMappingGenerator.java
| 16 +-
src/org/openbravo/dal/core/DalSessionFactoryController.java
| 1 -
src/org/openbravo/dal/security/EntityAccessChecker.java
| 41 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java
| 12 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql
| 8 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFile.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFile34_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFile_data.xsql
| 6 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
| 20 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html
| 12 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.xml
| 5 +
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank_data.xsql
| 2 +
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_CRemittance.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_DPManagement.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/CreateFrom_Shipment.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/DocAction.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder_data.xsql
| 6 +-
src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.html
| 4 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java
| 2 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java
| 3 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Project_Service.java
| 36 +
src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java
| 196 +
src/org/openbravo/erpCommon/ad_forms/AlertManagement.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/CallAcctServer.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/DebtPaymentUnapply.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql
| 3 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
| 138 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql
| 25 +-
src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocMatchInv_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_forms/DocTax.java
| 12 +
src/org/openbravo/erpCommon/ad_forms/EdiFileImport.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/FileImport.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/FileImport.java
| 8 +-
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html
| 6 +-
src/org/openbravo/erpCommon/ad_forms/GenerateShipmentsmanual.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/HeartbeatConfirm.html
| 10 +-
src/org/openbravo/erpCommon/ad_forms/HeartbeatConfirm.xml
| 4 +-
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html
| 21 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java
| 5 +
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.xml
| 2 +-
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
| 2 +-
src/org/openbravo/erpCommon/ad_forms/InvoiceVendorMultiline.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java
| 2 +
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementAdd.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallLocal.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP2.html
| 6 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP4.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/RegistrationConfirm.html
| 10 +-
src/org/openbravo/erpCommon/ad_forms/RegistrationConfirm.xml
| 4 +-
src/org/openbravo/erpCommon/ad_forms/RemittanceCancel.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrderCreate.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/Resultado.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/Role.html
| 19 +-
src/org/openbravo/erpCommon/ad_forms/SQLExecutor.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/ShowLogFile.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/ShowSessionVariables.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/Translation.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.html
| 2 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp.html
| 1 +
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F1.html
| 4 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F1.html
| 4 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F1.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/ApplyModules.html
| 5 +-
src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java
| 129 +-
src/org/openbravo/erpCommon/ad_process/CashBankOperations.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/CreateCashFlowStatement.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/CreateTaxReport.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/DeleteClient.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice_data.xsql
| 2 +-
src/org/openbravo/erpCommon/ad_process/GenerateHelp.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/PaymentMonitor.java
| 7 +-
src/org/openbravo/erpCommon/ad_process/PaymentMonitorProcess.java
| 10 +-
src/org/openbravo/erpCommon/ad_process/PriceListCreateAll.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/PrintInvoices.html
| 4 +-
src/org/openbravo/erpCommon/ad_process/RegisterModule.html
| 2 +-
src/org/openbravo/erpCommon/ad_process/SendMailText.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/GenerateModel347.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportAssetDepreciationSchedule.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportBank.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportBankJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportCash.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportCashFlow.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportCashJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.html
| 18 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.java
| 71 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.jrxml
| 12 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.xml
| 36 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPaymentTrack.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_BankAcc.jrxml
| 14 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP.jrxml
| 12 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_NoBP_BankAcc.jrxml
| 14 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql
| 25 +-
src/org/openbravo/erpCommon/ad_reports/ReportExpense.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
| 9 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournalDetail.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql
| 17 +-
src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDateJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInventory.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerFilterJR.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorFilterJR.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoices.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoicesJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportNotPosted.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportOffer.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceFilterJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportParetoProduct.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportPendingProductionJr.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportPricelist.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProduction.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProductionCost.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProductionJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProductionRunJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSite.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.jrxml
| 3102 +++---
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql
| 105 +-
src/org/openbravo/erpCommon/ad_reports/ReportProjectProgress.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalysesFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItem.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItemJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportShipmentFilterJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportShipper.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportStandardCostJRFilter.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignment.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignmentJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportTotalProductTemplate.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/ReportValuationStock.html
| 20 +-
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.html
| 8 +-
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseDetailInventoryJR.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDailyEnv.html
| 4 +-
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR.html
| 4 +-
src/org/openbravo/erpCommon/businessUtility/AccountTree.java
| 14 +-
src/org/openbravo/erpCommon/businessUtility/Buscador.html
| 2 +-
src/org/openbravo/erpCommon/businessUtility/TabAttachments_F1.html
| 4 +-
src/org/openbravo/erpCommon/modules/ImportModule.java
| 730 +-
src/org/openbravo/erpCommon/modules/ImportModule_data.xsql
| 39 +-
src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java
| 46 +
src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java
| 91 +-
src/org/openbravo/erpCommon/modules/RemoteModule.java
| 52 +
src/org/openbravo/erpCommon/obps/ActivationKey.java
| 2 +
src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html
| 2 +-
src/org/openbravo/erpCommon/security/Login.java
| 66 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 28 +-
src/org/openbravo/erpCommon/security/Login_F1.xml
| 10 +-
src/org/openbravo/erpCommon/security/Login_FS.html
| 5 +-
src/org/openbravo/erpCommon/security/Login_FS_RTL.html
| 4 +-
src/org/openbravo/erpCommon/security/Login_Options_F1.html
| 49 +-
src/org/openbravo/erpCommon/utility/AntExecutor.java
| 4 +-
src/org/openbravo/erpCommon/utility/ComboTableData.java
| 29 +-
src/org/openbravo/erpCommon/utility/ComboTableQuery_data.xsql
| 16 +-
src/org/openbravo/erpCommon/utility/ErrorTextParserORACLE.java
| 5 +
src/org/openbravo/erpCommon/utility/ErrorTextParserPOSTGRE.java
| 5 +
src/org/openbravo/erpCommon/utility/Log.html
| 21 +-
src/org/openbravo/erpCommon/utility/PoolStatus.html
| 4 +-
src/org/openbravo/erpCommon/utility/SetPriority.html
| 4 +-
src/org/openbravo/erpCommon/utility/SystemInfo.java
| 2 +-
src/org/openbravo/erpCommon/utility/TableSQLQuery_data.xsql
| 2 +-
src/org/openbravo/erpCommon/utility/UsedByLink.html
| 4 +-
src/org/openbravo/erpCommon/utility/VerticalMenu.html
| 30 +-
src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html
| 16 +-
src/org/openbravo/erpCommon/utility/WindowTree.html
| 4 +-
src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html
| 2 +-
src/org/openbravo/erpCommon/utility/reporting/printing/PrintStatus.html
| 10 +-
src/org/openbravo/erpReports/ReportPaymentFilter.html
| 2 +-
src/org/openbravo/erpReports/ReportRegisterFilter.html
| 2 +-
src/org/openbravo/reference/ui/UIList.java
| 35 +-
src/org/openbravo/reference/ui/UITableDir.java
| 10 +-
src/org/openbravo/scheduling/OBScheduler.java
| 15 +-
src/org/openbravo/scheduling/ProcessMonitor.java
| 10 +-
src/org/openbravo/scheduling/ProcessRequest_data.xsql
| 37 +-
src/org/openbravo/scheduling/ProcessRunner.java
| 2 +-
src/org/openbravo/service/dataset/DataSetService.java
| 2 +-
src/org/openbravo/service/system/DatabaseValidator.java
| 76 +
src/org/openbravo/service/system/SystemValidationResult.java
| 2 +-
src/org/openbravo/service/system/SystemValidationTask.java
| 3 -
src/org/openbravo/test/system/ErrorTextParserTest_data.xsql
| 98 +
web/images/Logos.css
| 9 +-
web/js/appStatus.js
| 24 +-
web/js/default/MessageBox.js
| 2 +
web/js/dojo/dojo.js
| 2 +-
web/js/dojotoolkit/dojo/dojo.js
| 2 +-
web/js/dojotoolkit/dojo/dojo.js.uncompressed.js
| 10 +-
web/js/menuKeyboard.js
| 6 +-
web/js/messages.js
| 20 +-
web/js/openbravo/widget/DataGrid.js
| 10 +-
web/js/searchs.js
| 4 +
web/js/utils.js
| 314 +-
web/js/windowKeyboard.js
| 2 +-
web/skins/Default/Openbravo_ERP_250.css
| 71 +-
350 files changed, 11389 insertions(+), 5628 deletions(-)
diffs (truncated from 30061 to 300 lines):
diff -r efdbe4e29619 -r be90e4dff316 .hgsigs
--- a/.hgsigs Tue Feb 23 18:42:24 2010 +0100
+++ b/.hgsigs Thu Mar 11 19:32:32 2010 +0100
@@ -11,3 +11,5 @@
e7c306101389e980c1a1fb9d1bfeb3e200efaa94 0
iEYEABECAAYFAksNhdEACgkQCX/oGf+2qkNCCgCfVvVHzYDUBoPwv3mHqE+dLpz88UsAnRrvpWvUmXozxdaMD0X0IV123bH0
0b5e5cf1aa6b85df792522ed84d9755a1563c4f6 0
iEYEABECAAYFAktQTfIACgkQCX/oGf+2qkMeKgCgxxmPlv10O2oQEIEF18iBJR5hD4AAn1VYgmnxMZUGQA7WT6/j8PtMV9je
630f94155c011c18a4bd948239d674953ad729c4 0
iEYEABECAAYFAkthyKQACgkQCX/oGf+2qkOIwgCcCk4MJcMrnHR9WgEGfRx4HoTYfjsAn26YI0m1bCQSlyqmh+gDusmsqrNA
+4a5dd51c34fbbf64e9f933f9b7d54589ef5fb7b9 0
iEYEABECAAYFAkuM+1EACgkQCX/oGf+2qkPHfgCdFKV1PxtXcckQ3R3+kJgXnRFAtgkAoM6eWuR1ZA3nRphHH7sX2SGoufA5
+75b887d57378e59138c0362b928a504db568ed9b 0
iEYEABECAAYFAkuSHAsACgkQCX/oGf+2qkOEpwCeM6aKuQ/VK5ywylW5Jiki2L5YX0UAoPtzt8ELfu+2n0hTB2E36NgVq1IU
diff -r efdbe4e29619 -r be90e4dff316 .hgtags
--- a/.hgtags Tue Feb 23 18:42:24 2010 +0100
+++ b/.hgtags Thu Mar 11 19:32:32 2010 +0100
@@ -21,3 +21,5 @@
003090f7d33a5d408405addea4c74ca8e1d9f186 2.50MP9
f873f7f56a657920123211550340ca358e270de7 2.50MP10
98d31cbff884dd20581e1cafad505ed8f9b33273 2.50MP11
+1a6428c78a5521471084e7b93a42a03a74543495 2.50MP12
+65aa17bbe739f7d3370aba319e68474c2356fdf2 2.50MP13
diff -r efdbe4e29619 -r be90e4dff316 build.xml
--- a/build.xml Tue Feb 23 18:42:24 2010 +0100
+++ b/build.xml Thu Mar 11 19:32:32 2010 +0100
@@ -441,8 +441,7 @@
stableDBdir="${stableDBdir}"
testDBdir="${base.src.db}/database"
verbosity="${bbdd.verbosity}"
- userId="0" adminMode="true"
- propertiesFile="${base.config}/Openbravo.properties"/>
+ />
</target>
<target name="export.sample.data" depends="code.rev">
@@ -641,7 +640,7 @@
<target name="apply.module">
<updatesystemstatus v="RB31"/>
- <java classname="org.openbravo.erpCommon.modules.ApplyModuleTask"
fork="true" maxmemory="${build.maxmemory}">
+ <java classname="org.openbravo.erpCommon.modules.ApplyModuleTask"
fork="true" maxmemory="${build.maxmemory}" failonerror="true">
<arg line="'${base.src}'" />
<classpath refid="project.class.path" />
</java>
diff -r efdbe4e29619 -r be90e4dff316
referencedata/sampledata/Accounting_Test.xml
--- a/referencedata/sampledata/Accounting_Test.xml Tue Feb 23 18:42:24
2010 +0100
+++ b/referencedata/sampledata/Accounting_Test.xml Thu Mar 11 19:32:32
2010 +0100
@@ -5663,6 +5663,24 @@
<attribute>C_Country_ID</attribute>
<searchKey>100</searchKey>
</ADPreference>
+ <ADProcessAccess id="17CA8BB997344F4E9E2ABFB70FD26DD5">
+ <id>17CA8BB997344F4E9E2ABFB70FD26DD5</id>
+ <process id="F9DFC02162B0473B9676870117DF61FE"/>
+ <role id="1000005"/>
+ <client id="1000001"/>
+ <organization id="0"/>
+ <active>true</active>
+ <editableField>true</editableField>
+ </ADProcessAccess>
+ <ADProcessAccess id="4970B0F457C2410182F807F4849C238D">
+ <id>4970B0F457C2410182F807F4849C238D</id>
+ <process id="F9DFC02162B0473B9676870117DF61FE"/>
+ <role id="1000006"/>
+ <client id="1000001"/>
+ <organization id="0"/>
+ <active>true</active>
+ <editableField>true</editableField>
+ </ADProcessAccess>
<ADProcessAccess id="5163A7B5FC6B442A96B642B8B4FFF524">
<id>5163A7B5FC6B442A96B642B8B4FFF524</id>
<process id="462033447A1548F09BBFB0683FA976CC"/>
@@ -13772,6 +13790,24 @@
<active>true</active>
<editableField>true</editableField>
</ADWindowAccess>
+ <ADWindowAccess id="6FD5721C0ACA4C02B1DB7BD19B6DC4AB">
+ <id>6FD5721C0ACA4C02B1DB7BD19B6DC4AB</id>
+ <window id="FEB8679CAA0D47E5978F10E22566FCEA"/>
+ <role id="1000006"/>
+ <client id="1000001"/>
+ <organization id="0"/>
+ <active>true</active>
+ <editableField>true</editableField>
+ </ADWindowAccess>
+ <ADWindowAccess id="96FF10426CA841A89FF37ABF546E87FF">
+ <id>96FF10426CA841A89FF37ABF546E87FF</id>
+ <window id="FEB8679CAA0D47E5978F10E22566FCEA"/>
+ <role id="1000005"/>
+ <client id="1000001"/>
+ <organization id="0"/>
+ <active>true</active>
+ <editableField>true</editableField>
+ </ADWindowAccess>
<ADWindowAccess id="98BE033EDE6443748C3FEF5D45F647D0">
<id>98BE033EDE6443748C3FEF5D45F647D0</id>
<window id="A9FD6A5AED3546EC83DB567882646D2E"/>
@@ -14035,6 +14071,8 @@
<serviceRevenue xsi:nil="true"/>
<setProjectType>false</setProjectType>
<startingDate xsi:nil="true"/>
+ <servicesProvidedCost xsi:nil="true"/>
+ <outsourcedCost xsi:nil="true"/>
</Project>
<ProjectAccounts id="52118BF1B84B4D84E040007F01005FEC">
<id>52118BF1B84B4D84E040007F01005FEC</id>
@@ -14125,6 +14163,7 @@
<standardQuantity xsi:nil="true"/>
<quantityType>false</quantityType>
<safetyStock xsi:nil="true"/>
+ <useAttributeSetValueAs xsi:nil="true"/>
</Product>
<ProductCategory id="1000009">
<id>1000009</id>
@@ -19083,6 +19122,8 @@
<standardPrice>50</standardPrice>
<cancelPriceAdjustment>false</cancelPriceAdjustment>
<orderDiscount xsi:nil="true"/>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</OrderLine>
<OrderLine id="1000067">
<id>1000067</id>
@@ -19127,6 +19168,8 @@
<standardPrice>150</standardPrice>
<cancelPriceAdjustment>false</cancelPriceAdjustment>
<orderDiscount xsi:nil="true"/>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</OrderLine>
<OrderLine id="1000068">
<id>1000068</id>
@@ -19171,6 +19214,8 @@
<standardPrice>50</standardPrice>
<cancelPriceAdjustment>false</cancelPriceAdjustment>
<orderDiscount xsi:nil="true"/>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</OrderLine>
<OrderLine id="1000069">
<id>1000069</id>
@@ -19215,6 +19260,8 @@
<standardPrice>50</standardPrice>
<cancelPriceAdjustment>false</cancelPriceAdjustment>
<orderDiscount xsi:nil="true"/>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</OrderLine>
<OrderLine id="1000070">
<id>1000070</id>
@@ -19259,6 +19306,8 @@
<standardPrice>50</standardPrice>
<cancelPriceAdjustment>false</cancelPriceAdjustment>
<orderDiscount xsi:nil="true"/>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</OrderLine>
<FinancialMgmtTaxRate id="1000007">
<id>1000007</id>
@@ -19289,6 +19338,9 @@
<originalRate xsi:nil="true"/>
<notTaxdeductable>false</notTaxdeductable>
<noVAT>false</noVAT>
+ <baseAmount>LNA</baseAmount>
+ <taxBase xsi:nil="true"/>
+ <docTaxAmount>D</docTaxAmount>
</FinancialMgmtTaxRate>
<FinancialMgmtTaxRate id="1000008">
<id>1000008</id>
@@ -19319,6 +19371,9 @@
<originalRate xsi:nil="true"/>
<notTaxdeductable>false</notTaxdeductable>
<noVAT>false</noVAT>
+ <baseAmount>LNA</baseAmount>
+ <taxBase xsi:nil="true"/>
+ <docTaxAmount>D</docTaxAmount>
</FinancialMgmtTaxRate>
<FinancialMgmtAcctSchema id="1000001">
<id>1000001</id>
@@ -23311,6 +23366,8 @@
<sOBPTaxCategory xsi:nil="true"/>
<fiscalcode xsi:nil="true"/>
<isofiscalcode xsi:nil="true"/>
+ <incotermsPO xsi:nil="true"/>
+ <incotermsSO xsi:nil="true"/>
</BusinessPartner>
<BusinessPartner id="1000021">
<id>1000021</id>
@@ -23384,6 +23441,8 @@
<sOBPTaxCategory xsi:nil="true"/>
<fiscalcode xsi:nil="true"/>
<isofiscalcode xsi:nil="true"/>
+ <incotermsPO xsi:nil="true"/>
+ <incotermsSO xsi:nil="true"/>
</BusinessPartner>
<BusinessPartner id="1000022">
<id>1000022</id>
@@ -23457,6 +23516,8 @@
<sOBPTaxCategory xsi:nil="true"/>
<fiscalcode xsi:nil="true"/>
<isofiscalcode xsi:nil="true"/>
+ <incotermsPO xsi:nil="true"/>
+ <incotermsSO xsi:nil="true"/>
</BusinessPartner>
<BusinessPartner id="1000023">
<id>1000023</id>
@@ -23530,6 +23591,8 @@
<sOBPTaxCategory xsi:nil="true"/>
<fiscalcode xsi:nil="true"/>
<isofiscalcode xsi:nil="true"/>
+ <incotermsPO xsi:nil="true"/>
+ <incotermsSO xsi:nil="true"/>
</BusinessPartner>
<BusinessPartnerLocation id="1000035">
<id>1000035</id>
@@ -25480,7 +25543,7 @@
<documentNo>10000000</documentNo>
<documentAction>--</documentAction>
<documentStatus>CO</documentStatus>
- <posted>N</posted>
+ <posted>p</posted>
<processNow>false</processNow>
<processed>true</processed>
<documentType id="1000039"/>
@@ -25592,7 +25655,7 @@
<documentNo>10000001</documentNo>
<documentAction>--</documentAction>
<documentStatus>CO</documentStatus>
- <posted>N</posted>
+ <posted>p</posted>
<processNow>false</processNow>
<processed>true</processed>
<documentType id="1000039"/>
@@ -25982,6 +26045,8 @@
<priceAdjustment xsi:nil="true"/>
<standardPrice>50</standardPrice>
<excludeforwithholding>false</excludeforwithholding>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</InvoiceLine>
<InvoiceLine id="1000087">
<id>1000087</id>
@@ -26014,6 +26079,8 @@
<priceAdjustment xsi:nil="true"/>
<standardPrice>150</standardPrice>
<excludeforwithholding>false</excludeforwithholding>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</InvoiceLine>
<InvoiceLine id="1000088">
<id>1000088</id>
@@ -26046,6 +26113,8 @@
<priceAdjustment xsi:nil="true"/>
<standardPrice>50</standardPrice>
<excludeforwithholding>false</excludeforwithholding>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</InvoiceLine>
<InvoiceLine id="1000089">
<id>1000089</id>
@@ -26078,6 +26147,8 @@
<priceAdjustment xsi:nil="true"/>
<standardPrice>50</standardPrice>
<excludeforwithholding>false</excludeforwithholding>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</InvoiceLine>
<InvoiceLine id="1000090">
<id>1000090</id>
@@ -26110,6 +26181,8 @@
<priceAdjustment xsi:nil="true"/>
<standardPrice>50</standardPrice>
<excludeforwithholding>false</excludeforwithholding>
+ <taxableAmount xsi:nil="true"/>
+ <editLineAmount>false</editLineAmount>
</InvoiceLine>
<InvoiceTax id="1000039">
<tax id="1000008"/>
@@ -26193,6 +26266,15 @@
<description xsi:nil="true"/>
<translation>false</translation>
</FinancialMgmtTaxCategoryTrl>
+ <ADFormAccess id="2FA74B6D652B4D0F95A580E4E7E286EB">
+ <id>2FA74B6D652B4D0F95A580E4E7E286EB</id>
+ <specialForm id="12D4CE60E8694097829C8FBBDBD503C4"/>
+ <role id="1000005"/>
+ <client id="1000001"/>
+ <organization id="0"/>
+ <active>true</active>
+ <editableField>true</editableField>
+ </ADFormAccess>
<ADFormAccess id="5E4DB943A59116CFE040007F01002944">
<id>5E4DB943A59116CFE040007F01002944</id>
<specialForm id="800017"/>
@@ -26652,6 +26734,15 @@
<active>true</active>
<editableField>true</editableField>
</ADFormAccess>
+ <ADFormAccess id="FB8F24DF6ADC4970B594347259FA67D4">
+ <id>FB8F24DF6ADC4970B594347259FA67D4</id>
+ <specialForm id="12D4CE60E8694097829C8FBBDBD503C4"/>
+ <role id="1000006"/>
+ <client id="1000001"/>
+ <organization id="0"/>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
