Merge pull request #321 from MULTidll/main

Implements the requested enhancements described in issue #307 and Resolves issues found in PR #318

Author: DjangoCRM

crm/site/requestadmin.py

@@ -3,6 +3,7 @@
 from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.core.handlers.wsgi import WSGIRequest
+from django.forms.widgets import HiddenInput
 from django.http import HttpResponseRedirect
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
@@ -192,12 +193,21 @@ def changelist_view(self, request, extra_context=None):
 
     def get_form(self, request, obj=None, **kwargs):
         form = super().get_form(request, obj, **kwargs)
+        
+        if obj and getattr(obj, "deal", None):
+            if "duplicate" in form.base_fields:
+                form.base_fields["duplicate"].widget = HiddenInput()
+            if "case" in form.base_fields:
+                form.base_fields["case"].widget = HiddenInput()
+
         if request.method == "POST" and '_create-deal' in request.POST:
             department_id = request.user.department_id
             works_globally = Department.objects.get(
-                id=department_id).works_globally
+                id=department_id
+            ).works_globally
             if works_globally:
                 form.country_must_be_specified = True
+
         return form
 
     def get_changeform_initial_data(self, request):