midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5475 Fixed Assets - NPE when creating an asset addition withou invoice (#1558)

This commit is contained in:
Carlos Ruiz 2022-11-12 02:15:48 +01:00 committed by GitHub
parent 6f737cacdd
commit fc6ae185b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.adempiere.base/src/org/compiere/model/MAssetAddition.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.exceptions.FillMandatoryException;
import org.compiere.process.DocAction; import org.compiere.process.DocAction;
import org.compiere.process.DocumentEngine; import org.compiere.process.DocumentEngine;
@ -539,7 +540,16 @@ public class MAssetAddition extends X_A_Asset_Addition
throw new AssetException(sb.toString()); throw new AssetException(sb.toString());
} }
} }
// Validate Source - Invoice
if (A_SOURCETYPE_Invoice.equals(getA_SourceType()))
{
if (getC_Invoice_ID() <= 0)
{
throw new FillMandatoryException(COLUMNNAME_C_Invoice_ID);
}
}
// Call model validators // Call model validators
m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE); m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE);
if (m_processMsg != null) if (m_processMsg != null)
@ -952,6 +962,8 @@ public class MAssetAddition extends X_A_Asset_Addition
if (A_SOURCETYPE_Invoice.equals(sourceType) && isProcessed()) if (A_SOURCETYPE_Invoice.equals(sourceType) && isProcessed())
{ {
int C_InvoiceLine_ID = getC_InvoiceLine_ID(); int C_InvoiceLine_ID = getC_InvoiceLine_ID();
if (C_InvoiceLine_ID == 0)
throw new AdempiereException("No Invoice Line");
MInvoiceLine invoiceLine = new MInvoiceLine(getCtx(), C_InvoiceLine_ID, get_TrxName()); MInvoiceLine invoiceLine = new MInvoiceLine(getCtx(), C_InvoiceLine_ID, get_TrxName());
invoiceLine.setA_Processed(!isReversal); invoiceLine.setA_Processed(!isReversal);
invoiceLine.setA_Asset_ID(isReversal ? 0 : getA_Asset_ID()); invoiceLine.setA_Asset_ID(isReversal ? 0 : getA_Asset_ID());