From a5dfcd229c9a165a853604e381180e5b1a76cddc Mon Sep 17 00:00:00 2001 From: Faheedkhan Date: Wed, 25 Jun 2025 13:40:13 +0300 Subject: [PATCH] update latest --- inventory/views.py | 2 +- templates/csv_upload.html | 6 ++-- templates/header.html | 2 +- templates/items/expenses/expenses_list.html | 2 +- templates/items/service/service_list.html | 2 +- .../bank_accounts/bank_account_list.html | 2 +- templates/ledger/bills/bill_list.html | 4 +-- .../ledger/coa_accounts/account_detail.html | 2 +- .../coa_accounts/partials/account_table.html | 2 +- .../journal_entry/journal_entry_list.html | 2 +- templates/ledger/ledger/ledger_list.html | 10 +++---- .../organizations/organization_list.html | 30 +++++++------------ templates/purchase_orders/po_list.html | 2 +- templates/sales/estimates/estimate_list.html | 2 +- templates/sales/invoices/invoice_list.html | 2 +- templates/sales/payments/payment_list.html | 2 +- templates/sales/sales_list.html | 5 ++-- templates/vendors/vendors_list.html | 2 +- 18 files changed, 36 insertions(+), 45 deletions(-) diff --git a/inventory/views.py b/inventory/views.py index 18785db4..c31a1778 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -3015,7 +3015,7 @@ class OrganizationListView(LoginRequiredMixin, ListView): model = models.Organization template_name = "organizations/organization_list.html" context_object_name = "organizations" - paginate_by = 1 + paginate_by = 20 def get_queryset(self): query = self.request.GET.get("q") diff --git a/templates/csv_upload.html b/templates/csv_upload.html index 1ea1ba5c..6e223e67 100644 --- a/templates/csv_upload.html +++ b/templates/csv_upload.html @@ -75,7 +75,7 @@

Upload Cars CSV

- + Download Sample CSV
@@ -170,8 +170,8 @@ {{ _("CSV should include columns: vin")}}
- - Cancel + + Cancel {% endblock %} \ No newline at end of file diff --git a/templates/header.html b/templates/header.html index 512f6a34..eeb6a35e 100644 --- a/templates/header.html +++ b/templates/header.html @@ -270,7 +270,7 @@ - {% endif %} + {% endif %} diff --git a/templates/items/expenses/expenses_list.html b/templates/items/expenses/expenses_list.html index 5a48a4f7..4f1c69d3 100644 --- a/templates/items/expenses/expenses_list.html +++ b/templates/items/expenses/expenses_list.html @@ -29,7 +29,7 @@ {% for expense in expenses %} - + {{ expense.item_number }} diff --git a/templates/items/service/service_list.html b/templates/items/service/service_list.html index 022b1bb2..031c5249 100644 --- a/templates/items/service/service_list.html +++ b/templates/items/service/service_list.html @@ -30,7 +30,7 @@ {% for service in services %} - + {{ service.pk }} diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html index 0edb49eb..331ed4f3 100644 --- a/templates/ledger/bank_accounts/bank_account_list.html +++ b/templates/ledger/bank_accounts/bank_account_list.html @@ -26,7 +26,7 @@ {% for bank in bank_accounts %} - + {{ bank.name }} diff --git a/templates/ledger/bills/bill_list.html b/templates/ledger/bills/bill_list.html index 3bda16f8..4b2e5568 100644 --- a/templates/ledger/bills/bill_list.html +++ b/templates/ledger/bills/bill_list.html @@ -56,7 +56,7 @@ {% for bill in bills %} - + {{ bill.bill_number }} @@ -81,7 +81,7 @@
- {% trans 'View' %} + {% trans 'View Bill detail' %}
diff --git a/templates/ledger/coa_accounts/account_detail.html b/templates/ledger/coa_accounts/account_detail.html index 49d7563f..66010549 100644 --- a/templates/ledger/coa_accounts/account_detail.html +++ b/templates/ledger/coa_accounts/account_detail.html @@ -99,7 +99,7 @@
- {% trans 'view'|capfirst %} + {% trans 'View Transacrions'|capfirst %}
diff --git a/templates/ledger/coa_accounts/partials/account_table.html b/templates/ledger/coa_accounts/partials/account_table.html index 206c2e81..f81348eb 100644 --- a/templates/ledger/coa_accounts/partials/account_table.html +++ b/templates/ledger/coa_accounts/partials/account_table.html @@ -39,7 +39,7 @@
- {% trans "View" %} + {% trans "View Journal Entries" %}
diff --git a/templates/ledger/journal_entry/journal_entry_list.html b/templates/ledger/journal_entry/journal_entry_list.html index 488b1eba..4dfb790c 100644 --- a/templates/ledger/journal_entry/journal_entry_list.html +++ b/templates/ledger/journal_entry/journal_entry_list.html @@ -58,7 +58,7 @@ {% for je in journal_entries %} - {{ je.je_number }} + {{ je.je_number }} {{ je.timestamp }} {% if je.get_activity_display %} diff --git a/templates/ledger/ledger/ledger_list.html b/templates/ledger/ledger/ledger_list.html index 4de53199..82ce253b 100644 --- a/templates/ledger/ledger/ledger_list.html +++ b/templates/ledger/ledger/ledger_list.html @@ -30,7 +30,7 @@ {% for ledger in ledgers %} - + {% if ledger.invoicemodel %} {{ ledger.get_wrapped_model_instance }} {% elif ledger.billmodel %} @@ -89,16 +89,16 @@ {% endif %} {% if ledger.can_post %} {% trans 'Post' %} + class="dropdown-item has-text-info has-text-weight-bold text-success">{% trans 'Post' %} {% endif %} {% if ledger.can_unpost %} {% trans 'UnPost' %} + class="dropdown-item has-text-warning has-text-weight-bold text-info">{% trans 'UnPost' %} {% endif %} {% if ledger.can_hide %} {% trans 'Hide' %} + class="dropdown-item has-text-warning has-text-weight-bold text-danger">{% trans 'Hide' %} {% endif %} {% if ledger.can_unhide %} {% trans 'Delete' %} + class="dropdown-item has-text-danger has-text-weight-bold text-danger">{% trans 'Delete' %} {% endif %}
diff --git a/templates/organizations/organization_list.html b/templates/organizations/organization_list.html index dd8d0506..497e6e3a 100644 --- a/templates/organizations/organization_list.html +++ b/templates/organizations/organization_list.html @@ -24,17 +24,9 @@
-
-
-
- - - {% if request.GET.q %} - - {% endif %} -
+
+ {% include 'partials/search_box.html' %}
-
@@ -42,7 +34,7 @@ - + -
{{ _('Name')|capfirst }}{{ _('Name')|capfirst }}
@@ -99,7 +91,7 @@
+
{{ org.name }} @@ -131,16 +123,16 @@
- {% if page_obj.paginator.num_pages > 1 %} + {% if page_obj.paginator.num_pages > 1 %} -
+
-
- {% include 'partials/pagination.html'%} -
+
+ {% include 'partials/pagination.html'%} +
-
-{% endif %} +
+ {% endif %} {% endblock %} diff --git a/templates/purchase_orders/po_list.html b/templates/purchase_orders/po_list.html index 6d2f4f9e..0a58786d 100644 --- a/templates/purchase_orders/po_list.html +++ b/templates/purchase_orders/po_list.html @@ -67,7 +67,7 @@
- {% trans 'Detail' %} + {% trans 'PO Detail' %} {% trans 'View Inventory Items' %}
diff --git a/templates/sales/estimates/estimate_list.html b/templates/sales/estimates/estimate_list.html index 2dc1f67f..eeb5002c 100644 --- a/templates/sales/estimates/estimate_list.html +++ b/templates/sales/estimates/estimate_list.html @@ -22,7 +22,7 @@ {% for estimate in estimates %} - {{ estimate.estimate_number }} + {{ estimate.estimate_number }} {{ estimate.customer.customer_name }} {% if estimate.status == 'draft' %} diff --git a/templates/sales/invoices/invoice_list.html b/templates/sales/invoices/invoice_list.html index 812a7a6b..dd32f24d 100644 --- a/templates/sales/invoices/invoice_list.html +++ b/templates/sales/invoices/invoice_list.html @@ -23,7 +23,7 @@ {% for invoice in invoices %} - {{ invoice.invoice_number }} + {{ invoice.invoice_number }} {{ invoice.customer }} {% if invoice.is_past_due %} diff --git a/templates/sales/payments/payment_list.html b/templates/sales/payments/payment_list.html index 99769c6e..b7ffa317 100644 --- a/templates/sales/payments/payment_list.html +++ b/templates/sales/payments/payment_list.html @@ -26,7 +26,7 @@ {% for journal in page_obj %} - {{ forloop.counter }} + {{ forloop.counter }} {{ journal.je_number }} {% if journal.ledger.invoicemodel %} diff --git a/templates/sales/sales_list.html b/templates/sales/sales_list.html index 2d88831e..faa13279 100644 --- a/templates/sales/sales_list.html +++ b/templates/sales/sales_list.html @@ -124,7 +124,7 @@ {% for tx in txs %} - +

{{tx.customer}}

@@ -204,8 +204,7 @@
-
{{ _("View") }} -
{{ _("Remove") }} +
{{ _("View Sales Order Detail") }}
diff --git a/templates/vendors/vendors_list.html b/templates/vendors/vendors_list.html index bc46fcea..2d679cc8 100644 --- a/templates/vendors/vendors_list.html +++ b/templates/vendors/vendors_list.html @@ -79,7 +79,7 @@ {% for vendor in vendors %} - +
{% if vendor.logo %}