details: /erp/devel/pi/rev/c9955f721177
changeset: 11840:c9955f721177
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 03 16:14:25 2011 +0200
summary: [cleanup] Reverted Import Data menu folder
details: /erp/devel/pi/rev/7cc821175253
changeset: 11841:7cc821175253
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 03 16:22:35 2011 +0200
summary: Merge back pi-cleanup project (import data folder)
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 -
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
src-db/database/sourcedata/AD_MENU.xml
| 11 +++
src-db/database/sourcedata/AD_TREENODE.xml
| 11 +++
src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql
| 22 +++---
12 files changed, 108 insertions(+), 82 deletions(-)
diffs (truncated from 347 to 300 lines):
diff -r b68bc4e566d9 -r 7cc821175253
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
Tue May 03 13:02:38 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java
Tue May 03 16:22:35 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 b68bc4e566d9 -r 7cc821175253
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
Tue May 03 13:02:38 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java
Tue May 03 16:22:35 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 b68bc4e566d9 -r 7cc821175253
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
Tue May 03 13:02:38 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java
Tue May 03 16:22:35 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 b68bc4e566d9 -r 7cc821175253
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
Tue May 03 13:02:38 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java
Tue May 03 16:22:35 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 b68bc4e566d9 -r 7cc821175253
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
Tue May 03 13:02:38 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java
Tue May 03 16:22:35 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 b68bc4e566d9 -r 7cc821175253
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
Tue May 03 13:02:38 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java
Tue May 03 16:22:35 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 b68bc4e566d9 -r 7cc821175253
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
Tue May 03 13:02:38 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/TestUtility.java
Tue May 03 16:22:35 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 b68bc4e566d9 -r 7cc821175253
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
Tue May 03 13:02:38 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
Tue May 03 16:22:35 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 b68bc4e566d9 -r 7cc821175253 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue May 03 13:02:38 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue May 03 16:22:35 2011 +0200
@@ -57668,7 +57668,7 @@
<!--3783--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--3783--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--3783--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3783--> <READONLYLOGIC><![CDATA[@Posted@='Y' | (@Processed@='Y' &
(@DocStatus@!'VO' | (@DocStatus@='VO' &
@VoidAutomaticallyCreated@=0)))]]></READONLYLOGIC>
+<!--3783--> <READONLYLOGIC><![CDATA[@Posted@='Y' | (@Processed@='Y' &
(@DocStatus@!'VO'))]]></READONLYLOGIC>
<!--3783--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--3783--> <SEQNO><![CDATA[250]]></SEQNO>
<!--3783--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
diff -r b68bc4e566d9 -r 7cc821175253 src-db/database/sourcedata/AD_MENU.xml
--- a/src-db/database/sourcedata/AD_MENU.xml Tue May 03 13:02:38 2011 +0200
+++ b/src-db/database/sourcedata/AD_MENU.xml Tue May 03 16:22:35 2011 +0200
@@ -646,6 +646,17 @@
<!--161--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--161--></AD_MENU>
+<!--163--><AD_MENU>
+<!--163--> <AD_MENU_ID><![CDATA[163]]></AD_MENU_ID>
+<!--163--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--163--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--163--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--163--> <NAME><![CDATA[Import Data]]></NAME>
+<!--163--> <DESCRIPTION><![CDATA[Open a folder where you can import
data.]]></DESCRIPTION>
+<!--163--> <ISSUMMARY><![CDATA[Y]]></ISSUMMARY>
+<!--163--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--163--></AD_MENU>
+
<!--164--><AD_MENU>
<!--164--> <AD_MENU_ID><![CDATA[164]]></AD_MENU_ID>
<!--164--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r b68bc4e566d9 -r 7cc821175253 src-db/database/sourcedata/AD_TREENODE.xml
--- a/src-db/database/sourcedata/AD_TREENODE.xml Tue May 03 13:02:38
2011 +0200
+++ b/src-db/database/sourcedata/AD_TREENODE.xml Tue May 03 16:22:35
2011 +0200
@@ -593,6 +593,17 @@
<!--52118BF1A21C4D84E040007F01005FEC--> <SEQNO><![CDATA[10]]></SEQNO>
<!--52118BF1A21C4D84E040007F01005FEC--></AD_TREENODE>
------------------------------------------------------------------------------
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
