From ceee06efd2a09ba264ff4b33504fa1b7dcec4976 Mon Sep 17 00:00:00 2001
From: akashdubey22 <34884206+akashdubey22@users.noreply.github.com>
Date: Wed, 27 Nov 2024 17:26:47 +0530
Subject: [PATCH] refactor: updated print format for general ledger (#44057)

* refactor: update General Ledger print format

* Update general_ledger.html

* Update general_ledger.html

Removed extra spaces

* refactor: use letter-spacing for titles

* Update general_ledger.html

Comment added back

* Update general_ledger.html

* refactor: adding Remarks conditions & print party_type

* refactor: added Remarks column & adjusted spaces

Remarks column will be printed when Show Remarks is checked.

* Update general_ledger.html

Removed whitespace

* Update general_ledger.html

Fixed by removing colspan=2 in Opening Balance.

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
---
 .../report/general_ledger/general_ledger.html | 254 ++++++++++++------
 1 file changed, 176 insertions(+), 78 deletions(-)

diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index bdea568bdf..f7771d1a66 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -1,82 +1,180 @@
-<h2 class="text-center">{%= __("Statement of Account") %}</h2>
-<h4 class="text-center">
-	{% if (filters.party_name) { %}
-		{%= filters.party_name %}
-	{% } else if (filters.party && filters.party.length) { %}
-		{%= filters.party %}
-	{% } else if (filters.account) { %}
-		{%= filters.account %}
-	{% } %}
-</h4>
+<!-- Modified on 25-11-2024
+-->
 
-<h6 class="text-center">
-	{% if (filters.tax_id) { %}
-	{%= __("Tax Id: ")%}	{%= filters.tax_id %}
-	{% } %}
-</h6>
+<style type="text/css">
+    /* General styles for both screen display and print */
+    body, html {
+        margin-top: 10;
+        padding: 0;
+        width: 100%;
+        height: auto; /* Allow content to expand */
+        font-family: Arial, sans-serif; /* Example font */
+    }
 
-<h5 class="text-center">
-	{%= frappe.datetime.str_to_user(filters.from_date) %}
-	{%= __("to") %}
-	{%= frappe.datetime.str_to_user(filters.to_date) %}
-</h5>
-<hr>
-<table class="table table-bordered">
-	<thead>
-		<tr>
-			<th style="width: 12%">{%= __("Date") %}</th>
-			<th style="width: 15%">{%= __("Reference") %}</th>
-			<th style="width: 25%">{%= __("Remarks") %}</th>
-			<th style="width: 15%">{%= __("Debit") %}</th>
-			<th style="width: 15%">{%= __("Credit") %}</th>
-			<th style="width: 18%">{%= __("Balance (Dr - Cr)") %}</th>
-		</tr>
-	</thead>
-	<tbody>
-		{% for(var i=0, l=data.length; i<l; i++) { %}
-			<tr>
-			{% if(data[i].posting_date) { %}
-				<td>{%= frappe.datetime.str_to_user(data[i].posting_date) %}</td>
-				<td>{%= data[i].voucher_type %}
-					<br>{%= data[i].voucher_no %}
-				</td>
-				{% var longest_word = cstr(data[i].remarks).split(" ").reduce((longest, word) => word.length > longest.length ? word : longest, ""); %}
-				<td {% if longest_word.length > 45 %} class="overflow-wrap-anywhere" {% endif %}>
-					<span>
-					{% if(!(filters.party || filters.account)) { %}
-						{%= data[i].party || data[i].account %}
-						<br>
-					{% } %}
+    /* Ensure consistent letter spacing across all media */
+    .title-letter-spacing {
+        letter-spacing: .2rem;
+    }
 
-					{% if(data[i].remarks) { %}
-						<br>{%= __("Remarks") %}: {%= data[i].remarks %}
-					{% } else if(data[i].bill_no) { %}
-						<br>{%= __("Supplier Invoice No") %}: {%= data[i].bill_no %}
-					{% } %}
-					</span>
-				</td>
-				<td style="text-align: right">
-					{%= format_currency(data[i].debit, filters.presentation_currency || data[i].account_currency) %}
-				</td>
-				<td style="text-align: right">
-					{%= format_currency(data[i].credit, filters.presentation_currency || data[i].account_currency) %}
-				</td>
-			{% } else { %}
-				<td></td>
-				<td></td>
-				<td><b>{%= frappe.format(data[i].account, {fieldtype: "Link"}) || "&nbsp;" %}</b></td>
-				<td style="text-align: right">
-					{%= data[i].account && format_currency(data[i].debit, filters.presentation_currency || data[i].account_currency) %}
-				</td>
-				<td style="text-align: right">
-					{%= data[i].account && format_currency(data[i].credit, filters.presentation_currency || data[i].account_currency) %}
-				</td>
-			{% } %}
-				<td style="text-align: right">
-					{%= format_currency(data[i].balance, filters.presentation_currency || data[i].account_currency) %}
-				</td>
+    /* Styles specific to printing and PDF generation */
+    @media print {
+        /* Set page size and margins for printing */
+        @page {
+            size: A4; /* Use fixed A4 page size */
+            margin-top: 10mm;
+        }
+
+        /* Force a page break before elements with the class "page-break" */
+        .page-break {
+            page-break-before: always;
+            margin-top: 10mm; /* Add some space after the break */
+        }
+
+        /* Ensure table headers repeat on each printed page */
+        thead {
+            display: table-header-group;
+        }
+
+        /* Ensure table footers repeat on each printed page */
+        tfoot {
+            display: table-footer-group;
+        }
+
+        th, td {
+            padding: 1px;
+            border: 1px solid black; /* Example border for clarity */
+        }
+
+        /* Hide elements that should not appear in print (optional) */
+        .no-print {
+            display: none !important;
+        }
+    }
+</style>
+
+<br>
+<div style="font-family:Arial">
+	<div>
+		<div class="title-letter-spacing" style="text-align:center; font-size:15px; text-decoration:underline;">
+			<b>
+				{%= __("STATEMENT OF ACCOUNTS") %}<br>
+				{% if (filters.party_name) { %}
+					<br>{%= filters.party_name %}
+				{% } else if (filters.party && filters.party.length) { %}
+					<br>{%= filters.party %}
+				{% } else if (filters.account) { %}
+					<br>{%= filters.account %}
+				{% } else { %}
+					<br>{%= __("All Parties ") %}
+				{% } %}
+			</b>
+		</div>
+		<div style="text-align:center; font-size:13px;">
+			<b>
+				{% if(filters.party_type) { %}
+					[ {%= filters.party_type %} ]<br>
+				{% } %}
+				{%= frappe.datetime.str_to_user(filters.from_date) %}
+				{%= __("to") %}
+				{%= frappe.datetime.str_to_user(filters.to_date) %}<br><br>
+			</b>
+		</div>
+	</div>
+	<table style="width:100%; font-size: 11px">
+		<thead>
+			<tr class="title-letter-spacing" style="text-align: center; font-weight:bold">
+				<td style="border: 1.5px solid black; width: 7em">DATE</td>
+				<td style="border: 1.5px solid black">PARTICULARS</td>
+				{% if(filters.show_remarks) { %}
+						<td style="border: 1.5px solid black">REMARKS</td>
+				{% } %}
+				<td style="border: 1.5px solid black; width: 9em">DEBIT</td>
+				<td style="border: 1.5px solid black; width: 9em">CREDIT</td>
+				<td style="border: 1.5px solid black; width: 10.2em">BALANCE</td>
 			</tr>
-		{% } %}
-	</tbody>
-</table>
-<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>
+		</thead>
+		<tbody>
+			{% for(var i=0, l=data.length; i<l; i++) { %}
+				<tr style="border-bottom: 1px solid black">
+					{% if(data[i].posting_date) { %}
+						<td style="text-align: center; border: 1px dotted black">
+							{%= frappe.datetime.str_to_user(data[i].posting_date) %}
+						</td>
+						<td style="border-right: 1px dotted black">
+							{%= data[i].voucher_type %} {%= data[i].voucher_no %}
+							{% if(!(filters.party || filters.account)) { %}
+								{%= data[i].party || data[i].account %}
+							{% } %}<br>
+							{% if(data[i].bill_no) { %}
+								{%= __("Supplier Invoice No") %}: {%= data[i].bill_no %}
+							{% } %}
+						</td>
+						{% if(filters.show_remarks) { %}
+						<td style="border-right: 1px dotted black; font-size: 10px">
+								{% if(data[i].remarks != "No Remarks" && data[i].remarks != "") { %}
+									{%= __("Remarks") %}: {%= data[i].remarks %}<br>
+								{% } %}
+						</td>
+						{% } %}
+						<td style="text-align: right; border-right: 1px dotted black">
+							{% if data[i].debit != 0 %}
+								{%= format_currency(data[i].debit, filters.presentation_currency) %}
+							{% } %}
+						</td>
+						<td style="text-align: right; border-right: 1px dotted black">
+							{% if data[i].credit != 0 %}
+								{%= format_currency(data[i].credit, filters.presentation_currency) %}
+							{% } %}
+						</td>
+					{% } else { %}
+						<td style="text-align: center; border: 1px dotted black">
+							{% if(i == 0) { %}
+								{%= frappe.datetime.str_to_user(filters.from_date) %}
+							{% } %}
+						</td>
+						<td style="text-align: left; border-right: 1px dotted black"><b>
+							{% if(i == l-2) { %}
+								{%= "Total" %}
+							{% } else { %}
+								{% if(i == l-1) { %}
+									{%= "Closing [Opening + Total] " %}
+								{% } else { %}
+									{%= frappe.format(data[i].account, {fieldtype: "Link"}) || "&nbsp;" %}
+								{% } %}
+							{% } %}</b>
+						</td>
+						{% if(filters.show_remarks) { %} <td style="text-align: left; border-right: 1px dotted black"></td>{% } %}
+						<td style="text-align: right; border-right: 1px dotted black">
+							{% if(i != 0){ %}
+								{% if(i != l-1){ %}
+									{%= data[i].account && format_currency(data[i].debit, filters.presentation_currency) %}
+								{% } %}
+							{% } %}
+						</td>
+						<td style="text-align: right; border-right: 1px dotted black">
+							{% if(i != 0){ %}
+								{% if(i != l-1){ %}
+									{%= data[i].account && format_currency(data[i].credit, filters.presentation_currency) %}
+								{% } %}
+							{% } %}
+						</td>
+					{% } %}
+						{% if(i == l-1) { %}
+							<td style="text-align: right; font-weight:bold; border-right: 1px dotted black">
+								{%= format_currency(data[i].balance, filters.presentation_currency) %}
+								{% if(data[i].balance < 0){ %}Cr{% } %}
+								{% if(data[i].balance > 0){ %}Dr{% } %}
+							</td>
+						{% } else { %}
+							<td style="text-align: right; border-right: 1px dotted black">
+								{% if(i != l-2) { %}
+									{%= format_currency(data[i].balance, filters.presentation_currency) %}
+								{% } %}
+							</td>
+						{% } %}
+				</tr>
+			{% endfor%}
+		</tbody>
+	</table>
+	<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>
+</div>
-- 
GitLab