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

update

Browse Source
This commit is contained in:
Marwan Alwali 2025-01-15 12:58:23 +03:00
parent 3889fed781
commit 704f0aaed6
9 changed files with 125 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
inventory/__pycache__/services.cpython-311.pyc
View File

Binary file not shown.

BIN
inventory/__pycache__/views.cpython-311.pyc
View File

Binary file not shown.

5
inventory/services.py
View File

@ -36,11 +36,10 @@ def decodevin(vin):
if result:=decode_vin(vin):
return result
elif result:=decode_vin_haikalna(vin):
return result
elif result:=elm(vin):
return result
elif result:=decode_vin_haikalna(vin):
return result
else:
return None

54
inventory/views.py
View File

@ -1814,15 +1814,14 @@ class AccountCreateView(LoginRequiredMixin, SuccessMessageMixin, CreateView):
success_message = "Account created successfully."
def form_valid(self, form):
form.instance.entity_model = self.request.user.dealer.entity
dealer = get_user_type(self.request)
form.instance.entity_model = dealer.entity
form.instance.depth = 0
return super().form_valid(form)
def get_form_kwargs(self):
"""
Override this method to pass additional keyword arguments to the form.
"""
entity = self.request.user.dealer.entity
dealer = get_user_type(self.request)
entity = dealer.entity
kwargs = super().get_form_kwargs()
kwargs["coa_model"] = entity.get_default_coa()
@ -1833,6 +1832,28 @@ class AccountDetailView(LoginRequiredMixin, DetailView):
model = AccountModel
template_name = "ledger/coa_accounts/account_detail.html"
context_object_name = "account"
slug_field = 'uuid'
DEFAULT_TXS_DAYS = 30
extra_context = {
'DEFAULT_TXS_DAYS': DEFAULT_TXS_DAYS,
'header_subtitle_icon': 'ic:round-account-tree'
}
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
account_model: AccountModel = context['object']
context['header_title'] = f'Account {account_model.code} - {account_model.name}'
context['page_title'] = f'Account {account_model.code} - {account_model.name}'
txs_qs = account_model.transactionmodel_set.all().posted().order_by(
'journal_entry__timestamp'
).select_related(
'journal_entry',
'journal_entry__entity_unit',
'journal_entry__ledger__billmodel',
'journal_entry__ledger__invoicemodel',
)
return context
class AccountUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
@ -1862,7 +1883,8 @@ class EstimateListView(LoginRequiredMixin, ListView):
context_object_name = "estimates"
def get_queryset(self):
entity = self.request.user.dealer.entity
dealer = get_user_type(self.request)
entity = dealer.entity
return entity.get_estimates()
@ -2160,7 +2182,7 @@ class DraftInvoiceModelUpdateFormView(LoginRequiredMixin, UpdateView):
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
dealer = get_user_type(self.request.user.dealer)
dealer = get_user_type(self.request)
kwargs["entity_slug"] = dealer.entity
kwargs["user_model"] = dealer.entity.admin
return kwargs
@ -2174,7 +2196,7 @@ class ApprovedInvoiceModelUpdateFormView(LoginRequiredMixin, UpdateView):
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
dealer = get_user_type(self.request.user.dealer)
dealer = get_user_type(self.request)
kwargs["entity_slug"] = dealer.entity
kwargs["user_model"] = dealer.entity.admin
return kwargs
@ -2191,7 +2213,7 @@ class PaidInvoiceModelUpdateFormView(LoginRequiredMixin, UpdateView):
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
dealer = get_user_type(self.request.user.dealer)
dealer = get_user_type(self.request)
kwargs["entity_slug"] = dealer.entity
kwargs["user_model"] = dealer.entity.admin
return kwargs
@ -2240,7 +2262,8 @@ def invoice_mark_as(request, pk):
def invoice_create(request, pk):
estimate = get_object_or_404(EstimateModel, pk=pk)
entity = request.user.dealer.entity
dealer = get_user_type(request)
entity = dealer.entity
form = InvoiceModelCreateForm(entity_slug=entity.slug, user_model=entity.admin)
if request.method == "POST":
@ -2323,7 +2346,8 @@ class InvoicePreviewView(LoginRequiredMixin, DetailView):
def PaymentCreateView(request, pk=None):
invoice = InvoiceModel.objects.filter(pk=pk).first()
entity = request.user.dealer.entity
dealer = get_user_type(request)
entity = dealer.entity
form = forms.PaymentForm()
if request.method == "POST":
form = forms.PaymentForm(request.POST)
@ -2658,14 +2682,14 @@ class ItemExpenseCreateView(CreateView):
success_url = reverse_lazy("item_expense_list")
def get_form_kwargs(self):
dealer = get_user_type(self.request.user.dealer)
dealer = get_user_type(self.request)
kwargs = super().get_form_kwargs()
kwargs["entity_slug"] = dealer.entity.slug
kwargs["user_model"] = dealer.entity.admin
return kwargs
def form_valid(self, form):
dealer = get_user_type(self.request.user.dealer)
dealer = get_user_type(self.request)
form.instance.entity = dealer.entity
return super().form_valid(form)
@ -2677,14 +2701,14 @@ class ItemExpenseUpdateView(UpdateView):
success_url = reverse_lazy("item_expense_list")
def get_form_kwargs(self):
dealer = get_user_type(self.request.user.dealer)
dealer = get_user_type(self.request)
kwargs = super().get_form_kwargs()
kwargs["entity_slug"] = dealer.entity.slug
kwargs["user_model"] = dealer.entity.admin
return kwargs
def form_valid(self, form):
dealer = get_user_type(self.request.user.dealer)
dealer = get_user_type(self.request)
form.instance.entity = dealer.entity
return super().form_valid(form)

2
templates/inventory/car_form.html
View File

@ -346,7 +346,7 @@
}
document.addEventListener("DOMContentLoaded", function () {
const csrfToken = getCookie("token");
const csrfToken = getCookie("csrftoken");
const vinInput = document.getElementById("{{ form.vin.id_for_label }}");
const decodeVinBtn = document.getElementById("decodeVinBtn");

6
templates/inventory/inventory_stats.html
View File

@ -12,9 +12,9 @@
<h1 class="fs-5 pt-3">{{ inventory.total_cars }}</h1>
<p class="fs-9 mb-0">{% trans "Total Cars in Inventory" %}</p>
</div>
<div class="col-6 col-md-4 col-xxl-2 text-center border-translucent border-start-xxl border-end-xxl-0 border-bottom-xxl-0 border-end-md border-bottom pb-4 pb-xxl-0"><span class="uil fs-5 lh-1 uil-envelope-upload text-info"></span>
<h1 class="fs-5 pt-3">1,866</h1>
<p class="fs-9 mb-0">Emails Sent</p>
<div class="col-6 col-md-4 col-xxl-2 text-center border-translucent border-start-xxl border-end-xxl-0 border-bottom-xxl-0 border-end-md border-bottom pb-4 pb-xxl-0"><span class="uil fs-5 lh-1 uil-lock-alt text-info"></span>
<h1 class="fs-5 pt-3">2</h1>
<p class="fs-9 mb-0">{{ _("Reserved")}}</p>
</div>
<div class="col-6 col-md-4 col-xxl-2 text-center border-translucent border-start-xxl border-bottom-xxl-0 border-bottom border-end border-end-md-0 pb-4 pb-xxl-0 pt-4 pt-md-0"><span class="uil fs-5 lh-1 uil-envelopes text-primary"></span>
<h1 class="fs-5 pt-3">1,366</h1>

66
templates/ledger/coa_accounts/account_detail.html
View File

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load i18n %}
{% block title %}{{ _("View Account") }}{% endblock title %}
{% block title %}{{ page_title }}{% endblock title %}
{% block content %}
<!-- Delete Modal -->
@ -40,8 +40,8 @@
<div class="row my-5">
<div class="card rounded ">
<div class="card-header bg-primary text-white ">
<p class="mb-0">{{ _("Bank Account Details") }}</p>
<div class="card-header ">
<p class="mb-0">{{ header_title|upper }}</p>
</div>
<div class="card-body">
<div class="row">
@ -54,6 +54,66 @@
<p><strong>{{ _("Active") }}:</strong> {{ account.active }}</p>
</div>
</div>
<div class="row">
<div class="col">
<table class="table is-fullwidth is-narrow is-striped is-bordered django-ledger-table-bottom-margin-75">
<tr>
<th class="has-text-centered">{{ _("JE Number")}}</th>
<th class="has-text-centered">{{ _("Date") }}</th>
<th class="has-text-centered">{{ _("Debit") }}</th>
<th class="has-text-centered">{{ _("Credit") }}</th>
<th class="has-text-centered">{{ _("Description") }}</th>
<th class="has-text-centered">{{ _("Unit") }}</th>
<th class="has-text-centered">{{ _("Actions") }}</th>
</tr>
{% for tx in transactions %}
<tr class="has-text-centered">
<td>{{ tx.journal_entry.je_number }}</td>
<td>{{ tx.journal_entry.timestamp }}</td>
<td>{% if tx.tx_type == 'debit' %}${{ tx.amount }}{% endif %}</td>
<td>{% if tx.tx_type == 'credit' %}${{ tx.amount }}{% endif %}</td>
<td>{{ tx.description }}</td>
<td>{{ tx.journal_entry.entity_unit.name }}</td>
<td>
<div class="dropdown is-right is-hoverable" id="tx-action-{{ tx.uuid }}">
<div class="dropdown-trigger">
<button class="button is-small is-rounded is-outlined"
aria-haspopup="true"
aria-controls="dropdown-menu">
<span>{% trans 'Actions' %}</span>
<span class="icon is-small fas fa-arrow-down"></span>
</button>
</div>
<div class="dropdown-menu" id="dropdown-menu-{{ tx.uuid }}" role="menu">
<div class="dropdown-content">
{# TODO: These URLs need to be replaced with the future mode method that generates it. #}
<a href="{% url 'django_ledger:je-detail' entity_slug=entity_slug ledger_pk=tx.journal_entry.ledger.uuid je_pk=tx.journal_entry.uuid %}"
class="dropdown-item has-text-success">View JE</a>
{% if tx.journal_entry.ledger.billmodel %}
<a href="{% url 'django_ledger:bill-detail' entity_slug=entity_slug bill_pk=tx.journal_entry.ledger.billmodel.uuid %}"
class="dropdown-item has-text-primary">View Bill</a>
{% elif tx.journal_entry.ledger.invoicemodel %}
<a href="{% url 'django_ledger:invoice-detail' entity_slug=entity_slug invoice_pk=tx.journal_entry.ledger.invoicemodel.uuid %}"
class="dropdown-item has-text-info">View Invoice</a>
{% endif %}
</div>
</div>
</div>
</td>
</tr>
{% endfor %}
<tr class="has-text-weight-bold">
<td></td>
<td class="has-text-right">Total</td>
<td class="has-text-centered">${{ total_credits }}</td>
<td class="has-text-centered">${{ total_debits }}</td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
</div>
</div>
<div class="card-footer d-flex ">
<a class="btn btn-sm btn-primary me-1" href="{% url 'account_update' account.pk %}">

30
templates/ledger/coa_accounts/account_list.html
View File

@ -47,10 +47,10 @@
<thead>
<tr class="bg-body-highlight">
<th class="sort border-top border-translucent ps-3" data-sort="name">{% trans "Account Name" %}</th>
<th class="sort border-top border-translucent" data-sort="code">{% trans "Code" %}</th>
<th class="sort border-top border-translucent text-end pe-3" data-sort="balance_type">{% trans "Balance Type" %}</th>
<th class="sort border-top border-translucent text-end pe-3" data-sort="active">{% trans "Active" %}</th>
<th class="border-top border-translucent ps-3">{% trans "Account Name" %}</th>
<th class="border-top border-translucent">{% trans "Code" %}</th>
<th class="border-top border-translucent text-end pe-3">{% trans "Balance Type" %}</th>
<th class="border-top border-translucent text-end pe-3">{% trans "Active" %}</th>
<th class="border-top border-translucent text-end align-middle pe-0 ps-4" scope="col"></th>
</tr>
@ -78,10 +78,10 @@
{% trans "Are you sure you want to delete this Account?" %}
</p>
<div class="d-grid gap-2">
<button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">
<button type="button" class="btn btn-phoenix-secondary btn-sm" data-bs-dismiss="modal">
{% trans "No" %}
</button>
<a type="button" class="btn btn-danger btn-sm" href="{% url 'account_delete' account.uuid %}">
<a type="button" class="btn btn-phoenix-danger btn-sm" href="{% url 'account_delete' account.uuid %}">
{% trans "Yes" %}
</a>
</div>
@ -91,9 +91,9 @@
</div>
</div>
<tr>
<td class="align-middle ps-3 name">{{ account.name }}</td>
<td class="align-middle code">{{ account.code }}</td>
<td class="align-middle balance_type text-end py-3 pe-3">
<td class="align-middle ps-3">{{ account.name }}</td>
<td class="align-middle">{{ account.code }}</td>
<td class="align-middle text-end py-3 pe-3">
{% if account.balance_type == 'debit' %}
<div class="badge badge-phoenix fs-10 badge-phoenix-success"><span class="fw-bold">{{ _("Debit") }}</span><span class="ms-1 fas fa-arrow-circle-down"></span></div>
@ -101,16 +101,18 @@
<div class="badge badge-phoenix fs-10 badge-phoenix-danger"><span class="fw-bold">{{ _("Credit") }}</span><span class="ms-1 fas fa-arrow-circle-up"></span></div>
{% endif %}
</td>
{% if account.is_active %}
<td class="align-middle active text-end py-3 pe-3"><span class="fw-bold text-success-dark fas fa-check"></span></td>
<td class="align-middle text-end py-3 pe-3">
{% if account.active %}
<span class="fw-bold text-success fas fa-check-circle"></span>
{% else %}
<td class="align-middle active text-end py-3 pe-3"><span class="fw-bold text-danger-dark fas fa-times"></span></td>
<span class="fw-bold text-danger far fa-times-circle"></span>
{% endif %}
</td>
<td>
<div class="btn-reveal-trigger position-static">
<button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
<div class="dropdown-menu dropdown-menu-end py-2"><a href="{% url 'account_update' account.uuid %}" class="dropdown-item text-success-dark">
{% trans "Edit" %}
<div class="dropdown-menu dropdown-menu-end py-2"><a href="{% url 'account_detail' account.uuid %}" class="dropdown-item text-success-dark">
{% trans "View" %}
</a>
<div class="dropdown-divider"></div><button class="dropdown-item text-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">{% trans "Delete" %}</button>
</div>

38
templates/sales/quotation_list.html
View File

@ -55,43 +55,7 @@
</table>
</div>
{% if is_paginated %}
<nav aria-label="Page navigation">
<ul class="pagination mb-0">
{% if page_obj.has_previous %}
<li class="page-item py-0">
<a class="page-link" href="?page={{ page_obj.previous_page_number }}" aria-label="Previous">
<span aria-hidden="true"><span class="fas fa-chevron-left"></span></span>
</a>
</li>
{% else %}
<li class="page-item disabled">
<a class="page-link" href="#" aria-label="Previous">
<span aria-hidden="true"><span class="fas fa-chevron-left"></span></span>
</a>
</li>
{% endif %}
{% for num in page_obj.paginator.page_range %}
{% if page_obj.number == num %}
<li class="page-item active"><a class="page-link" href="?page={{ num }}">{{ num }}</a></li>
{% else %}
<li class="page-item"><a class="page-link" href="?page={{ num }}">{{ num }}</a></li>
{% endif %}
{% endfor %}
{% if page_obj.has_next %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.next_page_number }}" aria-label="Next">
<span aria-hidden="true"><span class="fas fa-chevron-right"></span></span>
</a>
</li>
{% else %}
<li class="page-item disabled">
<a class="page-link" href="#" aria-label="Next">
<span aria-hidden="true"><span class="fas fa-chevron-right"></span></span>
</a>
</li>
{% endif %}
</ul>
</nav>
{% include 'partials/pagination.html' %}
{% endif %}
</div>
{% endblock %}