ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

update the default bill account settings

Browse Source
This commit is contained in:
ismail 2025-09-18 16:31:20 +03:00
parent 7c794a6390
commit a09ef86248
1 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
inventory/views.py
View File

@ -4218,7 +4218,7 @@ class BankAccountCreateView(
def get_form(self, form_class=None): def get_form(self, form_class=None):
dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"]) dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"])
form = super().get_form(form_class) 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=[ role__in=[
roles.ASSET_CA_CASH, roles.ASSET_CA_CASH,
roles.LIABILITY_CL_ACC_PAYABLE, roles.LIABILITY_CL_ACC_PAYABLE,
@ -8177,8 +8177,13 @@ class BillModelCreateView(LoginRequiredMixin, PermissionRequiredMixin,SuccessMes
return {"date_draft": get_localdate()} return {"date_draft": get_localdate()}
def get_form(self, form_class=None): 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"]) 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): def form_valid(self, form):
dealer = get_object_or_404(models.Dealer, slug=self.kwargs["dealer_slug"]) 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, "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): class BillModelDetailView(BillModelDetailViewBase):
template_name = "bill/bill_detail.html" template_name = "bill/bill_detail.html"