Merge branch 'dev' into 'f-transaction-permissions'

# Conflicts:
#   CHANGELOG.md

CHANGELOG.md

@@ -35,6 +35,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Denying a role permission has no effect
   [#196](https://gitlab.com/caosdb/caosdb-server/-/issues/196). See security
   notes below.
+* Missing RecordType leads to unexpected server error
+  [#166](https://gitlab.com/caosdb/caosdb-server/-/issues/166)
 
 ### Security ###
 

src/main/java/org/caosdb/server/jobs/Job.java

@@ -555,7 +555,7 @@ public abstract class Job {
    *
    * @param entity the entity to be resolved.
    * @return the resolved entity.
-   * @throws EntityWasNotUniqueException if the resolution failed due to ambuiguity of the name.
+   * @throws EntityWasNotUniqueException if the resolution failed due to ambiguity of the name.
    */
   protected EntityInterface resolve(final EntityInterface entity)
       throws EntityWasNotUniqueException {

src/main/java/org/caosdb/server/jobs/core/Inheritance.java

@@ -119,7 +119,7 @@ public class Inheritance extends EntityJob {
       }
 
       // implement properties
-      if (getEntity().hasProperties()) {
+      if (getEntity().getEntityStatus() == EntityStatus.QUALIFIED && getEntity().hasProperties()) {
         propertyLoop:
         for (final Property property : getEntity().getProperties()) {
           final ArrayList<Property> transfer = new ArrayList<>();