--HG--
branch : EDII
This commit is contained in:
hodianto 2019-08-30 15:45:38 +07:00
parent aadec7aeca
commit d5a007696b
2 changed files with 10 additions and 9 deletions

View File

@ -50,7 +50,9 @@ public class MID_TPBUpdateOrder extends SvrProcess{
// createCustomerRMALine(line, RMA); // createCustomerRMALine(line, RMA);
// line.setM_RMA_ID(RMA.get_ID()); // line.setM_RMA_ID(RMA.get_ID());
}else { }else {
continue; MOrder order = createPurchaseOrder(line);
createPurchaseOrderLine(line, order);
line.setC_Order_ID(order.get_ID());
} }
line.setProcessed(true); line.setProcessed(true);
line.saveEx(); line.saveEx();

View File

@ -35,16 +35,14 @@ public class MID_TPBUpdateOrderLine extends SvrProcess{
@Override @Override
protected String doIt() throws Exception { protected String doIt() throws Exception {
boolean isRetur = tpbLine.isReturn(); boolean isRetur = tpbLine.isReturn();
if(tpbLine.getM_Requisition_ID()>0 && !isRetur) { if (tpbLine.getM_RMA_ID()>0 && isRetur) {
MOrder order = createPurchaseOrder(tpbLine);
createPurchaseOrderLine(tpbLine, order);
tpbLine.setC_Order_ID(order.get_ID());
}else if (tpbLine.getM_RMA_ID()>0 && isRetur) {
MRMA RMA = createCustomerRMA(tpbLine); MRMA RMA = createCustomerRMA(tpbLine);
createCustomerRMALine(tpbLine, RMA); createCustomerRMALine(tpbLine, RMA);
tpbLine.setM_RMA_ID(RMA.get_ID()); tpbLine.setM_RMA_ID(RMA.get_ID());
}else { }else {
throw new AdempiereException("Requisition / RMA Wajib diisi !!!"); MOrder order = createPurchaseOrder(tpbLine);
createPurchaseOrderLine(tpbLine, order);
tpbLine.setC_Order_ID(order.get_ID());
} }
tpbLine.setProcessed(true); tpbLine.setProcessed(true);
tpbLine.saveEx(); tpbLine.saveEx();
@ -112,6 +110,7 @@ public class MID_TPBUpdateOrderLine extends SvrProcess{
retValue.setPOReference(line.getM_Requisition().getDocumentNo()); retValue.setPOReference(line.getM_Requisition().getDocumentNo());
retValue.setC_BPartner_ID(line.getC_BPartner_ID()); retValue.setC_BPartner_ID(line.getC_BPartner_ID());
retValue.setC_BPartner_Location_ID(line.getC_BPartner_Location_ID()); retValue.setC_BPartner_Location_ID(line.getC_BPartner_Location_ID());
if(line.getM_Requisition_ID()>0)
retValue.set_ValueNoCheck("M_Requisition_ID", line.getM_Requisition_ID()); retValue.set_ValueNoCheck("M_Requisition_ID", line.getM_Requisition_ID());
retValue.setDateAcct(line.getRegisterDate()); retValue.setDateAcct(line.getRegisterDate());
retValue.setC_Currency_ID(line.getC_Currency_ID()); retValue.setC_Currency_ID(line.getC_Currency_ID());
@ -150,7 +149,7 @@ public class MID_TPBUpdateOrderLine extends SvrProcess{
ol.setDiscount(detailLine.getDiscount()); ol.setDiscount(detailLine.getDiscount());
ol.setC_Tax_ID(reqLine.get_ValueAsInt("C_Tax_ID")); ol.setC_Tax_ID(reqLine.get_ValueAsInt("C_Tax_ID"));
ol.setPrice(detailLine.getPriceActual()); ol.setPrice(detailLine.getPriceActual());
ol.set_ValueNoCheck("M_Requistion_ID", line.getM_Requisition_ID()); ol.set_ValueNoCheck("M_Requistion_ID", detailLine.get_ValueAsInt("M_Requisition_ID"));
ol.set_ValueNoCheck("M_RequisitionLine_ID", detailLine.getM_RequisitionLine_ID()); ol.set_ValueNoCheck("M_RequisitionLine_ID", detailLine.getM_RequisitionLine_ID());
ol.saveEx(); ol.saveEx();
} }