From d5a007696bd52b4b3fa02b10c08959b5fa2172ba Mon Sep 17 00:00:00 2001
From: hodianto <none@none>
Date: Fri, 30 Aug 2019 15:45:38 +0700
Subject: [PATCH] Fix TPB

--HG--
branch : EDII
---
 .../midsuit/process/MID_TPBUpdateOrder.java       |  4 +++-
 .../midsuit/process/MID_TPBUpdateOrderLine.java   | 15 +++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrder.java b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrder.java
index 96de1ec..9c54ccd 100644
--- a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrder.java
+++ b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrder.java
@@ -50,7 +50,9 @@ public class MID_TPBUpdateOrder extends SvrProcess{
 //				createCustomerRMALine(line, RMA);
 //				line.setM_RMA_ID(RMA.get_ID());
 			}else {
-				continue;
+				MOrder order = createPurchaseOrder(line);
+				createPurchaseOrderLine(line, order);
+				line.setC_Order_ID(order.get_ID());
 			}
 			line.setProcessed(true);
 			line.saveEx();
diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrderLine.java b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrderLine.java
index c58487f..ea9a0fa 100644
--- a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrderLine.java
+++ b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrderLine.java
@@ -35,16 +35,14 @@ public class MID_TPBUpdateOrderLine extends SvrProcess{
 	@Override
 	protected String doIt() throws Exception {
 			boolean isRetur = tpbLine.isReturn();
-			if(tpbLine.getM_Requisition_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) {
+			if (tpbLine.getM_RMA_ID()>0 && isRetur) {
 				MRMA RMA = createCustomerRMA(tpbLine);
 				createCustomerRMALine(tpbLine, RMA);
 				tpbLine.setM_RMA_ID(RMA.get_ID());
 			}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.saveEx();
@@ -112,7 +110,8 @@ public class MID_TPBUpdateOrderLine extends SvrProcess{
 		retValue.setPOReference(line.getM_Requisition().getDocumentNo());
 		retValue.setC_BPartner_ID(line.getC_BPartner_ID());
 		retValue.setC_BPartner_Location_ID(line.getC_BPartner_Location_ID());
-		retValue.set_ValueNoCheck("M_Requisition_ID", line.getM_Requisition_ID());
+		if(line.getM_Requisition_ID()>0)
+			retValue.set_ValueNoCheck("M_Requisition_ID", line.getM_Requisition_ID());
 		retValue.setDateAcct(line.getRegisterDate());
 		retValue.setC_Currency_ID(line.getC_Currency_ID());
 		retValue.setSalesRep_ID(line.getSalesRep_ID());
@@ -150,7 +149,7 @@ public class MID_TPBUpdateOrderLine extends SvrProcess{
 			ol.setDiscount(detailLine.getDiscount());
 			ol.setC_Tax_ID(reqLine.get_ValueAsInt("C_Tax_ID"));
 			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.saveEx();
 		}