From 13b37c634613e59d15d1d260ca35d05663cca391 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 2 Sep 2016 11:25:28 +0530 Subject: [PATCH] Default letter head in report printing based on selected company --- .../report/accounts_receivable/accounts_receivable.html | 2 +- erpnext/accounts/report/financial_statements.html | 4 +++- erpnext/accounts/report/general_ledger/general_ledger.html | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html index 712d35b38ee..75c3e8c2054 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html @@ -1,5 +1,5 @@
- {%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %} + {%= frappe.boot.letter_heads[frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head")] %}

{%= __(report.report_name) %}

{%= filters.customer || filters.supplier %}

diff --git a/erpnext/accounts/report/financial_statements.html b/erpnext/accounts/report/financial_statements.html index 84cad1610d3..6959e5d3ed9 100644 --- a/erpnext/accounts/report/financial_statements.html +++ b/erpnext/accounts/report/financial_statements.html @@ -13,7 +13,9 @@ height: 37px; } - +
+ {%= frappe.boot.letter_heads[frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head")] %} +

{%= __(report.report_name) %}

{%= filters.company %}

{%= filters.fiscal_year %}

diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html index f22e7212707..7552eed1ac3 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.html +++ b/erpnext/accounts/report/general_ledger/general_ledger.html @@ -1,5 +1,5 @@
- {%= frappe.boot.letter_heads[filters.letter_head || frappe.defaults.get_default("letter_head")] %} + {%= frappe.boot.letter_heads[filters.letter_head || frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head")] %}

{%= __("Statement of Account") %}

{%= (filters.party || filters.account) && ((filters.party || filters.account) + ", ") || "" %} {%= filters.company %}