From e9d6a5da27883199add97fa08c2752832f96f927 Mon Sep 17 00:00:00 2001 From: Faheedkhan Date: Wed, 21 May 2025 19:24:14 +0300 Subject: [PATCH] add ui changes to the tables in the financials --- templates/items/expenses/expenses_list.html | 35 ++- templates/items/service/service_list.html | 34 ++- .../bank_accounts/bank_account_list.html | 9 +- templates/ledger/bills/bill_list.html | 215 ++++++++---------- .../ledger/coa_accounts/account_detail.html | 126 ++++++---- .../ledger/coa_accounts/account_list.html | 4 +- .../journal_entry/journal_entry_list.html | 41 ++-- .../journal_entry_transactions.html | 4 +- templates/ledger/ledger/ledger_list.html | 32 ++- templates/vendors/vendors_list.html | 16 +- 10 files changed, 305 insertions(+), 211 deletions(-) diff --git a/templates/items/expenses/expenses_list.html b/templates/items/expenses/expenses_list.html index 60696c4b..00a5f724 100644 --- a/templates/items/expenses/expenses_list.html +++ b/templates/items/expenses/expenses_list.html @@ -12,6 +12,28 @@ {% trans "Add Expense" %} +
+
+
+ + + {% if request.GET.q %} + + + + {% endif %} +
+
+
+ + {% if page_obj.object_list %}
@@ -61,8 +83,19 @@
-
+ +
{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} {{ _("Items of")}} {{ page_obj.paginator.count }} +
+ + {% if is_paginated %} + {% include 'partials/pagination.html' %} + {% endif %} + +
+ + + {% endif %} diff --git a/templates/items/service/service_list.html b/templates/items/service/service_list.html index 346febf8..5c2b0f30 100644 --- a/templates/items/service/service_list.html +++ b/templates/items/service/service_list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n static %} -{% block title %}{{ _("Expenses") }}{% endblock title %} +{% block title %}{{ _("Services") }}{% endblock title %} {% block content %} @@ -12,6 +12,28 @@ {% trans "Add Service" %}
+
+
+
+ + + {% if request.GET.q %} + + + + {% endif %} +
+
+
+ + {% if page_obj.object_list %}
@@ -67,7 +89,15 @@
-
+ +
{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} {{ _("Items of")}} {{ page_obj.paginator.count }} +
+ + {% if is_paginated %} + {% include 'partials/pagination.html' %} + {% endif %} + +
{% endif %} diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html index 3ff56911..7b32195a 100644 --- a/templates/ledger/bank_accounts/bank_account_list.html +++ b/templates/ledger/bank_accounts/bank_account_list.html @@ -76,7 +76,14 @@
-
+
{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} {{ _("Items of")}} {{ page_obj.paginator.count }} +
+ + {% if is_paginated %} + {% include 'partials/pagination.html' %} + {% endif %} + +
{% endif %} diff --git a/templates/ledger/bills/bill_list.html b/templates/ledger/bills/bill_list.html index 6299e12f..72da3311 100644 --- a/templates/ledger/bills/bill_list.html +++ b/templates/ledger/bills/bill_list.html @@ -10,129 +10,102 @@ {% endblock %} {% block content %} -
-
- - - {% trans 'New Bill' %} -
-
-
- -
-
-
-
+ +
+
+

{% trans "Bills" %}

+ {% trans 'New Bill' %} +
+ + + +
+
- - - {% if request.GET.q %} - - {% endif %} -
- -
-
-
- - -
-
- - - - - - - - - - - {% for bill in bills %} - - - - - - - {% empty %} - - - - {% endfor %} - -
- {% trans 'Bill Number' %} - - {% trans 'Bill Status' %} - - {% trans 'Vendor' %} - Action
{{ bill.bill_number }} - {% if bill.is_draft %} - - {% elif bill.is_review %} - - {% elif bill.is_approved %} - - {% elif bill.is_paid %} - - {% endif %} - {{ bill.bill_status }} - - - {{bill.vendor.vendor_name}} - -
- -
- {% trans 'View' %} -
-
-
- {% trans 'No bill found.' %} -
-
- -
- {{ page_obj.start_index }} {{ _('to') }} {{ page_obj.end_index }}{{ _('Items of') }}{{ page_obj.paginator.count }} -
- -
-
+
+
-
+ + + + +
+ + + + + + + + + + + + {% for bill in bills %} + + + + + + + {% empty %} + + + + {% endfor %} + +
{% trans 'Bill Number' %}{% trans 'Bill Status' %}{% trans 'Vendor' %}{% trans 'Action'%}
+ {{ bill.bill_number }} + + {% if bill.is_draft %} + + {% elif bill.is_review %} + + {% elif bill.is_approved %} + + {% elif bill.is_paid %} + + {% endif %} + {{ bill.bill_status }} + + + {{bill.vendor.vendor_name}} + +
+ +
+ {% trans 'View' %} +
+
+ +
+ {% trans 'No bill found.' %} +
+
+
{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} {{ _("Items of")}} {{ page_obj.paginator.count }} +
+ + {% if is_paginated %} + {% include 'partials/pagination.html' %} + {% endif %} + +
+
+
-
+ {% endblock %} diff --git a/templates/ledger/coa_accounts/account_detail.html b/templates/ledger/coa_accounts/account_detail.html index fc051955..f92aebf3 100644 --- a/templates/ledger/coa_accounts/account_detail.html +++ b/templates/ledger/coa_accounts/account_detail.html @@ -6,7 +6,7 @@ {% endblock %} {% block content %} - + + + +
+
@@ -122,6 +146,8 @@ {% trans 'Back to List' %}
+ + {% endblock %} diff --git a/templates/ledger/coa_accounts/account_list.html b/templates/ledger/coa_accounts/account_list.html index 380bba3e..2dd35aab 100644 --- a/templates/ledger/coa_accounts/account_list.html +++ b/templates/ledger/coa_accounts/account_list.html @@ -145,4 +145,6 @@ -{% endblock %} \ No newline at end of file +{% endblock %} + + diff --git a/templates/ledger/journal_entry/journal_entry_list.html b/templates/ledger/journal_entry/journal_entry_list.html index 2ac4b75c..12159875 100644 --- a/templates/ledger/journal_entry/journal_entry_list.html +++ b/templates/ledger/journal_entry/journal_entry_list.html @@ -31,33 +31,20 @@ +
-
-

{% trans "Journal Entries" %}

-
- {% comment %} {% if ledger.is_posted %} - {% if ledger.is_locked %} - {% trans 'UnLock All' %} - {% else %} - {% trans 'Lock All' %} - {% endif %} - {% endif %} - {% if not ledger.is_locked %} - {% if ledger.is_posted %} - {% trans 'UnPost All' %} - {% else %} - {% trans 'Post All' %} - {% endif %} - {% endif %} {% endcomment %} - {% trans "Add Journal Entry" %} -
-
-
-
- +
+

{% trans "Journal Entries" %}

+ {% trans "Add Journal Entry" %} +
+ + + +
+
- + @@ -126,8 +113,10 @@
{% trans "Document Number" %} {% trans "Timestamp" %} {% trans "Activity" %}
-
-
+ + + + {% 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 index 37c19d69..24810adb 100644 --- a/templates/ledger/journal_entry/journal_entry_transactions.html +++ b/templates/ledger/journal_entry/journal_entry_transactions.html @@ -11,9 +11,9 @@

{% trans "Transactions" %}

- +
- + diff --git a/templates/ledger/ledger/ledger_list.html b/templates/ledger/ledger/ledger_list.html index 3eaea9ff..db9b6138 100644 --- a/templates/ledger/ledger/ledger_list.html +++ b/templates/ledger/ledger/ledger_list.html @@ -12,6 +12,28 @@

{% trans "Ledger" %}

{% trans 'Create Ledger' %} + +
+
+
+ + + {% if request.GET.q %} + + + + {% endif %} +
+ +
+
{% trans "#" %} {% trans "Timestamp" %} {% trans "Account Name" %}
@@ -122,7 +144,15 @@
-
+ +
{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} {{ _("Items of")}} {{ page_obj.paginator.count }} +
+ + {% if is_paginated %} + {% include 'partials/pagination.html' %} + {% endif %} + +
diff --git a/templates/vendors/vendors_list.html b/templates/vendors/vendors_list.html index 4775dd9d..21c891d7 100644 --- a/templates/vendors/vendors_list.html +++ b/templates/vendors/vendors_list.html @@ -5,7 +5,7 @@ {% block vendors %}{{ _("Vendors")|capfirst }}{% endblock %} {% block content %} - +
@@ -128,11 +128,15 @@
-
- - {% if is_paginated %} - {% include 'partials/pagination.html' %} - {% endif %} + +
{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} {{ _("Items of")}} {{ page_obj.paginator.count }} +
+ + {% if is_paginated %} + {% include 'partials/pagination.html' %} + {% endif %} + +
{% endif %}