diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
index f61aacbce2..7328f168e3 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html
@@ -1,24 +1,42 @@
-
+
+
+
{{ _("STATEMENTS OF ACCOUNTS") }}
+
+
{{ _("Customer: ") }} {{filters.party[0] }}
+
+ {{ _("Date: ") }}
+ {{ frappe.format(filters.from_date, 'Date')}}
+ {{ _("to") }}
+ {{ frappe.format(filters.to_date, 'Date')}}
+
+
+
-
- {{ frappe.format(filters.from_date, 'Date')}}
- {{ _("to") }}
- {{ frappe.format(filters.to_date, 'Date')}}
-
-
-
-
-
- {{ _("Date") }} |
- {{ _("Ref") }} |
- {{ _("Party") }} |
- {{ _("Debit") }} |
- {{ _("Credit") }} |
- {{ _("Balance (Dr - Cr)") }} |
-
-
-
+
+
+
+ {{ _("Date") }} |
+ {{ _("Reference") }} |
+ {{ _("Remarks") }} |
+ {{ _("Debit") }} |
+ {{ _("Credit") }} |
+ {{ _("Balance (Dr - Cr)") }} |
+
+
+
{% for row in data %}
{% if(row.posting_date) %}
@@ -58,32 +76,34 @@
{% endfor %}
-
-
-{% if ageing %}
-{{ _("Ageing Report Based On ") }} {{ ageing.ageing_based_on }}
-
- {{ _("Up to " ) }} {{ frappe.format(filters.to_date, 'Date')}}
-
-
-
-
-
-
- 30 Days |
- 60 Days |
- 90 Days |
- 120 Days |
-
-
-
-
- {{ frappe.utils.fmt_money(ageing.range1, currency=filters.presentation_currency) }} |
- {{ frappe.utils.fmt_money(ageing.range2, currency=filters.presentation_currency) }} |
- {{ frappe.utils.fmt_money(ageing.range3, currency=filters.presentation_currency) }} |
- {{ frappe.utils.fmt_money(ageing.range4, currency=filters.presentation_currency) }} |
-
-
-
-{% endif %}
-Printed On {{ frappe.format(frappe.utils.get_datetime(), 'Datetime') }}
\ No newline at end of file
+
+
+ {% if ageing %}
+
{{ _("Ageing Report based on ") }} {{ ageing.ageing_based_on }}
+ {{ _("up to " ) }} {{ frappe.format(filters.to_date, 'Date')}}
+
+
+
+
+ 30 Days |
+ 60 Days |
+ 90 Days |
+ 120 Days |
+
+
+
+
+ {{ frappe.utils.fmt_money(ageing.range1, currency=filters.presentation_currency) }} |
+ {{ frappe.utils.fmt_money(ageing.range2, currency=filters.presentation_currency) }} |
+ {{ frappe.utils.fmt_money(ageing.range3, currency=filters.presentation_currency) }} |
+ {{ frappe.utils.fmt_money(ageing.range4, currency=filters.presentation_currency) }} |
+
+
+
+ {% endif %}
+ {% if terms_and_conditions %}
+
+ {{ terms_and_conditions }}
+
+ {% endif %}
+
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
index 4be0e2ec06..27a5f50ce2 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@@ -1,6 +1,5 @@
{
"actions": [],
- "allow_workflow": 1,
"autoname": "Prompt",
"creation": "2020-05-22 16:46:18.712954",
"doctype": "DocType",
@@ -28,9 +27,11 @@
"customers",
"preferences",
"orientation",
- "section_break_14",
"include_ageing",
"ageing_based_on",
+ "section_break_14",
+ "letter_head",
+ "terms_and_conditions",
"section_break_1",
"enable_auto_email",
"section_break_18",
@@ -270,10 +271,22 @@
"fieldname": "body",
"fieldtype": "Text Editor",
"label": "Body"
+ },
+ {
+ "fieldname": "letter_head",
+ "fieldtype": "Link",
+ "label": "Letter Head",
+ "options": "Letter Head"
+ },
+ {
+ "fieldname": "terms_and_conditions",
+ "fieldtype": "Link",
+ "label": "Terms and Conditions",
+ "options": "Terms and Conditions"
}
],
"links": [],
- "modified": "2020-08-08 08:47:09.185728",
+ "modified": "2021-05-21 10:14:22.426672",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Process Statement Of Accounts",
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
index a0dbff3db4..2ad455c48f 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@@ -64,6 +64,9 @@ def get_report_pdf(doc, consolidated=True):
tax_id = frappe.get_doc('Customer', entry.customer).tax_id
presentation_currency = get_party_account_currency('Customer', entry.customer, doc.company) \
or doc.currency or get_company_currency(doc.company)
+ if doc.letter_head:
+ from frappe.www.printview import get_letter_head
+ letter_head = get_letter_head(doc, 0)
filters= frappe._dict({
'from_date': doc.from_date,
@@ -91,7 +94,10 @@ def get_report_pdf(doc, consolidated=True):
continue
html = frappe.render_template(template_path, \
- {"filters": filters, "data": res, "ageing": ageing[0] if (doc.include_ageing and ageing) else None})
+ {"filters": filters, "data": res, "ageing": ageing[0] if doc.include_ageing else None,
+ "letter_head": letter_head if doc.letter_head else None,
+ "terms_and_conditions": frappe.db.get_value('Terms and Conditions', doc.terms_and_conditions, 'terms')
+ if doc.terms_and_conditions else None})
html = frappe.render_template(base_template_path, {"body": html, \
"css": get_print_style(), "title": "Statement For " + entry.customer})