copy letter head from invoice to payment entry
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 02d2b6b..d42bcd5 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -684,6 +684,7 @@
pe.paid_amount = paid_amount
pe.received_amount = received_amount
pe.allocate_payment_amount = 1
+ pe.letter_head = doc.get("letter_head")
pe.append("references", {
"reference_doctype": dt,
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 0d8b41f..0b0a020 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -31,7 +31,8 @@
},
onload_post_render: function(frm) {
- frm.get_field("delete_company_transactions").$input.addClass("btn-danger");
+ if(frm.get_field("delete_company_transactions").$input)
+ frm.get_field("delete_company_transactions").$input.addClass("btn-danger");
},
country: function(frm) {
erpnext.company.set_chart_of_accounts_options(frm.doc);