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

BF [3131227] - Product Price Vendor Break and UM conversion 

https://sourceforge.net/tracker/index.php?func=detail&aid=3131227&group_id=176962&atid=879335
This commit is contained in:
Carlos Ruiz 2011-03-25 20:33:42 -05:00
parent 68c975a347
commit f3f4881409
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,12 +539,13 @@ public class CalloutInvoice extends CalloutEngine
// Product Qty changed - recalc price // Product Qty changed - recalc price
else if ((mField.getColumnName().equals("QtyInvoiced") else if ((mField.getColumnName().equals("QtyInvoiced")
|| mField.getColumnName().equals("QtyEntered") || mField.getColumnName().equals("QtyEntered")
|| mField.getColumnName().equals("C_UOM_ID")
|| mField.getColumnName().equals("M_Product_ID")) || mField.getColumnName().equals("M_Product_ID"))
&& !"N".equals(Env.getContext(ctx, WindowNo, "DiscountSchema"))) && !"N".equals(Env.getContext(ctx, WindowNo, "DiscountSchema")))
{ {
int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID"); int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID");
if (mField.getColumnName().equals("QtyEntered")) if (mField.getColumnName().equals("QtyEntered"))
QtyInvoiced = MUOMConversion.convertProductTo (ctx, M_Product_ID, QtyInvoiced = MUOMConversion.convertProductFrom (ctx, M_Product_ID,
C_UOM_To_ID, QtyEntered); C_UOM_To_ID, QtyEntered);
if (QtyInvoiced == null) if (QtyInvoiced == null)
QtyInvoiced = QtyEntered; QtyInvoiced = QtyEntered;

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

@ -1036,12 +1036,13 @@ public class CalloutOrder extends CalloutEngine
// Product Qty changed - recalc price // Product Qty changed - recalc price
else if ((mField.getColumnName().equals("QtyOrdered") else if ((mField.getColumnName().equals("QtyOrdered")
|| mField.getColumnName().equals("QtyEntered") || mField.getColumnName().equals("QtyEntered")
|| mField.getColumnName().equals("C_UOM_ID")
|| mField.getColumnName().equals("M_Product_ID")) || mField.getColumnName().equals("M_Product_ID"))
&& !"N".equals(Env.getContext(ctx, WindowNo, "DiscountSchema"))) && !"N".equals(Env.getContext(ctx, WindowNo, "DiscountSchema")))
{ {
int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID"); int C_BPartner_ID = Env.getContextAsInt(ctx, WindowNo, "C_BPartner_ID");
if (mField.getColumnName().equals("QtyEntered")) if (mField.getColumnName().equals("QtyEntered"))
QtyOrdered = MUOMConversion.convertProductTo (ctx, M_Product_ID, QtyOrdered = MUOMConversion.convertProductFrom (ctx, M_Product_ID,
C_UOM_To_ID, QtyEntered); C_UOM_To_ID, QtyEntered);
if (QtyOrdered == null) if (QtyOrdered == null)
QtyOrdered = QtyEntered; QtyOrdered = QtyEntered;