Fix a few additional warnings not on original branch Conflicts: oscar/apps/basket/forms.py oscar/apps/order/utils.py oscar/apps/partner/strategy.py Fixes #1082