details: /erp/devel/main/rev/e6fc833ee397
changeset: 8010:e6fc833ee397
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Mon Aug 02 19:46:28 2010 +0530
summary: Fixes Issue 13325: Method M_GET_OFFERS_PRICE the standard price will
be passed with comma separated (Example : 35,00) standard price.Hence the value
is not calculated properly.
details: /erp/devel/main/rev/4e8a51c71835
changeset: 8011:4e8a51c71835
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Aug 02 19:15:57 2010 +0200
summary: Fixes issue 14080: When exporting and then importing the client in
the same environment i get and error
details: /erp/devel/main/rev/7d709e2f9e73
changeset: 8012:7d709e2f9e73
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Aug 02 22:08:08 2010 +0200
summary: Backed out changeset 4e8a51c71835
details: /erp/devel/main/rev/7a775a533180
changeset: 8013:7a775a533180
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Tue Aug 03 10:36:18 2010 +0530
summary: Fixes issue 13681: Not able to copy line item details using Copy
from order option from sales order window
As M_GET_OFFER_PRICE is deprecated , it's replaced with M_GET_OFFERS_PRICE in
order to resolve the issue
details: /erp/devel/main/rev/6ad52fc98d94
changeset: 8014:6ad52fc98d94
user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com>
date: Tue Aug 03 13:37:27 2010 +0530
summary: Fixes Issue 14100: Can't edit element value if org's name has more
than 32 chars
details: /erp/devel/main/rev/44967d45c991
changeset: 8015:44967d45c991
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Tue Aug 03 14:41:26 2010 +0530
summary: Fixes Issue 14071: Wrong behaviour when we have a good shipment with
'Description only' checked
details: /erp/devel/main/rev/d42db16889e8
changeset: 8016:d42db16889e8
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Tue Aug 03 17:08:58 2010 +0530
summary: Fixes Issue 13958: cursor incorrect in process c_bankstatement_post
details: /erp/devel/main/rev/c1ecf803c62a
changeset: 8017:c1ecf803c62a
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Aug 03 14:52:10 2010 +0200
summary: Fixes issue 14080: When exporting and then importing the client in
the same environment i get and error
details: /erp/devel/main/rev/38158faa4a84
changeset: 8018:38158faa4a84
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Aug 03 14:54:55 2010 +0200
summary: Fixes issue 14119: OBInterceptor sets detached user object from
OBContext in updatedBy property
details: /erp/devel/main/rev/0db5542af927
changeset: 8019:0db5542af927
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Aug 03 16:22:35 2010 +0200
summary: fixed issue 14086: Identify 3.0 instances in about box and in
heartbeat
About box now shows information about 3.0 template in case it is installed
this information is also send in the heartbeats.
details: /erp/devel/main/rev/8e370a149fe4
changeset: 8020:8e370a149fe4
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Aug 03 19:50:21 2010 +0200
summary: Fixes issue 14119: OBInterceptor sets detached user object from
OBContext in updatedBy property
details: /erp/devel/main/rev/c7f406e36f94
changeset: 8021:c7f406e36f94
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/main/rev/f9467e290752
changeset: 8022:f9467e290752
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Aug 04 09:01:08 2010 +0200
summary: Renamed Production status to General availability
details: /erp/devel/main/rev/8cd939863e92
changeset: 8023:8cd939863e92
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Aug 04 09:59:13 2010 +0200
summary: Fixed issue 14091. RemoveCheckChanges will no longer fail if the
table doesn't exist.
Also, changed the behaviour of ColumnSizeChanges so that an error message
doesn't appear if the table or column do not exist.
details: /erp/devel/main/rev/9e6ace807564
changeset: 8024:9e6ace807564
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Aug 04 10:31:45 2010 +0200
summary: related to issue 12682: Missing ad_module_id
details: /erp/devel/main/rev/70c809859a5c
changeset: 8025:70c809859a5c
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed Aug 04 13:33:17 2010 +0200
summary: Fixed bug 13311: RGL excel file is also ready to be translated
details: /erp/devel/main/rev/8bd78936b446
changeset: 8026:8bd78936b446
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Aug 04 11:10:18 2010 +0200
summary: Fixes issue 12801: Fixes duplicated entries of messages.js and
inclusion order
- Removed the duplicated entries of messages.js
- utils.js must be included before messages.js to be able to use the getFrame
function and retrieve the messages from frame: frameMenu
details: /erp/devel/main/rev/eb7b40bb1ecb
changeset: 8027:eb7b40bb1ecb
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Aug 04 13:13:08 2010 +0200
summary: Fixed issue 14123. The correct message when loging in after a
compile.complete.deploy and without restarting tomcat
details: /erp/devel/main/rev/492a83d38963
changeset: 8028:492a83d38963
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Aug 05 09:16:06 2010 +0200
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/02ad8e3730d2
changeset: 8029:02ad8e3730d2
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Aug 05 09:16:07 2010 +0200
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
| 6 +-
src-db/database/model/functions/M_INOUT_POST.xml
| 9 +-
src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml
| 2 +-
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 4 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 99 +++++----
src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java
| 3 +
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
| 4 +-
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/dal/core/OBInterceptor.java
| 10 +-
src/org/openbravo/erpCommon/ad_actionButton/ActionButtonDefault.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/ActionButtonResponse.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
| 2 +-
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_callouts/SL_Invoice_Product.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/About.html
| 40 ++-
src/org/openbravo/erpCommon/ad_forms/About.java
| 88 +++++++-
src/org/openbravo/erpCommon/ad_forms/About.xml
| 14 +-
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
| 4 +-
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
| 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
| 4 +-
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
| 1 -
src/org/openbravo/erpCommon/ad_forms/ModuleManagementSettings.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 2 +-
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/RequisitionToOrderCreate.html
| 4 +-
src/org/openbravo/erpCommon/ad_forms/Resultado.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/Role.html
| 2 +-
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/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/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
| 2 -
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/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_Redirect.html
| 4 +-
src/org/openbravo/erpCommon/ad_workflow/WorkflowControl_Response.html
| 4 +-
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/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/ModuleTree_data.xsql
| 22 +-
src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html
| 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
src/org/openbravo/erpCommon/security/Login_Options_F1.html
| 2 +-
src/org/openbravo/erpCommon/utility/Home.html
| 4 +-
src/org/openbravo/erpCommon/utility/OBVersion.java
| 66 ++++++
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/VerticalMenu.html
| 6 +-
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 -
src/org/openbravo/service/db/DataImportService.java
| 25 ++-
web/js/messages.js
| 32 +-
218 files changed, 481 insertions(+), 576 deletions(-)
diffs (truncated from 4203 to 300 lines):
diff -r a2b32071c996 -r 02ad8e3730d2 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r a2b32071c996 -r 02ad8e3730d2
src-db/database/model/functions/C_BANKSTATEMENT_POST.xml
--- a/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml Mon Aug 02
15:19:01 2010 +0200
+++ b/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml Thu Aug 05
09:16:07 2010 +0200
@@ -145,7 +145,7 @@
v_ResultStr := 'Reversed';
--Unpost Settlement
- FOR Cur_AutomaticSettlementCancel IN (SELECT DISTINCT S.C_SETTLEMENT_ID
+ FOR Cur_AutomaticSettlementCancel IN (SELECT DISTINCT S.C_SETTLEMENT_ID,
DP.C_BPartner_ID
FROM C_DEBT_PAYMENT DP, C_SETTLEMENT S
WHERE DP.C_SETTLEMENT_CANCEL_ID = S.C_SETTLEMENT_ID
AND DP.C_BANKSTATEMENTLINE_ID IN
@@ -170,8 +170,8 @@
FOR Cur_Debts IN
(SELECT DISTINCT C_BPartner_ID
FROM C_DEBT_PAYMENT
- WHERE
C_Settlement_Cancel_ID=Cur_AutomaticSettlementCancel.C_SETTLEMENT_ID
- OR C_Settlement_Cancel_ID IS NULL
+ WHERE
+ C_BPartner_ID = Cur_AutomaticSettlementCancel.C_BPartner_ID
OR
C_Settlement_Generate_ID=Cur_AutomaticSettlementCancel.C_SETTLEMENT_ID AND
ISRECEIPT = 'Y'
)
LOOP
diff -r a2b32071c996 -r 02ad8e3730d2
src-db/database/model/functions/M_INOUT_POST.xml
--- a/src-db/database/model/functions/M_INOUT_POST.xml Mon Aug 02 15:19:01
2010 +0200
+++ b/src-db/database/model/functions/M_INOUT_POST.xml Thu Aug 05 09:16:07
2010 +0200
@@ -317,7 +317,7 @@
AND IsStocked='Y'
AND ProductType='I';
-- Create Transaction for stocked product
- IF(Cur_InOutLine.M_Product_ID IS NOT NULL AND v_IsStocked=1) THEN
+ IF(Cur_InOutLine.M_Product_ID IS NOT NULL AND v_IsStocked=1 AND
Cur_InOutLine.IsDescription <> 'Y') THEN
v_ResultStr:='CreateTransaction';
Ad_Sequence_Next('M_Transaction', Cur_InOutLine.AD_Org_ID,
v_NextNo) ;
INSERT
@@ -514,7 +514,8 @@
sl.M_AttributeSetInstance_ID,
sl.MovementQty,
il.QTYINVOICED,
- i.DateAcct
+ i.DateAcct,
+ il.IsDescription
FROM M_INOUTLINE sl,
C_INVOICE i,
C_INVOICELINE il
@@ -648,7 +649,7 @@
CreatedBy, Updated, UpdatedBy, M_Product_ID,
M_AttributeSetInstance_ID, C_UOM_ID, M_Locator_ID, MovementQty,
Description, IsInvoiced, --MODIFIED BY F.IRIAZABAL
- QuantityOrder, M_Product_UOM_ID
+ QuantityOrder, M_Product_UOM_ID, IsDescription
)
VALUES
(
@@ -657,7 +658,7 @@
v_User, now(), v_User, Cur_InOutLine.M_Product_ID,
Cur_InOutLine.M_AttributeSetInstance_ID,
Cur_InOutLine.C_UOM_ID, Cur_InOutLine.M_Locator_ID, Cur_InOutLine.MovementQty *
-1,
'*R*: ' || Cur_InOutLine.Description,
Cur_InOutLine.IsInvoiced, --MODIFIED BY F.IRIAZABAL
- Cur_InOutLine.QuantityOrder * -1,
Cur_InOutLine.M_PRODUCT_UOM_ID
+ Cur_InOutLine.QuantityOrder * -1,
Cur_InOutLine.M_PRODUCT_UOM_ID, Cur_InOutLine.IsDescription
)
;
INSERT INTO M_MATCHINV
diff -r a2b32071c996 -r 02ad8e3730d2
src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml
--- a/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml Mon Aug 02
15:19:01 2010 +0200
+++ b/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml Thu Aug 05
09:16:07 2010 +0200
@@ -25,7 +25,7 @@
v_xTree_ID VARCHAR2(32);
v_xParent_ID VARCHAR2(32);
v_NextNo VARCHAR2(32);
- v_orgName VARCHAR2(32);
+ v_orgName VARCHAR2(60);
v_Cont NUMBER;
BEGIN
diff -r a2b32071c996 -r 02ad8e3730d2
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Mon Aug 02 15:19:01
2010 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Aug 05 09:16:07
2010 +0200
@@ -2393,10 +2393,10 @@
<!--801388--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--801388--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--801388--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801388--> <ACTION><![CDATA[X]]></ACTION>
+<!--801388--> <ACTION><![CDATA[M]]></ACTION>
<!--801388-->
<CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_forms.About]]></CLASSNAME>
<!--801388--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--801388--> <AD_FORM_ID><![CDATA[800015]]></AD_FORM_ID>
+<!--801388--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--801388--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--801388--></AD_MODEL_OBJECT>
diff -r a2b32071c996 -r 02ad8e3730d2 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Mon Aug 02 15:19:01 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Thu Aug 05 09:16:07 2010 +0200
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17989]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18028]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r a2b32071c996 -r 02ad8e3730d2
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Aug 02 15:19:01
2010 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Aug 05 09:16:07
2010 +0200
@@ -4247,17 +4247,6 @@
<!--804325--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--804325--></AD_TEXTINTERFACES>
-<!--804326--><AD_TEXTINTERFACES>
-<!--804326--> <AD_TEXTINTERFACES_ID><![CDATA[804326]]></AD_TEXTINTERFACES_ID>
-<!--804326--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--804326--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--804326--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--804326--> <TEXT><![CDATA[For more information on our licensing, please
consult]]></TEXT>
-<!--804326-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
-<!--804326--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--804326--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--804326--></AD_TEXTINTERFACES>
-
<!--804327--><AD_TEXTINTERFACES>
<!--804327--> <AD_TEXTINTERFACES_ID><![CDATA[804327]]></AD_TEXTINTERFACES_ID>
<!--804327--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4269,28 +4258,6 @@
<!--804327--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--804327--></AD_TEXTINTERFACES>
-<!--804331--><AD_TEXTINTERFACES>
-<!--804331--> <AD_TEXTINTERFACES_ID><![CDATA[804331]]></AD_TEXTINTERFACES_ID>
-<!--804331--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--804331--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--804331--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--804331--> <TEXT><![CDATA[Translator]]></TEXT>
-<!--804331-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
-<!--804331--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--804331--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--804331--></AD_TEXTINTERFACES>
-
-<!--804333--><AD_TEXTINTERFACES>
-<!--804333--> <AD_TEXTINTERFACES_ID><![CDATA[804333]]></AD_TEXTINTERFACES_ID>
-<!--804333--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--804333--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--804333--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--804333--> <TEXT><![CDATA[A special thanks to all those who translated
Openbravo ERP:]]></TEXT>
-<!--804333-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
-<!--804333--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--804333--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--804333--></AD_TEXTINTERFACES>
-
<!--804382--><AD_TEXTINTERFACES>
<!--804382--> <AD_TEXTINTERFACES_ID><![CDATA[804382]]></AD_TEXTINTERFACES_ID>
<!--804382--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16498,6 +16465,17 @@
<!--286B7E52905C48ABBDA74561A3C13F6D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--286B7E52905C48ABBDA74561A3C13F6D--></AD_TEXTINTERFACES>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--><AD_TEXTINTERFACES>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3-->
<AD_TEXTINTERFACES_ID><![CDATA[2A1D06FA18B54BFE9CF2ACB115B588E3]]></AD_TEXTINTERFACES_ID>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <TEXT><![CDATA[General Ledger
Report]]></TEXT>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml]]></FILENAME>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2A1D06FA18B54BFE9CF2ACB115B588E3--></AD_TEXTINTERFACES>
+
<!--2B21DC35615C450F83BD69A744CA0764--><AD_TEXTINTERFACES>
<!--2B21DC35615C450F83BD69A744CA0764-->
<AD_TEXTINTERFACES_ID><![CDATA[2B21DC35615C450F83BD69A744CA0764]]></AD_TEXTINTERFACES_ID>
<!--2B21DC35615C450F83BD69A744CA0764-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19413,17 +19391,6 @@
<!--6E0B3322B52A14C6E040007F010136CA-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--6E0B3322B52A14C6E040007F010136CA--></AD_TEXTINTERFACES>
-<!--6E0B3322B52B14C6E040007F010136CA--><AD_TEXTINTERFACES>
-<!--6E0B3322B52B14C6E040007F010136CA-->
<AD_TEXTINTERFACES_ID><![CDATA[6E0B3322B52B14C6E040007F010136CA]]></AD_TEXTINTERFACES_ID>
-<!--6E0B3322B52B14C6E040007F010136CA-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E0B3322B52B14C6E040007F010136CA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E0B3322B52B14C6E040007F010136CA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E0B3322B52B14C6E040007F010136CA--> <TEXT><![CDATA[Revision ID:]]></TEXT>
-<!--6E0B3322B52B14C6E040007F010136CA-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
-<!--6E0B3322B52B14C6E040007F010136CA--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E0B3322B52B14C6E040007F010136CA-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E0B3322B52B14C6E040007F010136CA--></AD_TEXTINTERFACES>
-
<!--6E59421C5B32AB25E040007F01016FD1--><AD_TEXTINTERFACES>
<!--6E59421C5B32AB25E040007F01016FD1-->
<AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B32AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
<!--6E59421C5B32AB25E040007F01016FD1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21182,6 +21149,50 @@
<!--8B6C738A9E948161E040007F010131B7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--8B6C738A9E948161E040007F010131B7--></AD_TEXTINTERFACES>
+<!--8CEBE8DADEA59992E040007F01014AE9--><AD_TEXTINTERFACES>
+<!--8CEBE8DADEA59992E040007F01014AE9-->
<AD_TEXTINTERFACES_ID><![CDATA[8CEBE8DADEA59992E040007F01014AE9]]></AD_TEXTINTERFACES_ID>
+<!--8CEBE8DADEA59992E040007F01014AE9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8CEBE8DADEA59992E040007F01014AE9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8CEBE8DADEA59992E040007F01014AE9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8CEBE8DADEA59992E040007F01014AE9--> <TEXT><![CDATA[Core Revision
ID:]]></TEXT>
+<!--8CEBE8DADEA59992E040007F01014AE9-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
+<!--8CEBE8DADEA59992E040007F01014AE9--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8CEBE8DADEA59992E040007F01014AE9-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8CEBE8DADEA59992E040007F01014AE9--></AD_TEXTINTERFACES>
+
+<!--8CEBE8DADEA89992E040007F01014AE9--><AD_TEXTINTERFACES>
+<!--8CEBE8DADEA89992E040007F01014AE9-->
<AD_TEXTINTERFACES_ID><![CDATA[8CEBE8DADEA89992E040007F01014AE9]]></AD_TEXTINTERFACES_ID>
+<!--8CEBE8DADEA89992E040007F01014AE9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8CEBE8DADEA89992E040007F01014AE9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8CEBE8DADEA89992E040007F01014AE9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8CEBE8DADEA89992E040007F01014AE9--> <TEXT><![CDATA[This instance includes
the following modules:]]></TEXT>
+<!--8CEBE8DADEA89992E040007F01014AE9-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
+<!--8CEBE8DADEA89992E040007F01014AE9--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8CEBE8DADEA89992E040007F01014AE9-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8CEBE8DADEA89992E040007F01014AE9--></AD_TEXTINTERFACES>
+
+<!--8CEBE8DADEAB9992E040007F01014AE9--><AD_TEXTINTERFACES>
+<!--8CEBE8DADEAB9992E040007F01014AE9-->
<AD_TEXTINTERFACES_ID><![CDATA[8CEBE8DADEAB9992E040007F01014AE9]]></AD_TEXTINTERFACES_ID>
+<!--8CEBE8DADEAB9992E040007F01014AE9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8CEBE8DADEAB9992E040007F01014AE9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8CEBE8DADEAB9992E040007F01014AE9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8CEBE8DADEAB9992E040007F01014AE9--> <TEXT><![CDATA[. Created by:]]></TEXT>
+<!--8CEBE8DADEAB9992E040007F01014AE9-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
+<!--8CEBE8DADEAB9992E040007F01014AE9--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8CEBE8DADEAB9992E040007F01014AE9-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8CEBE8DADEAB9992E040007F01014AE9--></AD_TEXTINTERFACES>
+
+<!--8CEBE8DADEAE9992E040007F01014AE9--><AD_TEXTINTERFACES>
+<!--8CEBE8DADEAE9992E040007F01014AE9-->
<AD_TEXTINTERFACES_ID><![CDATA[8CEBE8DADEAE9992E040007F01014AE9]]></AD_TEXTINTERFACES_ID>
+<!--8CEBE8DADEAE9992E040007F01014AE9-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8CEBE8DADEAE9992E040007F01014AE9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8CEBE8DADEAE9992E040007F01014AE9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8CEBE8DADEAE9992E040007F01014AE9--> <TEXT><![CDATA[For more information
on our licensing, please consult ]]></TEXT>
+<!--8CEBE8DADEAE9992E040007F01014AE9-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
+<!--8CEBE8DADEAE9992E040007F01014AE9--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8CEBE8DADEAE9992E040007F01014AE9-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8CEBE8DADEAE9992E040007F01014AE9--></AD_TEXTINTERFACES>
+
<!--8E2EEBC582974948836ACA2751E8A103--><AD_TEXTINTERFACES>
<!--8E2EEBC582974948836ACA2751E8A103-->
<AD_TEXTINTERFACES_ID><![CDATA[8E2EEBC582974948836ACA2751E8A103]]></AD_TEXTINTERFACES_ID>
<!--8E2EEBC582974948836ACA2751E8A103-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r a2b32071c996 -r 02ad8e3730d2
src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java
--- a/src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java
Mon Aug 02 15:19:01 2010 +0200
+++ b/src-test/org/openbravo/test/dal/DalPerformanceInventoryLineTest.java
Thu Aug 05 09:16:07 2010 +0200
@@ -22,6 +22,7 @@
import java.math.BigDecimal;
import org.apache.log4j.Logger;
+import org.hibernate.Hibernate;
import org.hibernate.criterion.Expression;
import org.openbravo.dal.core.DalUtil;
import org.openbravo.dal.service.OBCriteria;
@@ -108,6 +109,8 @@
final InventoryCountLine baseLine = (InventoryCountLine)
DalUtil.copy(iclObc.list().get(0),
false);
final long time = System.currentTimeMillis();
+ Hibernate.initialize(baseLine.getUpdatedBy());
+ Hibernate.initialize(baseLine.getCreatedBy());
commitTransaction();
final OBCriteria<InventoryCount> icObc =
OBDal.getInstance().createCriteria(
diff -r a2b32071c996 -r 02ad8e3730d2
src-wad/src/org/openbravo/wad/TemplateSortTab_Relation.html
--- a/src-wad/src/org/openbravo/wad/TemplateSortTab_Relation.html Mon Aug
02 15:19:01 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/TemplateSortTab_Relation.html Thu Aug
05 09:16:07 2010 +0200
@@ -28,12 +28,12 @@
var baseDirectory = "../../../../../web/";
</script>
<script language="JavaScript" type="text/javascript" id="confirmOnChanges">var
confirmOnChanges = false;</script>
-<script language="JavaScript" src="../../../../../web/js/messages.js"
type="text/javascript"></script>
<script language="JavaScript" src="../utility/DynamicJS.js"
type="text/javascript"></script>
<script language="JavaScript" type="text/javascript" id="paramLanguage">
defaultLang = "en_US";
</script>
<script language="JavaScript" src="../../../../../web/js/utils.js"
type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/messages.js"
type="text/javascript"></script>
<script language="JavaScript" src="../../../../../web/js/ajax.js"
type="text/javascript"></script>
<script language="JavaScript"
src="../../../../../web/js/default/MessageBox.js"
type="text/javascript"></script>
<script language="JavaScript" type="text/javascript">
diff -r a2b32071c996 -r 02ad8e3730d2
src-wad/src/org/openbravo/wad/Template_ActionButton.html
--- a/src-wad/src/org/openbravo/wad/Template_ActionButton.html Mon Aug 02
15:19:01 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/Template_ActionButton.html Thu Aug 05
09:16:07 2010 +0200
@@ -29,13 +29,13 @@
<script language="JavaScript" type="text/javascript" id="paramDirectory">
var baseDirectory = "../../../../../web/";
</script>
-<script language="JavaScript" src="../../../../../web/js/messages.js"
type="text/javascript"></script>
<script language="JavaScript" src="../utility/DynamicJS.js"
type="text/javascript"></script>
<script language="JavaScript" type="text/javascript" id="paramLanguage">
defaultLang = "en_US";
</script>
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
