Correct discrepancy between grade data sources for gradebook

lms/djangoapps/grades/rest_api/v1/gradebook_views.py

@@ -559,10 +559,10 @@ class GradebookView(GradeViewMixin, PaginatedAPIView):
                     effective_grade_percentage=Case(
                         When(override__isnull=False,
                              then=(
-                                 F('override__earned_all_override')
-                                 / F('override__possible_all_override')
+                                 F('override__earned_graded_override')
+                                 / F('override__possible_graded_override')
                              ) * 100),
-                        default=(F('earned_all') / F('possible_all')) * 100
+                        default=(F('earned_graded') / F('possible_graded')) * 100
                     )
                 )
                 grade_conditions = {

requirements/edx/base.txt

@@ -97,7 +97,7 @@ docutils==0.15.2          # via botocore
 drf-yasg==1.16
 edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
-edx-bulk-grades==0.5
+edx-bulk-grades==0.5.2
 edx-ccx-keys==0.2.2
 edx-celeryutils==0.3.0
 edx-completion==2.0.0

requirements/edx/development.txt

@@ -121,7 +121,7 @@ docutils==0.15.2
 drf-yasg==1.16
 edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
-edx-bulk-grades==0.5
+edx-bulk-grades==0.5.2
 edx-ccx-keys==0.2.2
 edx-celeryutils==0.3.0
 edx-completion==2.0.0

requirements/edx/testing.txt

@@ -117,7 +117,7 @@ docutils==0.15.2
 drf-yasg==1.16
 edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
-edx-bulk-grades==0.5
+edx-bulk-grades==0.5.2
 edx-ccx-keys==0.2.2
 edx-celeryutils==0.3.0
 edx-completion==2.0.0