From 670d61547fb6a7ee86050c2f1020cd247f12df52 Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Wed, 10 Jan 2024 22:05:02 +0530 Subject: [PATCH] fix: date in master document for dictionary condition (cherry picked from commit d96a777edd9cad698b9d9bb90863c1080eacb36f) # Conflicts: # erpnext/accounts/utils.py --- erpnext/accounts/utils.py | 10 ++++++++++ 1 file changed, 10 insertions(+) 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()