--- a/src/org/openbravo/base/model/Property.java	Thu Oct 01 11:17:54 2015 +0200
+++ b/src/org/openbravo/base/model/Property.java	Thu Oct 01 14:02:47 2015 +0200
@@ -285,7 +285,9 @@
       getEntity().setActiveEnabled(true);
       setActiveColumn(true);
     }
-    if (getName().equals("inheritedFrom")) {
+    if (getName().equals("inheritedFrom") && !isPrimitive()
+        && "ADRole".equals(getReferencedProperty().getEntity().getName())) {
+      log.info("Entity inheriting from role: " + getEntity().getName());
       getEntity().setHasInheritedFrom(true);
     }
   }