ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes for search

Browse Source
This commit is contained in:
Faheedkhan 2025-07-10 19:04:10 +03:00
parent 53dd2858fc
commit d7ba36b773
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
haikalbot/migrations/0001_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 5.2.4 on 2025-07-09 13:00 # Generated by Django 5.1.7 on 2025-07-10 12:55
import django.db.models.deletion import django.db.models.deletion
import django.utils.timezone import django.utils.timezone

2
haikalbot/migrations/0002_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 5.2.4 on 2025-07-09 13:00 # Generated by Django 5.1.7 on 2025-07-10 12:55
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models from django.db import migrations, models

4
inventory/migrations/0001_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 5.2.4 on 2025-07-09 13:00 # Generated by Django 5.1.7 on 2025-07-10 12:55
import datetime import datetime
import django.core.serializers.json import django.core.serializers.json
@ -22,7 +22,7 @@ class Migration(migrations.Migration):
('appointment', '0001_initial'), ('appointment', '0001_initial'),
('auth', '0012_alter_user_first_name_max_length'), ('auth', '0012_alter_user_first_name_max_length'),
('contenttypes', '0002_remove_content_type_name'), ('contenttypes', '0002_remove_content_type_name'),
('django_ledger', '0023_merge_20250708_1825'), ('django_ledger', '0021_alter_bankaccountmodel_account_model_and_more'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
] ]

6
inventory/models.py
View File

@ -2707,7 +2707,8 @@ class CustomGroup(models.Model):
"notes", "notes",
"tasks", "tasks",
"activity", "activity",
"payment"], "payment",
'vendor'],
other_perms=[ other_perms=[
"view_car", "view_car",
"view_carlocation", "view_carlocation",
@ -2715,6 +2716,9 @@ class CustomGroup(models.Model):
"view_carcolors", "view_carcolors",
"view_cartransfer", "view_cartransfer",
"view_saleorder", "view_saleorder",
"view_leads",
"view_opportunity",
"view_customers",
], ],
) )

14
inventory/views.py
View File

@ -2496,7 +2496,7 @@ class VendorListView(LoginRequiredMixin,PermissionRequiredMixin, ListView):
@login_required @login_required
@permission_required('django_ledger.view_vendormodel',raise_exception=True) @permission_required('inventory.view_vendor',raise_exception=True)
def vendorDetailView(request, dealer_slug,slug): def vendorDetailView(request, dealer_slug,slug):
""" """
Fetches and renders the detail view for a specific vendor. Fetches and renders the detail view for a specific vendor.
@ -9970,12 +9970,10 @@ class PurchaseOrderListView(LoginRequiredMixin, PermissionRequiredMixin, ListVie
qs=self.model.objects.filter(entity=dealer.entity) qs=self.model.objects.filter(entity=dealer.entity)
if query: if query:
qs=apply_search_filters(qs,query) qs=apply_search_filters(qs,query)
if self.request.is_dealer: return qs
return qs
staffmember= staffmember = getattr(self.request.user, "staffmember", None)
if staff := getattr(staffmember, "staff", None):
return qs.filter(staff=staff)
return self.model.objects.none()
# def get_queryset(self): # def get_queryset(self):
# dealer = get_user_type(self.request) # dealer = get_user_type(self.request)
# entity = dealer.entity # entity = dealer.entity
@ -10058,7 +10056,7 @@ class BasePurchaseOrderActionActionView(BasePurchaseOrderActionActionViewBase):
class PurchaseOrderModelDeleteView(PurchaseOrderModelDeleteViewBase): class PurchaseOrderModelDeleteView(PurchaseOrderModelDeleteViewBase):
template_name = "purchase_orders/po_delete.html" template_name = "purchase_orders/po_delete.html"
permission_required = "django_ledger.delete_purchaseordermodel" permission_required = "django_ledger.delete_purchaseordermodel"
def get_success_url(self): def get_success_url(self):
messages.add_message( messages.add_message(