From b2c609afa612df5365eed65ecfb4567a3fd61731 Mon Sep 17 00:00:00 2001 From: gitea Date: Tue, 21 Jan 2025 11:50:46 +0000 Subject: [PATCH] save --- inventory/forms.py | 12 +- inventory/views.py | 1 + templates/ledger/bills/bill_detail.html | 369 +++++++++++++------ templates/ledger/bills/bill_form.html | 183 +++++++-- templates/ledger/bills/bill_list.html | 43 +-- templates/ledger/bills/bill_update_form.html | 21 ++ 6 files changed, 456 insertions(+), 173 deletions(-) create mode 100644 templates/ledger/bills/bill_update_form.html diff --git a/inventory/forms.py b/inventory/forms.py index bf6640e8..ef79ae92 100644 --- a/inventory/forms.py +++ b/inventory/forms.py @@ -9,6 +9,7 @@ from phonenumber_field.phonenumber import PhoneNumber from .mixins import AddClassMixin from django.forms.models import inlineformset_factory from django_ledger.forms.invoice import InvoiceModelCreateForm as InvoiceModelCreateFormBase +from django_ledger.forms.bill import BillModelCreateForm as BillModelCreateFormBase from .models import ( Dealer, # Branch, @@ -637,4 +638,13 @@ class InvoiceModelCreateForm(InvoiceModelCreateFormBase): self.fields['cash_account'].widget = forms.HiddenInput() self.fields['prepaid_account'].widget = forms.HiddenInput() self.fields['unearned_account'].widget = forms.HiddenInput() - self.fields['date_draft'] = forms.DateField(widget=DateInput(attrs={'type': 'date'})) \ No newline at end of file + self.fields['date_draft'] = forms.DateField(widget=DateInput(attrs={'type': 'date'})) + +class BillModelCreateForm(BillModelCreateFormBase): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + self.fields['cash_account'].widget = forms.HiddenInput() + self.fields['prepaid_account'].widget = forms.HiddenInput() + self.fields['unearned_account'].widget = forms.HiddenInput() + self.fields['date_draft'] = forms.DateField(widget=DateInput(attrs={'type': 'date'})) diff --git a/inventory/views.py b/inventory/views.py index 99685af6..415ccae4 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -1,6 +1,7 @@ from decimal import Decimal from django.core.paginator import Paginator from django.forms import DateField, DateInput, HiddenInput, TextInput +from django_ledger.forms.bill import ApprovedBillModelUpdateForm, InReviewBillModelUpdateForm from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_exempt from django_ledger.models import ( diff --git a/templates/ledger/bills/bill_detail.html b/templates/ledger/bills/bill_detail.html index 07798133..d259c91e 100644 --- a/templates/ledger/bills/bill_detail.html +++ b/templates/ledger/bills/bill_detail.html @@ -1,122 +1,273 @@ -{% extends 'base.html' %} +{% extends "base.html" %} {% load i18n %} -{% block title %} - {{ page_title }} -{% endblock %} +{% block title %}{{ _("View Bill") }}{% endblock title %} {% block content %} - - - {% endblock %} + +{% block extra_js %} + + +{% endblock %} \ No newline at end of file diff --git a/templates/ledger/bills/bill_form.html b/templates/ledger/bills/bill_form.html index 1e9759c7..46b068bd 100644 --- a/templates/ledger/bills/bill_form.html +++ b/templates/ledger/bills/bill_form.html @@ -1,38 +1,159 @@ {% extends "base.html" %} -{% load i18n %} {% load crispy_forms_filters %} -{% block title %}{% trans "account" %}{% endblock title %} +{% load i18n static %} + +{% block title %}{{ _("Create Bill") }}{% endblock title %} {% block content %} -
- -
-
-

- {% if account.created %} - - {{ _("Edit Account") }} - {% else %} - - {{ _("Add Account") }} - {% endif %} -

-
-
-
- {% csrf_token %} - {{ form|crispy }} - {% for error in form.errors %} -
{{ error }}
- {% endfor %} -
- - {% trans "Cancel"|capfirst %} +
+

{% trans "Create Bill" %}

+ + {% csrf_token %} +
+ {{ form|crispy }} +
+
+

Unit Items

+
+
+ +
+
+ +
+
+ +
+
- +
+ +
+
-
+ + +
+ + {% trans "Cancel" %} +
+
-{% endblock %} \ No newline at end of file +{% endblock content %} + +{% block extra_js %} + +{% endblock extra_js %} \ No newline at end of file diff --git a/templates/ledger/bills/bill_list.html b/templates/ledger/bills/bill_list.html index a7830700..20486004 100644 --- a/templates/ledger/bills/bill_list.html +++ b/templates/ledger/bills/bill_list.html @@ -30,30 +30,25 @@
- - - {% if page_obj.object_list %} +
+ {% trans 'Bill Status' %} + - - + {% for bill in bills %} - - + + -
- {% trans 'Account Name' %} + {% trans 'Bill Number' %} - {% trans 'Code' %} - - {% trans 'Balance Type' %} - - {% trans 'Active' %} + {% trans 'Vendor' %}
{{ bill.name }}{{ bill.code }}{{ bill.bill_number }}{{ bill.bill_status }} - {% if bill.balance_type == 'debit' %} -
- {{ _('Debit') }} -
- {% else %} -
- {{ _('Credit') }} -
- {% endif %} - 		- {% if bill.active %} - - {% else %} - - {% endif %} + {{bill.vendor.vendor_name}}
- {% trans 'View' %} + {% trans 'View' %}
@@ -157,8 +137,7 @@ - - {% endif %} + diff --git a/templates/ledger/bills/bill_update_form.html b/templates/ledger/bills/bill_update_form.html new file mode 100644 index 00000000..e43c596c --- /dev/null +++ b/templates/ledger/bills/bill_update_form.html @@ -0,0 +1,21 @@ +{% extends 'base.html' %} +{% load i18n %} +{% load crispy_forms_filters %} +{% block title %}{% trans "Bill" %}{% endblock title %} +{% block content %} +
+

{% trans "Bill" %}

+
+ {% csrf_token %} + {{ form|crispy }} + + {% trans "Cancel" %} +
+
+{% endblock %} \ No newline at end of file