Merge remote-tracking branch 'origin/versions/micro' into versions/minor

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
2019-10-30 20:28:36 -04:00
parent 1e4088c819 6dda918bb3
commit 834697a01e
994 changed files with 2685 additions and 2534 deletions
@@ -133,7 +133,7 @@ class DuplicatedDocumentManager(models.Manager):
            app_label='documents', model_name='Document'
        )
        return Document.objects.filter(
-            pk__in=self.filter(documents__isnull=False).values_list(
+            pk__in=self.filter(documents__in_trash=False).values_list(
                'document_id', flat=True
            )
        )