From cef10864412137761ca9fff90f60dd4b6eb54a86 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Fri, 18 Mar 2016 15:03:57 +0530
Subject: [PATCH] [fix]Letterhead not being changed with change in company

---
 erpnext/public/js/controllers/transaction.js |  7 +------
 erpnext/public/js/utils.js                   | 18 ------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 9ca4351519..d109c656de 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -308,7 +308,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 
 		if (this.frm.doc.posting_date) var date = this.frm.doc.posting_date;
 		else var date = this.frm.doc.transaction_date;
-		erpnext.get_fiscal_year(this.frm.doc.company, date, function() { set_party_account(set_pricing); });
+		set_party_account(set_pricing);
 
 		if(this.frm.doc.company) {
 			erpnext.last_selected_company = this.frm.doc.company;
@@ -319,8 +319,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		if (this.frm.doc.transaction_date) {
 			this.frm.transaction_date = this.frm.doc.transaction_date;
 		}
-
-		erpnext.get_fiscal_year(this.frm.doc.company, this.frm.doc.transaction_date);
 	},
 
 	posting_date: function() {
@@ -342,11 +340,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 						if(r.message) {
 							me.frm.set_value("due_date", r.message);
 						}
-						erpnext.get_fiscal_year(me.frm.doc.company, me.frm.doc.posting_date);
 					}
 				})
-			} else {
-				erpnext.get_fiscal_year(me.frm.doc.company, me.frm.doc.posting_date);
 			}
 		}
 	},
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index c0549ba41d..9c287e75a7 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -13,24 +13,6 @@ $.extend(erpnext, {
 			return frappe.boot.sysdefaults.currency;
 	},
 
-	get_fiscal_year: function(company, date, fn) {
-		if(frappe.meta.get_docfield(cur_frm.doctype, "fiscal_year")) {
-			frappe.call({
-				type:"GET",
-				method: "erpnext.accounts.utils.get_fiscal_year",
-				args: {
-					"company": company,
-					"date": date,
-					"verbose": 0
-				},
-				callback: function(r) {
-					if (r.message)	cur_frm.set_value("fiscal_year", r.message[0]);
-					if (fn) fn();
-				}
-			});
-		}
-	},
-
 	toggle_naming_series: function() {
 		if(cur_frm.fields_dict.naming_series) {
 			cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);