diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 52b0c34673a..fd1e2914a4f 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -1222,8 +1222,18 @@ def get_autoname_with_number(number_value, doc_title, company):
 
 def parse_naming_series_variable(doc, variable):
 	if variable == "FY":
+<<<<<<< HEAD
 		date = doc.get("posting_date") or doc.get("transaction_date") or getdate()
 		return get_fiscal_year(date=date, company=doc.get("company"))[0]
+=======
+		if doc:
+			date = doc.get("posting_date") or doc.get("transaction_date") or getdate()
+			company = doc.get("company")
+		else:
+			date = getdate()
+			company = None
+		return get_fiscal_year(date=date, company=company)[0]
+>>>>>>> d96a777edd (fix: date in master document for dictionary condition)
 
 
 @frappe.whitelist()