update
This commit is contained in:
parent
2752026692
commit
b0c234b59a
Binary file not shown.
@ -207,7 +207,7 @@ def dealer_signup(request, *args, **kwargs):
|
||||
address = wf3.get("address")
|
||||
|
||||
if password != password_confirm:
|
||||
return JsonResponse({"error": _("Passwords do not match")}, status=400)
|
||||
return JsonResponse({"error": "Passwords do not match."}, status=400)
|
||||
|
||||
try:
|
||||
with transaction.atomic():
|
||||
@ -2946,7 +2946,7 @@ def delete_note(request, pk):
|
||||
note = get_object_or_404(models.Notes, pk=pk, created_by=request.user)
|
||||
lead_pk = note.content_object.pk
|
||||
note.delete()
|
||||
messages.success(request, _("Note deleted successfully"))
|
||||
messages.success(request, _("Note deleted successfully."))
|
||||
return redirect("lead_detail", pk=lead_pk)
|
||||
|
||||
|
||||
@ -4071,7 +4071,7 @@ class LedgerModelListView(LoginRequiredMixin, ListView,ArchiveIndexView):
|
||||
show_current = False
|
||||
show_visible = False
|
||||
|
||||
|
||||
|
||||
def get_queryset(self):
|
||||
qs = super().get_queryset()
|
||||
dealer = get_user_type(self.request)
|
||||
@ -4091,51 +4091,51 @@ class LedgerModelDetailView(LoginRequiredMixin, DetailView):
|
||||
model = LedgerModel
|
||||
context_object_name = "ledger"
|
||||
template_name = "ledger/ledger/ledger_detail.html"
|
||||
|
||||
|
||||
|
||||
# class LedgerModelCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView):
|
||||
# model = LedgerModel
|
||||
# template_name = "ledger/ledger/ledger_form.html"
|
||||
# form_class = forms.LedgerModelCreateForm
|
||||
# success_message = "Ledger created"
|
||||
|
||||
|
||||
# def get_form(self, form_class=None):
|
||||
# dealer = get_user_type(self.request)
|
||||
# form = forms.LedgerModelCreateForm(entity_slug=dealer.entity.slug,user_model=dealer.entity.admin,**self.get_form_kwargs())
|
||||
# return form
|
||||
# def get_success_url(self):
|
||||
# return reverse('ledger_list')
|
||||
|
||||
|
||||
# def form_valid(self, form):
|
||||
# instance = form.save(commit=False)
|
||||
# dealer = get_user_type(self.request)
|
||||
# instance.entity = dealer.entity
|
||||
# instance.save()
|
||||
# instance.save()
|
||||
# return super().form_valid(form)
|
||||
|
||||
class JournalEntryListView(LoginRequiredMixin, ListView):
|
||||
model = JournalEntryModel
|
||||
context_object_name = "journal_entries"
|
||||
template_name = "ledger/journal_entry/journal_entry_list.html"
|
||||
|
||||
|
||||
def get_queryset(self):
|
||||
qs = super().get_queryset()
|
||||
ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
|
||||
qs = qs.filter(ledger=ledger)
|
||||
return qs
|
||||
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['ledger'] = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
|
||||
return context
|
||||
|
||||
|
||||
class JournalEntryCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView):
|
||||
model = JournalEntryModel
|
||||
template_name = "ledger/journal_entry/journal_entry_form.html"
|
||||
form_class = forms.JournalEntryModelCreateForm
|
||||
ledger_model = None
|
||||
success_message = _("Journal Entry created")
|
||||
|
||||
|
||||
def get_form(self, form_class=None):
|
||||
dealer = get_user_type(self.request)
|
||||
ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
|
||||
@ -4150,11 +4150,11 @@ class JournalEntryCreateView(LoginRequiredMixin,SuccessMessageMixin, CreateView)
|
||||
context = super().get_context_data(**kwargs)
|
||||
context["ledger"] = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
|
||||
return context
|
||||
|
||||
|
||||
def get_success_url(self):
|
||||
ledger = LedgerModel.objects.filter(pk=self.kwargs['pk']).first()
|
||||
return reverse("journalentry_list", kwargs={"pk": ledger.pk})
|
||||
|
||||
|
||||
|
||||
def JournalEntryDeleteView(request,pk):
|
||||
journal_entry = get_object_or_404(JournalEntryModel, pk=pk)
|
||||
@ -4182,7 +4182,7 @@ def JournalEntryTransactionsView(request, pk):
|
||||
|
||||
class JournalEntryModelTXSDetailView(JournalEntryModelTXSDetailViewBase):
|
||||
template_name = 'ledger/journal_entry/journal_entry_txs.html'
|
||||
|
||||
|
||||
|
||||
def ledger_lock_all_journals(request,entity_slug,pk):
|
||||
ledger = LedgerModel.objects.filter(pk=pk).first()
|
||||
@ -4199,7 +4199,7 @@ def ledger_unlock_all_journals(request,entity_slug,pk):
|
||||
if not ledger.is_locked():
|
||||
messages.error(request, _("Ledger is already Unlocked"))
|
||||
return redirect("journalentry_list", pk=ledger.pk)
|
||||
|
||||
|
||||
ledger.unlock()
|
||||
ledger.save()
|
||||
qs = ledger.journal_entries.locked()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user