From 2d8ab00c56fa46697ace9894dcae17b012e0c91a Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Wed, 13 Sep 2017 14:56:54 +0800
Subject: [PATCH] IDEMPIERE-3484 ProjectIssue should create M_CostDetail record

---
 .../org/compiere/acct/Doc_ProjectIssue.java   | 15 +++++
 .../src/org/compiere/model/MCostDetail.java   | 64 +++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_ProjectIssue.java b/org.adempiere.base/src/org/compiere/acct/Doc_ProjectIssue.java
index 96238d43a5..512a8d120e 100644
--- a/org.adempiere.base/src/org/compiere/acct/Doc_ProjectIssue.java
+++ b/org.adempiere.base/src/org/compiere/acct/Doc_ProjectIssue.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.logging.Level;
 
 import org.compiere.model.MAcctSchema;
+import org.compiere.model.MCostDetail;
 import org.compiere.model.MProduct;
 import org.compiere.model.MProject;
 import org.compiere.model.MProjectIssue;
@@ -157,6 +158,20 @@ public class Doc_ProjectIssue extends Doc
 		cr.setM_Locator_ID(m_line.getM_Locator_ID());
 		cr.setLocationFromLocator(m_line.getM_Locator_ID(), true);	// from Loc
 		//
+		if (product != null && product.get_ID() > 0 && !product.isService() && product.isStocked()) {
+			BigDecimal costDetailQty = m_line.getQty();
+			BigDecimal costDetailAmt = cost;
+			if (!MCostDetail.createProjectIssue(as, m_line.getAD_Org_ID(),
+				m_line.getM_Product_ID(), m_line.getM_AttributeSetInstance_ID(),
+				m_line.get_ID(), 0,
+				costDetailAmt, costDetailQty,
+				m_line.getDescription(), getTrxName()))
+			{
+				p_Error = "Failed to create cost detail record";
+				return null;
+			}
+		}
+		//
 		ArrayList<Fact> facts = new ArrayList<Fact>();
 		facts.add(fact);
 		return facts;
diff --git a/org.adempiere.base/src/org/compiere/model/MCostDetail.java b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
index 4cc2aa662c..6333bec9ec 100644
--- a/org.adempiere.base/src/org/compiere/model/MCostDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/MCostDetail.java
@@ -529,6 +529,70 @@ public class MCostDetail extends X_M_CostDetail
 		return ok;
 	}	//	createMatchInvoice
 	
+	/**
+	 * 	Create Cost Detail for Project Issue.
+	 * 	Called from Doc_ProjectIssue
+	 *	@param as accounting schema
+	 *	@param AD_Org_ID org
+	 *	@param M_Product_ID product
+	 *	@param M_AttributeSetInstance_ID asi
+	 *	@param C_ProjectIssue_ID project issue line
+	 *	@param M_CostElement_ID optional cost element
+	 *	@param Amt amt total amount
+	 *	@param Qty qty
+	 *	@param Description optional description
+	 *	@param trxName transaction
+	 *	@return true if no error
+	 */
+	public static boolean createProjectIssue(MAcctSchema as, int AD_Org_ID, 
+		int M_Product_ID, int M_AttributeSetInstance_ID,
+		int C_ProjectIssue_ID, int M_CostElement_ID, 
+		BigDecimal Amt, BigDecimal Qty,
+		String Description, String trxName)
+	{
+		MCostDetail cd = get (as.getCtx(), "C_ProjectIssue_ID=? AND Coalesce(M_CostElement_ID,0)="+M_CostElement_ID, 
+				C_ProjectIssue_ID, M_AttributeSetInstance_ID, as.getC_AcctSchema_ID(), trxName);
+		//
+		if (cd == null)		//	createNew
+		{
+			cd = new MCostDetail (as, AD_Org_ID, 
+				M_Product_ID, M_AttributeSetInstance_ID, 
+				M_CostElement_ID, 
+				Amt, Qty, Description, trxName);
+			cd.setC_ProjectIssue_ID(C_ProjectIssue_ID);
+		}
+		else
+		{
+			if (cd.isProcessed())
+			{
+				cd.setDeltaAmt(Amt.subtract(cd.getAmt()));
+				cd.setDeltaQty(Qty.subtract(cd.getQty()));
+			}
+			else
+			{
+				cd.setDeltaAmt(BigDecimal.ZERO);
+				cd.setDeltaQty(BigDecimal.ZERO);
+				cd.setAmt(Amt);
+				cd.setQty(Qty);
+			}
+			if (cd.isDelta())
+			{
+				cd.setProcessed(false);
+				cd.setAmt(Amt);
+				cd.setQty(Qty);
+			}
+			else if (cd.isProcessed())
+				return true;	//	nothing to do
+		}
+		boolean ok = cd.save();
+		if (ok && !cd.isProcessed())
+		{
+			ok = cd.process();
+		}
+		if (s_log.isLoggable(Level.CONFIG)) s_log.config("(" + ok + ") " + cd);
+		return ok;
+	}	//	createProjectIssue
+	
 	/**************************************************************************
 	 * 	Get Cost Detail
 	 *	@param ctx context