From 68ea28e8552246b705c6b6f70e5e1fac610c820d Mon Sep 17 00:00:00 2001 From: Faheed Date: Thu, 18 Sep 2025 16:33:24 +0300 Subject: [PATCH 1/3] small fix get_get --- inventory/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/views.py b/inventory/views.py index 99532ed3..099bf146 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -4218,7 +4218,7 @@ class BankAccountCreateView( def get_form(self, form_class=None): dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"]) form = super().get_form(form_class) - account_qs = dealer.entity.get_get_default_coa_accounts().filter( + account_qs = dealer.entity.get_default_coa_accounts().filter( role__in=[ roles.ASSET_CA_CASH, roles.LIABILITY_CL_ACC_PAYABLE, @@ -4313,7 +4313,7 @@ class BankAccountUpdateView( def get_form(self, form_class=None): dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"]) form = super().get_form(form_class) - account_qs = dealer.entity.get_get_default_coa_accounts().filter( + account_qs = dealer.entity.get_default_coa_accounts().filter( role__in=[ roles.ASSET_CA_CASH, roles.LIABILITY_CL_ACC_PAYABLE, -- 2.39.5 From 0a2de0d8d5c8711027fff260bf28e13a8ae0a813 Mon Sep 17 00:00:00 2001 From: Faheed Date: Thu, 18 Sep 2025 17:23:05 +0300 Subject: [PATCH 2/3] commented create quotation from the header.html --- templates/groups/group_detail.html | 3 ++- templates/groups/group_list.html | 2 +- templates/header.html | 4 ++-- templates/plans/order_detail.html | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/templates/groups/group_detail.html b/templates/groups/group_detail.html index d4f269c8..0800b8f0 100644 --- a/templates/groups/group_detail.html +++ b/templates/groups/group_detail.html @@ -36,7 +36,8 @@

{{ _("Group Details") }}

- {% trans "Group List" %} + {% trans "Groups List" %} + {% trans "Staffs List" %}
diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html index 98087fb9..7e7ad146 100644 --- a/templates/groups/group_list.html +++ b/templates/groups/group_list.html @@ -55,7 +55,7 @@ - {% trans 'view'|capfirst %} + {% trans 'view Permissions'|capfirst %} diff --git a/templates/header.html b/templates/header.html index 5a39dc54..2698966d 100644 --- a/templates/header.html +++ b/templates/header.html @@ -194,7 +194,7 @@ data-bs-parent="#navbarVerticalCollapse" id="nv-sales">
  • {% trans 'sales'|capfirst %}
    • - {% if perms.django_ledger.add_estimatemodel %} + {% comment %} {% if perms.django_ledger.add_estimatemodel %}
    • - {% endif %} + {% endif %} {% endcomment %} {% if perms.django_ledger.view_estimatemodel %}
  • diff --git a/templates/plans/order_detail.html b/templates/plans/order_detail.html index 1fed37be..82eb1c53 100644 --- a/templates/plans/order_detail.html +++ b/templates/plans/order_detail.html @@ -60,15 +60,15 @@

    {% trans "Payment" %}

    + {% if object.completed %}

    - {% blocktrans with object.completed as completed %} - Payment completed on: {{ completed|date:"F j, Y" }} - {% endblocktrans %} + {% trans "Payment completed on : "%}{{object.completed}}

    + {% else %} {% if object.is_ready_for_payment %}

    -- 2.39.5 From 0ee526e8065e81a60e8eeacc4697118ddc559c4b Mon Sep 17 00:00:00 2001 From: Faheed Date: Thu, 18 Sep 2025 19:37:40 +0300 Subject: [PATCH 3/3] estimateforcarform queryset update --- inventory/forms.py | 2 +- inventory/views.py | 2 +- templates/inventory/car_detail.html | 2 +- templates/purchase_orders/includes/card_po.html | 2 +- templates/purchase_orders/po_confirm_delete.html | 6 ++++-- templates/purchase_orders/po_delete.html | 6 ++++-- templates/sales/estimates/sale_order_form.html | 3 ++- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/inventory/forms.py b/inventory/forms.py index d5a34498..52c69ed6 100644 --- a/inventory/forms.py +++ b/inventory/forms.py @@ -2268,7 +2268,7 @@ class CarDealershipRegistrationForm(forms.ModelForm): class CarDetailsEstimateCreate(forms.Form): customer = forms.ModelChoiceField( - queryset=Customer.objects.all(), + queryset=Customer.objects.filter(active=True), required=True, label="Customer", widget=forms.Select(attrs={"class": "form-control"}), diff --git a/inventory/views.py b/inventory/views.py index 2a3326c4..1f3b1de4 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -5005,7 +5005,7 @@ def create_estimate(request, dealer_slug, slug=None): customer = opportunity.customer print(customer) form.fields["customer"].queryset = models.Customer.objects.filter( - pk=customer.pk + pk=customer.pk ) form.initial["customer"] = customer diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index e6c88c50..a0c300fd 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -75,7 +75,7 @@

    • {% endif %} - {% if car.ready %} + {% if car.ready and car.status != 'sold' %}
    - {% trans "Cancel" %}
    {% endblock %} + diff --git a/templates/purchase_orders/po_delete.html b/templates/purchase_orders/po_delete.html index bfd337aa..28f22968 100644 --- a/templates/purchase_orders/po_delete.html +++ b/templates/purchase_orders/po_delete.html @@ -18,8 +18,8 @@ Purchase Order {{ po_model.po_number }}?{% endblocktrans %}

    - {% trans "All transactions associated with this Purchase Order will be deleted. - If you want to void the PO instead," %} {% trans "click here" %}

    @@ -33,3 +33,5 @@
    {% endblock %} + + diff --git a/templates/sales/estimates/sale_order_form.html b/templates/sales/estimates/sale_order_form.html index 80d7cefe..0d834097 100644 --- a/templates/sales/estimates/sale_order_form.html +++ b/templates/sales/estimates/sale_order_form.html @@ -28,7 +28,7 @@ {% trans 'Save' %} - {% trans "Cancel" %} @@ -40,3 +40,4 @@
    {% endblock content %} + -- 2.39.5