From 8c10f1e96a1f7917a3e16dec64686ff6438e6e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Sat, 18 Mar 2023 19:34:03 +0800
Subject: [PATCH] Revised the ledger not to show the accumulated balance of the
 nominal accounts.  The accumulated balance does not make sense for nominal
 accounts.

---
 src/accounting/report/reports/ledger.py                |  2 ++
 src/accounting/static/css/style.css                    | 10 ++++++++--
 .../accounting/report/include/ledger-row-desktop.html  |  4 +++-
 .../accounting/report/include/ledger-row-mobile.html   |  4 +++-
 src/accounting/templates/accounting/report/ledger.html | 10 +++++++---
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/accounting/report/reports/ledger.py b/src/accounting/report/reports/ledger.py
index d525f15..b452c67 100644
--- a/src/accounting/report/reports/ledger.py
+++ b/src/accounting/report/reports/ledger.py
@@ -178,6 +178,8 @@ class EntryCollector:
 
         :return: None.
         """
+        if self.__account.is_nominal:
+            return None
         balance: Decimal = 0 if self.brought_forward is None \
             else self.brought_forward.balance
         for entry in self.entries:
diff --git a/src/accounting/static/css/style.css b/src/accounting/static/css/style.css
index b735eff..4713fbb 100644
--- a/src/accounting/static/css/style.css
+++ b/src/accounting/static/css/style.css
@@ -221,12 +221,18 @@ a.accounting-report-table-row {
 .accounting-journal-table .accounting-report-table-row {
     grid-template-columns: 1fr 1fr 2fr 4fr 1fr 1fr;
 }
-.accounting-ledger-table .accounting-report-table-row {
+.accounting-ledger-real-table .accounting-report-table-row {
     grid-template-columns: 1fr 4fr 1fr 1fr 1fr;
 }
-.accounting-ledger-table .accounting-report-table-footer .accounting-report-table-row {
+.accounting-ledger-real-table .accounting-report-table-footer .accounting-report-table-row {
     grid-template-columns: 5fr 1fr 1fr 1fr;
 }
+.accounting-ledger-nominal-table .accounting-report-table-row {
+    grid-template-columns: 1fr 4fr 1fr 1fr;
+}
+.accounting-ledger-nominal-table .accounting-report-table-footer .accounting-report-table-row {
+    grid-template-columns: 5fr 1fr 1fr;
+}
 .accounting-income-expenses-table .accounting-report-table-row {
     grid-template-columns: 1fr 2fr 4fr 1fr 1fr 1fr;
 }
diff --git a/src/accounting/templates/accounting/report/include/ledger-row-desktop.html b/src/accounting/templates/accounting/report/include/ledger-row-desktop.html
index b50a1cd..30ffd1e 100644
--- a/src/accounting/templates/accounting/report/include/ledger-row-desktop.html
+++ b/src/accounting/templates/accounting/report/include/ledger-row-desktop.html
@@ -23,4 +23,6 @@ First written: 2023/3/8
 <div>{{ entry.summary|accounting_default }}</div>
 <div class="accounting-amount">{{ entry.debit|accounting_format_amount|accounting_default }}</div>
 <div class="accounting-amount">{{ entry.credit|accounting_format_amount|accounting_default }}</div>
-<div class="accounting-amount {% if entry.balance < 0 %} text-danger {% endif %}">{{ entry.balance|accounting_report_format_amount }}</div>
+{% if report.account.is_real %}
+  <div class="accounting-amount {% if entry.balance < 0 %} text-danger {% endif %}">{{ entry.balance|accounting_report_format_amount }}</div>
+{% endif %}
diff --git a/src/accounting/templates/accounting/report/include/ledger-row-mobile.html b/src/accounting/templates/accounting/report/include/ledger-row-mobile.html
index 2a970ee..03dff3e 100644
--- a/src/accounting/templates/accounting/report/include/ledger-row-mobile.html
+++ b/src/accounting/templates/accounting/report/include/ledger-row-mobile.html
@@ -37,5 +37,7 @@ First written: 2023/3/5
   {% if entry.credit %}
     <span class="badge rounded-pill bg-warning">-{{ entry.credit|accounting_format_amount }}</span>
   {% endif %}
-  <span class="badge rounded-pill bg-primary">{{ entry.balance|accounting_format_amount }}</span>
+  {% if report.account.is_real %}
+    <span class="badge rounded-pill bg-primary">{{ entry.balance|accounting_format_amount }}</span>
+  {% endif %}
 </div>
diff --git a/src/accounting/templates/accounting/report/ledger.html b/src/accounting/templates/accounting/report/ledger.html
index 4706c07..ed1a43a 100644
--- a/src/accounting/templates/accounting/report/ledger.html
+++ b/src/accounting/templates/accounting/report/ledger.html
@@ -49,14 +49,16 @@ First written: 2023/3/5
     {% include "accounting/include/pagination.html" %}
   {% endwith %}
 
-  <div class="d-none d-md-block accounting-report-table accounting-ledger-table">
+  <div class="d-none d-md-block accounting-report-table {% if report.account.is_real %} accounting-ledger-real-table {% else %} accounting-ledger-nominal-table {% endif %}">
     <div class="accounting-report-table-header">
       <div class="accounting-report-table-row">
         <div>{{ A_("Date") }}</div>
         <div>{{ A_("Summary") }}</div>
         <div class="accounting-amount">{{ A_("Debit") }}</div>
         <div class="accounting-amount">{{ A_("Credit") }}</div>
-        <div class="accounting-amount">{{ A_("Balance") }}</div>
+        {% if report.account.is_real %}
+          <div class="accounting-amount">{{ A_("Balance") }}</div>
+        {% endif %}
       </div>
     </div>
     <div class="accounting-report-table-body">
@@ -80,7 +82,9 @@ First written: 2023/3/5
             <div>{{ A_("Total") }}</div>
             <div class="accounting-amount">{{ entry.debit|accounting_format_amount|accounting_default }}</div>
             <div class="accounting-amount">{{ entry.credit|accounting_format_amount|accounting_default }}</div>
-            <div class="accounting-amount {% if entry.balance < 0 %} text-danger {% endif %}">{{ entry.balance|accounting_report_format_amount }}</div>
+            {% if report.account.is_real %}
+              <div class="accounting-amount {% if entry.balance < 0 %} text-danger {% endif %}">{{ entry.balance|accounting_report_format_amount }}</div>
+            {% endif %}
           </div>
         </div>
       {% endwith %}