details: https://code.openbravo.com/erp/devel/pi/rev/90c03ab79c8d
changeset: 17495:90c03ab79c8d
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Jul 17 12:50:47 2012 +0200
summary: Related to issue 21077.Properly set gross list price on RMA.
diffstat:
src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 17 +++++-----
1 files changed, 9 insertions(+), 8 deletions(-)
diffs (56 lines):
diff -r 6a37e436f203 -r 90c03ab79c8d
src/org/openbravo/common/actionhandler/SRMOPickEditLines.java
--- a/src/org/openbravo/common/actionhandler/SRMOPickEditLines.java Tue Jul
17 12:32:49 2012 +0200
+++ b/src/org/openbravo/common/actionhandler/SRMOPickEditLines.java Tue Jul
17 12:50:47 2012 +0200
@@ -190,8 +190,8 @@
newOrderLine.setTax(tax);
// Price
- BigDecimal unitPrice, netPrice, grossPrice, stdPrice, limitPrice,
listPrice, grossAmt, netListPrice, grossListPrice;
- grossPrice = grossAmt = stdPrice = grossListPrice = BigDecimal.ZERO;
+ BigDecimal unitPrice, netPrice, grossPrice, stdPrice, limitPrice,
grossAmt, netListPrice, grossListPrice;
+ stdPrice = BigDecimal.ZERO;
final int pricePrecision =
order.getCurrency().getPricePrecision().intValue();
final int stdPrecision =
order.getCurrency().getStandardPrecision().intValue();
@@ -201,20 +201,22 @@
isSOTrx, order.getPriceList());
unitPrice = pp.getStandardPrice();
limitPrice = pp.getPriceLimit();
- listPrice = pp.getListPrice();
+ netListPrice = pp.getListPrice();
+ grossListPrice = pp.getListPrice();
stdPrice = pp.getStandardPrice();
} catch (OBException e) {
// Product not found in price list. Prices default to ZERO
- unitPrice = limitPrice = listPrice = stdPrice = BigDecimal.ZERO;
+ unitPrice = limitPrice = netListPrice = grossListPrice = stdPrice =
BigDecimal.ZERO;
}
} else {
unitPrice = new BigDecimal(selectedLine.getString("unitPrice"));
if (shipmentLine != null && shipmentLine.getSalesOrderLine() != null) {
limitPrice = shipmentLine.getSalesOrderLine().getPriceLimit();
- listPrice = shipmentLine.getSalesOrderLine().getListPrice();
+ netListPrice = shipmentLine.getSalesOrderLine().getListPrice();
+ grossListPrice =
shipmentLine.getSalesOrderLine().getGrossListPrice();
stdPrice = shipmentLine.getSalesOrderLine().getStandardPrice();
} else {
- limitPrice = listPrice = stdPrice = unitPrice;
+ limitPrice = netListPrice = grossListPrice = stdPrice = unitPrice;
}
}
@@ -224,13 +226,12 @@
.setScale(stdPrecision, BigDecimal.ROUND_HALF_UP);
netPrice = FinancialUtils.calculateNetFromGross(tax.getId(), grossAmt,
pricePrecision,
grossAmt, qtyReturned);
- grossListPrice = listPrice;
limitPrice = netPrice;
stdPrice = netPrice;
netListPrice = netPrice;
} else {
netPrice = unitPrice;
- netListPrice = listPrice;
+ grossListPrice = grossAmt = grossPrice = BigDecimal.ZERO;
}
newOrderLine.setUnitPrice(netPrice);
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
