diff --git a/inventory/models.py b/inventory/models.py index 4ba4b9bd..504eb873 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -2203,7 +2203,7 @@ class Vendor(models.Model, LocalizedNameMixin): ) def get_absolute_url(self): - return reverse("vendor_detail", kwargs={"dealer_slug":self.dealer.slug,"pk": self.pk}) + return reverse("vendor_detail", kwargs={"dealer_slug":self.dealer.slug,"slug": self.slug}) def save(self, *args, **kwargs): if not self.slug: diff --git a/inventory/signals.py b/inventory/signals.py index 2692d058..b4945e2d 100644 --- a/inventory/signals.py +++ b/inventory/signals.py @@ -937,7 +937,7 @@ def po_fullfilled_notification(sender, instance, created, **kwargs): @receiver(post_save, sender=models.Vendor) def vendor_created_notification(sender, instance, created, **kwargs): if created: - recipients = models.CustomGroup.objects.filter(dealer=instance.dealer,name="Inventory").first().group.user_set.excludeall() + recipients = models.CustomGroup.objects.filter(dealer=instance.dealer,name="Inventory").first().group.user_set.all() for recipient in recipients: models.Notification.objects.create( diff --git a/inventory/views.py b/inventory/views.py index b950896b..2b564dca 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -8,7 +8,6 @@ import logging import tempfile import numpy as np from time import sleep - # from rich import print from random import randint from decimal import Decimal @@ -2495,7 +2494,7 @@ class VendorCreateView( ) else: messages.error(self.request, _("Vendor with this email already exists")) - return redirect("vendor_create") + return redirect("vendor_create",dealer_slug=self.kwargs["dealer_slug"]) dealer = get_user_type(self.request) form.instance.dealer = dealer form.instance.save() @@ -9323,6 +9322,74 @@ class PurchaseOrderListView(LoginRequiredMixin, PermissionRequiredMixin, ListVie dealer = get_user_type(self.request) entity = dealer.entity return self.model.objects.filter(entity=entity) + + def get_queryset(self): + dealer = get_user_type(self.request) + entity = dealer.entity + queryset = self.model.objects.filter(entity=entity) + + query = self.request.GET.get('q') # This is generic: looks for 'q' from GET + + if query: + # Start with an empty Q object for the search filters + search_filters = Q() + + # 1. Try to parse the query as a date + parsed_date = None + date_formats = [ + '%Y-%m-%d', # 2023-10-26 + '%m/%d/%Y', # 10/26/2023 + '%d-%m-%Y', # 26-10-2023 + '%B %d, %Y', # October 26, 2023 + '%b %d, %Y', # Oct 26, 2023 + '%Y/%m/%d', # 2023/10/26 + '%Y-%m', # 2023-10 (for year-month search) + '%Y', + '%b %d', + '%B %d' # 2023 (for year search) + ] + + for fmt in date_formats: + try: + # For '%Y-%m' and '%Y', we only care about year/month, not exact day + if fmt == '%Y-%m': + parsed_date = datetime.strptime(query, fmt) + search_filters |= Q(created__year=parsed_date.year, created__month=parsed_date.month) + break + elif fmt == '%Y': + parsed_date = datetime.strptime(query, fmt) + search_filters |= Q(created__year=parsed_date.year) + break + else: + parsed_date = datetime.strptime(query, fmt).date() + search_filters |= Q(created__date=parsed_date) # Matches exact date part of datetime field + break # Found a match, no need to try other formats + except ValueError: + continue # Try next format + + # 2. Add text-based search filters (always apply these) + # Combine them with OR operator + text_filters = ( + Q(po_number__icontains=query) | + Q(po_title__icontains=query) | + Q(po_status__icontains=query) | + Q(created__icontains=query) + + ) + + # If a date was successfully parsed, combine with text filters + if parsed_date: + # Use a combined Q object. This means it will search for + # (date_match OR po_number_match OR po_title_match) + queryset = queryset.filter(search_filters | text_filters).distinct() + else: + # If no date was parsed, only apply text filters + queryset = queryset.filter(text_filters).distinct() + + return queryset + + + def get_context_data(self, **kwargs): dealer = get_user_type(self.request) diff --git a/static/images/logos/users/pexels-marieke-schonfeld-1309710-2514035.jpg b/static/images/logos/users/pexels-marieke-schonfeld-1309710-2514035.jpg new file mode 100644 index 00000000..9c8f2f26 Binary files /dev/null and b/static/images/logos/users/pexels-marieke-schonfeld-1309710-2514035.jpg differ diff --git a/templates/crm/leads/lead_list.html b/templates/crm/leads/lead_list.html index 26debbd8..ec7c4c58 100644 --- a/templates/crm/leads/lead_list.html +++ b/templates/crm/leads/lead_list.html @@ -3,7 +3,7 @@ {% block title %}{{ _('Leads')|capfirst }}{% endblock title %} {% block content %} -
+

{{ _("Leads")|capfirst }}

{% include "crm/leads/partials/update_action.html" %} diff --git a/templates/crm/opportunities/opportunity_list.html b/templates/crm/opportunities/opportunity_list.html index 9ff9261f..fd00c753 100644 --- a/templates/crm/opportunities/opportunity_list.html +++ b/templates/crm/opportunities/opportunity_list.html @@ -87,7 +87,7 @@
-
+
{% include 'crm/opportunities/partials/opportunity_grid.html' %}
{% if page_obj.paginator.num_pages > 1 %} diff --git a/templates/crm/opportunities/partials/opportunity_grid.html b/templates/crm/opportunities/partials/opportunity_grid.html index 4579e465..5a371564 100644 --- a/templates/crm/opportunities/partials/opportunity_grid.html +++ b/templates/crm/opportunities/partials/opportunity_grid.html @@ -120,10 +120,10 @@
- {{ _("View Details") }} + {{ _("View") }} - {{ _("Update") }} + {{ _("Update") }}
diff --git a/templates/groups/group_detail.html b/templates/groups/group_detail.html index 26e9b017..56c763f9 100644 --- a/templates/groups/group_detail.html +++ b/templates/groups/group_detail.html @@ -109,11 +109,7 @@ {{ _("Delete") }} -======= href="{% url 'group_list' request.dealer.slug %}"> ->>>>>>> c9fad7b79c346875a636122fdc7514814180dbc7 {% trans "Back to List" %} diff --git a/templates/groups/group_permission_form.html b/templates/groups/group_permission_form.html index cf14458d..d1950406 100644 --- a/templates/groups/group_permission_form.html +++ b/templates/groups/group_permission_form.html @@ -32,11 +32,12 @@
{{ error }}
{% endfor %}
- {% trans "Cancel"|capfirst %} - + {% trans "Cancel"|capfirst %} +
diff --git a/templates/organizations/organization_detail.html b/templates/organizations/organization_detail.html index 4416f47a..892ae74d 100644 --- a/templates/organizations/organization_detail.html +++ b/templates/organizations/organization_detail.html @@ -11,14 +11,13 @@
  • {% trans "Address" %}: {{ organization.address }}
    • - {% trans "Edit" %} + {% trans "Edit" %} -
    {% include 'modal/delete_modal.html' %} diff --git a/templates/organizations/organization_form.html b/templates/organizations/organization_form.html index 57edc488..33c820d0 100644 --- a/templates/organizations/organization_form.html +++ b/templates/organizations/organization_form.html @@ -11,9 +11,9 @@ {% endblock %} {% block content %} -
    +
    -

    +

    {% if object %} {% trans 'Update Organization'%} {% else %} diff --git a/templates/partials/pagination.html b/templates/partials/pagination.html index a3b89dbc..0efee150 100644 --- a/templates/partials/pagination.html +++ b/templates/partials/pagination.html @@ -1,5 +1,5 @@ {% load i18n static %} -
    +
    {{ _("Showing") }} {{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} {{ _("of") }} {{ page_obj.paginator.count }} {{ _("results") }} diff --git a/templates/purchase_orders/po_list.html b/templates/purchase_orders/po_list.html index 2fa18613..46125fdf 100644 --- a/templates/purchase_orders/po_list.html +++ b/templates/purchase_orders/po_list.html @@ -65,9 +65,9 @@
    - {% trans 'Detail' %} + {% trans 'Purchase Order Detail' %} {% if po.po_status == 'fulfilled' %} - {% trans 'View Inventory Items' %} + {% trans 'Add Inventory Items' %} {% else %} {% endif %} diff --git a/templates/sales/estimates/sale_order_form1.html b/templates/sales/estimates/sale_order_form1.html index 1a6e1820..dfcb3077 100644 --- a/templates/sales/estimates/sale_order_form1.html +++ b/templates/sales/estimates/sale_order_form1.html @@ -72,7 +72,7 @@ {% block content %} -
    +