diff --git a/inventory/__pycache__/apps.cpython-311.pyc b/inventory/__pycache__/apps.cpython-311.pyc index 4fe06dca..352d3144 100644 Binary files a/inventory/__pycache__/apps.cpython-311.pyc and b/inventory/__pycache__/apps.cpython-311.pyc differ diff --git a/inventory/__pycache__/forms.cpython-311.pyc b/inventory/__pycache__/forms.cpython-311.pyc index 5c27f5ba..43d16c6c 100644 Binary files a/inventory/__pycache__/forms.cpython-311.pyc and b/inventory/__pycache__/forms.cpython-311.pyc differ diff --git a/inventory/__pycache__/urls.cpython-311.pyc b/inventory/__pycache__/urls.cpython-311.pyc index 2af2899c..fdd0861b 100644 Binary files a/inventory/__pycache__/urls.cpython-311.pyc and b/inventory/__pycache__/urls.cpython-311.pyc differ diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc index b7129e6d..20176a12 100644 Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ diff --git a/inventory/apps.py b/inventory/apps.py index 9a82aef1..849693ce 100644 --- a/inventory/apps.py +++ b/inventory/apps.py @@ -5,8 +5,7 @@ class InventoryConfig(AppConfig): name = 'inventory' def ready(self): - import inventory.signals - # from decimal import Decimal - # from inventory.models import VatRate - # VatRate.objects.get_or_create(rate=Decimal('0.15'), is_active=True) - + import inventory.signals + from decimal import Decimal + from inventory.models import VatRate + VatRate.objects.get_or_create(rate=Decimal('0.15'), is_active=True) diff --git a/inventory/forms.py b/inventory/forms.py index befa4506..6cd912b5 100644 --- a/inventory/forms.py +++ b/inventory/forms.py @@ -21,7 +21,9 @@ from django_ledger.forms.estimate import ( EstimateModelCreateForm as EstimateModelCreateFormBase, ) +# from django_ledger.forms.ledger import LedgerModelCreateForm as LedgerModelCreateFormBase from django_ledger.forms.bill import BillModelCreateForm as BillModelCreateFormBase +from django_ledger.forms.journal_entry import JournalEntryModelCreateForm as JournalEntryModelCreateFormBase from .models import ( Dealer, @@ -953,3 +955,10 @@ class DealersMakeForm(forms.Form): for car_make in self.cleaned_data["car_makes"]: DealersMake.objects.create(dealer=self.dealer, car_make=car_make) + + +class JournalEntryModelCreateForm(JournalEntryModelCreateFormBase): + pass + +# class LedgerModelCreateForm(LedgerModelCreateFormBase): +# pass \ No newline at end of file diff --git a/inventory/signals.py b/inventory/signals.py index 76094df6..64758555 100644 --- a/inventory/signals.py +++ b/inventory/signals.py @@ -82,11 +82,6 @@ def create_car_location(sender, instance, created, **kwargs): except Exception as e: print(f"Failed to create CarLocation for car {instance.vin}: {e}") -@receiver(post_save, sender=models.Dealer) -def create_dealer_settings(sender, instance, created, **kwargs): - if created: - models.DealerSettings.objects.create(dealer=instance) - # Create Entity @receiver(post_save, sender=models.Dealer) def create_ledger_entity(sender, instance, created, **kwargs): @@ -624,8 +619,7 @@ def create_ledger_entity(sender, instance, created, **kwargs): entity.create_account(coa_model=coa, code="6302", role=roles.EXPENSE_OTHER, name=_("Taxes"), balance_type="debit", active=True) entity.create_account(coa_model=coa, code="6303", role=roles.EXPENSE_OTHER, name=_("Foreign Currency Translation"), balance_type="debit", active=True) entity.create_account(coa_model=coa, code="6304", role=roles.EXPENSE_OTHER, name=_("Interest Expenses"), balance_type="debit", active=True) - - + @receiver(post_save, sender=models.Dealer) def create_dealer_groups(sender, instance, created, **kwargs): @@ -872,6 +866,24 @@ def update_car_status_on_reservation_update(sender, instance, **kwargs): car.status = models.CarStatusChoices.AVAILABLE car.save() +@receiver(post_save, sender=models.Dealer) +def create_dealer_settings(sender, instance, created, **kwargs): + if created: + models.DealerSettings.objects.create( + dealer=instance, + invoice_cash_account=instance.entity.get_all_accounts().filter(role=roles.ASSET_CA_CASH).first(), + invoice_prepaid_account=instance.entity.get_all_accounts().filter(role=roles.ASSET_CA_RECEIVABLES).first(), + invoice_unearned_account=instance.entity.get_all_accounts().filter(role=roles.LIABILITY_CL_DEFERRED_REVENUE).first(), + bill_cash_account=instance.entity.get_all_accounts().filter(role=roles.ASSET_CA_CASH).first(), + bill_prepaid_account=instance.entity.get_all_accounts().filter(role=roles.ASSET_CA_PREPAID).first(), + bill_unearned_account=instance.entity.get_all_accounts().filter(role=roles.LIABILITY_CL_ACC_PAYABLE).first() + ) + +@receiver(post_save, sender=models.Dealer) +def check_if_vat_exists(sender, instance, created, **kwargs): + if created: + models.VatRate.objects.get_create(is_active=True) + # @receiver(post_save, sender=EstimateModel) # def update_estimate_status(sender, instance,created, **kwargs): diff --git a/inventory/templatetags/tenhal_tag.py b/inventory/templatetags/tenhal_tag.py index c410ef04..14e45fa2 100644 --- a/inventory/templatetags/tenhal_tag.py +++ b/inventory/templatetags/tenhal_tag.py @@ -13,6 +13,7 @@ from django import template from django.db.models import Sum from django.urls import reverse from django.utils.formats import number_format +from decimal import Decimal # from django_ledger import __version__ # from django_ledger.forms.app_filters import EntityFilterForm, ActivityFilterForm @@ -27,7 +28,9 @@ from django_ledger.io.io_core import validate_activity, get_localdate register = template.Library() - +@register.filter() +def to_int(value): + return Decimal(value).quantize(Decimal("0.01")) # @register.simple_tag(name='current_version') # def current_version(): # return __version__ diff --git a/inventory/urls.py b/inventory/urls.py index c73cc237..21765357 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -407,6 +407,33 @@ urlpatterns = [ name="representative_delete", ), # Ledger URLS + # Ledger + path( + "ledgers/", views.LedgerModelListView.as_view(), name="ledger_list" + ), + path( + "ledgers//detail//", views.LedgerModelDetailView.as_view(), name="ledger_detail" + ), + # path( + # "ledgers/create/", views.LedgerModelCreateView.as_view(), name="ledger_create" + # ), + path( + "journalentries//list/", views.JournalEntryListView.as_view(), name="journalentry_list" + ), + path( + "journalentries//create/", views.JournalEntryCreateView.as_view(), name="journalentry_create" + ), + path( + "journalentries//delete/", views.JournalEntryDeleteView, name="journalentry_delete" + ), + path( + "journalentries//transactions/", + views.JournalEntryTransactionsView, + name="journalentry_transactions", + ), + path('journalentries///detail//txs/', + views.JournalEntryModelTXSDetailView.as_view(), + name='journalentry_txs'), # Bank Account path( "bank_accounts/", views.BankAccountListView.as_view(), name="bank_account_list" @@ -597,6 +624,7 @@ urlpatterns = [ name="bill_mark_as_paid", ), + # orders path("orders/", views.OrderListView.as_view(), name="order_list_view"), diff --git a/inventory/views.py b/inventory/views.py index 23f4af1c..4f02f134 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -48,12 +48,15 @@ from django.views.generic import ( UpdateView, DeleteView, TemplateView, + ArchiveIndexView, ) ##################################################################### # Django Ledger from django_ledger.io import roles from django_ledger.utils import accruable_net_summary +from django_ledger.views.invoice import InvoiceModelDetailView as InvoiceModelDetailViewBase +from django_ledger.views import LedgerModelListView as LedgerModelListViewBase,JournalEntryModelTXSDetailView as JournalEntryModelTXSDetailViewBase from django_ledger.forms.account import AccountModelCreateForm, AccountModelUpdateForm from django_ledger.views.entity import EntityModelDetailBaseView,EntityModelDetailHandlerView from django_ledger.forms.item import ( @@ -85,6 +88,7 @@ from django_ledger.models import ( CustomerModel, ItemModel, BillModel, + LedgerModel, VendorModel, ) from django_ledger.views.financial_statement import ( @@ -214,7 +218,7 @@ def dealer_signup(request, *args, **kwargs): user.groups.add(group) for perm in Permission.objects.filter(content_type__app_label__in=["inventory","django_ledger"]): group.permissions.add(perm) - + StaffMember.objects.create(user=user) models.Dealer.objects.create( user=user, @@ -2569,6 +2573,8 @@ def invoice_create(request, pk): invoice.save() messages.success(request, "Invoice created successfully!") return redirect("invoice_detail", pk=invoice.pk) + else: + print(form.errors) form = forms.InvoiceModelCreateForm( entity_slug=entity.slug, user_model=entity.admin ) @@ -3993,7 +3999,7 @@ class CarListViewTable(LoginRequiredMixin, ExportMixin, SingleTableView): @login_required def DealerSettingsView(request,pk): - dealer_setting = get_object_or_404(models.DealerSettings, pk=pk) + dealer_setting = get_object_or_404(models.DealerSettings, dealer__pk=pk) dealer = get_user_type(request) if request.method == 'POST': form = forms.DealerSettingsForm(request.POST, instance=dealer_setting) @@ -4038,4 +4044,122 @@ def assign_car_makes(request): existing_car_makes = models.DealersMake.objects.filter(dealer=dealer).values_list("car_make", flat=True) form = forms.DealersMakeForm(initial={"car_makes": existing_car_makes}, dealer=dealer) - return render(request, "dealers/assign_car_makes.html", {"form": form}) \ No newline at end of file + return render(request, "dealers/assign_car_makes.html", {"form": form}) + + +class LedgerModelListView(LoginRequiredMixin, ListView,ArchiveIndexView): + model = LedgerModel + context_object_name = "ledgers" + template_name = "ledger/ledger/ledger_list.html" + date_field = 'created' + ordering = '-created' + show_all = False + show_current = False + show_visible = False + + + def get_queryset(self): + qs = super().get_queryset() + dealer = get_user_type(self.request) + qs = qs.filter(entity=dealer.entity) + qs = qs.select_related('billmodel', 'invoicemodel') + qs = qs.order_by('-created') + if self.show_all: + return qs + if self.show_current: + qs = qs.current() + if self.show_visible: + qs = qs.visible() + return qs + +class LedgerModelDetailView(InvoiceModelDetailViewBase): + 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() +# 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() + form = forms.JournalEntryModelCreateForm( + entity_model=dealer.entity, + ledger_model=ledger, + **self.get_form_kwargs() + ) + form.fields.pop('entity_unit') + return form + def get_context_data(self, **kwargs): + 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) + ledger = journal_entry.ledger + journal_entry.delete() + messages.success(request, 'Journal Entry deleted') + return redirect("journalentry_list", pk=ledger.pk) + +def JournalEntryTransactionsView(request, pk): + journal = JournalEntryModel.objects.filter(pk=pk).first() + transactions = ( + TransactionModel.objects.filter(journal_entry=journal) + .order_by("account__code") + .all() + ) + return render( + request, + "ledger/journal_entry/journal_entry_transactions.html", + {"journal_entry": journal, "transactions": transactions}, + ) + + +class JournalEntryModelTXSDetailView(JournalEntryModelTXSDetailViewBase): + template_name = 'ledger/journal_entry/journal_entry_txs.html' \ No newline at end of file diff --git a/templates/header.html b/templates/header.html index 2c65bcbd..05cd65b0 100644 --- a/templates/header.html +++ b/templates/header.html @@ -249,6 +249,14 @@ {% endif %} {% if perms.django_ledger.view_itemmodel %} +
  • + +
    + {% trans "Ledgers"|capfirst %} +
    +     +
    • + {% endif %}
  • @@ -256,7 +264,6 @@
    • - {% endif %} {% if perms.django_ledger.view_itemmodel %}
  • @@ -452,7 +459,6 @@
    -
    {% if user.dealer.logo %} diff --git a/templates/ledger/bills/bill_list.html b/templates/ledger/bills/bill_list.html index dade723d..8fde0dff 100644 --- a/templates/ledger/bills/bill_list.html +++ b/templates/ledger/bills/bill_list.html @@ -11,7 +11,7 @@ {% endblock %} {% block content %}
    -
    +
    diff --git a/templates/ledger/journal_entry/includes/card_invoice.html b/templates/ledger/journal_entry/includes/card_invoice.html new file mode 100644 index 00000000..028e7da0 --- /dev/null +++ b/templates/ledger/journal_entry/includes/card_invoice.html @@ -0,0 +1,149 @@ +{% load django_ledger %} +{% load i18n %} + +{% if not create_invoice %} + {% if style == 'dashboard' %} +
    +
    +

    + {% icon "bi:cash-stack" 16 %} + {% trans 'Invoice' %} +

    +

    {{ invoice.customer.customer_name }}

    +

    {{ invoice.customer.address_1 }}

    + {% if not invoice.is_past_due %} +

    {% trans 'Due in' %}: {{ invoice.date_due | timeuntil }}

    + {% else %} +

    Past Due: {{ invoice.date_due | timesince }} ago

    + {% endif %} + {% if invoice.accrue %} +

    Accrue: {% icon 'ant-design:check-circle-filled' 24 %}

    + {% else %} +

    Accrue: {% icon 'maki:roadblock-11' 24 %}

    + {% endif %} +

    Owed to You: {% currency_symbol %}{{ invoice.get_amount_open | currency_format }}

    +

    Amount Paid: {% currency_symbol %}{{ invoice.amount_paid | currency_format }}

    +

    Progressed: {{ invoice.get_progress | percentage }}

    +
    +
    {{ invoice.get_progress | percentage }}
    +
    + {% modal_action invoice 'get' entity_slug %} +
    +
    + {% trans 'View' %} + {% trans 'Update' %} + {% if not invoice.is_paid %} + {% trans 'Mark as Paid' %} + {% endif %} +
    +
    + {% elif style == 'invoice-detail' %} +
    +
    +

    + {% icon 'uil:bill' 36 %} + {% trans 'Invoice Info' %} +

    +
    +
    + {% if invoice.is_draft %} +

    {% trans 'This invoice is' %} {{ invoice.get_invoice_status_display }}

    +

    {% trans 'Amount Due' %}: {% currency_symbol %}{{ invoice.amount_due | currency_format }}

    +

    {% trans 'Due Date' %}: {{ invoice.date_due | timeuntil }}

    +

    {% trans 'Is Accrued' %}: + {% if invoice.accrue %} + {% icon 'ant-design:check-circle-filled' 24 %} + {% else %} + {% icon 'maki:roadblock-11' 24 %} + {% endif %} +

    + {% elif invoice.is_review %} +

    {% trans 'This invoice is' %} {{ invoice.get_invoice_status_display }}

    +

    {% trans 'Amount Due' %}: {% currency_symbol %}{{ invoice.amount_due | currency_format }}

    +

    {% trans 'Due Date' %}: {{ invoice.date_due | timeuntil }}

    +

    {% trans 'Is Accrued' %}: + {% if invoice.accrue %} + {% icon 'ant-design:check-circle-filled' 24 %} + {% else %} + {% icon 'maki:roadblock-11' 24 %} + {% endif %} +

    + {% if invoice.xref %} +

    {% trans 'External Ref' %}: {{ invoice.xref }}

    + {% endif %} + {% elif invoice.is_approved %} +

    {% trans 'This invoice is' %} {{ invoice.get_invoice_status_display }}

    +

    {% trans 'Amount Due' %}: {% currency_symbol %}{{ invoice.amount_due | currency_format }}

    +

    {% trans 'Due Date' %}: {{ invoice.date_due | timeuntil }}

    +

    {% trans 'Is Accrued' %}: + {% if invoice.accrue %} + {% icon 'ant-design:check-circle-filled' 24 %} + {% else %} + {% icon 'maki:roadblock-11' 24 %} + {% endif %} +

    +

    {% trans 'Amount Paid' %}: {% currency_symbol %}{{ invoice.amount_paid | currency_format }}

    +

    {% trans 'Progressed' %}: {{ invoice.get_progress | percentage }}

    +
    +
    {{ invoice.get_progress | percentage }}
    +
    + {% elif invoice.is_paid %} +

    {% trans 'This invoice is' %} {{ invoice.get_invoice_status_display }}

    +

    {% trans 'Amount Paid' %}: {% currency_symbol %}{{ invoice.amount_paid | currency_format }}

    +

    {% trans 'Paid Date' %}: {{ invoice.date_paid | date }}

    + {% else %} +

    Invoice Amount: {% currency_symbol %}{{ invoice.amount_due | currency_format }}

    +

    {{ invoice.get_invoice_status_display | upper }}

    + {% endif %} +
    +
    + + + {# MARK DRAFT #} + {% if invoice.can_draft %} + {% trans 'Mark as Draft' %} + {% modal_action_v2 invoice invoice.get_mark_as_draft_url invoice.get_mark_as_draft_message invoice.get_mark_as_draft_html_id %} + {% endif %} + + {# MARK REVIEW #} + {% if invoice.can_review %} + {% trans 'Mark as Review' %} + {% modal_action_v2 invoice invoice.get_mark_as_review_url invoice.get_mark_as_review_message invoice.get_mark_as_review_html_id %} + {% endif %} + + {# MARK APPROVED #} + {% if invoice.can_approve %} + {% trans 'Approve' %} + {% modal_action_v2 invoice invoice.get_mark_as_approved_url invoice.get_mark_as_approved_message invoice.get_mark_as_approved_html_id %} + {% endif %} + + {# MARK PAID #} + {% if invoice.can_pay %} + {% trans 'Mark as Paid' %} + {% modal_action_v2 invoice invoice.get_mark_as_paid_url invoice.get_mark_as_paid_message invoice.get_mark_as_paid_html_id %} + {% endif %} + + {# MARK VOID #} + {% if invoice.can_void %} + {% trans 'Void' %} + {% modal_action_v2 invoice invoice.get_mark_as_void_url invoice.get_mark_as_void_message invoice.get_mark_as_void_html_id %} + {% endif %} + + {# MARK CANCELED #} + {% if invoice.can_cancel %} + {% trans 'Cancel' %} + {% modal_action_v2 invoice invoice.get_mark_as_canceled_url invoice.get_mark_as_canceled_message invoice.get_mark_as_canceled_html_id %} + {% endif %} +
    +
    + {% endif %} +{% else %} +
    +
    + + {% icon "ic:baseline-add-circle-outline" 48 %} + +

    {% trans 'New Invoice' %}

    +
    +
    +{% endif %} \ No newline at end of file diff --git a/templates/ledger/journal_entry/includes/card_journal_entry.html b/templates/ledger/journal_entry/includes/card_journal_entry.html new file mode 100644 index 00000000..227d882c --- /dev/null +++ b/templates/ledger/journal_entry/includes/card_journal_entry.html @@ -0,0 +1,58 @@ +{% load django_ledger %} +{% load i18n %} + +
    +
    +

    {% trans 'Journal Entry Detail' %}

    +
    +
    +

    {{ journal_entry.je_number }}

    + + {% if journal_entry.entity_unit %} +

    {{ journal_entry.entity_unit.name }}

    + {% endif %} + +

    {% trans 'Date' %}: {{ journal_entry.timestamp | date }}

    + +

    {% trans 'Posted' %}: + {% if journal_entry.is_posted %} + {% icon 'ant-design:check-circle-filled' 24 %} + {% else %} + {% icon 'maki:roadblock-11' 24 %} + {% endif %} +

    +

    {% trans 'Locked' %}: + {% if journal_entry.is_locked %} + {% icon 'ant-design:check-circle-filled' 24 %} + {% else %} + {% icon 'maki:roadblock-11' 24 %} + {% endif %} +

    + {% if journal_entry.activity %} +

    {% trans 'Activity' %}: {{ journal_entry.get_activity_display }}

    + {% endif %} + {% if journal_entry.description %} +

    {{ journal_entry.description }}

    + {% endif %} +
    +
    +
    + {% if journal_entry.can_lock %} + {% trans 'Lock' %} + {% endif %} + {% if journal_entry.can_unlock %} + {% trans 'UnLock' %} + {% endif %} + {% if journal_entry.can_post %} + {% trans 'Post' %} + {% endif %} + {% if journal_entry.can_unpost %} + {% trans 'UnPost' %} + {% endif %} +
    +
    +
    \ No newline at end of file diff --git a/templates/ledger/journal_entry/journal_entry_form.html b/templates/ledger/journal_entry/journal_entry_form.html new file mode 100644 index 00000000..db46f826 --- /dev/null +++ b/templates/ledger/journal_entry/journal_entry_form.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% load crispy_forms_filters %} +{% load i18n static %} + +{% block title %}{{ _("Create Journal Entry") }}{% endblock title %} + +{% block content %} +
    +

    {% trans "Create Journal Entry" %}

    +
    + {% csrf_token %} +
    + {{ form|crispy }} +
    +
    + + {% trans "Cancel" %} +
    +
    +
    +{% endblock content %} \ No newline at end of file diff --git a/templates/ledger/journal_entry/journal_entry_list.html b/templates/ledger/journal_entry/journal_entry_list.html new file mode 100644 index 00000000..56923be5 --- /dev/null +++ b/templates/ledger/journal_entry/journal_entry_list.html @@ -0,0 +1,119 @@ +{% extends "base.html" %} +{% load i18n static %} + +{% block title %}{{ _("Journal Entries") }}{% endblock title %} + +{% block content %} + + +
    +
    + +

    {% trans "Journal Entries" %}

    + {% trans "Add Journal Entry" %} +
    + +
    + + + + + + + + + + + + + + + {% for je in journal_entries %} + + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    {% trans "Document Number" %}{% trans "Timestamp" %}{% trans "Activity" %}{% trans "Description" %}{% trans "Posted" %}{% trans "Locked" %}{% trans "Transaction Count" %}{% trans "Action" %}
    {{ je.je_number }}{{ je.timestamp }} + {% if je.get_activity_display %} + {{ je.get_activity_display }} + {% endif %} + {{ je.description }} + {% if je.is_posted %} + + {% else %} + + {% endif %} + + {% if je.is_locked %} + + {% else %} + + {% endif %} + + {{ je.txs_count }} + +
    + +
    + {% trans "View" %} + {% trans "Edit" %} + +
    + {% trans "Delete" %} + {% trans "View" %} + {% trans "Transactions" %} +
    +
    +
    {% trans "No Bank Accounts Found" %}
    +
    +
    +
    + +
    +{% endblock %} \ No newline at end of file diff --git a/templates/ledger/journal_entry/journal_entry_transactions.html b/templates/ledger/journal_entry/journal_entry_transactions.html new file mode 100644 index 00000000..284eb793 --- /dev/null +++ b/templates/ledger/journal_entry/journal_entry_transactions.html @@ -0,0 +1,49 @@ +{% extends "base.html" %} +{% load i18n static %} + +{% block title %}{{ _("Transactions") }}{% endblock title %} + +{% block content %} +
    +
    + {% include 'ledger/journal_entry/includes/card_journal_entry.html' with journal_entry=journal_entry %} +
    +

    {% trans "Transactions" %}

    + +
    + + + + + + + + + + + + + {% for transaction in transactions %} + + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    {% trans "#" %}{% trans "Timestamp" %}{% trans "Account Name" %}{% trans "Account Code" %}{% trans "Debit" %}{% trans "Credit" %}{% trans "Description" %}
    {{ forloop.counter }}{{ transaction.created|date}}{{ transaction.account.name }}{{ transaction.account.code }}{% if transaction.tx_type == "debit" %} {{ transaction.amount }}{{ CURRENCY }}{% endif %}{% if transaction.tx_type == "credit" %} {{ transaction.amount }}{{ CURRENCY }}{% endif %}{{ transaction.description }}
    {% trans "No Transactions Found" %}
    +
    +
    +
    + +
    +{% endblock %} \ No newline at end of file diff --git a/templates/ledger/journal_entry/journal_entry_txs.html b/templates/ledger/journal_entry/journal_entry_txs.html new file mode 100644 index 00000000..f9cd4ef6 --- /dev/null +++ b/templates/ledger/journal_entry/journal_entry_txs.html @@ -0,0 +1,99 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} +{% load crispy_forms_tags %} + +{% block content %} +
    +
    + {% include 'ledger/journal_entry/includes/card_journal_entry.html' with journal_entry=journal_entry %} +
    +
    +
    +
    +
    + {% csrf_token %} +
    +
    + {% if txs_formset.non_form_errors %} + + {% endif %} + {{ txs_formset.management_form|crispy }} +
    +
    + + + + + + + + {% if txs_formset.can_delete %} + + {% endif %} + + + + {% for f in txs_formset %} + + + + + + + + {% endfor %} + +
    AccountTX TypeAmountDescriptionDelete
    + {% for hidden_field in f.hidden_fields %} + {{ hidden_field }} + {% endfor %} + {{ f.account|as_crispy_field }} + {{ f.tx_type|as_crispy_field }}{{ f.amount|as_crispy_field }}{{ f.description|as_crispy_field }} + {% if txs_formset.can_delete %} + {{ f.DELETE|as_crispy_field }} + {% endif %} +
    +
    +
    + + + {% trans 'Done' %} + + {% if journal_entry.can_lock %} + + {% trans 'Lock' %} + + {% endif %} + {% if journal_entry.can_unlock %} + + {% trans 'UnLock' %} + + {% endif %} + {% if journal_entry.can_post %} + + {% trans 'Post' %} + + {% endif %} + {% if journal_entry.can_unpost %} + + {% trans 'UnPost' %} + + {% endif %} +
    +
    +
    +
    +
    +
    +
    +{% endblock %} \ No newline at end of file diff --git a/templates/ledger/ledger/ledger_detail.html b/templates/ledger/ledger/ledger_detail.html new file mode 100644 index 00000000..ebe847df --- /dev/null +++ b/templates/ledger/ledger/ledger_detail.html @@ -0,0 +1,155 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load static %} +{% load django_ledger %} + +{% block content %} +
    +
    +
    + {{invoice}} +
    + {% include 'ledger/journal_entry/includes/card_invoice.html' with invoice=invoice entity_slug=view.kwargs.entity_slug style='invoice-detail' %} +
    +
    +
    +
    + + {% trans 'Invoice List' %} + +
    +
    +
    +
    +
    +
    +
    +
    +

    {% trans 'Cash Account' %}: + {{ invoice.cash_account.code }} +

    +

    + {% currency_symbol %}{{ invoice.get_amount_cash | absolute | currency_format }}

    +
    + + {% if invoice.accrue %} +
    +

    {% trans 'Accounts Receivable' %}: + {{ invoice.prepaid_account.code }} +

    +

    + {% currency_symbol %}{{ invoice.get_amount_prepaid | currency_format }}

    +
    +
    +

    {% trans 'Deferred Revenue' %}: + {{ invoice.unearned_account.code }} +

    +

    + {% currency_symbol %}{{ invoice.get_amount_unearned | currency_format }}

    +
    +
    +

    Accrued {{ invoice.get_progress_percent }}%

    +

    + {% currency_symbol %}{{ invoice.get_amount_earned | currency_format }}

    +
    + {% else %} +
    +

    You Are Owed

    +

    + {% currency_symbol %}{{ invoice.get_amount_open | currency_format }}

    +
    + {% endif %} +
    +
    +
    +
    +
    +

    + {% icon 'grommet-icons:transaction' 36 %} + {% trans 'Invoice Items' %} +

    +
    +
    +
    + + + + + + + + + + + + {% for invoice_item in itemtxs_qs %} + + + + + + + {% endfor %} + + + + + + + +
    {% trans 'Item' %}{% trans 'Unit Cost' %}{% trans 'Quantity' %}{% trans 'Total' %}
    {{ invoice_item.item_model }}{% currency_symbol %}{{ invoice_item.unit_cost | currency_format }}{{ invoice_item.quantity }} + {% currency_symbol %}{{ invoice_item.total_amount | currency_format }}
    {% trans 'Total' %} + {% currency_symbol %}{{ total_amount_due | currency_format }} +
    +
    +
    +
    +
    + {% if invoice.is_active %} +
    +
    + {% trans 'Balance Sheet' %} + {% trans 'Income Statement' %} + {% trans 'Cash Flow Statement' %} +
    +
    +
    + + {% trans 'Balance Sheet PDF' %}{% icon 'bytesize:download' 24 %} + + {% trans 'Income Statement PDF' %}{% icon 'bytesize:download' 24 %} + + {% trans 'Cash Flow Statement PDF' %}{% icon 'bytesize:download' 24 %} +
    +
    +
    + {% endif %} +
    +
    +
    +

    + {% icon 'grommet-icons:transaction' 36 %} + {% trans 'Invoice Transactions' %} +

    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +{% endblock %} \ No newline at end of file diff --git a/templates/ledger/ledger/ledger_form.html b/templates/ledger/ledger/ledger_form.html new file mode 100644 index 00000000..86d40ae7 --- /dev/null +++ b/templates/ledger/ledger/ledger_form.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% load crispy_forms_filters %} +{% load i18n static %} + +{% block title %}{{ _("Create Ledger") }}{% endblock title %} + +{% block content %} +
    +

    {% trans "Create Ledger" %}

    +
    + {% csrf_token %} +
    + {{ form|crispy }} +
    +
    + + {% trans "Cancel" %} +
    +
    +
    +{% endblock content %} \ No newline at end of file diff --git a/templates/ledger/ledger/ledger_list.html b/templates/ledger/ledger/ledger_list.html new file mode 100644 index 00000000..cd715f5b --- /dev/null +++ b/templates/ledger/ledger/ledger_list.html @@ -0,0 +1,71 @@ +{% extends "base.html" %} +{% load i18n static %} + +{% block title %}{{ _("Ledger") }}{% endblock title %} + +{% block content %} +
    +
    +

    {% trans "Ledger" %}

    +
    + +
    + + + + + + + + + + + + + {% for ledger in ledgers %} + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    {% trans "Ledger Name" %}{% trans "Journal Entries" %}{% trans "Earliest Date" %}{% trans "Posted" %}{% trans "Locked" %}{% trans "Action" %}
    + {{ ledger.get_wrapped_model_instance }} + + + + + {{ ledger.journal_entries__count }} + {{ _('Journal Entries') }} + + + + {% if ledger.earliest_timestamp %}{{ ledger.earliest_timestamp | date }}{% endif %} + + {% if ledger.is_posted %} + + {% else %} + + {% endif %} + + {% if ledger.is_locked %} + + {% else %} + + {% endif %} +
    {% trans "No Bank Accounts Found" %}
    +
    +
    +
    + +
    +{% endblock %} \ No newline at end of file diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html index 9f3fd32c..cccc682c 100644 --- a/templates/sales/estimates/estimate_detail.html +++ b/templates/sales/estimates/estimate_detail.html @@ -4,6 +4,23 @@ {% block title %}{{ _("View Quotation") }}{% endblock title %} {% block content %} + +
    diff --git a/templates/sales/invoices/invoice_detail.html b/templates/sales/invoices/invoice_detail.html index e896c30c..31f0a1bb 100644 --- a/templates/sales/invoices/invoice_detail.html +++ b/templates/sales/invoices/invoice_detail.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load i18n %} +{% load tenhal_tag %} {% block title %}{{ _("View Estimate") }}{% endblock title %} {% block customCSS %} @@ -24,7 +25,7 @@ +
    {% csrf_token %} @@ -88,11 +89,12 @@ {% trans 'Record Payment' %} {% endif %} {% if not invoice.is_paid %} - + {% endif %} {% trans 'Preview' %} -
    +
    + {{invoice.amount_owned}}
    diff --git a/templates/sales/orders/purchase_order.html b/templates/sales/orders/purchase_order.html new file mode 100644 index 00000000..a7353cbc --- /dev/null +++ b/templates/sales/orders/purchase_order.html @@ -0,0 +1,120 @@ +{% block customCSS %} + +{% endblock %} +
    +
    + +
    +
    +
    +
    +
    +
    +

    {{ _('Purchase Order') }}

    +
    +
    +
    +
    + {{ estimate.customer.customer_name }}
    + Order ID #{{ estimate.sale_orders.first.formatted_order_id }}
    + {{ estimate.sale_orders.first.created|date }} +
    + + + + + + + + + + {% for item in data.cars %} + + + + + {% endfor %} + + + + {% for service in data.additionals %} + + + + + {% endfor %} + +
    ItemPrice
    {{ item.make }}{{ item.unit_price }}
    Additionals :
    {{ service.name }}{{ service.price_ }}
    +
    +
    +
    + + + + + + + + + + + + + +
    Total
    {{ data.grand_total }}
    +
    +
    +
    +
    +

    {{ _('Signature') }}:

    +
    +
    +
    +
    +
    + +{% block customJS %} + +{% endblock %}