+ {% if net_vat > 0 %}
+ {% trans "Amount to be paid to Tax Authority" %} / المبلغ المستحق للدفع للهيئة الضريبية
+ {% else %}
+ {% trans "Amount to be refunded from Tax Authority" %} / المبلغ المستحق للاسترداد من الهيئة الضريبية
+ {% endif %}
+
+
+
+
+
+
+{% endblock %}
diff --git a/accounting/urls.py b/accounting/urls.py
index b1d6a56..8b4699a 100644
--- a/accounting/urls.py
+++ b/accounting/urls.py
@@ -9,6 +9,7 @@ urlpatterns = [
path('journal-entries/', views.journal_entries, name='journal_entries'),
path('journal-entries/manual/', views.manual_journal_entry, name='manual_journal_entry'),
path('ledger//', views.account_ledger, name='account_ledger'),
+ path('reports/vat/', views.vat_report, name='vat_report'),
path('trial-balance/', views.trial_balance, name='trial_balance'),
path('balance-sheet/', views.balance_sheet, name='balance_sheet'),
path('profit-loss/', views.profit_loss, name='profit_loss'),
diff --git a/accounting/views.py b/accounting/views.py
index 6a563f6..28476a5 100644
--- a/accounting/views.py
+++ b/accounting/views.py
@@ -4,13 +4,71 @@ from django.contrib.auth.decorators import login_required
from django.contrib import messages
from .models import Account, JournalEntry, JournalItem
from .forms import AccountForm, JournalEntryForm
-from django.db.models import Sum, Q, Value, DecimalField
+from core.models import Sale, Purchase, Product
+from django.db.models import Sum, Q, Value, DecimalField, F
from django.db.models.functions import Coalesce
from django.utils import timezone
-from datetime import datetime
+from datetime import datetime, date
from django.db import transaction
import json
+@login_required
+def vat_report(request):
+ start_date = request.GET.get('start_date')
+ end_date = request.GET.get('end_date')
+
+ if not start_date:
+ start_date = timezone.now().replace(day=1).strftime('%Y-%m-%d')
+ if not end_date:
+ end_date = timezone.now().strftime('%Y-%m-%d')
+
+ # Convert strings to date objects for filtering
+ # Note: We filter by the day inclusive
+
+ sales = Sale.objects.filter(created_at__date__gte=start_date, created_at__date__lte=end_date).exclude(status='cancelled')
+ purchases = Purchase.objects.filter(created_at__date__gte=start_date, created_at__date__lte=end_date).exclude(status='cancelled').prefetch_related('items__product')
+
+ # Output VAT (Sales)
+ total_sales_subtotal = sales.aggregate(sum=Sum('subtotal'))['sum'] or 0
+ total_output_vat = sales.aggregate(sum=Sum('vat_amount'))['sum'] or 0
+ total_sales_gross = sales.aggregate(sum=Sum('total_amount'))['sum'] or 0
+
+ # Input VAT (Purchases) - Estimated based on Product VAT rate
+ # Since Purchase model doesn't store VAT explicitly, we calculate it from items
+ total_purchases_subtotal = 0
+ total_input_vat = 0
+
+ for purchase in purchases:
+ purchase_vat = 0
+ purchase_subtotal = 0
+ for item in purchase.items.all():
+ # Assume item line_total is cost * quantity
+ # We calculate VAT on top.
+ rate = float(item.product.vat)
+ line_total = float(item.line_total)
+ tax = line_total * (rate / 100.0)
+ purchase_vat += tax
+ purchase_subtotal += line_total
+
+ total_input_vat += purchase_vat
+ total_purchases_subtotal += purchase_subtotal
+
+ total_purchases_gross = total_purchases_subtotal + total_input_vat
+
+ context = {
+ 'start_date': start_date,
+ 'end_date': end_date,
+ 'total_sales_subtotal': total_sales_subtotal,
+ 'total_output_vat': total_output_vat,
+ 'total_sales_gross': total_sales_gross,
+ 'total_purchases_subtotal': total_purchases_subtotal,
+ 'total_input_vat': total_input_vat,
+ 'total_purchases_gross': total_purchases_gross,
+ 'net_vat': float(total_output_vat) - total_input_vat,
+ 'currency': 'OMR',
+ }
+ return render(request, 'accounting/vat_report.html', context)
+
@login_required
def accounting_dashboard(request):
total_assets = sum(acc.balance for acc in Account.objects.filter(account_type='asset'))
diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 2433d21..1e00527 100644
Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ
diff --git a/core/templates/core/customer_statement.html b/core/templates/core/customer_statement.html
index 0f755ca..7c23d2f 100644
--- a/core/templates/core/customer_statement.html
+++ b/core/templates/core/customer_statement.html
@@ -3,11 +3,44 @@
{% block content %}
-
+
Customer Statement
+ {% if selected_customer %}
+
+ {% endif %}
-
+
+
+
Filter
@@ -40,28 +73,45 @@
{% if selected_customer %}
-
+
-
Statement for: {{ selected_customer.name }}
+
+
Customer Statement
+
+
+
{{ selected_customer.name }}
+ {% if selected_customer.phone %}
Phone: {{ selected_customer.phone }}
{% endif %}
+
+
+
Date Range:
+
+ {% if start_date %}{{ start_date }}{% else %}Start{% endif %}
+ to
+ {% if end_date %}{{ end_date }}{% else %}Present{% endif %}
+