midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1398 Tax lookups not transaction aware / minor - remove warnings on Callouts

This commit is contained in:
Carlos Ruiz 2014-02-15 11:17:05 -05:00
parent 9e5cd134dc
commit 574243be63
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java
View File

@ -153,7 +153,7 @@ public class CalloutRMA extends CalloutEngine {
invoice.getDateInvoiced(), invoice.getDateInvoiced(), invoice.getDateInvoiced(), invoice.getDateInvoiced(),
AD_Org_ID, rma.getShipment().getM_Warehouse_ID(), AD_Org_ID, rma.getShipment().getM_Warehouse_ID(),
invoice.getC_BPartner_Location_ID(), // should be bill to 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 else
{ {
@ -168,7 +168,7 @@ public class CalloutRMA extends CalloutEngine {
order.getDateOrdered(), order.getDateOrdered(), order.getDateOrdered(), order.getDateOrdered(),
AD_Org_ID, order.getM_Warehouse_ID(), AD_Org_ID, order.getM_Warehouse_ID(),
order.getC_BPartner_Location_ID(), // should be bill to 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 else
return "No Invoice/Order found the Shipment/Receipt associated"; return "No Invoice/Order found the Shipment/Receipt associated";

2
org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java
View File

@ -477,7 +477,7 @@ public class CalloutInvoice extends CalloutEngine
// //
int C_Tax_ID = Tax.get(ctx, M_Product_ID, C_Charge_ID, billDate, shipDate, 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, 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 (log.isLoggable(Level.INFO)) log.info("Tax ID=" + C_Tax_ID);
// //
if (C_Tax_ID == 0) if (C_Tax_ID == 0)

2
org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java
View File

@ -323,7 +323,7 @@ public class CalloutInvoiceBatch extends CalloutEngine
// //
int C_Tax_ID = Tax.get(ctx, 0, C_Charge_ID, billDate, shipDate, 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, 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 (log.isLoggable(Level.INFO)) log.info("Tax ID=" + C_Tax_ID);
// //
if (C_Tax_ID == 0) if (C_Tax_ID == 0)

2
org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java
View File

@ -1002,7 +1002,7 @@ public class CalloutOrder extends CalloutEngine
// //
int C_Tax_ID = Tax.get (ctx, M_Product_ID, C_Charge_ID, billDate, shipDate, 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, 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 (log.isLoggable(Level.INFO)) log.info("Tax ID=" + C_Tax_ID);
// //
if (C_Tax_ID == 0) if (C_Tax_ID == 0)