Merge branch 'dev' into feature-ocrmypdf

2020-11-30 23:53:19 +01:00
parent 8a5c782425 d58706a34b
commit 24b8c358cc
12 changed files with 182 additions and 345 deletions
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -445,6 +445,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
        shutil.copy(src, dst)
        return dst

+    @override_settings(PAPERLESS_FILENAME_FORMAT=None)
    def testNormalOperation(self):

        filename = self.get_test_file()