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

IDEMPIERE-3742 Wrong product cost for partial MR

This commit is contained in:
Heng Sin Low 2018-08-08 11:07:43 +08:00
parent 0bd4ac0329
commit 9dcd937950
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java
View File

@ -445,14 +445,41 @@ public class Doc_MatchPO extends Doc
&& mPO[i].getM_MatchPO_ID() != mMatchPO.getM_MatchPO_ID()) && mPO[i].getM_MatchPO_ID() != mMatchPO.getM_MatchPO_ID())
{ {
BigDecimal qty = (isReturnTrx ? mPO[i].getQty().negate() : mPO[i].getQty()); BigDecimal qty = (isReturnTrx ? mPO[i].getQty().negate() : mPO[i].getQty());
BigDecimal orderCost = BigDecimal.ZERO;
if (mPO[i].getM_InOutLine_ID() > 0) if (mPO[i].getM_InOutLine_ID() > 0)
{ {
tQty = tQty.add(qty); tQty = tQty.add(qty);
tAmt = tAmt.add(poCost.multiply(qty)); //IDEMPIERE-3742 Wrong product cost for partial MR
if (m_oLine.getC_Currency_ID() != as.getC_Currency_ID())
{
MOrder order = m_oLine.getParent();
if(MAcctSchema.COSTINGMETHOD_AveragePO.equals(as.getCostingMethod()))
{
orderCost = mPO[i].getM_InOutLine().getC_OrderLine().getPriceActual();
Timestamp dateAcct = mPO[i].getM_InOutLine().getM_InOut().getDateAcct();
BigDecimal rate = MConversionRate.getRate(
order.getC_Currency_ID(), as.getC_Currency_ID(),
dateAcct, order.getC_ConversionType_ID(),
m_oLine.getAD_Client_ID(), m_oLine.getAD_Org_ID());
if (rate == null)
{
p_Error = "Purchase Order not convertible - " + as.getName();
return null;
}
orderCost = orderCost.multiply(rate);
tAmt = tAmt.add(orderCost.multiply(qty));
} else {
tAmt = tAmt.add(poCost.multiply(qty));
}
} //IDEMPIERE-3742 Wrong product cost for partial MR
else {
tAmt = tAmt.add(poCost.multiply(qty));
}
} }
} }
} }
poCost = poCost.multiply(getQty()); // Delivered so far poCost = poCost.multiply(getQty()); // Delivered so far
tAmt = tAmt.add(isReturnTrx ? poCost.negate() : poCost); tAmt = tAmt.add(isReturnTrx ? poCost.negate() : poCost);
tQty = tQty.add(isReturnTrx ? getQty().negate() : getQty()); tQty = tQty.add(isReturnTrx ? getQty().negate() : getQty());