Merge branch 'dev' into 'master'

Dev

See merge request !327

finance/views.py

@@ -268,7 +268,7 @@ class YandexPay(APIView):
             pay = Payment.objects.get(id=pk)
             try:
                 inv = InvoiceRebilling.objects.get(yandex_pay=pay)
-            except InvoiceRebilling:
+            except InvoiceRebilling.DoesNotExist:
                 inv = None
             r = requests.post('https://money.yandex.ru/eshop.xml', data={
                 'shopId': pay.shop_id,
@@ -483,4 +483,4 @@ class DemoYandexCheckView(YandexCheckView):
 
 
 class DemoYandexAvisoView(YandexAvisoView):
-    pass
+    pass