bug fixes for search

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

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.utils.timezone

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
from django.db import migrations, models

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 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),
]

View File

@ -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",
],
)

View File

@ -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(

View File

@ -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')">
<i class="fas fa-truck me-2"></i>{% trans 'Mark as Fulfilled' %}
</button>
{% endif %}