From 101fbdd5d1ca71ca2d89a99cd9c93df3a1b3d4b1 Mon Sep 17 00:00:00 2001 From: Juliana Corredor Date: Fri, 19 Oct 2012 12:02:27 -0500 Subject: [PATCH] IDEMPIERE-366 Improve Role Inheritance / When a Master role is not active, doesnt allow to inherit permissions --- org.adempiere.base/src/org/compiere/model/MRole.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MRole.java b/org.adempiere.base/src/org/compiere/model/MRole.java index dc93502819..f2dc42877d 100644 --- a/org.adempiere.base/src/org/compiere/model/MRole.java +++ b/org.adempiere.base/src/org/compiere/model/MRole.java @@ -2621,9 +2621,13 @@ public final class MRole extends X_AD_Role } s_log.info("Include "+role); - this.m_includedRoles.add(role); - role.setParentRole(this); - role.m_includedSeqNo = seqNo; + + if(role.isActive()){ + this.m_includedRoles.add(role); + role.setParentRole(this); + role.m_includedSeqNo = seqNo; + } + } /**