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

#2822201: Correct Actualization of CurrentQty in MCost 

https://sourceforge.net/tracker/?func=detail&aid=2822201&group_id=176962&atid=879335
This commit is contained in:
armenrz 2009-09-13 10:36:14 +00:00
parent a7c4fed665
commit f5bcca0a7b
1 changed files with 1223 additions and 1168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
base/src/org/compiere/model/MCostDetail.java
View File

@ -979,24 +979,33 @@ public class MCostDetail extends X_M_CostDetail
if (MAcctSchema.COSTINGMETHOD_AveragePO.equals(costingMethod) || if (MAcctSchema.COSTINGMETHOD_AveragePO.equals(costingMethod) ||
MAcctSchema.COSTINGMETHOD_AverageInvoice.equals(costingMethod)) MAcctSchema.COSTINGMETHOD_AverageInvoice.equals(costingMethod))
{ {
if (cost.getCurrentQty().compareTo(Env.ZERO) == 0) /** Problem with Landed Costs: certain cost element may not occur in every purchases,
{ * causing the average calculation of that cost element wrongly took the current qty.
//initialize current qty for new landed cost element *
String sql = "SELECT QtyOnHand FROM M_Storage" * Solution:
* Make sure the current qty is reflecting the actual qty in storage
*/
String sql = "SELECT COALESCE(SUM(QtyOnHand),0) FROM M_Storage"
+ " WHERE AD_Client_ID=" + cost.getAD_Client_ID() + " WHERE AD_Client_ID=" + cost.getAD_Client_ID()
+ " AND AD_Org_ID=" + cost.getAD_Org_ID()
+ " AND M_Product_ID=" + cost.getM_Product_ID()
+ " AND M_AttributeSetInstance_ID=" + M_ASI_ID;
if (M_ASI_ID == 0)
sql = "SELECT SUM(QtyOnHand) FROM M_Storage"
+ " WHERE AD_Client_ID=" + cost.getAD_Client_ID()
+ " AND AD_Org_ID=" + cost.getAD_Org_ID()
+ " AND M_Product_ID=" + cost.getM_Product_ID(); + " AND M_Product_ID=" + cost.getM_Product_ID();
BigDecimal bd = DB.getSQLValueBD(get_TrxName(), sql); //Costing Level
if (bd != null) String CostingLevel = product.getCostingLevel(as);
cost.setCurrentQty(bd.subtract(qty)); // (initial qty = onhand qty - allocated qty) if (MAcctSchema.COSTINGLEVEL_Organization.equals(CostingLevel))
sql += " AND AD_Org_ID=" + cost.getAD_Org_ID();
else if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel))
sql += " AND M_AttributeSetInstance_ID=" + M_ASI_ID;
//
BigDecimal qtyOnhand = DB.getSQLValueBD(get_TrxName(), sql);
if (qtyOnhand.signum() != 0)
{
BigDecimal oldSum = cost.getCurrentCostPrice().multiply(cost.getCurrentQty());
BigDecimal sumAmt = oldSum.add(amt); // amt is total already
BigDecimal costs = sumAmt.divide(qtyOnhand, precision, BigDecimal.ROUND_HALF_UP);
cost.setCurrentCostPrice(costs);
} }
cost.setWeightedAverage(amt, qty); //also get averaged cost.setCumulatedAmt(cost.getCumulatedAmt().add(amt));
cost.setCumulatedQty(cost.getCumulatedQty().add(qty));
cost.setCurrentQty(qtyOnhand);
} }
else //original logic from Compiere else //original logic from Compiere
{ {
@ -1005,7 +1014,7 @@ public class MCostDetail extends X_M_CostDetail
cost.add(amt, qty); cost.add(amt, qty);
} }
// end AZ // end AZ
log.finer("Inv - none - " + cost); log.finer("Inv - Landed Costs - " + cost);
} }
// else // else
// log.warning("Inv - " + ce + " - " + cost); // log.warning("Inv - " + ce + " - " + cost);
@ -1107,6 +1116,52 @@ public class MCostDetail extends X_M_CostDetail
} }
else else
log.warning("QtyAdjust - " + ce + " - " + cost); log.warning("QtyAdjust - " + ce + " - " + cost);
//AZ Goodwill
//Also update Landed Costs to reflect the actual qty in storage
String costingMethod = ce.getCostingMethod();
if (MAcctSchema.COSTINGMETHOD_AveragePO.equals(costingMethod) ||
MAcctSchema.COSTINGMETHOD_AverageInvoice.equals(costingMethod))
{
MCostElement[] lce = MCostElement.getNonCostingMethods(this);
if (lce.length > 0)
{
String sql = "SELECT COALESCE(SUM(QtyOnHand),0) FROM M_Storage"
+ " WHERE AD_Client_ID=" + cost.getAD_Client_ID()
+ " AND M_Product_ID=" + cost.getM_Product_ID();
//Costing Level
String CostingLevel = product.getCostingLevel(as);
if (MAcctSchema.COSTINGLEVEL_Organization.equals(CostingLevel))
sql += " AND AD_Org_ID=" + cost.getAD_Org_ID();
else if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel))
sql += " AND M_AttributeSetInstance_ID=" + M_ASI_ID;
//
BigDecimal qtyOnhand = DB.getSQLValueBD(get_TrxName(), sql);
for (int i = 0 ; i < lce.length ; i++)
{
MCost lCost = MCost.get(getCtx(), cost.getAD_Client_ID(), cost.getAD_Org_ID(),
cost.getM_Product_ID(), cost.getM_CostType_ID(), cost.getC_AcctSchema_ID(),
lce[i].getM_CostElement_ID(), cost.getM_AttributeSetInstance_ID(), get_TrxName());
if (lCost != null)
{
if (qtyOnhand.signum() != 0)
{
// new average cost
BigDecimal oldSum = lCost.getCurrentCostPrice().multiply(lCost.getCurrentQty());
BigDecimal costs = oldSum.divide(qtyOnhand, precision, BigDecimal.ROUND_HALF_UP);
lCost.setCurrentCostPrice(costs);
}
lCost.setCurrentQty(qtyOnhand);
if (!lCost.save())
{
log.warning("Update Landed Costs (Qty) fail: " + lce + " - " + lCost);
return false;
}
}
}
}//end-if
}
//end AZ
} }
else // unknown or no id else // unknown or no id
{ {