Fix two deprecation warnings.

lms/djangoapps/shoppingcart/models.py

@@ -645,6 +645,7 @@ class OrderItem(TimeStampedModel):
     """
     class Meta(object):
         app_label = "shoppingcart"
+        base_manager_name = 'objects'
 
     objects = InheritanceManager()
     order = models.ForeignKey(Order, db_index=True)
@@ -1091,6 +1092,7 @@ class InvoiceItem(TimeStampedModel):
     """
     class Meta(object):
         app_label = "shoppingcart"
+        base_manager_name = 'objects'
 
     objects = InheritanceManager()
     invoice = models.ForeignKey(Invoice, db_index=True)

openedx/core/djangoapps/user_api/accounts/tests/test_models.py

@@ -99,7 +99,7 @@ def test_retirement_request_create_success():
     Ensure that retirement request record creation succeeds.
     """
     user = UserFactory()
-    retirement = UserRetirementRequest.create_retirement_request(user)
+    UserRetirementRequest.create_retirement_request(user)
     assert UserRetirementRequest.has_user_requested_retirement(user)
 
 
@@ -108,7 +108,7 @@ def test_retirement_request_created_upon_status(setup_retirement_states):  # pyl
     Ensure that retirement request record is created upon retirement status creation.
     """
     user = UserFactory()
-    retirement = UserRetirementStatus.create_retirement(user)
+    UserRetirementStatus.create_retirement(user)
     assert UserRetirementRequest.has_user_requested_retirement(user)
 
 

openedx/core/djangoapps/user_api/admin.py

@@ -3,7 +3,7 @@ Django admin configuration pages for the user_api app
 """
 from django.contrib import admin
 
-from .models import RetirementState, UserRetirementStatus
+from .models import RetirementState, UserRetirementStatus, UserRetirementRequest
 
 
 @admin.register(RetirementState)
@@ -31,3 +31,15 @@ class UserRetirementStatusAdmin(admin.ModelAdmin):
 
     class Meta(object):
         model = UserRetirementStatus
+
+
+@admin.register(UserRetirementRequest)
+class UserRetirementRequestAdmin(admin.ModelAdmin):
+    """
+    Admin interface for the UserRetirementRequestAdmin model.
+    """
+    list_display = ('user', 'created')
+    raw_id_fields = ('user',)
+
+    class Meta(object):
+        model = UserRetirementRequest

openedx/core/djangoapps/user_api/models.py

@@ -195,6 +195,9 @@ class UserRetirementRequest(TimeStampedModel):
         """
         return cls.objects.filter(user=user).exists()
 
+    def __unicode__(self):
+        return u'User: {} Requested: {}'.format(self.user.id, self.created)
+
 
 class UserRetirementStatus(TimeStampedModel):
     """