chore: resolve conflicts

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html

@@ -13,11 +13,7 @@
 		</div>
 		{% endif %}
 	</div>
-<<<<<<< HEAD
-	<h2 class="text-center">{{ _("STATEMENTS OF ACCOUNTS") }}</h2>
-=======
 	<h2 class="text-center">{{ _("GENERAL LEDGER") }}</h2>
->>>>>>> 4a4c2188ec (fix(process statement of accounts): naming of reports)
 	<div>
 		{% if filters.party[0] == filters.party_name[0] %}
 			<h5 style="float: left;">{{ _("Customer: ") }} <b>{{ filters.party_name[0] }}</b></h5>

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json

@@ -402,15 +402,7 @@
   }
  ],
  "links": [],
-<<<<<<< HEAD
-<<<<<<< HEAD
- "modified": "2025-08-04 18:21:12.603623",
-=======
- "modified": "2025-10-07 11:17:05.444394",
->>>>>>> dbab718aaa (fix(process statement of accounts): allow renaming)
-=======
  "modified": "2025-10-07 12:19:20.719898",
->>>>>>> d610d1dccd (feat(process statement of accounts): added more frequency options for auto email)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts",

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html

@@ -6,14 +6,8 @@
 	.print-format td {
 		vertical-align:middle !important;
 	}
-	</style>
+</style>
 
-<<<<<<< HEAD
-	<div id="header-html" class="hidden-pdf">
-		{% if letter_head.content %}
-		<div class="letter-head text-center">{{ letter_head.content }}</div>
-		<hr style="height:2px;border-width:0;color:black;background-color:black;">
-=======
 <div id="header-html" class="hidden-pdf">
 	{% if letter_head.content %}
 	<div class="letter-head text-center">{{ letter_head.content }}</div>
@@ -65,64 +59,19 @@
 	{% for i in report.columns %}
 		{% if i.fieldname == "age" and ns.idx is none %}
 			{% set ns.idx = loop.index0 %}
->>>>>>> 4a4c2188ec (fix(process statement of accounts): naming of reports)
-		{% endif %}
-	</div>
-	<div id="footer-html" class="visible-pdf">
-		{% if letter_head.footer %}
-		<div class="letter-head-footer">
-			<hr style="border-width:0;color:black;background-color:black;padding-bottom:2px;">
-			{{ letter_head.footer }}
-		</div>
-		{% endif %}
-	</div>
-
-	<h2 class="text-center" style="margin-top:0">{{ _(report.report_name) }}</h2>
-	<h4 class="text-center">
-		{{ filters.customer_name }}
-	</h4>
-	<h6 class="text-center">
-		{% if (filters.tax_id) %}
-		{{ _("Tax Id: ") }}{{ filters.tax_id }}
-		{% endif %}
-	</h6>
-	<h5 class="text-center">
-		{{ _(filters.ageing_based_on) }}
-		{{ _("Until") }}
-		{{ frappe.format(filters.report_date, 'Date') }}
-	</h5>
-
-	<div class="clearfix">
-		<div class="pull-left">
-		{% if(filters.payment_terms) %}
-			<strong>{{ _("Payment Terms") }}:</strong> {{ filters.payment_terms }}
-		{% endif %}
-		</div>
-		<div class="pull-right">
-		{% if(filters.credit_limit) %}
-			<strong>{{ _("Credit Limit") }}:</strong> {{ frappe.utils.fmt_money(filters.credit_limit) }}
-		{% endif %}
-		</div>
-	</div>
-
-	{% if(filters.show_future_payments) %}
-		{% set balance_row = data.slice(-1).pop() %}
-		{% for i in report.columns %}
-			{% if i.fieldname == 'age' %}
-				{% set elem = i %}
 		{% endif %}
 	{% endfor %}
-		{% set start = report.columns.findIndex(elem) %}
+
-		{% set range1 = report.columns[start].label %}
+	{% set age = report.columns[ns.idx].label %}
-		{% set range2 = report.columns[start+1].label %}
+	{% set range1 = report.columns[ns.idx+1].label %}
-		{% set range3 = report.columns[start+2].label %}
+	{% set range2 = report.columns[ns.idx+2].label %}
-		{% set range4 = report.columns[start+3].label %}
+	{% set range3 = report.columns[ns.idx+3].label %}
-		{% set range5 = report.columns[start+4].label %}
+	{% set range4 = report.columns[ns.idx+4].label %}
-		{% set range6 = report.columns[start+5].label %}
+	{% set range5 = report.columns[ns.idx+5].label %}
 
 	{% if(balance_row) %}
 	<table class="table table-bordered table-condensed">
-			<caption class="text-right">(Amount in {{ data[0]["currency"] ~ "" }})</caption>
+		<caption class="text-right">{{ _("Amount in {0}").format(data[0]["currency"] ~ "") }}</caption>
 			<colgroup>
 				<col style="width: 30mm;">
 				<col style="width: 18mm;">
@@ -137,12 +86,12 @@
 		<thead>
 			<tr>
 				<th>{{ _(" ") }}</th>
+				<th>{{ _(age) }}</th>
 				<th>{{ _(range1) }}</th>
 				<th>{{ _(range2) }}</th>
 				<th>{{ _(range3) }}</th>
 				<th>{{ _(range4) }}</th>
 				<th>{{ _(range5) }}</th>
-					<th>{{ _(range6) }}</th>
 				<th>{{ _("Total") }}</th>
 			</tr>
 		</thead>
@@ -150,25 +99,25 @@
 			<tr>
 				<td>{{ _("Total Outstanding") }}</td>
 				<td class="text-right">
-						{{ format_number(balance_row["age"], null, 2) }}
+					{{ frappe.utils.flt(balance_row["age"], 2) }}
 				</td>
 				<td class="text-right">
-						{{ frappe.utils.fmt_money(balance_row["range1"], data[data.length-1]["currency"]) }}
+					{{ frappe.utils.fmt_money(balance_row["range1"], currency=balance_row["currency"]) }}
 				</td>
 				<td class="text-right">
-						{{ frappe.utils.fmt_money(balance_row["range2"], data[data.length-1]["currency"]) }}
+					{{ frappe.utils.fmt_money(balance_row["range2"], currency=balance_row["currency"]) }}
 				</td>
 				<td class="text-right">
-						{{ frappe.utils.fmt_money(balance_row["range3"], data[data.length-1]["currency"]) }}
+					{{ frappe.utils.fmt_money(balance_row["range3"], currency=balance_row["currency"]) }}
 				</td>
 				<td class="text-right">
-						{{ frappe.utils.fmt_money(balance_row["range4"], data[data.length-1]["currency"]) }}
+					{{ frappe.utils.fmt_money(balance_row["range4"], currency=balance_row["currency"]) }}
 				</td>
 				<td class="text-right">
-						{{ frappe.utils.fmt_money(balance_row["range5"], data[data.length-1]["currency"]) }}
+					{{ frappe.utils.fmt_money(balance_row["range5"], currency=balance_row["currency"]) }}
 				</td>
 				<td class="text-right">
-						{{ frappe.utils.fmt_money(flt(balance_row["outstanding"]), data[data.length-1]["currency"]) }}
+					{{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["outstanding"]), currency=balance_row["currency"]) }}
 				</td>
 			</tr>
 				<td>{{ _("Future Payments") }}</td>
@@ -179,7 +128,7 @@
 				<td></td>
 				<td></td>
 				<td class="text-right">
-						{{ frappe.utils.fmt_money(flt(balance_row[("future_amount")]), data[data.length-1]["currency"]) }}
+					{{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["future_amount"]), currency=balance_row["currency"]) }}
 				</td>
 			<tr class="cvs-footer">
 				<th class="text-left">{{ _("Cheques Required") }}</th>
@@ -190,14 +139,14 @@
 				<th></th>
 				<th></th>
 				<th class="text-right">
-						{{ frappe.utils.fmt_money(flt(balance_row["outstanding"] - balance_row[("future_amount")]), data[data.length-1]["currency"]) }}</th>
+					{{ frappe.utils.fmt_money(frappe.utils.flt(balance_row["outstanding"] - balance_row["future_amount"]), currency=balance_row["currency"]) }}</th>
 			</tr>
 		</tbody>
 
 	</table>
 	{% endif %}
-	{% endif %}
+{% endif %}
-	<table class="table table-bordered">
+<table class="table table-bordered">
 	<thead>
 		<tr>
 			{% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %}
@@ -210,7 +159,7 @@
 				{% else %}
 					<th style="width: 24%">{{ _("Reference") }}</th>
 				{% endif %}
-					{% if not(filters.show_future_payments) %}
+				{% if not(filters.show_future_payments) and filters.show_remarks %}
 					<th style="width: 20%">
 					{% if (filters.customer or filters.supplier or filters.customer_name) %}
 						{{ _("Remarks") }}
@@ -224,9 +173,9 @@
 					<th style="width: 10%; text-align: right">{{ _("Paid Amount") }}</th>
 					<th style="width: 10%; text-align: right">
 						{% if report.report_name == "Accounts Receivable" %}
-								{{ _('Credit Note') }}
+							{{ _("Credit Note") }}
 						{% else %}
-								{{ _('Debit Note') }}
+							{{ _("Debit Note") }}
 						{% endif %}
 					</th>
 				{% endif %}
@@ -251,9 +200,9 @@
 				<th style="width: 15%">{{ _("Total Paid Amount") }}</th>
 				<th style="width: 15%">
 					{% if report.report_name == "Accounts Receivable Summary" %}
-							{{ _('Credit Note Amount') }}
+						{{ _("Credit Note Amount") }}
 					{% else %}
-							{{ _('Debit Note Amount') }}
+						{{ _("Debit Note Amount") }}
 					{% endif %}
 				</th>
 				<th style="width: 15%">{{ _("Total Outstanding Amount") }}</th>
@@ -265,7 +214,7 @@
 			<tr>
 			{% if(report.report_name == "Accounts Receivable" or report.report_name == "Accounts Payable") %}
 				{% if(data[i]["party"]) %}
-						<td>{{ frappe.format((data[i]["posting_date"]), 'Date') }}</td>
+					<td>{{ frappe.format(data[i]["posting_date"], 'Date') }}</td>
 					<td style="text-align: right">{{ data[i]["age"] }}</td>
 					<td>
 						{% if not(filters.show_future_payments) %}
@@ -279,7 +228,7 @@
 					<td>{{ data[i]["sales_person"] }}</td>
 					{% endif %}
 
-						{% if not (filters.show_future_payments) %}
+					{% if not (filters.show_future_payments) and filters.show_remarks %}
 					<td>
 						{% if(not(filters.customer or filters.supplier or filters.customer_name)) %}
 							{{ data[i]["party"] }}
@@ -378,27 +327,41 @@
 		{% endfor %}
 		<td></td>
 		<td></td>
+		{% if (filters.show_future_payments) or filters.show_remarks %}
 			<td></td>
+		{% endif %}
+		{% if not(filters.show_future_payments) %}
 			<td></td>
 			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }}</b></td>
 			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="paid"), currency=data[0]["currency"]) }}</b></td>
 			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="credit_note"), currency=data[0]["currency"]) }}</b></td>
 			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="outstanding"), currency=data[0]["currency"]) }}</b></td>
+		{% else %}
+			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="invoiced"), currency=data[0]["currency"]) }}</b></td>
+			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="outstanding"), currency=data[0]["currency"]) }}</b></td>
+			<td></td>
+			<td></td>
+			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="future_amount"), currency=data[0]["currency"]) }}</b></td>
+			<td style="text-align: right"><b>{{ frappe.utils.fmt_money(data|sum(attribute="remaining_balance"), currency=data[0]["currency"]) }}</b></td>
+		{% endif %}
 	</tbody>
-	</table>
+</table>
-	<br>
+<br>
-	{% if ageing %}
+{% if ageing %}
-	<h4 class="text-center">{{ _("Ageing Report based on ") }} {{ ageing.ageing_based_on }}
+<h4 class="text-center">
-		{{ _("up to " ) }}  {{ frappe.format(filters.report_date, 'Date')}}
+	{{ _("Ageing Report based on {0} up to {1}").format(
-	</h4>
+		ageing.ageing_based_on,
-	<table class="table table-bordered">
+		frappe.format(filters.report_date, "Date")
+	) }}
+</h4>
+<table class="table table-bordered">
 	<thead>
 		<tr>
-				<th style="width: 25%">0 - 30 Days</th>
+			<th style="width: 25%">{{ _("0 - 30 Days") }}</th>
-				<th style="width: 25%">30 - 60 Days</th>
+			<th style="width: 25%">{{ _("30 - 60 Days") }}</th>
-				<th style="width: 25%">60 - 90 Days</th>
+			<th style="width: 25%">{{ _("60 - 90 Days") }}</th>
-				<th style="width: 25%">90 - 120 Days</th>
+			<th style="width: 25%">{{ _("90 - 120 Days") }}</th>
-				<th style="width: 20%">Above 120 Days</th>
+			<th style="width: 20%">{{ _("Above 120 Days") }}</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -410,11 +373,11 @@
 			<td>{{ frappe.utils.fmt_money(ageing.range5, currency=filters.presentation_currency) }}</td>
 		</tr>
 	</tbody>
-	</table>
+</table>
-	{% endif %}
+{% endif %}
-	{% if terms_and_conditions %}
+{% if terms_and_conditions %}
-	<div>
+<div>
 	{{ terms_and_conditions }}
-	</div>
+</div>
-	{% endif %}
+{% endif %}
-	<p class="text-right text-muted">{{ _("Printed On ") }}{{ frappe.utils.now() }}</p>
+<p class="text-right text-muted">{{ _("Printed on {0}").format(frappe.utils.now()) }}</p>