Merge pull request #1814 from openedx/eahmadjaved/ENT-7410

fix: variable name conflicts in monthly_impact_report command
openedx · Jul 27, 2023 · e7c94f4 · e7c94f4
2 parents abbbe5e + 7ed9a64
commit e7c94f4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,10 @@ Change Log
 
 Unreleased
 ----------
+[4.0.6]
+--------
+fix: variable name conflicts in monthly_impact_report command
+
 [4.0.5]
 --------
 feat: incorporate additional attributes to degreed v2

diff --git a/enterprise/__init__.py b/enterprise/__init__.py
@@ -2,6 +2,6 @@
 Your project description goes here.
 """
 
-__version__ = "4.0.5"
+__version__ = "4.0.6"
 
 default_app_config = "enterprise.apps.EnterpriseConfig"
diff --git a/enterprise/management/commands/monthly_impact_report.py b/enterprise/management/commands/monthly_impact_report.py
@@ -176,9 +176,9 @@
         on
             s.id=cs.skill_id
         WHERE
-            enterprise_enrollment_created >=(SELECT two_months_ago_start_range FROM dynamic_dates)
+            enterprise_enrollment_created_at >=(SELECT two_months_ago_start_range FROM dynamic_dates)
         AND
-             enterprise_enrollment_created <= (SELECT two_months_ago_end_range FROM dynamic_dates)
+             enterprise_enrollment_created_at <= (SELECT two_months_ago_end_range FROM dynamic_dates)
         GROUP BY
             1,2
         ORDER BY
@@ -493,9 +493,9 @@
         on
             s.id=cs.skill_id
         WHERE
-            enterprise_enrollment_created >= (SELECT last_month_start_range FROM dynamic_dates)
+            enterprise_enrollment_created_at >= (SELECT last_month_start_range FROM dynamic_dates)
         AND
-            enterprise_enrollment_created <= (SELECT last_month_end_range FROM dynamic_dates)
+            enterprise_enrollment_created_at <= (SELECT last_month_end_range FROM dynamic_dates)
         GROUP BY
             1,2
         ORDER BY