Merge remote-tracking branch 'origin/features/multi_version_document' into clients/bc

mayan/apps/ocr/migrations/0001_initial.py

@@ -9,6 +9,10 @@ class Migration(migrations.Migration):
         ('documents', '__first__'),
     ]
 
+    run_before = [
+        ('documents', '0052_rename_document_page'),
+    ]
+
     operations = [
         migrations.CreateModel(
             name='DocumentVersionOCRError',

mayan/apps/sources/links.py

@@ -114,7 +114,7 @@ link_staging_file_delete = Link(
     tags='dangerous', text=_('Delete'), view='sources:staging_file_delete',
 )
 link_document_pages_append = Link(
-    args='resolved_object.pk',
+    args='resolved_object.pk', condition=document_new_version_not_blocked,
     icon_class_path='mayan.apps.sources.icons.icon_document_pages_append',
     permissions=(permission_document_new_version,),
     text=_('Append pages'),