From 19dded6c92bdcaf49ee72921e2bab10725bdd791 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 7 Mar 2011 11:06:27 -0500 Subject: [PATCH] Fix bug in CalloutInvoice and CalloutOrder: - variables PriceEntered and PriceActual are not correctly assigned, and they are used in some processes below -> result, calculate of taxamt and linenetamt is wrong --- .../src/org/compiere/model/CalloutInvoice.java | 3 +++ .../src/org/compiere/model/CalloutOrder.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java index fbad12afe3..872ef64dfd 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java @@ -527,10 +527,12 @@ public class CalloutInvoice extends CalloutEngine // else ignore if (mField.getColumnName().equals("PriceActual")) { + PriceEntered = (BigDecimal) value; mTab.setValue("PriceEntered", value); } else if (mField.getColumnName().equals("PriceEntered")) { + PriceActual = (BigDecimal) value; mTab.setValue("PriceActual", value); } } @@ -561,6 +563,7 @@ public class CalloutInvoice extends CalloutEngine // log.fine("amt - QtyChanged -> PriceActual=" + pp.getPriceStd() + ", PriceEntered=" + PriceEntered + ", Discount=" + pp.getDiscount()); + PriceActual = pp.getPriceStd(); mTab.setValue("PriceActual", pp.getPriceStd()); // mTab.setValue("Discount", pp.getDiscount()); mTab.setValue("PriceEntered", PriceEntered); diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java index ccbbf32f6f..6c9753cf75 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java @@ -998,10 +998,12 @@ public class CalloutOrder extends CalloutEngine // else ignore if (mField.getColumnName().equals("PriceActual")) { + PriceEntered = (BigDecimal) value; mTab.setValue("PriceEntered", value); } else if (mField.getColumnName().equals("PriceEntered")) { + PriceActual = (BigDecimal) value; mTab.setValue("PriceActual", value); } } @@ -1032,6 +1034,7 @@ public class CalloutOrder extends CalloutEngine // log.fine("QtyChanged -> PriceActual=" + pp.getPriceStd() + ", PriceEntered=" + PriceEntered + ", Discount=" + pp.getDiscount()); + PriceActual = pp.getPriceStd(); mTab.setValue("PriceActual", pp.getPriceStd()); mTab.setValue("Discount", pp.getDiscount()); mTab.setValue("PriceEntered", PriceEntered);