details: /erp/devel/pi/rev/ba384fa5324d
changeset: 11835:ba384fa5324d
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Mon May 02 16:14:03 2011 +0200
summary: [cleanup] Removed unused reports (part I)
details: /erp/devel/pi/rev/5f6b328a4e3f
changeset: 11836:5f6b328a4e3f
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Mon May 02 19:33:40 2011 +0200
summary: [cleanup] Removed unused reports (part II)
details: /erp/devel/pi/rev/3496b4f3c89f
changeset: 11837:3496b4f3c89f
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Mon May 02 19:37:56 2011 +0200
summary: Merge from PI
details: /erp/devel/pi/rev/b68bc4e566d9
changeset: 11838:b68bc4e566d9
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 03 13:02:38 2011 +0200
summary: [cleanup] Removed unused reports (part III of III)
details: /erp/devel/pi/rev/b13d51000e9c
changeset: 11839:b13d51000e9c
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 03 15:57:10 2011 +0200
summary: Merge back pi-cleanup project (reports)
diffstat:
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java
| 20 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
| 20 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java
| 20 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java
| 20 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java
| 32 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java
| 20 +-
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
| 8 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
| 4 -
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
| 4 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
| 6 +-
referencedata/sampledata/F_B_International_Group.xml
| 614 +-
referencedata/sampledata/QA_Testing.xml
| 164 +-
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/tables/AD_DIMENSION.xml
| 7 -
src-db/database/model/triggers/AD_PROCESS_TRG.xml
| 1 -
src-db/database/model/triggers/AD_WINDOW_TRG.xml
| 13 -
src-db/database/sourcedata/AD_COLUMN.xml
| 38 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 8 +-
src-db/database/sourcedata/AD_FIELD.xml
| 94 +-
src-db/database/sourcedata/AD_MENU.xml
| 52 -
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 84 -
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 140 -
src-db/database/sourcedata/AD_PROCESS.xml
| 137 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 2044 ---
src-db/database/sourcedata/AD_TREENODE.xml
| 44 -
src-db/database/sourcedata/AD_VAL_RULE.xml
| 11 -
src-test/org/openbravo/test/dal/DalStoredProcedureTest.java
| 2 +-
src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql
| 22 +-
src/org/openbravo/erpCommon/ad_reports/DataLocators.srpt
| 37 -
src/org/openbravo/erpCommon/ad_reports/DataLocators.xml
| 28 -
src/org/openbravo/erpCommon/ad_reports/DataLocatorsPDF.fo
| 30 -
src/org/openbravo/erpCommon/ad_reports/DataLocatorsPDF.xml
| 28 -
src/org/openbravo/erpCommon/ad_reports/DateColumn.srpt
| 26 -
src/org/openbravo/erpCommon/ad_reports/DateColumn.xml
| 26 -
src/org/openbravo/erpCommon/ad_reports/DateColumnPDF.fo
| 23 -
src/org/openbravo/erpCommon/ad_reports/DateColumnPDF.xml
| 25 -
src/org/openbravo/erpCommon/ad_reports/DateColumnTamPDF.fo
| 21 -
src/org/openbravo/erpCommon/ad_reports/DateColumnTamPDF.xml
| 26 -
src/org/openbravo/erpCommon/ad_reports/PurchaseOrderDimensionalNoComparative.jrxml
| 729 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingComparativeNoPeriod.srpt
| 60 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingComparativeNoPeriod.xml
| 49 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingComparativePeriod.srpt
| 87 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingComparativePeriod.xml
| 59 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalyses.java
| 902 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesEdit.html
| 307 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesEdit.xml
| 141 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesEdition.html
| 198 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesEdition.xml
| 110 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesFilter.html
| 910 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalysesFilter.xml
| 86 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingCountDimensionalAnalyses_data.xsql
| 684 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingNoComparativeNoPeriod.srpt
| 42 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingNoComparativeNoPeriod.xml
| 44 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingNoComparativePeriod.srpt
| 42 -
src/org/openbravo/erpCommon/ad_reports/ReportAccountingNoComparativePeriod.xml
| 47 -
src/org/openbravo/erpCommon/ad_reports/ReportBank.html
| 373 -
src/org/openbravo/erpCommon/ad_reports/ReportBank.java
| 183 -
src/org/openbravo/erpCommon/ad_reports/ReportBank.xml
| 48 -
src/org/openbravo/erpCommon/ad_reports/ReportBankEdit.html
| 75 -
src/org/openbravo/erpCommon/ad_reports/ReportBankEdit.xml
| 52 -
src/org/openbravo/erpCommon/ad_reports/ReportBank_data.xsql
| 76 -
src/org/openbravo/erpCommon/ad_reports/ReportCash.html
| 386 -
src/org/openbravo/erpCommon/ad_reports/ReportCash.java
| 164 -
src/org/openbravo/erpCommon/ad_reports/ReportCash.xml
| 48 -
src/org/openbravo/erpCommon/ad_reports/ReportCashEdit.html
| 94 -
src/org/openbravo/erpCommon/ad_reports/ReportCashEdit.xml
| 49 -
src/org/openbravo/erpCommon/ad_reports/ReportCash_data.xsql
| 76 -
src/org/openbravo/erpCommon/ad_reports/ReportDimensionalAnalysesPDF.java
| 348 -
src/org/openbravo/erpCommon/ad_reports/ReportInventory.html
| 313 -
src/org/openbravo/erpCommon/ad_reports/ReportInventory.java
| 259 -
src/org/openbravo/erpCommon/ad_reports/ReportInventory.xml
| 42 -
src/org/openbravo/erpCommon/ad_reports/ReportInventoryEdit.html
| 87 -
src/org/openbravo/erpCommon/ad_reports/ReportInventoryEdit.xml
| 43 -
src/org/openbravo/erpCommon/ad_reports/ReportInventory_data.xsql
| 95 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensional.fo
| 1075 --
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalyses.java
| 594 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml
| 5309 ----------
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesEdition.html
| 737 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesEdition.xml
| 447 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesFilter.html
| 901 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesFilter.xml
| 102 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalPDF.java
| 453 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalPDF.xml
| 475 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerEdition.fo
| 102 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerEdition.html
| 90 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerEdition.java
| 358 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerEdition.xml
| 56 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerEdition_Pdf.xml
| 43 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerFilter.html
| 649 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerFilter.xml
| 85 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount.html
| 465 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount.java
| 206 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount.xml
| 46 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountEdit.html
| 118 -
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountEdit.xml
| 51 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEdition.fo
| 100 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEdition.html
| 66 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEdition.java
| 202 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEdition.xml
| 36 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEdition_Pdf.xml
| 33 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionFilter.html
| 454 -
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionFilter.xml
| 53 -
src/org/openbravo/erpCommon/ad_reports/ReportProduction.html
| 378 -
src/org/openbravo/erpCommon/ad_reports/ReportProduction.java
| 162 -
src/org/openbravo/erpCommon/ad_reports/ReportProduction.xml
| 42 -
src/org/openbravo/erpCommon/ad_reports/ReportProductionPDF.fo
| 122 -
src/org/openbravo/erpCommon/ad_reports/ReportProductionPDF.xml
| 38 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSite.html
| 662 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSite.java
| 411 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSite.xml
| 80 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSitePDF.fo
| 156 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSitePDF.xml
| 45 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSitePop.html
| 108 -
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSitePop.xml
| 46 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalyses.fo
| 685 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalyses.java
| 505 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalysesEdition.html
| 426 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalysesEdition.xml
| 252 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalysesEditionPDF.xml
| 254 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalysesFilter.html
| 509 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalysesFilter.xml
| 95 -
src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalyses_data.xsql
| 241 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyze_data.xsql
| 283 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderDimensional.fo
| 786 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderDimensionalPDF.java
| 408 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderDimensionalPDF.xml
| 307 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItem.html
| 316 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItem.java
| 201 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItem.xml
| 40 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItemEdit.jrxml
| 650 -
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItemEdit.xml
| 40 -
src/org/openbravo/erpCommon/ad_reports/ReportShipmentEdition_Pdf.xml
| 33 -
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignment.fo
| 162 -
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignment.html
| 367 -
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignment.java
| 166 -
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignment.xml
| 45 -
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignment_PDF.xml
| 41 -
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseDetailInventory.jrxml
| 990 -
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseDetailInventoryJR.html
| 379 -
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseDetailInventoryJR.java
| 174 -
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseDetailInventoryJR.xml
| 45 -
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseDetailInventory_data.xsql
| 108 -
src/org/openbravo/erpCommon/ad_reports/Totals.srpt
| 29 -
src/org/openbravo/erpCommon/ad_reports/Totals.xml
| 29 -
src/org/openbravo/erpCommon/ad_reports/TotalsFO.fo
| 40 -
src/org/openbravo/erpCommon/ad_reports/TotalsFO.xml
| 29 -
src/org/openbravo/erpCommon/ad_reports/TotalsXLS.srpt
| 29 -
src/org/openbravo/erpCommon/ad_reports/TotalsXLS.xml
| 29 -
src/org/openbravo/erpCommon/businessUtility/WindowTabs.java
| 42 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java
| 35 +-
src/org/openbravo/erpReports/RptC_Invoice.fo
| 228 -
src/org/openbravo/erpReports/RptC_Invoice.xml
| 35 -
src/org/openbravo/erpReports/RptC_InvoiceLines.fo
| 224 -
src/org/openbravo/erpReports/RptC_InvoiceLines.xml
| 44 -
src/org/openbravo/erpReports/RptC_Order.fo
| 122 -
src/org/openbravo/erpReports/RptC_Order.xml
| 33 -
src/org/openbravo/erpReports/RptC_OrderLines.fo
| 98 -
src/org/openbravo/erpReports/RptC_OrderLines.xml
| 32 -
src/org/openbravo/erpReports/RptC_Proposal.fo
| 60 -
src/org/openbravo/erpReports/RptC_Proposal.java
| 97 -
src/org/openbravo/erpReports/RptC_Proposal.xml
| 29 -
src/org/openbravo/erpReports/RptC_ProposalFootnote.fo
| 23 -
src/org/openbravo/erpReports/RptC_ProposalFootnote.xml
| 26 -
src/org/openbravo/erpReports/RptC_ProposalHeader.fo
| 45 -
src/org/openbravo/erpReports/RptC_ProposalHeader.xml
| 41 -
src/org/openbravo/erpReports/RptC_ProposalLines.fo
| 64 -
src/org/openbravo/erpReports/RptC_ProposalLines.xml
| 31 -
src/org/openbravo/erpReports/RptC_Proposal_data.xsql
| 118 -
src/org/openbravo/erpReports/subremittance.jrxml
| 488 -
169 files changed, 218 insertions(+), 37153 deletions(-)
diffs (truncated from 40059 to 300 lines):
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java
Tue May 03 15:57:10 2011 +0200
@@ -160,18 +160,18 @@
private Invoice dataSetup() throws Exception {
// DATA SETUP
- String bpartnerId = "1000008"; // McGiver
- String priceListId = "1000003"; // General Sales
- String paymentTermId = "1000000"; // Immediate"
+ String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
+ String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
+ String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
String currencyId = "102"; // EUR
- String productId = "1000006"; // Hat
- String taxId = "1000002"; // VAT 4%
- String docTypeId = "1000001"; // AR Invoice
+ String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
+ String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
+ String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
BigDecimal invoicedQuantity = new BigDecimal("5");
- BigDecimal netUnitPrice = new BigDecimal("35");
- BigDecimal netListPrice = new BigDecimal("37");
- BigDecimal lineNetAmount = new BigDecimal("175");
- BigDecimal priceLimit = new BigDecimal("33.50");
+ BigDecimal netUnitPrice = new BigDecimal("2.04");
+ BigDecimal netListPrice = new BigDecimal("2.04");
+ BigDecimal lineNetAmount = new BigDecimal("10.20");
+ BigDecimal priceLimit = new BigDecimal("1");
PriceList testPriceList = OBDal.getInstance().get(PriceList.class,
priceListId);
BusinessPartner testBusinessPartner = OBDal.getInstance()
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
Tue May 03 15:57:10 2011 +0200
@@ -163,18 +163,18 @@
private Invoice dataSetup() throws Exception {
// DATA SETUP
- String bpartnerId = "1000008"; // McGiver
- String priceListId = "1000003"; // General Sales
- String paymentTermId = "1000000"; // Immediate"
+ String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
+ String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
+ String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
String currencyId = "102"; // EUR
- String productId = "1000006"; // Hat
- String taxId = "1000002"; // VAT 4%
- String docTypeId = "1000001"; // AR Invoice
+ String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
+ String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
+ String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
BigDecimal invoicedQuantity = new BigDecimal("5");
- BigDecimal netUnitPrice = new BigDecimal("35");
- BigDecimal netListPrice = new BigDecimal("37");
- BigDecimal lineNetAmount = new BigDecimal("175");
- BigDecimal priceLimit = new BigDecimal("33.50");
+ BigDecimal netUnitPrice = new BigDecimal("2.04");
+ BigDecimal netListPrice = new BigDecimal("2.04");
+ BigDecimal lineNetAmount = new BigDecimal("10.20");
+ BigDecimal priceLimit = new BigDecimal("1");
PriceList testPriceList = OBDal.getInstance().get(PriceList.class,
priceListId);
BusinessPartner testBusinessPartner = OBDal.getInstance()
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java
Tue May 03 15:57:10 2011 +0200
@@ -143,18 +143,18 @@
private Invoice dataSetup() throws Exception {
// DATA SETUP
- String bpartnerId = "1000008"; // McGiver
- String priceListId = "1000003"; // General Sales
- String paymentTermId = "1000000"; // Immediate"
+ String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
+ String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
+ String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
String currencyId = "102"; // EUR
- String productId = "1000006"; // Hat
- String taxId = "1000002"; // VAT 4%
- String docTypeId = "1000001"; // AR Invoice
+ String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
+ String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
+ String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
BigDecimal invoicedQuantity = new BigDecimal("5");
- BigDecimal netUnitPrice = new BigDecimal("35");
- BigDecimal netListPrice = new BigDecimal("37");
- BigDecimal lineNetAmount = new BigDecimal("175");
- BigDecimal priceLimit = new BigDecimal("33.50");
+ BigDecimal netUnitPrice = new BigDecimal("2.04");
+ BigDecimal netListPrice = new BigDecimal("2.04");
+ BigDecimal lineNetAmount = new BigDecimal("10.20");
+ BigDecimal priceLimit = new BigDecimal("1");
PriceList testPriceList = OBDal.getInstance().get(PriceList.class,
priceListId);
BusinessPartner testBusinessPartner = OBDal.getInstance()
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java
Tue May 03 15:57:10 2011 +0200
@@ -127,18 +127,18 @@
private Invoice dataSetup() throws Exception {
// DATA SETUP
- String bpartnerId = "1000008"; // McGiver
- String priceListId = "1000003"; // General Sales
- String paymentTermId = "1000000"; // Immediate"
+ String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
+ String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
+ String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
String currencyId = "102"; // EUR
- String productId = "1000006"; // Hat
- String taxId = "1000002"; // VAT 4%
- String docTypeId = "1000001"; // AR Invoice
+ String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
+ String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
+ String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
BigDecimal invoicedQuantity = new BigDecimal("5");
- BigDecimal netUnitPrice = new BigDecimal("35");
- BigDecimal netListPrice = new BigDecimal("37");
- BigDecimal lineNetAmount = new BigDecimal("175");
- BigDecimal priceLimit = new BigDecimal("33.50");
+ BigDecimal netUnitPrice = new BigDecimal("2.04");
+ BigDecimal netListPrice = new BigDecimal("2.04");
+ BigDecimal lineNetAmount = new BigDecimal("10.20");
+ BigDecimal priceLimit = new BigDecimal("1");
PriceList testPriceList = OBDal.getInstance().get(PriceList.class,
priceListId);
BusinessPartner testBusinessPartner = OBDal.getInstance()
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java
Tue May 03 15:57:10 2011 +0200
@@ -61,8 +61,8 @@
* Payment Proposal with two invoices of different business partner
partially paid.
*/
public void testRunPayment_05() {
- String mcGiver = "1000008";
- String turtle = "1000013";
+ String fruitBio = "8A64B71A2B0B2946012B0FE1E45F01B0";
+ String happyDrinks = "8A64B71A2B0B2946012B0FE1E37001AB";
String currencyId = "102"; // EUR
Invoice inv1;
Invoice inv2;
@@ -70,8 +70,8 @@
boolean exception = false;
try {
- inv1 = createPurchaseInvoice(mcGiver);
- inv2 = createPurchaseInvoice(turtle);
+ inv1 = createPurchaseInvoice(fruitBio);
+ inv2 = createPurchaseInvoice(happyDrinks);
inv1 = OBDal.getInstance().get(Invoice.class, inv1.getId());
inv2 = OBDal.getInstance().get(Invoice.class, inv2.getId());
@@ -92,13 +92,13 @@
mergeScheduleDetails.add(scheduleDetails2.get(0));
HashMap<String, BigDecimal> amounts = new HashMap<String, BigDecimal>();
- amounts.put(scheduleDetails1.get(0).getId(), new BigDecimal("100"));
- amounts.put(scheduleDetails2.get(0).getId(), new BigDecimal("100"));
+ amounts.put(scheduleDetails1.get(0).getId(), new BigDecimal("5"));
+ amounts.put(scheduleDetails2.get(0).getId(), new BigDecimal("5"));
OBContext.setAdminMode(true);
try {
// ORA-01779: cannot modify a column which maps to a non key-preserved
table
- FIN_AddPayment.savePaymentProposal(paymentProposal, new
BigDecimal("200"),
+ FIN_AddPayment.savePaymentProposal(paymentProposal, new
BigDecimal("10"),
mergeScheduleDetails, amounts, null);
} finally {
OBContext.restorePreviousMode();
@@ -119,17 +119,17 @@
private Invoice createPurchaseInvoice(String businessPartnerId) throws
Exception {
// DATA SETUP
- String priceListId = "1000003"; // General Sales
- String paymentTermId = "1000000"; // Immediate"
+ String priceListId = "8A64B71A2B0B2946012B0BD96C470131"; // Happy Drinks
Price List
+ String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
String currencyId = "102"; // EUR
- String productId = "1000006"; // Hat
- String taxId = "1000002"; // VAT 4%
- String docTypeId = "1000008"; // AR Invoice
+ String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
+ String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
+ String docTypeId = "71F835BC045742ADAAF5B6856914BB26"; // US AP Invoice
BigDecimal invoicedQuantity = new BigDecimal("5");
- BigDecimal netUnitPrice = new BigDecimal("35");
- BigDecimal netListPrice = new BigDecimal("37");
- BigDecimal lineNetAmount = new BigDecimal("175");
- BigDecimal priceLimit = new BigDecimal("33.50");
+ BigDecimal netUnitPrice = new BigDecimal("1.36");
+ BigDecimal netListPrice = new BigDecimal("1.36");
+ BigDecimal lineNetAmount = new BigDecimal("6.80");
+ BigDecimal priceLimit = new BigDecimal("1");
PriceList testPriceList = OBDal.getInstance().get(PriceList.class,
priceListId);
BusinessPartner testBusinessPartner =
OBDal.getInstance().get(BusinessPartner.class,
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java
Tue May 03 15:57:10 2011 +0200
@@ -147,18 +147,18 @@
private Invoice dataSetup() throws Exception {
// DATA SETUP
- String bpartnerId = "1000008"; // McGiver
- String priceListId = "1000003"; // General Sales
- String paymentTermId = "1000000"; // Immediate"
+ String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
+ String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
+ String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
String currencyId = "102"; // EUR
- String productId = "1000006"; // Hat
- String taxId = "1000002"; // VAT 4%
- String docTypeId = "1000001"; // AR Invoice
+ String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
+ String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
+ String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
BigDecimal invoicedQuantity = new BigDecimal("5");
- BigDecimal netUnitPrice = new BigDecimal("35");
- BigDecimal netListPrice = new BigDecimal("37");
- BigDecimal lineNetAmount = new BigDecimal("175");
- BigDecimal priceLimit = new BigDecimal("33.50");
+ BigDecimal netUnitPrice = new BigDecimal("2.04");
+ BigDecimal netListPrice = new BigDecimal("2.04");
+ BigDecimal lineNetAmount = new BigDecimal("10.20");
+ BigDecimal priceLimit = new BigDecimal("1");
String executionProcessId = "717D521D5F454FAD9199B831001BB4E0"; // Simple
Execution Process
PriceList testPriceList = OBDal.getInstance().get(PriceList.class,
priceListId);
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
---
a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
Tue May 03 15:57:10 2011 +0200
@@ -434,7 +434,13 @@
}
public static void setTestContext() {
- OBContext.setOBContext("100", "1000004", "1000000", "1000000");
+ // User = Openbravo
+ // Role = F&B International Group Admin
+ // Client = F&B International Group
+ // Org = F&B US, Inc.
+ OBContext.setOBContext("100", "FF8080812AFBCB14012AFBD3E4340031",
+ "FF8080812AFBCB14012AFBD3E373001F",
"B9C7088AB859483A9B1FB342AC2BE17A");
+
}
private static ConnectionProvider getConnectionProviderMy() {
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
Tue May 03 15:57:10 2011 +0200
@@ -109,10 +109,6 @@
if ("S".equals(paymentRunPayment.getResult())) {
String paymentStatus = paymentRunPayment.getPayment().getStatus();
- if ("RPAE".equals(paymentStatus)) {
- paymentStatus = paymentRunPayment.getPayment().isReceipt() ?
"RPR" : "PPM";
- paymentRunPayment.getPayment().setStatus(paymentStatus);
- }
if ("PPW".equals(paymentRun.getSourceOfTheExecution())) {
FIN_PaymentProposal pp =
getPaymentProposalFromPayment(paymentRunPayment.getPayment());
pp.setStatus("PPM");
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
Tue May 03 15:57:10 2011 +0200
@@ -11,7 +11,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-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -264,7 +264,7 @@
}
protected List<Role> getRoles(Map<String, Object> parameters) {
- ActivationKey ak = new ActivationKey();
+ ActivationKey ak = ActivationKey.getInstance();
SystemInformation sysInfo =
OBDal.getInstance().get(SystemInformation.class, "0");
boolean correctSystemStatus = sysInfo.getSystemStatus() == null
|| KernelServlet.getGlobalParameters().getOBProperty("safe.mode",
"false")
diff -r dff773cd5937 -r b13d51000e9c
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
Mon May 02 11:58:06 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
Tue May 03 15:57:10 2011 +0200
@@ -26,6 +26,8 @@
import org.openbravo.client.kernel.KernelConstants;
import org.openbravo.client.kernel.Template;
import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.obps.ActivationKey;
+import org.openbravo.erpCommon.obps.ActivationKey.FeatureRestriction;
import org.openbravo.model.ad.ui.Field;
import org.openbravo.model.ad.ui.Tab;
import org.openbravo.model.ad.ui.Window;
@@ -126,7 +128,9 @@
final List<OBViewTab> tempTabs = new ArrayList<OBViewTab>();
for (Tab tab : getWindow().getADTabList()) {
// NOTE: grid sequence and field sequence tabs do not have any fields
defined!
- if (!tab.isActive() || tab.getADFieldList().isEmpty()) {
+ if (!tab.isActive()
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
