From 6fa0052834efbe8a1848603012c72f2c706acf45 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 9 Dec 2020 20:49:15 +0100 Subject: [PATCH] IDEMPIERE-4588 Error in MOrder.setC_DocTypeTarget_ID (String DocSubTypeSO_x) when IsDefault=Y in a Purchase Order (#446) --- org.adempiere.base/src/org/compiere/model/MOrder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index 4a14bee6c9..0041a6843a 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -393,9 +393,10 @@ public class MOrder extends X_C_Order implements DocAction String sql = "SELECT C_DocType_ID FROM C_DocType " + "WHERE AD_Client_ID=? AND AD_Org_ID IN (0," + getAD_Org_ID() + ") AND DocSubTypeSO=? " + + " AND IsSOTrx=? " + " AND IsActive='Y' " + "ORDER BY AD_Org_ID DESC, IsDefault DESC"; - int C_DocType_ID = DB.getSQLValue(null, sql, getAD_Client_ID(), DocSubTypeSO_x); + int C_DocType_ID = DB.getSQLValue(null, sql, getAD_Client_ID(), DocSubTypeSO_x, isSOTrx() ? "Y" : "N"); if (C_DocType_ID <= 0) log.severe ("Not found for AD_Client_ID=" + getAD_Client_ID () + ", SubType=" + DocSubTypeSO_x); else