From 574243be6308f2be60b450b4643fca2c8f264d5b Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 15 Feb 2014 11:17:05 -0500 Subject: [PATCH] IDEMPIERE-1398 Tax lookups not transaction aware / minor - remove warnings on Callouts --- .../src/org/adempiere/model/CalloutRMA.java | 4 ++-- .../src/org/compiere/model/CalloutInvoice.java | 2 +- .../src/org/compiere/model/CalloutInvoiceBatch.java | 2 +- .../src/org/compiere/model/CalloutOrder.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java index 504ab6e170..586fb5f66d 100644 --- a/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java +++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java @@ -153,7 +153,7 @@ public class CalloutRMA extends CalloutEngine { invoice.getDateInvoiced(), invoice.getDateInvoiced(), AD_Org_ID, rma.getShipment().getM_Warehouse_ID(), invoice.getC_BPartner_Location_ID(), // should be bill to - invoice.getC_BPartner_Location_ID(), rma.isSOTrx()); + invoice.getC_BPartner_Location_ID(), rma.isSOTrx(), null); } else { @@ -168,7 +168,7 @@ public class CalloutRMA extends CalloutEngine { order.getDateOrdered(), order.getDateOrdered(), AD_Org_ID, order.getM_Warehouse_ID(), order.getC_BPartner_Location_ID(), // should be bill to - order.getC_BPartner_Location_ID(), rma.isSOTrx()); + order.getC_BPartner_Location_ID(), rma.isSOTrx(), null); } else return "No Invoice/Order found the Shipment/Receipt associated"; 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 b3e36dc703..771bb308fd 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java @@ -477,7 +477,7 @@ public class CalloutInvoice extends CalloutEngine // int C_Tax_ID = Tax.get(ctx, M_Product_ID, C_Charge_ID, billDate, shipDate, AD_Org_ID, M_Warehouse_ID, billC_BPartner_Location_ID, shipC_BPartner_Location_ID, - Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y")); + Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y"), null); if (log.isLoggable(Level.INFO)) log.info("Tax ID=" + C_Tax_ID); // if (C_Tax_ID == 0) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java index 03c23608da..3def446db6 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java @@ -323,7 +323,7 @@ public class CalloutInvoiceBatch extends CalloutEngine // int C_Tax_ID = Tax.get(ctx, 0, C_Charge_ID, billDate, shipDate, AD_Org_ID, M_Warehouse_ID, C_BPartner_Location_ID, C_BPartner_Location_ID, - Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y")); + Env.getContext(ctx, WindowNo, "IsSOTrx").equals("Y"), null); if (log.isLoggable(Level.INFO)) log.info("Tax ID=" + C_Tax_ID); // if (C_Tax_ID == 0) 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 09331f172a..a8aef526ce 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java @@ -1002,7 +1002,7 @@ public class CalloutOrder extends CalloutEngine // int C_Tax_ID = Tax.get (ctx, M_Product_ID, C_Charge_ID, billDate, shipDate, AD_Org_ID, M_Warehouse_ID, billC_BPartner_Location_ID, shipC_BPartner_Location_ID, - "Y".equals(Env.getContext(ctx, WindowNo, "IsSOTrx"))); + "Y".equals(Env.getContext(ctx, WindowNo, "IsSOTrx")), null); if (log.isLoggable(Level.INFO)) log.info("Tax ID=" + C_Tax_ID); // if (C_Tax_ID == 0)