From d7ba36b7733ed269cd36e96b0bf84268fadfff5f Mon Sep 17 00:00:00 2001 From: Faheedkhan Date: Thu, 10 Jul 2025 19:04:10 +0300 Subject: [PATCH] bug fixes for search --- haikalbot/migrations/0001_initial.py | 2 +- haikalbot/migrations/0002_initial.py | 2 +- inventory/migrations/0001_initial.py | 4 ++-- inventory/models.py | 6 +++++- inventory/views.py | 14 ++++++-------- templates/purchase_orders/includes/card_po.html | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/haikalbot/migrations/0001_initial.py b/haikalbot/migrations/0001_initial.py index 4d92b23a..6d70604b 100644 --- a/haikalbot/migrations/0001_initial.py +++ b/haikalbot/migrations/0001_initial.py @@ -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.utils.timezone diff --git a/haikalbot/migrations/0002_initial.py b/haikalbot/migrations/0002_initial.py index 1b740d02..dd38a5d5 100644 --- a/haikalbot/migrations/0002_initial.py +++ b/haikalbot/migrations/0002_initial.py @@ -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 from django.db import migrations, models diff --git a/inventory/migrations/0001_initial.py b/inventory/migrations/0001_initial.py index 8e326055..cf9ffd02 100644 --- a/inventory/migrations/0001_initial.py +++ b/inventory/migrations/0001_initial.py @@ -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 django.core.serializers.json @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('appointment', '0001_initial'), ('auth', '0012_alter_user_first_name_max_length'), ('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), ] diff --git a/inventory/models.py b/inventory/models.py index 13af691d..0bf0e7d4 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -2707,7 +2707,8 @@ class CustomGroup(models.Model): "notes", "tasks", "activity", - "payment"], + "payment", + 'vendor'], other_perms=[ "view_car", "view_carlocation", @@ -2715,6 +2716,9 @@ class CustomGroup(models.Model): "view_carcolors", "view_cartransfer", "view_saleorder", + "view_leads", + "view_opportunity", + "view_customers", ], ) diff --git a/inventory/views.py b/inventory/views.py index b2f525b9..a20fd1a4 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -2496,7 +2496,7 @@ class VendorListView(LoginRequiredMixin,PermissionRequiredMixin, ListView): @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): """ 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) if query: qs=apply_search_filters(qs,query) - if self.request.is_dealer: - 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() + return qs + + + # def get_queryset(self): # dealer = get_user_type(self.request) # entity = dealer.entity @@ -10058,7 +10056,7 @@ class BasePurchaseOrderActionActionView(BasePurchaseOrderActionActionViewBase): class PurchaseOrderModelDeleteView(PurchaseOrderModelDeleteViewBase): template_name = "purchase_orders/po_delete.html" - permission_required = "django_ledger.delete_purchaseordermodel" + permission_required = "django_ledger.delete_purchaseordermodel" def get_success_url(self): messages.add_message( diff --git a/templates/purchase_orders/includes/card_po.html b/templates/purchase_orders/includes/card_po.html index f3688d96..5b5110d1 100644 --- a/templates/purchase_orders/includes/card_po.html +++ b/templates/purchase_orders/includes/card_po.html @@ -149,7 +149,7 @@ onclick="showPOModal('Fulfill PO', '{% url 'po-action-mark-as-fulfilled' request.dealer.slug entity_slug po_model.pk %}', 'Mark As Fulfilled')"> {% trans 'Mark as Fulfilled' %} - + {% endif %}