[Enhancement] Added letter head for the report (#7250)
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index b2b6aea..5290caf 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -297,6 +297,8 @@
this.print_template = r.message.print_template;
this.pos_profile_data = r.message.pos_profile;
this.default_customer = r.message.default_customer || null;
+ this.print_settings = locals[":Print Settings"]["Print Settings"];
+ this.letter_head = frappe.boot.letter_heads[this.pos_profile_data[letter_head]] || {};
},
save_previous_entry : function(){
@@ -327,9 +329,9 @@
frappe.meta.sync(data)
})
- this.print_template_data = frappe.render_template("print_template",
- {content: this.print_template, title:"POS",
- base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css})
+ this.print_template_data = frappe.render_template("print_template", {content: this.print_template,
+ title:"POS", base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css,
+ print_settings: this.print_settings, header: this.letter_head.header, footer: this.letter_head.footer})
},
setup: function(){
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 0fca7dc..dc79d1f 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -80,13 +80,6 @@
"fieldname":"group_by_account",
"label": __("Group by Account"),
"fieldtype": "Check",
- },
- {
- "fieldname":"letter_head",
- "label": __("Letter Head"),
- "fieldtype": "Link",
- "options": "Letter Head",
- "default": frappe.defaults.get_default("letter_head"),
}
]
}
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index 97ef329..6e71769 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -13,8 +13,6 @@
bootinfo.website_settings = frappe.get_doc('Website Settings')
if frappe.session['user']!='Guest':
- bootinfo.letter_heads = get_letter_heads()
-
update_page_info(bootinfo)
load_country_and_currency(bootinfo)
@@ -42,12 +40,6 @@
number_format, smallest_currency_fraction_value, symbol from tabCurrency
where enabled=1""", as_dict=1, update={"doctype":":Currency"})
-def get_letter_heads():
- import frappe
- ret = frappe.db.sql("""select name, content from `tabLetter Head`
- where disabled=0""")
- return dict(ret)
-
def update_page_info(bootinfo):
bootinfo.page_info.update({
"Chart of Accounts": {