Skip to content

processing when creating deal for case marked-request #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

processing when creating deal for case marked-request #302

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c5d725
processing when creating deal for case marked-request
Tosinibikunle Sep 30, 2025
0cad216
Merge branch 'DjangoCRM:main' into proceesing-when-creating-deal-for-…
Tosinibikunle Oct 1, 2025
0e1055b
Merge branch 'DjangoCRM:main' into proceesing-when-creating-deal-for-…
Tosinibikunle Oct 3, 2025
76ab0ff
fix: process when creating deal for case marked request updated
Tosinibikunle Oct 3, 2025
6a09de0
removed the redundant check for obj.pk and upddated the logic
Tosinibikunle Oct 6, 2025
1f7efeb
Merge branch 'proceesing-when-creating-deal-for-case-marked-request' …
Tosinibikunle Oct 6, 2025
8460cc7
resolved merge conflicts.
Tosinibikunle Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions crm/site/requestadmin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,14 @@ def changelist_view(self, request, extra_context=None):
def get_form(self, request, obj=None, **kwargs):
form = super().get_form(request, obj, **kwargs)
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
if works_globally:
form.country_must_be_specified = True
if obj.case:
form.country_must_be_specified = False
else:
department_id = request.user.department_id
works_globally = Department.objects.get(
id=department_id).works_globally
if works_globally:
form.country_must_be_specified = True
return form

def get_changeform_initial_data(self, request):
Expand Down Expand Up @@ -243,12 +246,16 @@ def save_model(self, request, obj, form, change):
if request.user.is_manager:
obj.subsequent = True

if any((
'_create-deal' in request.POST or 'duplicate' in form.changed_data and obj.duplicate,
'_close-case' in request.POST)):
obj.pending = False
elif '_activate-case' in request.POST:
obj.pending = True
if '_create-deal' in request.POST:
# Do not deactivate if this is a case
if not obj.case:
obj.pending = False
else:
obj.pending = True
elif ('duplicate' in form.changed_data and obj.duplicate) or '_close-case' in request.POST:
obj.pending = False
elif '_activate-case' in request.POST:
obj.pending = True
if not obj.pending:
if not obj.owner:
obj.owner = request.user
Expand Down