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

IDEMPIERE-213 Costing: Seed/Initial Cost Clean up

This commit is contained in:
Heng Sin Low 2012-03-26 15:17:25 +08:00
parent be6b85f531
commit 1982a8b331
2 changed files with 72 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
org.adempiere.base/src/org/compiere/model/MCost.java
View File

@ -214,11 +214,7 @@ public class MCost extends X_M_Cost
{ {
if (zeroCostsOK) if (zeroCostsOK)
return Env.ZERO; return Env.ZERO;
materialCostEach = getSeedCosts(product, M_ASI_ID,
as, Org_ID, costingMethod, C_OrderLine_ID);
} }
if (materialCostEach == null)
return null;
// Material Costs // Material Costs
BigDecimal materialCost = materialCostEach.multiply(qty); BigDecimal materialCost = materialCostEach.multiply(qty);
@ -278,13 +274,13 @@ public class MCost extends X_M_Cost
BigDecimal retValue = null; BigDecimal retValue = null;
// Direct Data // Direct Data
if (MCostElement.COSTINGMETHOD_AverageInvoice.equals(costingMethod)) if (MCostElement.COSTINGMETHOD_AverageInvoice.equals(costingMethod))
retValue = calculateAverageInv(product, M_ASI_ID, as, Org_ID); return null;
else if (MCostElement.COSTINGMETHOD_AveragePO.equals(costingMethod)) else if (MCostElement.COSTINGMETHOD_AveragePO.equals(costingMethod))
retValue = calculateAveragePO(product, M_ASI_ID, as, Org_ID); return null;
else if (MCostElement.COSTINGMETHOD_Fifo.equals(costingMethod)) else if (MCostElement.COSTINGMETHOD_Fifo.equals(costingMethod))
retValue = calculateFiFo(product, M_ASI_ID, as, Org_ID); return null;
else if (MCostElement.COSTINGMETHOD_Lifo.equals(costingMethod)) else if (MCostElement.COSTINGMETHOD_Lifo.equals(costingMethod))
retValue = calculateLiFo(product, M_ASI_ID, as, Org_ID); return null;
else if (MCostElement.COSTINGMETHOD_LastInvoice.equals(costingMethod)) else if (MCostElement.COSTINGMETHOD_LastInvoice.equals(costingMethod))
retValue = getLastInvoicePrice(product, M_ASI_ID, Org_ID, as.getC_Currency_ID()); retValue = getLastInvoicePrice(product, M_ASI_ID, Org_ID, as.getC_Currency_ID());
else if (MCostElement.COSTINGMETHOD_LastPOPrice.equals(costingMethod)) else if (MCostElement.COSTINGMETHOD_LastPOPrice.equals(costingMethod))
@ -298,7 +294,7 @@ public class MCost extends X_M_Cost
{ {
// migrate old costs // migrate old costs
MProductCosting pc = MProductCosting.get(product.getCtx(), product.getM_Product_ID(), MProductCosting pc = MProductCosting.get(product.getCtx(), product.getM_Product_ID(),
as.getC_AcctSchema_ID(), null); as.getC_AcctSchema_ID(), product.get_TrxName());
if (pc != null) if (pc != null)
retValue = pc.getCurrentCostPrice(); retValue = pc.getCurrentCostPrice();
} }
@ -306,7 +302,7 @@ public class MCost extends X_M_Cost
; ;
else else
throw new IllegalArgumentException("Unknown Costing Method = " + costingMethod); throw new IllegalArgumentException("Unknown Costing Method = " + costingMethod);
if (retValue != null && retValue.signum() != 0) if (retValue != null && retValue.signum() > 0)
{ {
s_log.fine(product.getName() + ", CostingMethod=" + costingMethod + " - " + retValue); s_log.fine(product.getName() + ", CostingMethod=" + costingMethod + " - " + retValue);
return retValue; return retValue;
@ -316,7 +312,7 @@ public class MCost extends X_M_Cost
if (C_OrderLine_ID != 0) if (C_OrderLine_ID != 0)
{ {
retValue = getPOPrice(product, C_OrderLine_ID, as.getC_Currency_ID()); retValue = getPOPrice(product, C_OrderLine_ID, as.getC_Currency_ID());
if (retValue != null && retValue.signum() != 0) if (retValue != null && retValue.signum() > 0)
{ {
s_log.fine(product.getName() + ", PO - " + retValue); s_log.fine(product.getName() + ", PO - " + retValue);
return retValue; return retValue;
@ -327,8 +323,8 @@ public class MCost extends X_M_Cost
if (!MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod)) if (!MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod))
{ {
MCostElement ce = MCostElement.getMaterialCostElement(as, MCostElement.COSTINGMETHOD_StandardCosting); MCostElement ce = MCostElement.getMaterialCostElement(as, MCostElement.COSTINGMETHOD_StandardCosting);
MCost cost = get(product, M_ASI_ID, as, Org_ID, ce.getM_CostElement_ID()); MCost cost = get(product, M_ASI_ID, as, Org_ID, ce.getM_CostElement_ID(), product.get_TrxName());
if (cost != null && cost.getCurrentCostPrice().signum() != 0) if (cost != null && cost.getCurrentCostPrice().signum() > 0)
{ {
s_log.fine(product.getName() + ", Standard - " + cost); s_log.fine(product.getName() + ", Standard - " + cost);
return cost.getCurrentCostPrice(); return cost.getCurrentCostPrice();
@ -337,15 +333,14 @@ public class MCost extends X_M_Cost
// We do not have a price // We do not have a price
// PO first // PO first
if (MCostElement.COSTINGMETHOD_AveragePO.equals(costingMethod) if (MCostElement.COSTINGMETHOD_LastPOPrice.equals(costingMethod)
|| MCostElement.COSTINGMETHOD_LastPOPrice.equals(costingMethod)
|| MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod)) || MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod))
{ {
// try Last PO // try Last PO
retValue = getLastPOPrice(product, M_ASI_ID, Org_ID, as.getC_Currency_ID()); retValue = getLastPOPrice(product, M_ASI_ID, Org_ID, as.getC_Currency_ID());
if (Org_ID != 0 && (retValue == null || retValue.signum() == 0)) if (Org_ID != 0 && (retValue == null || retValue.signum() == 0))
retValue = getLastPOPrice(product, M_ASI_ID, 0, as.getC_Currency_ID()); retValue = getLastPOPrice(product, M_ASI_ID, 0, as.getC_Currency_ID());
if (retValue != null && retValue.signum() != 0) if (retValue != null && retValue.signum() > 0)
{ {
s_log.fine(product.getName() + ", LastPO = " + retValue); s_log.fine(product.getName() + ", LastPO = " + retValue);
return retValue; return retValue;
@ -366,15 +361,14 @@ public class MCost extends X_M_Cost
// Still Nothing // Still Nothing
// Inv second // Inv second
if (MCostElement.COSTINGMETHOD_AveragePO.equals(costingMethod) if (MCostElement.COSTINGMETHOD_LastPOPrice.equals(costingMethod)
|| MCostElement.COSTINGMETHOD_LastPOPrice.equals(costingMethod)
|| MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod)) || MCostElement.COSTINGMETHOD_StandardCosting.equals(costingMethod))
{ {
// try last Inv // try last Inv
retValue = getLastInvoicePrice(product, M_ASI_ID, Org_ID, as.getC_Currency_ID()); retValue = getLastInvoicePrice(product, M_ASI_ID, Org_ID, as.getC_Currency_ID());
if (Org_ID != 0 && (retValue == null || retValue.signum() == 0)) if (Org_ID != 0 && (retValue == null || retValue.signum() == 0))
retValue = getLastInvoicePrice(product, M_ASI_ID, 0, as.getC_Currency_ID()); retValue = getLastInvoicePrice(product, M_ASI_ID, 0, as.getC_Currency_ID());
if (retValue != null && retValue.signum() != 0) if (retValue != null && retValue.signum() > 0)
{ {
s_log.fine(product.getName() + ", LastInv = " + retValue); s_log.fine(product.getName() + ", LastInv = " + retValue);
return retValue; return retValue;
@ -386,7 +380,7 @@ public class MCost extends X_M_Cost
retValue = getLastPOPrice(product, M_ASI_ID, Org_ID, as.getC_Currency_ID()); retValue = getLastPOPrice(product, M_ASI_ID, Org_ID, as.getC_Currency_ID());
if (Org_ID != 0 && (retValue == null || retValue.signum() == 0)) if (Org_ID != 0 && (retValue == null || retValue.signum() == 0))
retValue = getLastPOPrice(product, M_ASI_ID, 0, as.getC_Currency_ID()); retValue = getLastPOPrice(product, M_ASI_ID, 0, as.getC_Currency_ID());
if (retValue != null && retValue.signum() != 0) if (retValue != null && retValue.signum() > 0)
{ {
s_log.fine(product.getName() + ", LastPO = " + retValue); s_log.fine(product.getName() + ", LastPO = " + retValue);
return retValue; return retValue;
@ -394,7 +388,7 @@ public class MCost extends X_M_Cost
} }
// Still nothing try ProductPO // Still nothing try ProductPO
MProductPO[] pos = MProductPO.getOfProduct(product.getCtx(), product.getM_Product_ID(), null); MProductPO[] pos = MProductPO.getOfProduct(product.getCtx(), product.getM_Product_ID(), product.get_TrxName());
for (int i = 0; i < pos.length; i++) for (int i = 0; i < pos.length; i++)
{ {
BigDecimal price = pos[i].getPricePO(); BigDecimal price = pos[i].getPricePO();
@ -423,13 +417,48 @@ public class MCost extends X_M_Cost
} }
// Still nothing try Purchase Price List // Still nothing try Purchase Price List
// .... BigDecimal price = getSeedCostFromPriceList(product, as, Org_ID);
if (price != null && price.signum() > 0)
{
retValue = price;
}
s_log.fine(product.getName() + " = " + retValue); s_log.fine(product.getName() + " = " + retValue);
return retValue; return retValue;
} // getSeedCosts } // getSeedCosts
private static BigDecimal getSeedCostFromPriceList(MProduct product,
MAcctSchema as, int orgID) {
String sql = "SELECT pp.PriceList, pp.PriceStd FROM M_ProductPrice pp" +
" INNER JOIN M_PriceList_Version plv ON (pp.M_PriceList_Version_ID = plv.M_PriceList_Version_ID AND plv.ValidFrom <= trunc(sysdate))" +
" INNER JOIN M_PriceList pl ON (plv.M_PriceList_ID = pl.M_PriceList_ID AND pl.IsSOPriceList = 'N')" +
" WHERE pp.AD_Client_ID = ? AND pp.AD_Org_ID IN (0, ?) AND pp.M_Product_ID = ? AND pp.PriceList > 0 AND pp.IsActive = 'Y' " +
" ORDER BY pp.AD_Org_ID Desc, plv.ValidFrom Desc";
PreparedStatement st = null;
ResultSet rs = null;
try {
st = DB.prepareStatement(sql, product.get_TrxName());
st.setInt(1, as.getAD_Client_ID());
st.setInt(2, orgID);
st.setInt(3, product.getM_Product_ID());
rs = st.executeQuery();
if (rs.next()) {
BigDecimal priceList = rs.getBigDecimal(1);
BigDecimal priceStd = rs.getBigDecimal(2);
if (priceStd != null && priceStd.signum() > 0)
return priceStd;
else
return priceList;
}
} catch (SQLException e) {
throw new DBException(e, sql);
} finally {
DB.close(rs, st);
}
return BigDecimal.ZERO;
}
/** /**
* Get Last Invoice Price in currency * Get Last Invoice Price in currency
* @param product product * @param product product

27
org.adempiere.base/src/org/compiere/model/MCostDetail.java
View File

@ -892,6 +892,23 @@ public class MCostDetail extends X_M_CostDetail
cost.add(amt, qty); cost.add(amt, qty);
log.finer("PO - LastPO - " + cost); log.finer("PO - LastPO - " + cost);
} }
else if (ce.isStandardCosting())
{
// Update cost record only if it is zero
if (cost.getCurrentCostPrice().signum() == 0
&& cost.getCurrentCostPriceLL().signum() == 0)
{
cost.setCurrentCostPrice(price);
if (cost.getCurrentCostPrice().signum() == 0)
{
cost.setCurrentCostPrice(MCost.getSeedCosts(product, M_ASI_ID,
as, Org_ID, ce.getCostingMethod(), getC_OrderLine_ID()));
}
log.finest("PO - Standard - CurrentCostPrice(seed)="+cost.getCurrentCostPrice()+", price="+price);
}
cost.add(amt, qty);
log.finer("PO - Standard - " + cost);
}
else if (ce.isUserDefined()) else if (ce.isUserDefined())
{ {
// Interface // Interface
@ -948,10 +965,8 @@ public class MCostDetail extends X_M_CostDetail
} }
else if (ce.isStandardCosting()) else if (ce.isStandardCosting())
{ {
// Update cost record only if newly created. // Update cost record only if it is zero
// Elsewhere we risk to set the CurrentCostPrice to an undesired price. if (cost.getCurrentCostPrice().signum() == 0
if (cost.is_new()
&& cost.getCurrentCostPrice().signum() == 0
&& cost.getCurrentCostPriceLL().signum() == 0) && cost.getCurrentCostPriceLL().signum() == 0)
{ {
cost.setCurrentCostPrice(price); cost.setCurrentCostPrice(price);
@ -962,8 +977,8 @@ public class MCostDetail extends X_M_CostDetail
as, Org_ID, ce.getCostingMethod(), getC_OrderLine_ID())); as, Org_ID, ce.getCostingMethod(), getC_OrderLine_ID()));
log.finest("Inv - Standard - CurrentCostPrice(seed)="+cost.getCurrentCostPrice()+", price="+price); log.finest("Inv - Standard - CurrentCostPrice(seed)="+cost.getCurrentCostPrice()+", price="+price);
} }
} cost.add(amt, qty);
cost.add(amt, qty); }
log.finer("Inv - Standard - " + cost); log.finer("Inv - Standard - " + cost);
} }
else if (ce.isUserDefined()) else if (ce.isUserDefined())