From 7a5e1a7044af7b238d9ec90c8bdc0f640d023b25 Mon Sep 17 00:00:00 2001 From: Flatlogic Bot Date: Tue, 3 Feb 2026 03:00:53 +0000 Subject: [PATCH] Autosave: 20260203-030052 --- core/__pycache__/urls.cpython-311.pyc | Bin 10018 -> 10392 bytes core/__pycache__/utils.cpython-311.pyc | Bin 0 -> 2648 bytes core/__pycache__/views.cpython-311.pyc | Bin 105174 -> 115511 bytes core/templates/base.html | 41 ++- .../core/customer_payment_receipt.html | 15 +- core/templates/core/customer_statement.html | 165 ++++++++++++ core/templates/core/invoice_detail.html | 8 + core/templates/core/invoice_edit.html | 2 +- core/templates/core/invoices.html | 5 + core/templates/core/pos.html | 12 +- core/templates/core/purchase_detail.html | 8 + core/templates/core/quotation_detail.html | 8 + core/templates/core/sale_receipt.html | 235 ++++++++++++++++++ core/templates/core/supplier_statement.html | 164 ++++++++++++ core/urls.py | 3 + core/utils.py | 64 +++++ core/views.py | 220 +++++++++++++++- 17 files changed, 924 insertions(+), 26 deletions(-) create mode 100644 core/__pycache__/utils.cpython-311.pyc create mode 100644 core/templates/core/customer_statement.html create mode 100644 core/templates/core/sale_receipt.html create mode 100644 core/templates/core/supplier_statement.html create mode 100644 core/utils.py diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 418c66903fb2f0c5c7bced4eb3e0bede6e29c358..ef01a1732a785917851c11b32c3bf58988f5eca3 100644 GIT binary patch delta 2073 zcmZ{lT~HfU6o5%MNND+~v=rFoC*d#90)YxG0;PmDg%A>GArJxuQnIuOe`&I`T5Um} z`k+qh9YUpgnZ0wqbH01_ z=k9Jk@ok?eyi-uHCyQ@`^KV5wmA4AZOphPfJ^5tJlv8w9$&OBDikU6^`K_(eqI*0w zg$bUz&r?lb@KoS=>dX5teU_b-b&v13-7*EI!(WYOHKobb{5v5zuEf^kYQnL&kxZ*TBxeu4iXzzkr22t2kiJQORaSrAZ~X#rRD{TGH-m27Z4>pHod)u@pH;Tgt|1C;4crXey0~|G-HuSXy}_zqq20q2 zJQ{cyc=USFp@IBaDdpNl+(_iA^4um7A0j^*cdqmtz{^Id*5%-bmYRPg! z#Qi4H&%tRDbee>!CEp;zkZI=}tjT&-(@mXz3X>X4GMLoes0txR&C{$O9*lD9>f+)yR392>oW#S0m*)&0;+V z%p_DJc~2q@nRgbne7lp$t!aM$TpG9-xO6uf!-gSkyI4gB?HQ#orokA4G2Mg82>G>! zuP1^}z$n55DdhLwk1$EvI7}e~$WOJhWf~z!{^l@)ups7y5YCG^iwI#cM?qN1%-Otv zuwtB~E!oLxJ02c?@iMNWv1Se#~!Xx@M_>?;MFgo5jTwb zm=VbgzHAH=9I!(o!=L| zcuO|X=+E9+n$~mr&)+xj^ zh%t!i)2IYVw1KZB!UB1hLkQtKNjJz-iwI$(leqpt>f7~(DX1(NN>i$n9d^^PU2oV0 Op=|BV{Nfk+zt%q+!H1y$ delta 1691 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 VcaUqWqjjTmA?|}Zdebnz{{W1Gv;6=7 literal 0 HcmV?d00001 diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index fd3d528fdaa8ad23efacb95f97a1880533363f32..38ddb913df745f939489e87eaffd2b4fdf897c9a 100644 GIT binary patch delta 30931 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%0A?|8Q=iGE>O{{q&zc;Ndd2kJv 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 Ra!NlTg_=#xZ4~U!{(n1gi+2D3 delta 23528 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 diff --git a/core/templates/base.html b/core/templates/base.html index fec2673..6d3a1cd 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -53,11 +53,11 @@
  • - + {% trans "Sales" %} -
    • @@ -187,6 +178,32 @@ {% if user.is_superuser or user.is_staff %} + + +
  • + + {% trans "Reports" %} + + + +
    • +
  • diff --git a/core/templates/core/customer_payment_receipt.html b/core/templates/core/customer_payment_receipt.html index 2113e28..51b5349 100644 --- a/core/templates/core/customer_payment_receipt.html +++ b/core/templates/core/customer_payment_receipt.html @@ -116,6 +116,15 @@ font-weight: 700; margin-top: 5px; } + .amount-in-words { + text-align: center; + margin-top: 15px; + font-style: italic; + color: #666; + font-size: 14px; + border-top: 1px solid #eee; + padding-top: 10px; + } .footer { text-align: center; margin-top: 40px; @@ -212,10 +221,14 @@
    {{ settings.currency_symbol }}{{ payment.amount|floatformat:3 }}
    +
    + {% trans "Amount in Words" %}: {{ amount_in_words }} +
    +

    {% trans "Thank you for your business!" %}

    {{ settings.business_name }} © {% now "Y" %}

    - + \ No newline at end of file diff --git a/core/templates/core/customer_statement.html b/core/templates/core/customer_statement.html new file mode 100644 index 0000000..ffa8b0a --- /dev/null +++ b/core/templates/core/customer_statement.html @@ -0,0 +1,165 @@ +{% extends 'base.html' %} +{% load i18n %} + +{% block title %}{% trans "Customer Statement" %} | {{ site_settings.business_name }}{% endblock %} + +{% block content %} +
    +
    +
    +

    {% trans "Customer Statement" %}

    +

    {% trans "View transaction history and balance for customers." %}

    +
    +
    + +
    +
    + + +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    + + {% if customer %} +
    +
    +
    +
    +
    + {% if settings.logo %} + Logo + {% endif %} +

    {{ settings.business_name }}

    +

    {{ settings.address }}

    +

    {{ settings.phone }} | {{ settings.email }}

    +
    +
    +

    {% trans "STATEMENT" %}

    +

    {% trans "Date" %}: {% now "Y-m-d" %}

    + {% if start_date or end_date %} +

    + {% if start_date %}{% trans "From" %}: {{ start_date }}{% endif %} + {% if end_date %} {% trans "To" %}: {{ end_date }}{% endif %} +

    + {% endif %} +
    +
    +
    +
    +
    +
    {% trans "Bill To" %}
    +
    {{ customer.name }}
    +

    {{ customer.address }}

    +

    {{ customer.phone }}

    +
    +
    +
    + +
    + + + + + + + + + + + + + {% if opening_balance != 0 or start_date %} + + + + + + + + {% endif %} + + {% for item in statement_data %} + + + + + + + + + {% empty %} + + + + {% endfor %} + + + + + + + +
    {% trans "Date" %}{% trans "Transaction" %}{% trans "Reference" %}{% trans "Debit" %} (+){% trans "Credit" %} (-){% trans "Balance" %}
    {{ start_date|default:"---" }}{% trans "Opening Balance" %}{% if opening_balance > 0 %}{{ settings.currency_symbol }}{{ opening_balance|floatformat:settings.decimal_places }}{% endif %}{% if opening_balance < 0 %}{{ settings.currency_symbol }}{{ opening_balance_abs|floatformat:settings.decimal_places }}{% endif %}{{ settings.currency_symbol }}{{ opening_balance|floatformat:settings.decimal_places }}
    {{ item.date|date:"Y-m-d" }}{{ item.type }}{{ item.reference }} + {% if item.debit > 0 %} + {{ settings.currency_symbol }}{{ item.debit|floatformat:settings.decimal_places }} + {% else %}-{% endif %} + + {% if item.credit > 0 %} + {{ settings.currency_symbol }}{{ item.credit|floatformat:settings.decimal_places }} + {% else %}-{% endif %} + {{ settings.currency_symbol }}{{ item.balance|floatformat:settings.decimal_places }}
    {% trans "No transactions found for the selected period." %}
    {% trans "Closing Balance" %} + {% with last=statement_data|last %} + {{ settings.currency_symbol }}{{ last.balance|default:opening_balance|floatformat:settings.decimal_places }} + {% endwith %} +
    +
    +
    +
    + {% else %} +
    +
    + +
    +

    {% trans "Select a Customer" %}

    +

    {% trans "Please select a customer and date range to view their statement." %}

    +
    + {% endif %} +
    + + +{% endblock %} diff --git a/core/templates/core/invoice_detail.html b/core/templates/core/invoice_detail.html index 9cd927a..ad255a6 100644 --- a/core/templates/core/invoice_detail.html +++ b/core/templates/core/invoice_detail.html @@ -168,6 +168,14 @@ + +
    +
    +
    {% trans "Amount in Words" %} / المبلغ بالحروف
    +
    {{ amount_in_words }}
    +
    +
    + {% if sale.payments.exists %}
    diff --git a/core/templates/core/invoice_edit.html b/core/templates/core/invoice_edit.html index b67a66d..d9f900c 100644 --- a/core/templates/core/invoice_edit.html +++ b/core/templates/core/invoice_edit.html @@ -251,7 +251,7 @@ this.cart.splice(index, 1); }, saveSale() { - this.isProcessing = true; + this.isProcessing = true; if (!this.customerId && this.paymentType !== 'cash') { alert('{% trans "Credit or Partial payments are not allowed for Guest customers." %}'); this.isProcessing = false; return; } let actualPaidAmount = 0; if (this.paymentType === 'cash') { diff --git a/core/templates/core/invoices.html b/core/templates/core/invoices.html index 648c046..e9f57ad 100644 --- a/core/templates/core/invoices.html +++ b/core/templates/core/invoices.html @@ -106,6 +106,11 @@
    + {% if sale.status == 'paid' %} + + + + {% endif %} diff --git a/core/templates/core/pos.html b/core/templates/core/pos.html index d5f84be..be555d4 100644 --- a/core/templates/core/pos.html +++ b/core/templates/core/pos.html @@ -345,7 +345,7 @@
    - +
    {% for method in payment_methods %}
    @@ -637,7 +637,7 @@ selectPaymentMethod(firstBtn, firstBtn.dataset.id); } - const paymentModal = new bootstrap.Modal(document.getElementById('paymentModal')); + selectPaymentType('cash'); const paymentModal = new bootstrap.Modal(document.getElementById('paymentModal')); paymentModal.show(); } @@ -692,7 +692,7 @@ calculateBalance(); } - function selectPaymentMethod(btn, id) { + let currentPaymentType = 'cash'; function selectPaymentType(type) { const customerId = document.getElementById('customerSelect').value; if (type === 'credit' && !customerId) { alert('{% trans "Credit sales are not allowed for Walking Customers. Please select a customer." %}'); return; } currentPaymentType = type; document.getElementById('typeCashBtn').classList.toggle('active', type === 'cash'); document.getElementById('typeCashBtn').classList.toggle('btn-primary', type === 'cash'); document.getElementById('typeCashBtn').classList.toggle('btn-outline-primary', type !== 'cash'); document.getElementById('typeCreditBtn').classList.toggle('active', type === 'credit'); document.getElementById('typeCreditBtn').classList.toggle('btn-primary', type === 'credit'); document.getElementById('typeCreditBtn').classList.toggle('btn-outline-primary', type !== 'credit'); const isCredit = type === 'credit'; document.getElementById('cashReceivedInput').disabled = isCredit; document.getElementById('paymentMethodButtons').querySelectorAll('button').forEach(btn => btn.disabled = isCredit); if (isCredit) { document.getElementById('cashReceivedInput').value = 0; calculateBalance(); } else { setExactAmount(); } } function selectPaymentMethod(btn, id) { document.querySelectorAll('.payment-method-btn').forEach(b => b.classList.remove('active')); btn.classList.add('active'); selectedPaymentMethodId = id; @@ -757,13 +757,13 @@ const data = { customer_id: document.getElementById('customerSelect').value, - payment_method_id: selectedPaymentMethodId, + payment_method_id: currentPaymentType === 'cash' ? selectedPaymentMethodId : null, items: cart, total_amount: totalAmount, - paid_amount: totalAmount, + paid_amount: currentPaymentType === 'cash' ? totalAmount : 0, discount: discount, loyalty_points_redeemed: loyaltyRedeem, - payment_type: 'cash' + payment_type: currentPaymentType }; fetch('{% url "create_sale_api" %}', { diff --git a/core/templates/core/purchase_detail.html b/core/templates/core/purchase_detail.html index ac0c522..149e2b6 100644 --- a/core/templates/core/purchase_detail.html +++ b/core/templates/core/purchase_detail.html @@ -154,6 +154,14 @@
    + +
    +
    +
    {% trans "Amount in Words" %} / المبلغ بالحروف
    +
    {{ amount_in_words }}
    +
    +
    + {% if purchase.payments.exists %}
    diff --git a/core/templates/core/quotation_detail.html b/core/templates/core/quotation_detail.html index 11abd4a..b92dfcc 100644 --- a/core/templates/core/quotation_detail.html +++ b/core/templates/core/quotation_detail.html @@ -178,6 +178,14 @@
    + +
    +
    +
    {% trans "Amount in Words" %} / المبلغ بالحروف
    +
    {{ amount_in_words }}
    +
    +
    +
    {% trans "Terms and Conditions" %} / الشروط والأحكام
    diff --git a/core/templates/core/sale_receipt.html b/core/templates/core/sale_receipt.html new file mode 100644 index 0000000..01e2108 --- /dev/null +++ b/core/templates/core/sale_receipt.html @@ -0,0 +1,235 @@ +{% load i18n static %} + + + + + {% trans "Payment Receipt" %} #{{ sale.invoice_number|default:sale.id }} + + + +
    + + {% trans "Back to Invoices" %} +
    + +
    +
    +
    + {% if settings.logo %} + Logo + {% endif %} +

    {{ settings.business_name }}

    +

    {{ settings.address|linebreaksbr }}

    +

    {% trans "Phone" %}: {{ settings.phone }}

    + {% if settings.vat_number %} +

    {% trans "VAT No" %}: {{ settings.vat_number }}

    + {% endif %} +
    +
    +

    {% trans "Payment Receipt" %}

    +
    +

    {% trans "Invoice #" %}: {{ sale.invoice_number|default:sale.id }}

    +

    {% trans "Date" %}: {{ sale.created_at|date:"Y-m-d" }}

    +
    +
    +
    + +
    +
    +

    {% trans "Received From" %}

    +

    {{ sale.customer.name|default:"Guest" }}

    + {% if sale.customer.phone %} +

    {{ sale.customer.phone }}

    + {% endif %} +
    +
    +

    {% trans "Status" %}

    +

    {% trans "Paid In Full" %}

    +

    {% trans "Total Invoice" %}: {{ settings.currency_symbol }}{{ sale.total_amount|floatformat:3 }}

    +
    +
    + +
    +
    + {% trans "Payment Type" %} + {{ sale.get_payment_type_display }} +
    +
    + {% trans "Transaction Status" %} + {% trans "Settled" %} +
    +
    + {% trans "Sold By" %} + {{ sale.created_by.get_full_name|default:sale.created_by.username }} +
    + {% if sale.notes %} +
    + {% trans "Notes" %} + {{ sale.notes }} +
    + {% endif %} +
    + +
    +

    {% trans "Total Amount Received" %}

    +
    {{ settings.currency_symbol }}{{ sale.total_amount|floatformat:3 }}
    +
    + +
    + {% trans "Amount in Words" %}: {{ amount_in_words }} +
    + +
    +

    {% trans "Thank you for your business!" %}

    +

    {{ settings.business_name }} © {% now "Y" %}

    +
    +
    + + \ No newline at end of file diff --git a/core/templates/core/supplier_statement.html b/core/templates/core/supplier_statement.html new file mode 100644 index 0000000..3cf87fa --- /dev/null +++ b/core/templates/core/supplier_statement.html @@ -0,0 +1,164 @@ +{% extends 'base.html' %} +{% load i18n %} + +{% block title %}{% trans "Supplier Statement" %} | {{ site_settings.business_name }}{% endblock %} + +{% block content %} +
    +
    +
    +

    {% trans "Supplier Statement" %}

    +

    {% trans "View transaction history and balance for suppliers." %}

    +
    +
    + +
    +
    + + +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    + + {% if supplier %} +
    +
    +
    +
    +
    + {% if settings.logo %} + Logo + {% endif %} +

    {{ settings.business_name }}

    +

    {{ settings.address }}

    +

    {{ settings.phone }} | {{ settings.email }}

    +
    +
    +

    {% trans "SUPPLIER STATEMENT" %}

    +

    {% trans "Date" %}: {% now "Y-m-d" %}

    + {% if start_date or end_date %} +

    + {% if start_date %}{% trans "From" %}: {{ start_date }}{% endif %} + {% if end_date %} {% trans "To" %}: {{ end_date }}{% endif %} +

    + {% endif %} +
    +
    +
    +
    +
    +
    {% trans "Supplier" %}
    +
    {{ supplier.name }}
    +

    {{ supplier.phone }}

    +
    +
    +
    + +
    + + + + + + + + + + + + + {% if opening_balance != 0 or start_date %} + + + + + + + + {% endif %} + + {% for item in statement_data %} + + + + + + + + + {% empty %} + + + + {% endfor %} + + + + + + + +
    {% trans "Date" %}{% trans "Transaction" %}{% trans "Reference" %}{% trans "Debit" %} (+){% trans "Credit" %} (-){% trans "Balance" %}
    {{ start_date|default:"---" }}{% trans "Opening Balance" %}{% if opening_balance > 0 %}{{ settings.currency_symbol }}{{ opening_balance|floatformat:settings.decimal_places }}{% endif %}{% if opening_balance < 0 %}{{ settings.currency_symbol }}{{ opening_balance_abs|floatformat:settings.decimal_places }}{% endif %}{{ settings.currency_symbol }}{{ opening_balance|floatformat:settings.decimal_places }}
    {{ item.date|date:"Y-m-d" }}{{ item.type }}{{ item.reference }} + {% if item.debit > 0 %} + {{ settings.currency_symbol }}{{ item.debit|floatformat:settings.decimal_places }} + {% else %}-{% endif %} + + {% if item.credit > 0 %} + {{ settings.currency_symbol }}{{ item.credit|floatformat:settings.decimal_places }} + {% else %}-{% endif %} + {{ settings.currency_symbol }}{{ item.balance|floatformat:settings.decimal_places }}
    {% trans "No transactions found for the selected period." %}
    {% trans "Closing Balance" %} + {% with last=statement_data|last %} + {{ settings.currency_symbol }}{{ last.balance|default:opening_balance|floatformat:settings.decimal_places }} + {% endwith %} +
    +
    +
    +
    + {% else %} +
    +
    + +
    +

    {% trans "Select a Supplier" %}

    +

    {% trans "Please select a supplier and date range to view their statement." %}

    +
    + {% endif %} +
    + + +{% endblock %} diff --git a/core/urls.py b/core/urls.py index 4511836..02b091a 100644 --- a/core/urls.py +++ b/core/urls.py @@ -9,6 +9,8 @@ urlpatterns = [ path('suppliers/', views.suppliers, name='suppliers'), path('purchases/', views.purchases, name='purchases'), path('reports/', views.reports, name='reports'), + path('reports/customer-statement/', views.customer_statement, name='customer_statement'), + path('reports/supplier-statement/', views.supplier_statement, name='supplier_statement'), path('settings/', views.settings_view, name='settings'), path('profile/', views.profile_view, name='profile'), path('users/', views.user_management, name='user_management'), @@ -22,6 +24,7 @@ urlpatterns = [ path('invoices/delete//', views.delete_sale, name='delete_sale'), path('invoices/payments/', views.customer_payments, name='customer_payments'), path('invoices/receipt//', views.customer_payment_receipt, name='customer_payment_receipt'), + path('invoices/sale-receipt//', views.sale_receipt, name='sale_receipt'), path("invoices/edit//", views.edit_invoice, name="edit_invoice"), # Quotations diff --git a/core/utils.py b/core/utils.py new file mode 100644 index 0000000..789cdb9 --- /dev/null +++ b/core/utils.py @@ -0,0 +1,64 @@ +def number_to_words_en(number): + """ + Converts a number to English words. + Handles decimals up to 3 places (common for some currencies). + """ + if number == 0: + return "Zero" + + units = ["", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", + "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen"] + tens = ["", "", "Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety"] + thousands = ["", "Thousand", "Million", "Billion"] + + def _convert_less_than_thousand(num): + res = "" + if num >= 100: + res += units[num // 100] + " Hundred " + num %= 100 + if num >= 20: + res += tens[num // 10] + " " + num %= 10 + if num > 0: + res += units[num] + return res.strip() + + # Split into integer and fractional parts + parts = str(float(number)).split('.') + integer_part = int(parts[0]) + fractional_part = int(parts[1]) if len(parts) > 1 else 0 + + # Convert integer part + res = "" + if integer_part == 0: + res = "Zero" + else: + idx = 0 + while integer_part > 0: + if integer_part % 1000 != 0: + res = _convert_less_than_thousand(integer_part % 1000) + " " + thousands[idx] + " " + res + integer_part //= 1000 + idx += 1 + + words = res.strip() + + # Convert fractional part (e.g., for 0.125 -> 125/1000) + if fractional_part > 0: + # Standard way is often "and X/100" or "and X cents" + # We'll just append "and X/1000" or similar based on length + frac_str = parts[1] + denom = 10 ** len(frac_str) + words += f" and {fractional_part}/{denom}" + + return words + +def number_to_words_ar(number): + """ + A very basic Arabic number to words converter. + For a production system, a library like 'num2words' with lang='ar' is highly recommended. + """ + # This is a placeholder for Arabic. For now, we'll return the English version or just a simplified one. + # Since writing a full Arabic number-to-words engine is complex, I'll stick to a simpler implementation + # if I can, or just use English for both if not specified. + # However, I'll try to provide a basic one if possible. + return number_to_words_en(number) # Fallback to EN for now to ensure it works. diff --git a/core/views.py b/core/views.py index d88a0b6..966ba7b 100644 --- a/core/views.py +++ b/core/views.py @@ -1,3 +1,5 @@ +from django.utils.translation import gettext_lazy as _ +from .utils import number_to_words_en from django.core.paginator import Paginator import decimal from django.contrib.auth.models import User, Group, Permission @@ -171,7 +173,11 @@ def purchase_create(request): def purchase_detail(request, pk): purchase = get_object_or_404(Purchase, pk=pk) settings = SystemSetting.objects.first() - return render(request, 'core/purchase_detail.html', {'purchase': purchase, 'settings': settings}) + return render(request, 'core/purchase_detail.html', { + 'purchase': purchase, + 'settings': settings, + 'amount_in_words': number_to_words_en(purchase.total_amount) + }) @csrf_exempt @login_required @@ -334,7 +340,11 @@ def invoice_create(request): def invoice_detail(request, pk): sale = get_object_or_404(Sale, pk=pk) settings = SystemSetting.objects.first() - return render(request, 'core/invoice_detail.html', {'sale': sale, 'settings': settings}) + return render(request, 'core/invoice_detail.html', { + 'sale': sale, + 'settings': settings, + 'amount_in_words': number_to_words_en(sale.total_amount) + }) @login_required def edit_invoice(request, pk): @@ -367,6 +377,7 @@ def edit_invoice(request, pk): 'payment_method_id': payment_method_id }) +@csrf_exempt def create_sale_api(request): if request.method == 'POST': try: @@ -389,6 +400,9 @@ def create_sale_api(request): if customer_id: customer = Customer.objects.get(id=customer_id) + if not customer and payment_type != 'cash': + return JsonResponse({'success': False, 'error': _('Credit or Partial payments are not allowed for Guest customers.')}, status=400) + settings = SystemSetting.objects.first() if not settings: settings = SystemSetting.objects.create() @@ -572,7 +586,11 @@ def quotation_create(request): def quotation_detail(request, pk): quotation = get_object_or_404(Quotation, pk=pk) settings = SystemSetting.objects.first() - return render(request, 'core/quotation_detail.html', {'quotation': quotation, 'settings': settings}) + return render(request, 'core/quotation_detail.html', { + 'quotation': quotation, + 'settings': settings, + 'amount_in_words': number_to_words_en(quotation.total_amount) + }) @csrf_exempt @login_required @@ -691,7 +709,11 @@ def sale_return_create(request): def sale_return_detail(request, pk): sale_return = get_object_or_404(SaleReturn, pk=pk) settings = SystemSetting.objects.first() - return render(request, 'core/sale_return_detail.html', {'sale_return': sale_return, 'settings': settings}) + return render(request, 'core/sale_return_detail.html', { + 'sale_return': sale_return, + 'settings': settings, + 'amount_in_words': number_to_words_en(sale_return.total_amount) + }) @csrf_exempt @login_required @@ -777,7 +799,11 @@ def purchase_return_create(request): def purchase_return_detail(request, pk): purchase_return = get_object_or_404(PurchaseReturn, pk=pk) settings = SystemSetting.objects.first() - return render(request, 'core/purchase_return_detail.html', {'purchase_return': purchase_return, 'settings': settings}) + return render(request, 'core/purchase_return_detail.html', { + 'purchase_return': purchase_return, + 'settings': settings, + 'amount_in_words': number_to_words_en(purchase_return.total_amount) + }) @csrf_exempt @login_required @@ -1728,6 +1754,7 @@ def expense_category_delete_view(request, pk): return redirect('expense_categories') @csrf_exempt @login_required +@csrf_exempt def update_sale_api(request, pk): if request.method == 'POST': try: @@ -1766,6 +1793,9 @@ def update_sale_api(request, pk): customer = None if customer_id: customer = Customer.objects.get(id=customer_id) + + if not customer and payment_type != 'cash': + return JsonResponse({'success': False, 'error': _('Credit or Partial payments are not allowed for Guest customers.')}, status=400) sale.customer = customer sale.invoice_number = invoice_number @@ -1901,6 +1931,19 @@ def customer_payments(request): }) @login_required +@login_required +def sale_receipt(request, pk): + """ + Printable receipt for a fully paid sale + """ + sale = get_object_or_404(Sale, pk=pk) + settings = SystemSetting.objects.first() + return render(request, "core/sale_receipt.html", { + "sale": sale, + "settings": settings, + "amount_in_words": number_to_words_en(sale.total_amount) + }) + def customer_payment_receipt(request, pk): """ Printable receipt for a customer payment @@ -1909,5 +1952,170 @@ def customer_payment_receipt(request, pk): settings = SystemSetting.objects.first() return render(request, "core/customer_payment_receipt.html", { "payment": payment, - "settings": settings + "settings": settings, + "amount_in_words": number_to_words_en(payment.amount) }) + +@login_required +def customer_statement(request): + """ + Generate a transaction statement for a specific customer. + """ + customers = Customer.objects.all().order_by('name') + customer_id = request.GET.get('customer') + start_date = request.GET.get('start_date') + end_date = request.GET.get('end_date') + + statement_data = [] + customer = None + opening_balance = 0 + + if customer_id: + customer = get_object_or_404(Customer, id=customer_id) + + # Calculate opening balance before start_date + if start_date: + sales_before = Sale.objects.filter(customer=customer, created_at__date__lt=start_date).aggregate(total=Sum('total_amount'))['total'] or 0 + returns_before = SaleReturn.objects.filter(customer=customer, created_at__date__lt=start_date).aggregate(total=Sum('total_amount'))['total'] or 0 + payments_before = SalePayment.objects.filter(sale__customer=customer, payment_date__lt=start_date).aggregate(total=Sum('amount'))['total'] or 0 + opening_balance = float(sales_before) - float(returns_before) - float(payments_before) + + # Fetch transactions within range + sales = Sale.objects.filter(customer=customer) + returns = SaleReturn.objects.filter(customer=customer) + payments = SalePayment.objects.filter(sale__customer=customer) + + if start_date: + sales = sales.filter(created_at__date__gte=start_date) + returns = returns.filter(created_at__date__gte=start_date) + payments = payments.filter(payment_date__gte=start_date) + if end_date: + sales = sales.filter(created_at__date__lte=end_date) + returns = returns.filter(created_at__date__lte=end_date) + payments = payments.filter(payment_date__lte=end_date) + + for sale in sales: + statement_data.append({ + 'date': sale.created_at.date(), + 'type': _('Sale Invoice'), + 'reference': sale.invoice_number or f"#{sale.id}", + 'debit': float(sale.total_amount), + 'credit': 0, + }) + for ret in returns: + statement_data.append({ + 'date': ret.created_at.date(), + 'type': _('Sale Return'), + 'reference': ret.return_number or f"#{ret.id}", + 'debit': 0, + 'credit': float(ret.total_amount), + }) + for pay in payments: + statement_data.append({ + 'date': pay.payment_date, + 'type': _('Payment'), + 'reference': pay.notes or _('Payment Received'), + 'debit': 0, + 'credit': float(pay.amount), + }) + + statement_data.sort(key=lambda x: (x['date'], x['type'])) + + running_balance = opening_balance + for item in statement_data: + running_balance += item['debit'] - item['credit'] + item['balance'] = running_balance + + settings = SystemSetting.objects.first() + context = { + 'customers': customers, + 'customer': customer, + 'statement_data': statement_data, + 'opening_balance': opening_balance, 'opening_balance_abs': abs(opening_balance), + 'start_date': start_date, + 'end_date': end_date, + 'settings': settings + } + return render(request, 'core/customer_statement.html', context) + +@login_required +def supplier_statement(request): + """ + Generate a transaction statement for a specific supplier. + """ + suppliers = Supplier.objects.all().order_by('name') + supplier_id = request.GET.get('supplier') + start_date = request.GET.get('start_date') + end_date = request.GET.get('end_date') + + statement_data = [] + supplier = None + opening_balance = 0 + + if supplier_id: + supplier = get_object_or_404(Supplier, id=supplier_id) + + # Calculate opening balance before start_date + if start_date: + purchases_before = Purchase.objects.filter(supplier=supplier, created_at__date__lt=start_date).aggregate(total=Sum('total_amount'))['total'] or 0 + returns_before = PurchaseReturn.objects.filter(supplier=supplier, created_at__date__lt=start_date).aggregate(total=Sum('total_amount'))['total'] or 0 + payments_before = PurchasePayment.objects.filter(purchase__supplier=supplier, payment_date__lt=start_date).aggregate(total=Sum('amount'))['total'] or 0 + opening_balance = float(purchases_before) - float(returns_before) - float(payments_before) + + # Fetch transactions within range + purchases = Purchase.objects.filter(supplier=supplier) + returns = PurchaseReturn.objects.filter(supplier=supplier) + payments = PurchasePayment.objects.filter(purchase__supplier=supplier) + + if start_date: + purchases = purchases.filter(created_at__date__gte=start_date) + returns = returns.filter(created_at__date__gte=start_date) + payments = payments.filter(payment_date__gte=start_date) + if end_date: + purchases = purchases.filter(created_at__date__lte=end_date) + returns = returns.filter(created_at__date__lte=end_date) + payments = payments.filter(payment_date__lte=end_date) + + for purchase in purchases: + statement_data.append({ + 'date': purchase.created_at.date(), + 'type': _('Purchase Invoice'), + 'reference': purchase.invoice_number or f"#{purchase.id}", + 'debit': float(purchase.total_amount), + 'credit': 0, + }) + for ret in returns: + statement_data.append({ + 'date': ret.created_at.date(), + 'type': _('Purchase Return'), + 'reference': ret.return_number or f"#{ret.id}", + 'debit': 0, + 'credit': float(ret.total_amount), + }) + for pay in payments: + statement_data.append({ + 'date': pay.payment_date, + 'type': _('Payment'), + 'reference': pay.notes or _('Payment Sent'), + 'debit': 0, + 'credit': float(pay.amount), + }) + + statement_data.sort(key=lambda x: (x['date'], x['type'])) + + running_balance = opening_balance + for item in statement_data: + running_balance += item['debit'] - item['credit'] + item['balance'] = running_balance + + settings = SystemSetting.objects.first() + context = { + 'suppliers': suppliers, + 'supplier': supplier, + 'statement_data': statement_data, + 'opening_balance': opening_balance, 'opening_balance_abs': abs(opening_balance), + 'start_date': start_date, + 'end_date': end_date, + 'settings': settings + } + return render(request, 'core/supplier_statement.html', context)