parent
254ad8a60d
commit
343fe6c1ef
|
|
@ -354,8 +354,8 @@ public class MID_CreateFromOrder extends CreateFrom {
|
|||
StringBuilder sql = new StringBuilder();
|
||||
|
||||
if (reqLine.getC_UOM_ID()>0 && reqLine.getM_Product_ID() > 0) {
|
||||
if(reqLine.getC_UOM_ID()!=reqLine.getM_Product().getC_UOM_ID())
|
||||
// qtyOrdered = MUOMConversion.convertProductTo (Env.getCtx(), reqLine.getM_Product_ID(), reqLine.getC_UOM_ID(), qty);
|
||||
if(reqLine.getC_UOM_ID()!=reqLine.getM_Product().getC_UOM_ID())
|
||||
qtyOrdered = MUOMConversion.convertProductFrom(Env.getCtx(), reqLine.getM_Product_ID(), reqLine.getC_UOM_ID(), qty);
|
||||
if (qtyOrdered == null)
|
||||
qtyOrdered = Env.ZERO;
|
||||
|
|
@ -385,8 +385,6 @@ public class MID_CreateFromOrder extends CreateFrom {
|
|||
orderLine.setPriceList(pricing.getPriceList());
|
||||
orderLine.setPriceLimit(pricing.getPriceLimit());
|
||||
|
||||
|
||||
|
||||
//@Hodianto Change Default Price List
|
||||
MPriceList priceList = new MPriceList(Env.getCtx(), M_PriceList_ID, null);
|
||||
if(priceList.get_ValueAsBoolean("isLastPriceUsed")){
|
||||
|
|
@ -435,28 +433,23 @@ public class MID_CreateFromOrder extends CreateFrom {
|
|||
orderLine.setQtyEntered(Qty);
|
||||
orderLine.setQtyOrdered(qtyOrdered);
|
||||
orderLine.setPriceEntered(reqLine.getPriceActual());
|
||||
if(Qty.compareTo(qtyOrdered)!=0){
|
||||
orderLine.setPriceList(reqLine.getPriceActual().multiply(Qty).divide(qtyOrdered,4,BigDecimal.ROUND_HALF_DOWN));
|
||||
if(qty.compareTo(qtyOrdered)!=0){
|
||||
orderLine.setPriceList(reqLine.getPriceActual().multiply(qty).divide(qtyOrdered,4,BigDecimal.ROUND_HALF_DOWN));
|
||||
}else{
|
||||
orderLine.setPriceList(reqLine.getPriceActual());
|
||||
}
|
||||
orderLine.setPriceActual(orderLine.getPriceList());
|
||||
orderLine.setLineNetAmt();
|
||||
orderLine.setPriceList(orderLine.getPriceActual());
|
||||
//Add by @solrizal increment LIne Number by 10
|
||||
|
||||
orderLine.set_ValueOfColumn("PriceRequisition", reqLine.getPriceActual());
|
||||
|
||||
orderLine.set_ValueOfColumn("DiscAmt", Env.ZERO);
|
||||
orderLine.set_ValueOfColumn("M_Requisition_ID", reqLine.getM_Requisition_ID());
|
||||
orderLine.set_ValueOfColumn("M_RequisitionLine_ID", reqLine.get_ID());
|
||||
|
||||
orderLine.set_ValueOfColumn("IsTrackAsAsset", reqLine.get_ValueAsBoolean("IsTrackAsAsset"));
|
||||
|
||||
orderLine.setDescription(reqLine.getDescription()==null? "" : reqLine.getDescription());
|
||||
orderLine.set_ValueNoCheck("Comments", reqLine.get_Value("Comments"));
|
||||
// orderLine.set_ValueOfColumn("Comments", reqLine.get_Value("Comments"));
|
||||
|
||||
// Add By @animfalahuddin
|
||||
|
||||
if(org.get_ValueAsBoolean("IsProjectBased")) {
|
||||
orderLine.set_ValueNoCheck("Construction_C_Order_ID", reqLine.get_Value("Construction_C_Order_ID") != null ? reqLine.get_ValueAsInt("Construction_C_Order_ID") : null);
|
||||
orderLine.set_ValueNoCheck("SAP_ExpenseCode_ID", reqLine.get_Value("SAP_ExpenseCode_ID") != null ? reqLine.get_ValueAsInt("SAP_ExpenseCode_ID") : null);
|
||||
|
|
|
|||
Loading…
Reference in New Issue