From 0d4f56bf849eae216f9a48cf2b1b3f6c838d574e Mon Sep 17 00:00:00 2001
From: Shllokkk <shllokosan23@gmail.com>
Date: Thu, 26 Mar 2026 17:23:15 +0530
Subject: [PATCH] refactor: table body data rendering cleanup

---
 .../general_ledger_standard.json              |   4 +-
 .../report/general_ledger/general_ledger.html | 153 +++++++++---------
 2 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/erpnext/accounts/print_format/general_ledger_standard/general_ledger_standard.json b/erpnext/accounts/print_format/general_ledger_standard/general_ledger_standard.json
index da4fe92a006..05efcc4aab6 100644
--- a/erpnext/accounts/print_format/general_ledger_standard/general_ledger_standard.json
+++ b/erpnext/accounts/print_format/general_ledger_standard/general_ledger_standard.json
@@ -8,14 +8,14 @@
  "docstatus": 0,
  "doctype": "Print Format",
  "font_size": 14,
- "html": "<style type=\"text/css\">\n    body, html {\n        margin-top: 10px;\n        padding: 0;\n        width: 100%;\n        height: auto;\n        font-family: Inter, sans-serif;\n        font-size: 14px;\n        line-height: 21px;\n        color: #171717;\n    }\n\n    .title-letter-spacing {\n        letter-spacing: .2rem;\n\t\tfont-size: 14px; \n\t\tfont-weight: 600; \n\t\tcolor: #171717;\n    }\n\n    .report-table table {\n        width: 100%;\n        table-layout: fixed;\n        border-collapse: collapse;\n    }\n\n    .report-table thead th {\n        background: #f8f8f8;\n        text-align: center;\n\t\tfont-size: 14px;\n        font-weight: 500;\n        color: #7c7c7c;\n        border-top: 1px solid #ededed;\n        border-bottom: 1px solid #ededed;\n        padding: 6px 8px;\n    }\n\n    .report-table tbody td {\n        padding: 6px 8px;\n        border-top: 1px solid #ededed;\n        border-bottom: 1px solid #ededed;\n        vertical-align: top;\n        word-wrap: break-word;\n        font-size: 14px;\n    }\n\n    .report-table thead th:first-child {\n        border-left: 1px solid #ededed;\n    }\n\n    .report-table thead th:last-child {\n        border-right: 1px solid #ededed;\n    }\n\n    .report-table tbody tr:last-child td {\n        border-bottom: none;\n    }\n\n    .date-col {\n        white-space: nowrap;\n    }\n\n    .text-center { text-align: center; }\n    .text-left { text-align: left; }\n    .text-right { text-align: right; font-variant-numeric: tabular-nums; }\n\n    .text-bold { font-weight: 700; }\n\n    .report-meta {\n        margin: 10px 0 14px;\n        padding: 8px 10px;\n        color: #171717;\n\t\tfont-size: 14px;\n        display: flex;\n        justify-content: space-between;\n        align-items: flex-start;\n        gap: 12px;\n    }\n\n    .report-meta .left,\n    .report-meta .right {\n        display: flex;\n        flex-direction: column;\n    }\n\n    .report-meta .filter-row {\n        margin-bottom: 4px;\n        line-height: 1.5;\n    }\n\n    .report-meta strong {\n        color: #7c7c7c;\n        font-weight: 500;\n    }\n\n    @media print {\n        @page {\n            size: A4;\n            margin-top: 10mm;\n        }\n        thead {\n            display: table-header-group;\n        }\n        tfoot {\n            display: table-footer-group;\n        }\n        tr {\n            page-break-inside: avoid;\n        }\n        .no-print {\n            display: none !important;\n        }\n    }\n</style>\n\n<br>\n\n<div>\n\n    <div class=\"text-center\" style=\"margin-bottom: 12px;\">\n        <div class=\"title-letter-spacing\">\n            {%= __(\"STATEMENT OF ACCOUNTS\") %}\n        </div>\n    </div>\n\n    {% if (subtitle && subtitle.trim()) { %}\n        <div class=\"report-meta\">\n            {{ subtitle }}\n        </div>\n    {% } else { %}\n       <div class=\"report-meta\">\n\t\t\t<div class=\"left\">\n\t\t\t\t<div class=\"filter-row\">\n\t\t\t\t\t<strong>{%= __(\"Customer\") %}:</strong>\n\t\t\t\t\t{%= \n\t\t\t\t\t\t(filters.party.length && filters.party.join(\", \")) || filters.party_name || \"All Parties\"\n\t\t\t\t\t%}\n\t\t\t\t</div>\n\t\t\t</div>\n\n\t\t\t<div class=\"right text-right\">\n\t\t\t\t<div class=\"filter-row\">\n\t\t\t\t\t<strong>{%= __(\"Statement Period\") %}:</strong>\n\t\t\t\t\t{%= __(\"{0} to {1}\", [\n\t\t\t\t\t\tfrappe.datetime.str_to_user(filters.from_date),\n\t\t\t\t\t\tfrappe.datetime.str_to_user(filters.to_date)\n\t\t\t\t\t]) %}\n\t\t\t\t</div>\n\t\t\t</div>\n\t\t</div>\n    {% } %}\n\n    <div class=\"report-table\">\n        <table>\n            <thead>\n                <tr>\n                    <th style=\"width: 8em; text-align: left;\">{%= __(\"Date\") %}</th>\n                    <th style=\"text-align: left;\">{%= __(\"Voucher Details\") %}</th>\n\n                    {% if(filters.show_remarks) { %}\n                        <th>{%= __(\"Remarks\") %}</th>\n                    {% } %}\n\n                    <th style=\"width: 10em; text-align: right;\">{%= __(\"Debit\") %}</th>\n                    <th style=\"width: 10em; text-align: right;\">{%= __(\"Credit\") %}</th>\n                    <th style=\"width: 10em; text-align: right;\">{%= __(\"Balance\") %}</th>\n                </tr>\n            </thead>\n\n            <tbody>\n                {% for(var i=0, l=data.length; i<l; i++) { %}\n                    {% var row = data[i]; %}\n                    <tr>\n\n                        <td class=\"text-left date-col\">\n                            {% if(row.posting_date) { %}\n                                {%= frappe.datetime.str_to_user(row.posting_date) %}\n                            {% } else if(i == 0) { %}\n                                {%= frappe.datetime.str_to_user(filters.from_date) %}\n                            {% } %}\n                        </td>\n\n                        <td class=\"{% if(!row.posting_date) { %}text-left text-bold{% } %}\">\n                            {% if(row.posting_date) { %}\n                                {%= row.voucher_type %} {%= row.voucher_no %}\n\n                                {% if(!(filters.party || filters.account)) { %}\n                                    <div style=\"margin-top: 2px;\">\n                                        {%= row.party || row.account %}\n                                    </div>\n                                {% } %}\n\n                                {% if(row.bill_no) { %}\n                                    <div style=\"margin-top: 2px;\">\n                                        {%= __(\"Supplier Invoice No\") %}: {%= row.bill_no %}\n                                    </div>\n                                {% } %}\n\n                            {% } else { %}\n                                {% if(i == l-2) { %}\n                                    {%= __(\"Total\") %}\n                                {% } else if(i == l-1) { %}\n                                    {%= __(\"Closing [Opening + Total] \") %}\n                                {% } else { %}\n                                    {%= frappe.format(row.account, {fieldtype: \"Link\"}) || \"&nbsp;\" %}\n                                {% } %}\n                            {% } %}\n                        </td>\n\n                        {% if(filters.show_remarks) { %}\n                            <td class=\"text-left\">\n                                {% if(row.posting_date && row.remarks && row.remarks != \"No Remarks\") { %}\n                                    {%= row.remarks %}\n                                {% } %}\n                            </td>\n                        {% } %}\n\n                        <td class=\"text-right\">\n                            {% if(row.posting_date) { %}\n                                {% if(row.debit != 0) { %}\n                                    {%= format_currency(row.debit, filters.presentation_currency) %}\n                                {% } %}\n                            {% } else if(i != 0 && i != l-1) { %}\n                                {%= row.account && format_currency(row.debit, filters.presentation_currency) %}\n                            {% } %}\n                        </td>\n\n                        <td class=\"text-right\">\n                            {% if(row.posting_date) { %}\n                                {% if(row.credit != 0) { %}\n                                    {%= format_currency(row.credit, filters.presentation_currency) %}\n                                {% } %}\n                            {% } else if(i != 0 && i != l-1) { %}\n                                {%= row.account && format_currency(row.credit, filters.presentation_currency) %}\n                            {% } %}\n                        </td>\n\n                        <td class=\"text-right {% if(i == l-1) { %}text-bold{% } %}\">\n                            {% if(i == l-1) { %}\n                                {%= format_currency(row.balance, filters.presentation_currency) %}\n                                {% if(row.balance < 0){ %} Cr{% } %}\n                                {% if(row.balance > 0){ %} Dr{% } %}\n                            {% } else { %}\n                                {%= format_currency(row.balance, filters.presentation_currency) %}\n                            {% } %}\n                        </td>\n\n                    </tr>\n                {% endfor %}\n            </tbody>\n        </table>\n    </div>\n\n    <p class=\"text-right\">\n        {%= __(\"Printed on {0}\", [\n            frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())\n        ]) %}\n    </p>\n\n</div>",
+ "html": "<style type=\"text/css\">\n    body, html {\n        margin-top: 10px;\n        padding: 0;\n        width: 100%;\n        height: auto;\n        font-family: Inter, sans-serif;\n        font-size: 14px;\n        line-height: 21px;\n        color: #171717;\n    }\n\n    .title-letter-spacing {\n\t\tfont-size: 14px;\n\t\tfont-weight: 600;\n\t\tcolor: #171717;\n    }\n\n    .report-table table {\n        width: 100%;\n        table-layout: fixed;\n        border-collapse: collapse;\n    }\n\n    .report-table thead th {\n        background: #f8f8f8;\n        text-align: center;\n\t\tfont-size: 14px;\n        font-weight: 500;\n        color: #7c7c7c;\n        border-top: 1px solid #ededed;\n        border-bottom: 1px solid #ededed;\n        padding: 6px 8px;\n    }\n\n    .report-table tbody td {\n        padding: 6px 8px;\n        border-top: 1px solid #ededed;\n        border-bottom: 1px solid #ededed;\n        vertical-align: top;\n        word-wrap: break-word;\n        font-size: 14px;\n    }\n\n    .report-table thead th:first-child {\n        border-left: 1px solid #ededed;\n    }\n\n    .report-table thead th:last-child {\n        border-right: 1px solid #ededed;\n    }\n\n    .report-table tbody tr:last-child td {\n        border-bottom: none;\n    }\n\n    .date-col {\n        white-space: nowrap;\n    }\n\n    .text-center { text-align: center; }\n    .text-left { text-align: left; }\n    .text-right { text-align: right; font-variant-numeric: tabular-nums; }\n\n    .text-bold { font-weight: 700; }\n\n    .report-meta {\n        margin: 10px 0 14px;\n        padding: 8px 10px;\n        color: #171717;\n\t\tfont-size: 14px;\n        display: flex;\n        justify-content: space-between;\n        align-items: flex-start;\n        gap: 12px;\n    }\n\n    .report-meta .left,\n    .report-meta .right {\n        display: flex;\n        flex-direction: column;\n    }\n\n    .report-meta .filter-row {\n        margin-bottom: 4px;\n        line-height: 1.5;\n    }\n\n    .report-meta strong {\n        color: #7c7c7c;\n        font-weight: 500;\n    }\n\n    @media print {\n        @page {\n            size: A4;\n            margin-top: 10mm;\n        }\n        thead {\n            display: table-header-group;\n        }\n        tfoot {\n            display: table-footer-group;\n        }\n        tr {\n            page-break-inside: avoid;\n        }\n        .no-print {\n            display: none !important;\n        }\n    }\n</style>\n\n<br>\n\n<div>\n\n    <div class=\"text-center\" style=\"margin-bottom: 12px;\">\n        <div class=\"title-letter-spacing\">\n            {%= __(\"Statement Of Accounts\") %}\n        </div>\n    </div>\n\n    {% if (subtitle && subtitle.trim()) { %}\n        <div class=\"report-meta\">\n            {{ subtitle }}\n        </div>\n    {% } else { %}\n       <div class=\"report-meta\">\n\t\t\t<div class=\"left\">\n\t\t\t\t<div class=\"filter-row\">\n\t\t\t\t\t<strong>{%= __(\"Customer\") %}:</strong>\n\t\t\t\t\t{%=\n\t\t\t\t\t\t(filters.party.length && filters.party.join(\", \")) || filters.party_name || \"All Parties\"\n\t\t\t\t\t%}\n\t\t\t\t</div>\n\t\t\t</div>\n\n\t\t\t<div class=\"right text-right\">\n\t\t\t\t<div class=\"filter-row\">\n\t\t\t\t\t<strong>{%= __(\"Statement Period\") %}:</strong>\n\t\t\t\t\t{%= __(\"{0} to {1}\", [\n\t\t\t\t\t\tfrappe.datetime.str_to_user(filters.from_date),\n\t\t\t\t\t\tfrappe.datetime.str_to_user(filters.to_date)\n\t\t\t\t\t]) %}\n\t\t\t\t</div>\n\t\t\t</div>\n\t\t</div>\n    {% } %}\n\n    <div class=\"report-table\">\n        <table>\n            <thead>\n                <tr>\n                    <th style=\"width: 8em; text-align: left;\">{%= __(\"Date\") %}</th>\n                    <th style=\"text-align: left;\">{%= __(\"Voucher Details\") %}</th>\n\n                    {% if(filters.show_remarks) { %}\n                        <th>{%= __(\"Remarks\") %}</th>\n                    {% } %}\n\n                    <th style=\"width: 10em; text-align: right;\">{%= __(\"Debit\") %}</th>\n                    <th style=\"width: 10em; text-align: right;\">{%= __(\"Credit\") %}</th>\n                    <th style=\"width: 10em; text-align: right;\">{%= __(\"Balance\") %}</th>\n                </tr>\n            </thead>\n\n            <tbody>\n\t\t\t\t{% for(var i=0, l=data.length; i<l; i++) { %}\n\t\t\t\t\t{% var row = data[i]; %}\n\t\t\t\t\t{% var is_entry = row.posting_date; %}\n\t\t\t\t\t{% var is_last = i == l-1; %}\n\t\t\t\t\t{% var is_second_last = i == l-2; %}\n\n\t\t\t\t\t<tr>\n\n\t\t\t\t\t\t<!-- Date -->\n\t\t\t\t\t\t<td class=\"text-left date-col\">\n\t\t\t\t\t\t\t{% if(is_entry) { %}\n\t\t\t\t\t\t\t\t{%= frappe.datetime.str_to_user(row.posting_date) %}\n\t\t\t\t\t\t\t{% } else if(i == 0) { %}\n\t\t\t\t\t\t\t\t{%= frappe.datetime.str_to_user(filters.from_date) %}\n\t\t\t\t\t\t\t{% } %}\n\t\t\t\t\t\t</td>\n\n\t\t\t\t\t\t<!-- Voucher Details -->\n\t\t\t\t\t\t<td class=\"{% if(!is_entry) { %}text-left text-bold{% } %}\">\n\t\t\t\t\t\t\t{% if(is_entry) { %}\n\n\t\t\t\t\t\t\t\t{%= row.voucher_type %} {%= row.voucher_no %}\n\n\t\t\t\t\t\t\t\t{% if(!(filters.party || filters.account)) { %}\n\t\t\t\t\t\t\t\t\t<div style=\"margin-top: 2px;\">\n\t\t\t\t\t\t\t\t\t\t{%= row.party || row.account %}\n\t\t\t\t\t\t\t\t\t</div>\n\t\t\t\t\t\t\t\t{% } %}\n\n\t\t\t\t\t\t\t\t{% if(row.bill_no) { %}\n\t\t\t\t\t\t\t\t\t<div style=\"margin-top: 2px;\">\n\t\t\t\t\t\t\t\t\t\t{%= __(\"Supplier Invoice No\") %}: {%= row.bill_no %}\n\t\t\t\t\t\t\t\t\t</div>\n\t\t\t\t\t\t\t\t{% } %}\n\n\t\t\t\t\t\t\t{% } else { %}\n\n\t\t\t\t\t\t\t\t{% if(is_second_last) { %}\n\t\t\t\t\t\t\t\t\t{%= __(\"Total\") %}\n\t\t\t\t\t\t\t\t{% } else if(is_last) { %}\n\t\t\t\t\t\t\t\t\t{%= __(\"Closing [Opening + Total] \") %}\n\t\t\t\t\t\t\t\t{% } else { %}\n\t\t\t\t\t\t\t\t\t{%= frappe.format(row.account, {fieldtype: \"Link\"}) || \"&nbsp;\" %}\n\t\t\t\t\t\t\t\t{% } %}\n\n\t\t\t\t\t\t\t{% } %}\n\t\t\t\t\t\t</td>\n\n\t\t\t\t\t\t<!-- Remarks -->\n\t\t\t\t\t\t{% if(filters.show_remarks) { %}\n\t\t\t\t\t\t<td class=\"text-left\">\n\t\t\t\t\t\t\t{% if(is_entry && row.remarks && row.remarks != \"No Remarks\") { %}\n\t\t\t\t\t\t\t\t{%= row.remarks %}\n\t\t\t\t\t\t\t{% } %}\n\t\t\t\t\t\t</td>\n\t\t\t\t\t\t{% } %}\n\n\t\t\t\t\t\t<!-- Debit -->\n\t\t\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t\t\t{% if(is_entry) { %}\n\t\t\t\t\t\t\t\t{% if(row.debit != 0) { %}\n\t\t\t\t\t\t\t\t\t{%= format_currency(row.debit, filters.presentation_currency) %}\n\t\t\t\t\t\t\t\t{% } %}\n\t\t\t\t\t\t\t{% } else if(i != 0 && !is_last) { %}\n\t\t\t\t\t\t\t\t{%= row.account && format_currency(row.debit, filters.presentation_currency) %}\n\t\t\t\t\t\t\t{% } %}\n\t\t\t\t\t\t</td>\n\n\t\t\t\t\t\t<!-- Credit -->\n\t\t\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t\t\t{% if(is_entry) { %}\n\t\t\t\t\t\t\t\t{% if(row.credit != 0) { %}\n\t\t\t\t\t\t\t\t\t{%= format_currency(row.credit, filters.presentation_currency) %}\n\t\t\t\t\t\t\t\t{% } %}\n\t\t\t\t\t\t\t{% } else if(i != 0 && !is_last) { %}\n\t\t\t\t\t\t\t\t{%= row.account && format_currency(row.credit, filters.presentation_currency) %}\n\t\t\t\t\t\t\t{% } %}\n\t\t\t\t\t\t</td>\n\n\t\t\t\t\t\t<!-- Balance -->\n\t\t\t\t\t\t<td class=\"text-right {% if(is_last) { %}text-bold{% } %}\">\n\t\t\t\t\t\t\t{% if(is_last) { %}\n\t\t\t\t\t\t\t\t{%= format_currency(row.balance, filters.presentation_currency) %}\n\t\t\t\t\t\t\t\t{% if(row.balance < 0) { %} Cr{% } %}\n\t\t\t\t\t\t\t\t{% if(row.balance > 0) { %} Dr{% } %}\n\t\t\t\t\t\t\t{% } else { %}\n\t\t\t\t\t\t\t\t{%= format_currency(row.balance, filters.presentation_currency) %}\n\t\t\t\t\t\t\t{% } %}\n\t\t\t\t\t\t</td>\n\n\t\t\t\t\t</tr>\n\t\t\t\t{% } %}\n\t\t\t</tbody>\n        </table>\n    </div>\n\n    <p class=\"text-right\">\n        {%= __(\"Printed on {0}\", [\n            frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string())\n        ]) %}\n    </p>\n\n</div>",
  "idx": 0,
  "line_breaks": 0,
  "margin_bottom": 15.0,
  "margin_left": 15.0,
  "margin_right": 15.0,
  "margin_top": 15.0,
- "modified": "2026-03-26 12:02:00.022093",
+ "modified": "2026-03-26 17:07:36.264246",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "General Ledger Standard",
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index cb3fdddac73..c620986bc2c 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -11,7 +11,7 @@
     }
 
     .title-letter-spacing {
-		font-size: 14px;
+		font-size: 15px;
 		font-weight: 600;
 		color: #171717;
     }
@@ -117,7 +117,7 @@
 
     <div class="text-center" style="margin-bottom: 12px;">
         <div class="title-letter-spacing">
-            {%= __("STATEMENT OF ACCOUNTS") %}
+            {%= __("Statement Of Accounts") %}
         </div>
     </div>
 
@@ -156,7 +156,7 @@
                     <th style="text-align: left;">{%= __("Voucher Details") %}</th>
 
                     {% if(filters.show_remarks) { %}
-                        <th>{%= __("Remarks") %}</th>
+                        <th style="text-align: left;">{%= __("Remarks") %}</th>
                     {% } %}
 
                     <th style="width: 10em; text-align: right;">{%= __("Debit") %}</th>
@@ -166,86 +166,93 @@
             </thead>
 
             <tbody>
-                {% for(var i=0, l=data.length; i<l; i++) { %}
-                    {% var row = data[i]; %}
-                    <tr>
+				{% for(var i=0, l=data.length; i<l; i++) { %}
+					{% var row = data[i]; %}
+					{% var is_entry = row.posting_date; %}
+					{% var is_last = i == l-1; %}
+					{% var is_second_last = i == l-2; %}
 
-                        <td class="text-left date-col">
-                            {% if(row.posting_date) { %}
-                                {%= frappe.datetime.str_to_user(row.posting_date) %}
-                            {% } else if(i == 0) { %}
-                                {%= frappe.datetime.str_to_user(filters.from_date) %}
-                            {% } %}
-                        </td>
+					<tr>
 
-                        <td class="{% if(!row.posting_date) { %}text-left text-bold{% } %}">
-                            {% if(row.posting_date) { %}
-                                {%= row.voucher_type %} {%= row.voucher_no %}
+						<td class="text-left date-col">
+							{% if(is_entry) { %}
+								{%= frappe.datetime.str_to_user(row.posting_date) %}
+							{% } else if(i == 0) { %}
+								{%= frappe.datetime.str_to_user(filters.from_date) %}
+							{% } %}
+						</td>
 
-                                {% if(!(filters.party || filters.account)) { %}
-                                    <div style="margin-top: 2px;">
-                                        {%= row.party || row.account %}
-                                    </div>
-                                {% } %}
+						<td class="{% if(!is_entry) { %}text-left text-bold{% } %}">
+							{% if(is_entry) { %}
 
-                                {% if(row.bill_no) { %}
-                                    <div style="margin-top: 2px;">
-                                        {%= __("Supplier Invoice No") %}: {%= row.bill_no %}
-                                    </div>
-                                {% } %}
+								{%= row.voucher_type %} {%= row.voucher_no %}
 
-                            {% } else { %}
-                                {% if(i == l-2) { %}
-                                    {%= __("Total") %}
-                                {% } else if(i == l-1) { %}
-                                    {%= __("Closing [Opening + Total] ") %}
-                                {% } else { %}
-                                    {%= frappe.format(row.account, {fieldtype: "Link"}) || "&nbsp;" %}
-                                {% } %}
-                            {% } %}
-                        </td>
+								{% if(!(filters.party || filters.account)) { %}
+									<div style="margin-top: 2px;">
+										{%= row.party || row.account %}
+									</div>
+								{% } %}
 
-                        {% if(filters.show_remarks) { %}
-                            <td class="text-left">
-                                {% if(row.posting_date && row.remarks && row.remarks != "No Remarks") { %}
-                                    {%= row.remarks %}
-                                {% } %}
-                            </td>
-                        {% } %}
+								{% if(row.bill_no) { %}
+									<div style="margin-top: 2px;">
+										{%= __("Supplier Invoice No") %}: {%= row.bill_no %}
+									</div>
+								{% } %}
 
-                        <td class="text-right">
-                            {% if(row.posting_date) { %}
-                                {% if(row.debit != 0) { %}
-                                    {%= format_currency(row.debit, filters.presentation_currency) %}
-                                {% } %}
-                            {% } else if(i != 0 && i != l-1) { %}
-                                {%= row.account && format_currency(row.debit, filters.presentation_currency) %}
-                            {% } %}
-                        </td>
+							{% } else { %}
 
-                        <td class="text-right">
-                            {% if(row.posting_date) { %}
-                                {% if(row.credit != 0) { %}
-                                    {%= format_currency(row.credit, filters.presentation_currency) %}
-                                {% } %}
-                            {% } else if(i != 0 && i != l-1) { %}
-                                {%= row.account && format_currency(row.credit, filters.presentation_currency) %}
-                            {% } %}
-                        </td>
+								{% if(is_second_last) { %}
+									{%= __("Total") %}
+								{% } else if(is_last) { %}
+									{%= __("Closing [Opening + Total] ") %}
+								{% } else { %}
+									{%= frappe.format(row.account, {fieldtype: "Link"}) || "&nbsp;" %}
+								{% } %}
 
-                        <td class="text-right {% if(i == l-1) { %}text-bold{% } %}">
-                            {% if(i == l-1) { %}
-                                {%= format_currency(row.balance, filters.presentation_currency) %}
-                                {% if(row.balance < 0){ %} Cr{% } %}
-                                {% if(row.balance > 0){ %} Dr{% } %}
-                            {% } else { %}
-                                {%= format_currency(row.balance, filters.presentation_currency) %}
-                            {% } %}
-                        </td>
+							{% } %}
+						</td>
 
-                    </tr>
-                {% endfor %}
-            </tbody>
+						{% if(filters.show_remarks) { %}
+						<td class="text-left">
+							{% if(is_entry && row.remarks && row.remarks != "No Remarks") { %}
+								{%= row.remarks %}
+							{% } %}
+						</td>
+						{% } %}
+
+						<td class="text-right">
+							{% if(is_entry) { %}
+								{% if(row.debit != 0) { %}
+									{%= format_currency(row.debit, filters.presentation_currency) %}
+								{% } %}
+							{% } else if(i != 0 && !is_last) { %}
+								{%= row.account && format_currency(row.debit, filters.presentation_currency) %}
+							{% } %}
+						</td>
+
+						<td class="text-right">
+							{% if(is_entry) { %}
+								{% if(row.credit != 0) { %}
+									{%= format_currency(row.credit, filters.presentation_currency) %}
+								{% } %}
+							{% } else if(i != 0 && !is_last) { %}
+								{%= row.account && format_currency(row.credit, filters.presentation_currency) %}
+							{% } %}
+						</td>
+
+						<td class="text-right {% if(is_last) { %}text-bold{% } %}">
+							{% if(is_last) { %}
+								{%= format_currency(row.balance, filters.presentation_currency) %}
+								{% if(row.balance < 0) { %} Cr{% } %}
+								{% if(row.balance > 0) { %} Dr{% } %}
+							{% } else { %}
+								{%= format_currency(row.balance, filters.presentation_currency) %}
+							{% } %}
+						</td>
+
+					</tr>
+				{% } %}
+			</tbody>
         </table>
     </div>