Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend

Reviewed-on: #271

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,
@@ -8177,8 +8177,13 @@ class BillModelCreateView(LoginRequiredMixin, PermissionRequiredMixin,SuccessMes
         return {"date_draft": get_localdate()}
 
     def get_form(self, form_class=None):
+        # form = super().get_form(form_class)
         dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"])
-        return BillModelCreateForm(entity_model=dealer.entity, **self.get_form_kwargs())
+        form = BillModelCreateForm(entity_model=dealer.entity, **self.get_form_kwargs())
+        form.initial['prepaid_account'] = models.DealerSettings.objects.filter(dealer=dealer).first().bill_prepaid_account or None
+        form.initial['unearned_account'] = models.DealerSettings.objects.filter(dealer=dealer).first().bill_unearned_account or None
+        form.initial['cash_account'] = models.DealerSettings.objects.filter(dealer=dealer).first().bill_cash_account or None
+        return form
 
     def form_valid(self, form):
         dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"])
@@ -8281,7 +8286,19 @@ class BillModelCreateView(LoginRequiredMixin, PermissionRequiredMixin,SuccessMes
                 "bill_pk": bill_model.uuid,
             },
         )
-
+    def get_queryset(self):
+        qs = super().get_queryset()
+        return qs.select_related(
+            "ledger",
+            "ledger__entity",
+            "vendor",
+            "cash_account",
+            "prepaid_account",
+            "unearned_account",
+            "cash_account__coa_model",
+            "prepaid_account__coa_model",
+            "unearned_account__coa_model",
+        )
 
 class BillModelDetailView(BillModelDetailViewBase):
     template_name = "bill/bill_detail.html"

templates/support/ticket_list.html

@@ -103,11 +103,6 @@
                                                        href="{% url 'ticket_detail' request.dealer.slug ticket.id %}">
                                                         <i class="fa fa-eye me-2"></i>{% trans "View" %}
                                                     </a>
-                                                    <a class="dropdown-item"
-                                                       href="{% url 'ticket_update'  ticket.id%}">
-                                                        <i class="fa fa-edit me-2"></i>{% trans "Update" %}
-                                                    </a>
-                                                    
                                             </div>
                                             </div>
                                         </td>