diff --git a/inventory/signals.py b/inventory/signals.py index a37a1b4c..20a42738 100644 --- a/inventory/signals.py +++ b/inventory/signals.py @@ -13,6 +13,7 @@ from django_ledger.models import ( TransactionModel, LedgerModel, AccountModel, + PurchaseOrderModel ) from . import models from django.utils.timezone import now @@ -892,3 +893,10 @@ def update_finance_cost(sender, instance, created, **kwargs): # save_journal(instance,ledger,vendor) # else: # save_journal(instance,ledger,vendor) + +@receiver(post_save, sender=PurchaseOrderModel) +def create_po_item_upload(sender,instance,created,**kwargs): + if instance.po_status == "fulfilled": + for item in instance.get_itemtxs_data()[0]: + dealer = models.Dealer.objects.get(entity=instance.entity) + models.PoItemsUploaded.objects.create(dealer=dealer,po=instance, item=item, status="fulfilled") diff --git a/inventory/urls.py b/inventory/urls.py index 0de89f7a..94b061ba 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -9,7 +9,7 @@ from django.conf.urls import handler403, handler400, handler404, handler500 urlpatterns = [ # main URLs path("", views.HomeView.as_view(), name="home"), - # path("/", views.HomeView.as_view(), name="home"), + path("/", views.HomeView.as_view(), name="home"), path("welcome/", views.WelcomeView.as_view(), name="welcome"), # Accounts URLs # path("login/", allauth_views.LoginView.as_view(template_name="account/login.html"), name="account_login"), diff --git a/inventory/views.py b/inventory/views.py index 1a440465..fbb24d4c 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -1573,12 +1573,25 @@ class CarDeleteView( model = models.Car template_name = "inventory/car_confirm_delete.html" - success_url = reverse_lazy("inventory_stats") + permission_required = ["inventory.delete_car"] def delete(self, request, *args, **kwargs): messages.success(request, _("Car deleted successfully")) return super().delete(request, *args, **kwargs) + def get_success_url(self): + """ + Returns the URL to redirect to after a successful car deletion. + It dynamically includes the dealer_slug from the URL. + """ + + dealer_slug = self.kwargs.get('dealer_slug') + if dealer_slug: + return reverse_lazy("car_list", kwargs={'dealer_slug': dealer_slug}) + else: + + messages.error(self.request, _("Could not determine dealer for redirection.")) + return reverse_lazy("home") class CarLocationCreateView(LoginRequiredMixin, PermissionRequiredMixin, CreateView): @@ -9522,13 +9535,7 @@ class PurchaseOrderMarkAsApprovedView(BasePurchaseOrderActionActionView): class PurchaseOrderMarkAsFulfilledView(BasePurchaseOrderActionActionView): action_name = "mark_as_fulfilled" - - def get(self, request, dealer_slug, entity_slug, po_pk, *args, **kwargs): - po = get_object_or_404(PurchaseOrderModel, pk=po_pk) - for item in po.get_itemtxs_data()[0]: - models.PoItemsUploaded.objects.create(po=po, item=item, status="fulfilled") - return super().get(request, dealer_slug, entity_slug, po_pk, *args, **kwargs) - + class PurchaseOrderMarkAsCanceledView(BasePurchaseOrderActionActionView): action_name = "mark_as_canceled" diff --git a/templates/crm/leads/lead_form.html b/templates/crm/leads/lead_form.html index cd888aa2..2beec219 100644 --- a/templates/crm/leads/lead_form.html +++ b/templates/crm/leads/lead_form.html @@ -25,7 +25,7 @@ {% block content %}
-

{% if object %}{{ _("Update") }}{% else %}{{ _("Create") }}{% endif %}

+

{% if object %}{{ _("Update Lead") }}{% else %}{{ _("Create New Lead") }}{% endif %}

diff --git a/templates/crm/leads/lead_tracking.html b/templates/crm/leads/lead_tracking.html index cfef8140..9c153639 100644 --- a/templates/crm/leads/lead_tracking.html +++ b/templates/crm/leads/lead_tracking.html @@ -77,7 +77,7 @@
{{ _("New Leads")}} ({{new|length}})
{% for lead in new %} - +
{{lead.full_name|capfirst}}
{{lead.email}}
diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html index 0d544fae..3531048d 100644 --- a/templates/crm/opportunities/opportunity_detail.html +++ b/templates/crm/opportunities/opportunity_detail.html @@ -13,7 +13,7 @@
{% if opportunity.estimate %} - {{ _("View Quotation")}} + {{ _("View Quotation")}} {% else %}

{{ _("No Estimate") }}

{% endif %} diff --git a/templates/crm/opportunities/partials/opportunity_grid.html b/templates/crm/opportunities/partials/opportunity_grid.html index 6709ab4f..4579e465 100644 --- a/templates/crm/opportunities/partials/opportunity_grid.html +++ b/templates/crm/opportunities/partials/opportunity_grid.html @@ -119,7 +119,7 @@
- + {{ _("View Details") }} diff --git a/templates/groups/group_detail.html b/templates/groups/group_detail.html index 56c763f9..26e9b017 100644 --- a/templates/groups/group_detail.html +++ b/templates/groups/group_detail.html @@ -109,7 +109,11 @@ {{ _("Delete") }} +======= href="{% url 'group_list' request.dealer.slug %}"> +>>>>>>> c9fad7b79c346875a636122fdc7514814180dbc7 {% trans "Back to List" %} diff --git a/templates/header.html b/templates/header.html index b12cd682..11d24de0 100644 --- a/templates/header.html +++ b/templates/header.html @@ -71,7 +71,7 @@
  • - {% trans "create quotation"|capfirst %} + {% trans "create quotation"|capfirst %}
    • @@ -80,12 +80,20 @@
  • - {% trans "quotations"|capfirst %} + {% trans "quotations"|capfirst %}
    • {% endif %} - + +
  • + +
    + {% trans "Sales Orders"|capfirst %} +
    +     +
    • + {% if perms.django_ledger.view_invoicemodel %}
  • @@ -104,13 +112,7 @@
    • {% endif %} -
  • - -
    - {% trans "Sales Orders"|capfirst %} -
    -     -
    • +
    @@ -470,7 +472,7 @@
    Privacy policy•Terms•Cookies
    - {% else %} + {% else %}
    {% trans 'Sign In' %}
    diff --git a/templates/inventory/car_confirm_delete.html b/templates/inventory/car_confirm_delete.html index 92933658..8e12ee39 100644 --- a/templates/inventory/car_confirm_delete.html +++ b/templates/inventory/car_confirm_delete.html @@ -3,11 +3,13 @@ {% load i18n %} {% block title %}Delete Car{% endblock %} {% block content %} +

    Delete Car

    -

    Are you sure you want to delete the car "{{ car }}"?

    +

    Are you sure you want to delete the car "{{ car }}"?

    {% csrf_token %} {% trans 'Cancel' %}
    +
    {% endblock %} diff --git a/templates/inventory/car_list_view.html b/templates/inventory/car_list_view.html index 8b566764..ec1a3eed 100644 --- a/templates/inventory/car_list_view.html +++ b/templates/inventory/car_list_view.html @@ -305,7 +305,7 @@
    - + {% endblock %} {% block customJS %} diff --git a/templates/ledger/coa_accounts/account_detail.html b/templates/ledger/coa_accounts/account_detail.html index c1082520..92b9ebef 100644 --- a/templates/ledger/coa_accounts/account_detail.html +++ b/templates/ledger/coa_accounts/account_detail.html @@ -99,7 +99,7 @@
    - {% trans 'view'|capfirst %} + {% trans 'view Transactions'|capfirst %}
    diff --git a/templates/ledger/coa_accounts/partials/account_table.html b/templates/ledger/coa_accounts/partials/account_table.html index 41638aa6..5f1a0d67 100644 --- a/templates/ledger/coa_accounts/partials/account_table.html +++ b/templates/ledger/coa_accounts/partials/account_table.html @@ -39,7 +39,7 @@
    - {% trans "View" %} + {% trans "View Journal Entries" %}
    diff --git a/templates/organizations/organization_form.html b/templates/organizations/organization_form.html index dc69abfa..57edc488 100644 --- a/templates/organizations/organization_form.html +++ b/templates/organizations/organization_form.html @@ -12,7 +12,16 @@ {% block content %}
    -

    {% trans "Add Organization" %}

    + +

    + {% if object %} + {% trans 'Update Organization'%} + {% else %} + {% trans 'Add New Organization'%} + {% endif %} +

    + +
    diff --git a/templates/organizations/organization_list.html b/templates/organizations/organization_list.html index a225b7e0..df3ab9a7 100644 --- a/templates/organizations/organization_list.html +++ b/templates/organizations/organization_list.html @@ -75,7 +75,7 @@
    diff --git a/templates/purchase_orders/po_detail.html b/templates/purchase_orders/po_detail.html index 05809b2d..672fa591 100644 --- a/templates/purchase_orders/po_detail.html +++ b/templates/purchase_orders/po_detail.html @@ -10,14 +10,12 @@
    -
    {% include 'purchase_orders/includes/card_po.html' with dealer_slug=request.dealer.slug po_model=po_model entity_slug=entity_slug style='po-detail' %}
    - {% trans 'PO List' %} @@ -25,9 +23,7 @@
    - -
    - +
    @@ -50,30 +46,20 @@
    -
    +
    - -
    - -
    -
    -

    {{ po_model.po_title }}

    - - -
    - {% po_item_table1 po_items %} -
    +
    +
    + {% po_item_table1 po_items %}
    - -     - {% trans 'PO List' %} - -
    + + + +
    + {% include "purchase_orders/includes/mark_as.html" %} -
    {% endblock %} @@ -91,15 +77,15 @@ document.getElementById('POModalTitle').textContent = title; document.getElementById('POModalBody').innerHTML = ` -
    - - ${buttonText} - - -
    - `; +
    + + ${buttonText} + + +
    + `; modal.show(); }; diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html index cf2ca8b9..a63aa76a 100644 --- a/templates/sales/estimates/estimate_detail.html +++ b/templates/sales/estimates/estimate_detail.html @@ -74,12 +74,6 @@
    - {% if estimate.invoicemodel_set.first %} - - {{ _("View Invoice")}} - - {% endif %} - {% if estimate.status == 'draft' %} {% trans 'Send Quotation' %} @@ -87,16 +81,23 @@ {% elif estimate.status == 'approved' %} - {% if estimate.sale_orders.first %} + {% if estimate.sale_orders.first %} + {% trans 'Create Invoice' %} - {{ _("Preview Sale Order") }} - {% else %} + {{ _("Preview Sale Order") }} + + {% else %} {% trans 'Create Sale Order' %} {% comment %} {% endcomment %} - {% endif %} - {% elif estimate.status == 'in_review' %} - {% trans 'Preview' %} + {% endif %} + + + {% elif estimate.status == 'completed' %} + {{ _("Preview Sale Order") }} + + {{ _("View Invoice")}} {% endif %} + {% if estimate.can_cancel %} {% if perms.django_ledger.change_estimatemodel %} diff --git a/templates/users/user_detail.html b/templates/users/user_detail.html index 97c1bd58..3f4127d8 100644 --- a/templates/users/user_detail.html +++ b/templates/users/user_detail.html @@ -23,7 +23,7 @@
    -
    +

    Groups