From 28e051a0617e9f7e14fee22da7d15ff94f7e8c7f Mon Sep 17 00:00:00 2001 From: gitea Date: Tue, 14 Jan 2025 13:06:57 +0000 Subject: [PATCH] update --- inventory/urls.py | 1 + inventory/views.py | 23 +- templates/header.html | 11 +- templates/items/expenses/expenses_list.html | 10 +- templates/items/service/service_create.html | 10 +- templates/items/service/service_list.html | 134 ++++------- .../bank_accounts/bank_account_list.html | 120 ++++------ .../ledger/coa_accounts/account_list.html | 220 ++++-------------- templates/sales/payments/payment_list.html | 6 +- 9 files changed, 176 insertions(+), 359 deletions(-) diff --git a/inventory/urls.py b/inventory/urls.py index 6886d26d..0b12fcc3 100644 --- a/inventory/urls.py +++ b/inventory/urls.py @@ -174,6 +174,7 @@ urlpatterns = [ # Items path('items/services/', views.ItemServiceListView.as_view(), name='item_service_list'), path('items/services/create/', views.ItemServiceCreateView.as_view(), name='item_service_create'), + path('items/services//update/', views.ItemServiceUpdateView.as_view(), name='item_service_update'), # Expanese path('items/expeneses/', views.ItemExpenseListView.as_view(), name='item_expense_list'), path('items/expeneses/create/', views.ItemExpenseCreateView.as_view(), name='item_expense_create'), diff --git a/inventory/views.py b/inventory/views.py index e73d4e9e..e12d5e2f 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -2719,12 +2719,29 @@ def fetch_notifications(request): return JsonResponse({"notifications": notifications_data}) -class ItemServiceCreateView(CreateView): +class ItemServiceCreateView(LoginRequiredMixin,SuccessMessageMixin,CreateView): model = models.AdditionalServices form_class = forms.AdditionalServiceForm template_name = "items/service/service_create.html" success_url = reverse_lazy("item_service_list") + success_message = _("Service created successfully.") + context_object_name = "service" + + def form_valid(self, form): + vat = models.VatRate.objects.get(is_active=True) + form.instance.dealer = get_user_type(self.request.user.dealer) + if form.instance.taxable: + form.instance.price = (form.instance.price * vat.rate) + form.instance.price + return super().form_valid(form) +class ItemServiceUpdateView(LoginRequiredMixin,SuccessMessageMixin,UpdateView): + model = models.AdditionalServices + form_class = forms.AdditionalServiceForm + template_name = "items/service/service_create.html" + success_url = reverse_lazy("item_service_list") + success_message = _("Service updated successfully.") + context_object_name = "service" + def form_valid(self, form): vat = models.VatRate.objects.get(is_active=True) form.instance.dealer = get_user_type(self.request.user.dealer) @@ -2734,13 +2751,13 @@ class ItemServiceCreateView(CreateView): class ItemServiceListView(ListView): - model = ItemModel + model = models.AdditionalServices template_name = "items/service/service_list.html" context_object_name = "services" def get_queryset(self): dealer = get_user_type(self.request) - items = dealer.entity.get_items_services() + items = models.AdditionalServices.objects.filter(dealer=dealer).all() return items diff --git a/templates/header.html b/templates/header.html index 43efe394..87221ba3 100644 --- a/templates/header.html +++ b/templates/header.html @@ -194,7 +194,7 @@
@@ -230,14 +230,7 @@ -
  • - -
    - {% trans "Opportunities"|capfirst %} -
    -     - -
    • +
    diff --git a/templates/items/expenses/expenses_list.html b/templates/items/expenses/expenses_list.html index 769e2e54..3d971d81 100644 --- a/templates/items/expenses/expenses_list.html +++ b/templates/items/expenses/expenses_list.html @@ -4,8 +4,12 @@ {% block title %}{{ _("Expenses") }}{% endblock title %} {% block content %} -
    -

    {% trans "Expenses" %}

    +
    +
    + +

    {% trans "Expenses" %}

    + {% trans "Add Expense" %} +
    @@ -24,7 +28,7 @@ {{ expense.item_number }} {{ expense.name }} {{ expense.uom }} - + {% trans "Update" %} diff --git a/templates/items/service/service_create.html b/templates/items/service/service_create.html index 085ba15c..017f209f 100644 --- a/templates/items/service/service_create.html +++ b/templates/items/service/service_create.html @@ -7,8 +7,14 @@
    -
    -
    {{ _("Add Service") }}
    +
    +
    + {% if service.pk %} + {{ _("UpdateService") }} + {% else %} + {{ _("Add Service") }} + {% endif %} +
    {% csrf_token %} diff --git a/templates/items/service/service_list.html b/templates/items/service/service_list.html index 70ab2b0a..fd2911ac 100644 --- a/templates/items/service/service_list.html +++ b/templates/items/service/service_list.html @@ -1,106 +1,60 @@ {% extends "base.html" %} -{% load i18n %} -{% load render_table from django_tables2 %} +{% load i18n static %} -{% block title %}{% trans "users" %}{% endblock title %} -{% block users %}{% trans "users"|capfirst %}{% endblock %} +{% block title %}{{ _("Expenses") }}{% endblock title %} {% block content %} -
    -
    -
    -
    -
    -
    - -
    - - - - {% if request.GET.q %} - - - - {% endif %} -
    - - -
    - - +
    +
    + +

    {% trans "Services" %}

    + {% trans "Add Service" %} +
    +
    + +
    +
    - - - - + + + + + + - + {% for service in services %} + + + + + + + + + {% empty %} - - - - + {% endfor %} -
    {% trans 'Item Number'|capfirst %}{% trans 'Name'|capfirst %}{% trans 'Unit of Measure'|capfirst %}{% trans 'Cost of Goods Sold'|capfirst %}{% trans "Item Number" %}{% trans "Name" %}{% trans "Unit of Measure" %}{% trans "Taxable" %}{% trans "Account" %}{% trans "Action" %}
    {{ service.item.item_number }}{{ service.name }}{{ service.uom }} + {% if service.taxable %} + Yes + {% else %} + No + {% endif %} + {{ service.item.cogs_account }} + + {% trans "Update" %} + +
    {{ service.item_number }}{{ service.name }}{{ service.uom }}{{ service.cogs_account }}{% trans "No Invoice Found" %}
    - - {% if is_paginated %} - -{% endif %} - -
    -
    -
    +
    +
    +
    -{% endblock %} - +{% endblock %} \ No newline at end of file diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html index 2c73845c..dc630ed9 100644 --- a/templates/ledger/bank_accounts/bank_account_list.html +++ b/templates/ledger/bank_accounts/bank_account_list.html @@ -1,82 +1,50 @@ {% extends "base.html" %} -{% load i18n %} -{% block title %}{% trans "Bank Accounts" %}{% endblock title %} -{% block bank_accounts %} - - {% trans "Bank Accounts" %} - - -{% endblock %} +{% load i18n static %} + +{% block title %}{{ _("Bank Accounts") }}{% endblock title %} + {% block content %} - - -
    -
    -
    -
    - - - {% if request.GET.q %} - - - - {% endif %} -
    -
    -
    +
    +
    + +

    {% trans "Bank Accounts" %}

    + {% trans "Add Bank Account" %} +
    +
    + +
    + + + + + + + + + + + {% for bank in bank_accounts %} + + + + + + + {% empty %} + + + + {% endfor %} + +
    {% trans "Name" %}{% trans "Account Number" %}{% trans "Type" %}{% trans "Action" %}
    {{ bank.name }}{{ bank.account_number }}{{ bank.account_type|capfirst }} + + {% trans "Update" %} + +
    {% trans "No Invoice Found" %}
    +
    +
    - - - -
    -
    -
    -
    -
    {% trans "Bank Accounts" %}
    -
    -
    - - - - - - - - - - {% for account in bank_accounts %} - - - - - - {% empty %} - - - - {% endfor %} - -
    {% trans "Name" %}{% trans "Type" %}{% trans "Actions" %}
    {{ account.name }}{{ account.cash_account }} - - {% trans "view" %} - -
    - {% trans "No customers found." %} -
    -
    - - {% if is_paginated %} - {% include 'partials/pagination.html' %} - {% endif %} -
    {% endblock %} \ No newline at end of file diff --git a/templates/ledger/coa_accounts/account_list.html b/templates/ledger/coa_accounts/account_list.html index d3e6e178..0d2f39af 100644 --- a/templates/ledger/coa_accounts/account_list.html +++ b/templates/ledger/coa_accounts/account_list.html @@ -1,180 +1,52 @@ {% extends "base.html" %} -{% load i18n %} -{% block title %}{% trans "Accounts" %}{% endblock title %} -{% block accounts %} - - {% trans "Accounts"|capfirst %} - - -{% endblock %} +{% load i18n static %} + +{% block title %}{{ _("Accounts") }}{% endblock title %} + {% block content %} -
    -
    -
    - -
    -
    -
    -
    -
    - - - {% if request.GET.q %} - - - - {% endif %} -
    -
    -
    -
    -
    - - - -{% if page_obj.object_list %} - -
    -
    - - - - - - - - - - - - - - {% for account in accounts %} -
    {% trans "Account Name" %}{% trans "Code" %}{% trans "Balance Type" %}{% trans "Active" %}
    + + + + + + + + + + + {% for account in accounts %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
    {% trans "Name" %}{% trans "Account Number" %}{% trans "Balance Type" %}{% trans "Active" %}{% trans "Action" %}
    {{ account.name }}{{ account.code }}{{ account.balance_type|capfirst }}{{ account.active }} + + {% trans "Update" %} + +
    {% trans "No Invoice Found" %}
    +
    +
    -
    - - {{ account.name }} - {{ account.code }} - - - {% if account.balance_type == 'debit' %} -
    {{ _("Debit") }}
    - {% else %} -
    {{ _("Credit") }}
    - {% endif %} - - {% if account.is_active %} - - {% else %} - - {% endif %} - -
    - -
    - {% trans "Edit" %} - -
    -
    -
    - - - - {% empty %} - - - {% trans "No account found." %} - - - {% endfor %} - - -
    - -
    {{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }} {{ _("Items of")}} {{ page_obj.paginator.count }} -
    - - - -
    -
    -
    - {% endif %} -
    {% endblock %} \ No newline at end of file diff --git a/templates/sales/payments/payment_list.html b/templates/sales/payments/payment_list.html index 59283e03..52ccc0e1 100644 --- a/templates/sales/payments/payment_list.html +++ b/templates/sales/payments/payment_list.html @@ -5,8 +5,10 @@ {% block content %}
    - {% trans "Add Payment" %} -

    {% trans "Payments" %}

    +
    + {% trans "Add Payment" %} +

    {% trans "Payments" %}

    +