diff --git a/accounting/__pycache__/views.cpython-311.pyc b/accounting/__pycache__/views.cpython-311.pyc index 86bed7d..c4192dc 100644 Binary files a/accounting/__pycache__/views.cpython-311.pyc and b/accounting/__pycache__/views.cpython-311.pyc differ diff --git a/accounting/templates/accounting/journal_entries.html b/accounting/templates/accounting/journal_entries.html index b47711e..82d1e7c 100644 --- a/accounting/templates/accounting/journal_entries.html +++ b/accounting/templates/accounting/journal_entries.html @@ -18,38 +18,80 @@ - {% for entry in entries %} -
-
-
- {% trans "Date" %}: {{ entry.date }} - {% trans "Reference" %}: {{ entry.reference }} -
-
#{{ entry.id }}
-
-
-

{% trans "Description" %}: {{ entry.description }}

+
+
- +
- - - + + + + + + - {% for item in entry.items.all %} + {% for entry in entries %} + - + + + - + + + + + {% empty %} + + {% endfor %} @@ -58,12 +100,5 @@ - {% empty %} -
-
-

{% trans "No journal entries found." %}

-
-
- {% endfor %} {% endblock %} \ No newline at end of file diff --git a/accounting/views.py b/accounting/views.py index 4eee8dd..43f269a 100644 --- a/accounting/views.py +++ b/accounting/views.py @@ -69,7 +69,10 @@ def account_create_update(request, pk=None): @login_required def journal_entries(request): - entries = JournalEntry.objects.all().order_by('-date', '-id') + entries = JournalEntry.objects.annotate( + total_debit=Sum('items__amount', filter=Q(items__type='debit')), + total_credit=Sum('items__amount', filter=Q(items__type='credit')) + ).prefetch_related('items__account').order_by('-date', '-id') return render(request, 'accounting/journal_entries.html', {'entries': entries}) @login_required diff --git a/core/templates/base.html b/core/templates/base.html index e126f04..d566c76 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -320,6 +320,29 @@ {% endif %} + +
  • + + {% trans "Account" %} + + + +
    • + {% endwith %} @@ -327,85 +350,15 @@
    - - -
    +
    {% block content %}{% endblock %}
    @@ -417,15 +370,17 @@ const sidebar = document.getElementById('sidebar'); const sidebarCollapse = document.getElementById('sidebarCollapse'); - sidebarCollapse.addEventListener('click', function (e) { - e.stopPropagation(); - sidebar.classList.toggle('active'); - }); + if (sidebarCollapse) { + sidebarCollapse.addEventListener('click', function (e) { + e.stopPropagation(); + sidebar.classList.toggle('active'); + }); + } // Close sidebar when clicking outside on mobile document.addEventListener('click', function (e) { - if (window.innerWidth <= 992 && sidebar.classList.contains('active')) { - if (!sidebar.contains(e.target) && e.target !== sidebarCollapse) { + if (window.innerWidth <= 992 && sidebar && sidebar.classList.contains('active')) { + if (!sidebar.contains(e.target) && e.target !== sidebarCollapse && !sidebarCollapse.contains(e.target)) { sidebar.classList.remove('active'); } } diff --git a/core/templates/core/invoice_detail.html b/core/templates/core/invoice_detail.html index cbd00db..222d2e6 100644 --- a/core/templates/core/invoice_detail.html +++ b/core/templates/core/invoice_detail.html @@ -31,18 +31,18 @@ -
    +
    {% trans "Account" %}{% trans "Debit" %}{% trans "Credit" %}{% trans "Date" %}{% trans "Ref #" %}{% trans "Description" %}{% trans "Debit" %}{% trans "Credit" %}{% trans "Actions" %}
    {{ entry.date }} - {{ item.account.code }} - - {% if LANGUAGE_CODE == 'ar' %}{{ item.account.name_ar }}{% else %}{{ item.account.name_en }}{% endif %} + {% if entry.reference %} + {{ entry.reference }} + {% else %} + - + {% endif %} - {% if item.type == 'debit' %}{{ item.amount|floatformat:global_settings.decimal_places }}{% endif %} + {{ entry.description|truncatechars:60 }}{{ entry.total_debit|floatformat:global_settings.decimal_places }}{{ entry.total_credit|floatformat:global_settings.decimal_places }} + - {% if item.type == 'credit' %}{{ item.amount|floatformat:global_settings.decimal_places }}{% endif %} +
    +
    +
    +
    {% trans "Transaction Details" %} #{{ entry.id }}
    + {% trans "Created" %}: {{ entry.created_at|date:"Y-m-d H:i" }} +
    + + + + + + + + + + {% for item in entry.items.all %} + + + + + + {% endfor %} + +
    {% trans "Account" %}{% trans "Debit" %}{% trans "Credit" %}
    + {{ item.account.code }} - + {% if LANGUAGE_CODE == 'ar' %}{{ item.account.name_ar }}{% else %}{{ item.account.name_en }}{% endif %} + + {% if item.type == 'debit' %}{{ item.amount|floatformat:global_settings.decimal_places }}{% endif %} + + {% if item.type == 'credit' %}{{ item.amount|floatformat:global_settings.decimal_places }}{% endif %} +
    +
    +
    + {% trans "No journal entries found." %}
    - +
    +
    + - - - - @@ -121,74 +121,74 @@ {% for item in sale.items.all %} - - - - + + + {% endfor %} - - + - - + {% if sale.discount > 0 %} - - + {% endif %} - - + - - + - - +
    +
    {% trans "Item Description" %}
    وصف العنصر
    		 +
    {% trans "Unit Price" %}
    سعر الوحدة
    		 +
    {% trans "Quantity" %}
    الكمية
    		 +
    {% trans "Total" %}
    المجموع
    +
    {{ item.product.name_ar }}
    {{ item.product.name_en }}
    		{{ settings.currency_symbol }}{{ item.unit_price|floatformat:3 }}{{ item.quantity|floatformat:2 }}{{ settings.currency_symbol }}{{ item.line_total|floatformat:3 }}{{ settings.currency_symbol }}{{ item.unit_price|floatformat:3 }}{{ item.quantity|floatformat:2 }}{{ settings.currency_symbol }}{{ item.line_total|floatformat:3 }}
    +
    {% trans "Subtotal" %}
    المجموع الفرعي
    		{{ settings.currency_symbol }}{{ sale.subtotal|floatformat:3 }}{{ settings.currency_symbol }}{{ sale.subtotal|floatformat:3 }}
    +
    {% trans "VAT" %}
    الضريبة
    		{{ settings.currency_symbol }}{{ sale.vat_amount|floatformat:3 }}{{ settings.currency_symbol }}{{ sale.vat_amount|floatformat:3 }}
    +
    {% trans "Discount" %}
    الخصم
    		-{{ settings.currency_symbol }}{{ sale.discount|floatformat:3 }}-{{ settings.currency_symbol }}{{ sale.discount|floatformat:3 }}
    +
    {% trans "Grand Total" %}
    المجموع الكلي
    		{{ settings.currency_symbol }}{{ sale.total_amount|floatformat:3 }}{{ settings.currency_symbol }}{{ sale.total_amount|floatformat:3 }}
    +
    {% trans "Total Paid" %}
    إجمالي المدفوع
    		{{ settings.currency_symbol }}{{ sale.paid_amount|floatformat:3 }}{{ settings.currency_symbol }}{{ sale.paid_amount|floatformat:3 }}
    +
    {% trans "Balance Due" %}
    الرصيد المستحق
    		{{ settings.currency_symbol }}{{ sale.balance_due|floatformat:3 }}{{ settings.currency_symbol }}{{ sale.balance_due|floatformat:3 }}
    -
    -
    +
    +
    {% trans "Amount in Words" %} / المبلغ بالحروف
    {{ amount_in_words }}
    @@ -196,11 +196,11 @@ {% if sale.payments.exists %} -
    -
    {% trans "Payment Records" %} / سجلات الدفع
    +
    +
    {% trans "Payment Records" %} / سجلات الدفع
    - - +
    + @@ -233,13 +233,13 @@ {% if sale.notes %} -
    +
    {% trans "Internal Notes" %} / ملاحظات داخلية

    {{ sale.notes }}

    {% endif %} -
    +

    {% trans "Thank you for your business!" %} / شكراً لتعاملكم معنا!

    {% trans "Software by Meezan" %} / برمجة ميزان

    @@ -333,32 +333,70 @@ document.addEventListener("DOMContentLoaded", function() { @media print { @page { size: A4 portrait; - margin: 0; + margin: 10mm; } body { background-color: white !important; - -webkit-print-color-adjust: exact !important; - print-color-adjust: exact !important; margin: 0 !important; padding: 0 !important; + font-size: 12px; } .container { - width: 210mm !important; - max-width: 210mm !important; - margin: 0 auto !important; + width: 100% !important; + max-width: 100% !important; + margin: 0 !important; padding: 0 !important; } + .d-print-none { display: none !important; } + + /* Layout Overrides */ #invoice-card { - width: 210mm !important; - min-height: 297mm !important; + width: 100% !important; + max-width: none !important; margin: 0 !important; border: none !important; - border-radius: 0 !important; box-shadow: none !important; + border-radius: 0 !important; } - .d-print-none { display: none !important; } - .p-5 { padding: 15mm !important; } - .table-responsive { overflow: visible !important; } + + .print-section { + padding: 0 !important; + } + + /* Spacing Reductions */ + .print-mb-2 { margin-bottom: 0.5rem !important; } + .print-mb-1 { margin-bottom: 0.25rem !important; } + .print-mt-2 { margin-top: 1rem !important; } + .print-pt-2 { padding-top: 0.5rem !important; } + .print-pb-0 { padding-bottom: 0 !important; } + .print-px-0 { padding-left: 0 !important; padding-right: 0 !important; } + .print-mx-0 { margin-left: 0 !important; margin-right: 0 !important; } + .print-p-0 { padding: 0 !important; } + + /* Font Size Reductions */ + .print-h1 { font-size: 18px !important; margin-bottom: 0.5rem !important; } + .print-h3 { font-size: 16px !important; } + .print-h5 { font-size: 14px !important; } + .print-small { font-size: 10px !important; } + + /* Table Compactness */ + .table th, .table td { + padding: 4px 8px !important; + font-size: 11px !important; + } + .print-py-1 { padding-top: 4px !important; padding-bottom: 4px !important; } + + /* Hide Backgrounds */ + .print-bg-none { background-color: transparent !important; } + .badge { + border: 1px solid #000; + color: #000 !important; + background: transparent !important; + padding: 2px 8px !important; + } + + /* Logo sizing */ + .print-logo { max-height: 50px !important; } } {% endblock %} \ No newline at end of file diff --git a/core/templates/core/lpo_detail.html b/core/templates/core/lpo_detail.html index d317b58..6f08bd7 100644 --- a/core/templates/core/lpo_detail.html +++ b/core/templates/core/lpo_detail.html @@ -29,28 +29,28 @@
    -
    +
    {% trans "Date" %} / التاريخ {% trans "Method" %} / الطريقة
    - +
    +
    + - - - - @@ -120,32 +120,32 @@ {% for item in order.items.all %} - - - - + + + {% endfor %} - - +
    +
    {% trans "Item Description" %}
    وصف العنصر
    		 +
    {% trans "Cost Price" %}
    سعر التكلفة
    		 +
    {% trans "Quantity" %}
    الكمية
    		 +
    {% trans "Total" %}
    المجموع
    +
    {{ item.product.name_ar }}
    {{ item.product.name_en }}
    		{{ settings.currency_symbol }}{{ item.cost_price|floatformat:3 }}{{ item.quantity|floatformat:2 }}{{ settings.currency_symbol }}{{ item.line_total|floatformat:3 }}{{ settings.currency_symbol }}{{ item.cost_price|floatformat:3 }}{{ item.quantity|floatformat:2 }}{{ settings.currency_symbol }}{{ item.line_total|floatformat:3 }}
    +
    {% trans "Grand Total" %}
    المجموع الكلي
    		{{ settings.currency_symbol }}{{ order.total_amount|floatformat:3 }}{{ settings.currency_symbol }}{{ order.total_amount|floatformat:3 }}
    -
    -
    +
    +
    {% trans "Amount in Words" %} / المبلغ بالحروف
    {{ amount_in_words }}
    @@ -153,13 +153,13 @@ {% if order.notes %} -
    +
    {% trans "Notes" %} / ملاحظات

    {{ order.notes }}

    {% endif %} -
    +

    {% trans "Thank you for your business!" %} / شكراً لتعاملكم معنا!

    @@ -186,32 +186,70 @@ function downloadPDF() { @media print { @page { size: A4 portrait; - margin: 0; + margin: 10mm; } body { background-color: white !important; - -webkit-print-color-adjust: exact !important; - print-color-adjust: exact !important; margin: 0 !important; padding: 0 !important; + font-size: 12px; } .container { - width: 210mm !important; - max-width: 210mm !important; - margin: 0 auto !important; + width: 100% !important; + max-width: 100% !important; + margin: 0 !important; padding: 0 !important; } + .d-print-none { display: none !important; } + + /* Layout Overrides */ #order-card { - width: 210mm !important; - min-height: 297mm !important; + width: 100% !important; + max-width: none !important; margin: 0 !important; border: none !important; - border-radius: 0 !important; box-shadow: none !important; + border-radius: 0 !important; } - .d-print-none { display: none !important; } - .p-5 { padding: 15mm !important; } - .table-responsive { overflow: visible !important; } + + .print-section { + padding: 0 !important; + } + + /* Spacing Reductions */ + .print-mb-2 { margin-bottom: 0.5rem !important; } + .print-mb-1 { margin-bottom: 0.25rem !important; } + .print-mt-2 { margin-top: 1rem !important; } + .print-pt-2 { padding-top: 0.5rem !important; } + .print-pb-0 { padding-bottom: 0 !important; } + .print-px-0 { padding-left: 0 !important; padding-right: 0 !important; } + .print-mx-0 { margin-left: 0 !important; margin-right: 0 !important; } + .print-p-0 { padding: 0 !important; } + + /* Font Size Reductions */ + .print-h1 { font-size: 18px !important; margin-bottom: 0.5rem !important; } + .print-h3 { font-size: 16px !important; } + .print-h5 { font-size: 14px !important; } + .print-small { font-size: 10px !important; } + + /* Table Compactness */ + .table th, .table td { + padding: 4px 8px !important; + font-size: 11px !important; + } + .print-py-1 { padding-top: 4px !important; padding-bottom: 4px !important; } + + /* Hide Backgrounds */ + .print-bg-none { background-color: transparent !important; } + .badge { + border: 1px solid #000; + color: #000 !important; + background: transparent !important; + padding: 2px 8px !important; + } + + /* Logo sizing */ + .print-logo { max-height: 50px !important; } } {% endblock %} \ No newline at end of file diff --git a/core/templates/core/purchase_detail.html b/core/templates/core/purchase_detail.html index f91ae88..33f8e98 100644 --- a/core/templates/core/purchase_detail.html +++ b/core/templates/core/purchase_detail.html @@ -21,18 +21,18 @@
    -
    +