Merge branch 'develop'

backend/controllers/DocumentController.php

@@ -481,7 +481,9 @@ class DocumentController extends BackendController
                     $json['orders_update_array'] = $document ? $this->initOrdersArray($orderModule->findOrdersByUserAndDeliveryNote($user, $document)) : [];
                 }
 
-                if ($typeAction == 'create' && ($classDocument == 'Invoice' || $classDocument == 'DeliveryNote')) {
+                if ($producerModule->getSolver()->getConfig('option_document_default_naming')
+                    && $typeAction == 'create'
+                    && ($classDocument == 'Invoice' || $classDocument == 'DeliveryNote')) {
                     $json['name'] = $documentModule->getSolver()->getDefaultName($classDocument, $user);
                 }