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

Average Costing & Landed Cost fixes

This commit is contained in:
armenrz 2007-06-25 09:56:24 +00:00
parent bd70acbad6
commit 91686301cf
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
base/src/org/compiere/acct/Doc_MatchInv.java
View File

@ -205,7 +205,7 @@ public class Doc_MatchInv extends Doc
else // Cash Acct
{
MInvoice invoice = m_invoiceLine.getParent();
if (as.getC_Currency_ID() == invoice.getC_Currency_ID())
if (as.getC_Currency_ID() != invoice.getC_Currency_ID())
LineNetAmt = MConversionRate.convert(getCtx(), LineNetAmt,
invoice.getC_Currency_ID(), as.getC_Currency_ID(),
invoice.getDateAcct(), invoice.getC_ConversionType_ID(),
@ -250,22 +250,14 @@ public class Doc_MatchInv extends Doc
{
tQty = tQty.add(mInv[i].getQty());
multiplier = mInv[i].getQty()
.divide(m_invoiceLine.getQtyInvoiced(), 12, BigDecimal.ROUND_HALF_UP)
.abs();
.divide(m_invoiceLine.getQtyInvoiced(), 12, BigDecimal.ROUND_HALF_UP).abs();
tAmt = tAmt.add(m_invoiceLine.getLineNetAmt().multiply(multiplier));
}
}
tAmt = tAmt.add(cr.getAcctBalance().negate());
// set Qty to negative value when MovementType is Vendor Returns
MInOut receipt = m_receiptLine.getParent();
if (receipt.getMovementType().equals(MInOut.MOVEMENTTYPE_VendorReturns))
tQty = tQty.add(getQty().negate()); // Qty is set to negative value
else
tQty = tQty.add(getQty());
// Different currency
MInvoice invoice = m_invoiceLine.getParent();
if (as.getC_Currency_ID() == invoice.getC_Currency_ID())
if (as.getC_Currency_ID() != invoice.getC_Currency_ID())
{
tAmt = MConversionRate.convert(getCtx(), tAmt,
invoice.getC_Currency_ID(), as.getC_Currency_ID(),
@ -278,6 +270,14 @@ public class Doc_MatchInv extends Doc
}
}
tAmt = tAmt.add(cr.getAcctBalance().negate()); //Invoice Price
// set Qty to negative value when MovementType is Vendor Returns
MInOut receipt = m_receiptLine.getParent();
if (receipt.getMovementType().equals(MInOut.MOVEMENTTYPE_VendorReturns))
tQty = tQty.add(getQty().negate()); // Qty is set to negative value
else
tQty = tQty.add(getQty());
// Set Total Amount and Total Quantity from Matched Invoice
MCostDetail.createInvoice(as, getAD_Org_ID(),
getM_Product_ID(), matchInv.getM_AttributeSetInstance_ID(),

7
base/src/org/compiere/acct/Doc_MatchPO.java
View File

@ -151,13 +151,13 @@ public class Doc_MatchPO extends Doc
priceCost = m_oLine.getPriceActual();
for (int i = 0 ; i < mPO.length ; i++)
{
if (mPO[i].isPosted())
if (mPO[i].isPosted() && mPO[i].getM_MatchPO_ID() != get_ID())
{
tQty = tQty.add(mPO[i].getQty());
tAmt = tAmt.add(priceCost.multiply(mPO[i].getQty()));
}
}
// Different currency
if (m_oLine.getC_Currency_ID() != as.getC_Currency_ID())
{
@ -175,6 +175,9 @@ public class Doc_MatchPO extends Doc
if (tAmt.scale() > as.getCostingPrecision())
tAmt = tAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP);
}
tAmt = tAmt.add(poCost);
tQty = tQty.add(getQty());
// Set Total Amount and Total Quantity from Matched PO
MCostDetail.createOrder(as, m_oLine.getAD_Org_ID(),