Merge branch 'master' into develop

# Conflicts:
#	ems-core/src/main/resources/rules/config_activity.drl

ems-core/src/main/resources/rules/config_activity.drl

@@ -218,13 +218,3 @@ then
 	modify ( $entity ) { setJtbRLavt(jtbRlavt), setEffectiveEndtime($entity.getEffectiveEndtime() == null? new Date(): $entity.getEffectiveEndtime()) }
 end
 
-rule "completeDatiInsJtbRlavr"
-no-loop
-when
-    eval(completeRulesEnabled)
-    $entity : JtbRLavr(operation == OperationType.INSERT || (operation == OperationType.INSERT_OR_UPDATE && inseritoDa== null))
-then
-    modify ( $entity ) {
-        setInseritoDa(username), setDataIns(new Date())
-    }
-end

ems-core/src/main/resources/rules/production.drl

@@ -164,6 +164,27 @@ then
     modify ( $rLavR ) { setaOra(aOra) }
 end
 
+rule "completeDatiInsJtbRlavr"
+no-loop
+when
+    eval(completeRulesEnabled)
+    $entity : JtbRLavr(operation == OperationType.INSERT || (operation == OperationType.INSERT_OR_UPDATE && inseritoDa== null))
+then
+    modify ( $entity ) {
+        setInseritoDa(username), setDataIns(new Date())
+    }
+end
+
+rule "completeDatiModJtbRlavr"
+no-loop
+when
+    eval(completeRulesEnabled)
+    $entity : JtbRLavr(operation != OperationType.DELETE )
+then
+    modify ( $entity ) {
+        setModificatoDa(username), setDataMod(new Date())
+    }
+end
 
 //---------------------------------------------------------------------------------------------