From aa98a2beccd725a71017b3d730b252d565f7e620 Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Sun, 25 Oct 2015 09:18:03 -0500 Subject: [PATCH] IDEMPIERE-2908 Method to retrieve doctype or doctype target --- org.adempiere.base/src/org/compiere/model/MInvoice.java | 9 ++++++++- org.adempiere.base/src/org/compiere/model/MOrder.java | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java index 95b445b3e4..39e5943080 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoice.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java @@ -67,7 +67,7 @@ public class MInvoice extends X_C_Invoice implements DocAction /** * */ - private static final long serialVersionUID = -859760245939837565L; + private static final long serialVersionUID = 6262118410996877227L; /** * Get Payments Of BPartner @@ -2739,4 +2739,11 @@ public class MInvoice extends X_C_Invoice implements DocAction providers.values().toArray(retValue); return retValue; } + + /** Returns C_DocType_ID (or C_DocTypeTarget_ID if C_DocType_ID is not set) */ + public int getDocTypeID() + { + return getC_DocType_ID() > 0 ? getC_DocType_ID() : getC_DocTypeTarget_ID(); + } + } // MInvoice diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index 6c0d4b7745..18c98a4014 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -70,7 +70,7 @@ public class MOrder extends X_C_Order implements DocAction /** * */ - private static final long serialVersionUID = -6750443365394535762L; + private static final long serialVersionUID = -4032643956656204341L; /** * Create new Order by copying @@ -2963,4 +2963,11 @@ public class MOrder extends X_C_Order implements DocAction providers.values().toArray(retValue); return retValue; } + + /** Returns C_DocType_ID (or C_DocTypeTarget_ID if C_DocType_ID is not set) */ + public int getDocTypeID() + { + return getC_DocType_ID() > 0 ? getC_DocType_ID() : getC_DocTypeTarget_ID(); + } + } // MOrder