diff --git a/dhis-2/dhis-test-e2e/src/test/resources/tracker/programs_with_program_rules.json b/dhis-2/dhis-test-e2e/src/test/resources/tracker/programs_with_program_rules.json
index 9e1757d55eed..2713213dfc93 100644
--- a/dhis-2/dhis-test-e2e/src/test/resources/tracker/programs_with_program_rules.json
+++ b/dhis-2/dhis-test-e2e/src/test/resources/tracker/programs_with_program_rules.json
@@ -711,7 +711,7 @@
},
"favorites": [],
"translations": [],
-
+
"attributeValues": []
}],
"translations": [],
@@ -960,7 +960,8 @@
"created": "2020-12-08T09:10:20.341",
"name": "TA tracker program rule - showerror on stage",
"displayName": "TA tracker program rule - showerror",
- "condition": "V{enrollment_date} > V{current_date}",
+ "externalAccess": false,
+ "condition": "d2:daysBetween(V{enrollment_date},V{current_date}) < 0",
"favorite": false,
"program": {
"id": "U5HE4IRrZ7S"
@@ -1002,7 +1003,7 @@
"users": {},
"userGroups": {}
},
- "condition": "V{event_date} < V{current_date}",
+ "condition": "d2:daysBetween(V{event_date},V{current_date}) > 0",
"program": {
"id": "U5HE4IRrZ7S"
},
@@ -1031,7 +1032,7 @@
"users": {},
"userGroups": {}
},
- "condition": "V{event_date} < V{current_date}",
+ "condition": "d2:daysBetween(V{event_date},V{current_date}) > 0",
"program": {
"id": "U5HE4IRrZ7S"
},
@@ -1082,7 +1083,8 @@
"created": "2020-12-08T09:10:20.341",
"name": "TA tracker program rule - warnings",
"displayName": "TA tracker program rule - warnings",
- "condition": "V{enrollment_date} < V{current_date}",
+ "externalAccess": false,
+ "condition": "d2:daysBetween(V{enrollment_date},V{current_date}) > 0",
"favorite": false,
"program": {
"id": "U5HE4IRrZ7S"
diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index e9b496424d2a..7380a44ee16a 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -85,7 +85,7 @@
- 3.2.1
+ 3.2.2
0.6.1