diff --git a/inventory/urls.py b/inventory/urls.py index f0a92d2d..a6f63fbc 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -443,7 +443,7 @@ urlpatterns = [ path( "/inventory//list/", views.InventoryListView.as_view(), - name="inventort_list", + name="inventory_list", ), # Sales URLs quotation_create # path( diff --git a/inventory/views.py b/inventory/views.py index f85797cd..7f716543 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -10617,10 +10617,12 @@ class PurchaseOrderListView(LoginRequiredMixin, PermissionRequiredMixin, ListVie query = self.request.GET.get("q") qs = self.model.objects.filter(entity=dealer.entity) if query: - qs = apply_search_filters(qs, query) + qs=qs.filter(Q(po_number__icontains=query)|Q(po_status__icontains=query)|Q(po_title__icontains=query)) + return qs return qs def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) dealer = get_user_type(self.request) vendors=models.Vendor.objects.filter(dealer=dealer) context = super().get_context_data(**kwargs) diff --git a/scripts/set_plans.py b/scripts/set_plans.py index 11ef1bf5..0fb47a05 100644 --- a/scripts/set_plans.py +++ b/scripts/set_plans.py @@ -58,7 +58,7 @@ def run(): visible=True, order=1, ) - basic_plan.quotas.add(basic_quota) + basic_plan.quotas.add(basic_quota,free_quota) pro_plan = Plan.objects.create( name="Professional", @@ -69,7 +69,7 @@ def run(): visible=True, # order=2 ) - pro_plan.quotas.add(basic_quota, pro_quota) + pro_plan.quotas.add(free_quota,basic_quota, pro_quota) premium_plan = Plan.objects.create( name="Premium", @@ -80,4 +80,4 @@ def run(): visible=True, order=3, ) - premium_plan.quotas.add(basic_quota, pro_quota, premium_quota) + premium_plan.quotas.add(free_quota,basic_quota, pro_quota, premium_quota) diff --git a/templates/header.html b/templates/header.html index 899708f7..3fe083dd 100644 --- a/templates/header.html +++ b/templates/header.html @@ -6,7 +6,7 @@