|
|
@@ -570,16 +570,19 @@ public class Order extends Controller {
|
|
|
BigDecimal invoiceamount = BigDecimal.valueOf(0);
|
|
|
BigDecimal amount = BigDecimal.valueOf(0);
|
|
|
BigDecimal defaultamount = BigDecimal.valueOf(0);
|
|
|
+ BigDecimal saleamount = BigDecimal.valueOf(0);
|
|
|
BigDecimal qty = new BigDecimal("0");
|
|
|
if (dataRows.isNotEmpty()) {
|
|
|
writeoffamount = dataRows.get(0).getBigDecimal("writeoffamount");
|
|
|
invoiceamount = dataRows.get(0).getBigDecimal("invoiceamount");
|
|
|
amount = dataRows.get(0).getBigDecimal("amount");
|
|
|
defaultamount = dataRows.get(0).getBigDecimal("defaultamount");
|
|
|
+ saleamount = dataRows.get(0).getBigDecimal("saleamount");
|
|
|
qty = dataRows.get(0).getBigDecimal("qty");
|
|
|
}
|
|
|
row.put("amount", amount);
|
|
|
row.put("defaultamount", defaultamount);
|
|
|
+ row.put("saleamount", saleamount);
|
|
|
row.put("qty", qty);
|
|
|
row.put("writeoffamount", writeoffamount);
|
|
|
row.put("invoiceamount", invoiceamount);
|