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

BF [ 2314749 ] MatchPO not considering currency PriceMatchDifference

This commit is contained in:
teo_sarca 2008-11-19 20:43:39 +00:00
parent 33406f2710
commit 25af97b81b
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
base/src/org/compiere/model/MMatchPO.java
View File

@ -40,6 +40,9 @@ import org.compiere.util.Env;
* *
* @author Bayu Cahya, Sistematika * @author Bayu Cahya, Sistematika
* <li>BF [ 2240484 ] Re MatchingPO, MMatchPO doesn't contains Invoice info * <li>BF [ 2240484 ] Re MatchingPO, MMatchPO doesn't contains Invoice info
*
* @author Teo Sarca, www.arhipac.ro
* <li>BF [ 2314749 ] MatchPO not considering currency PriceMatchDifference
*/ */
public class MMatchPO extends X_M_MatchPO public class MMatchPO extends X_M_MatchPO
{ {
@ -485,10 +488,28 @@ public class MMatchPO extends X_M_MatchPO
} // getOrderLine } // getOrderLine
/** /**
* Before Save * Get PriceActual from Invoice and convert it to Order Currency
* @param newRecord new * @return Price Actual in Order Currency
* @return true
*/ */
public BigDecimal getInvoicePriceActual()
{
MInvoiceLine iLine = getInvoiceLine();
MInvoice invoice = iLine.getParent();
MOrder order = getOrderLine().getParent();
BigDecimal priceActual = iLine.getPriceActual();
int invoiceCurrency_ID = invoice.getC_Currency_ID();
int orderCurrency_ID = order.getC_Currency_ID();
if (invoiceCurrency_ID != orderCurrency_ID)
{
priceActual = MConversionRate.convert(getCtx(), priceActual, invoiceCurrency_ID, orderCurrency_ID,
invoice.getDateInvoiced(), invoice.getC_ConversionType_ID(),
getAD_Client_ID(), getAD_Org_ID());
}
return priceActual;
}
@Override
protected boolean beforeSave (boolean newRecord) protected boolean beforeSave (boolean newRecord)
{ {
// Set Trx Date // Set Trx Date
@ -559,7 +580,7 @@ public class MMatchPO extends X_M_MatchPO
is_ValueChanged("C_OrderLine_ID") || is_ValueChanged("C_InvoiceLine_ID"))) is_ValueChanged("C_OrderLine_ID") || is_ValueChanged("C_InvoiceLine_ID")))
{ {
BigDecimal poPrice = getOrderLine().getPriceActual(); BigDecimal poPrice = getOrderLine().getPriceActual();
BigDecimal invPrice = getInvoiceLine().getPriceActual(); BigDecimal invPrice = getInvoicePriceActual();
BigDecimal difference = poPrice.subtract(invPrice); BigDecimal difference = poPrice.subtract(invPrice);
if (difference.signum() != 0) if (difference.signum() != 0)
{ {
@ -598,6 +619,7 @@ public class MMatchPO extends X_M_MatchPO
* @param success success * @param success success
* @return success * @return success
*/ */
@Override
protected boolean afterSave (boolean newRecord, boolean success) protected boolean afterSave (boolean newRecord, boolean success)
{ {
if (newRecord && success) if (newRecord && success)
@ -690,6 +712,7 @@ public class MMatchPO extends X_M_MatchPO
* Before Delete * Before Delete
* @return true if acct was deleted * @return true if acct was deleted
*/ */
@Override
protected boolean beforeDelete () protected boolean beforeDelete ()
{ {
if (isPosted()) if (isPosted())
@ -708,6 +731,7 @@ public class MMatchPO extends X_M_MatchPO
* @param success success * @param success success
* @return success * @return success
*/ */
@Override
protected boolean afterDelete (boolean success) protected boolean afterDelete (boolean success)
{ {
// Order Delivered/Invoiced // Order Delivered/Invoiced