nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-01-14 09:41:48 +05:30
committed by GitHub
parent 6bd01f227e
commit 5336cd49c9
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/utils.py
View File

@@ -1222,10 +1222,6 @@ def get_autoname_with_number(number_value, doc_title, company):
def parse_naming_series_variable(doc, variable): def parse_naming_series_variable(doc, variable):
if variable == "FY": 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: if doc:
date = doc.get("posting_date") or doc.get("transaction_date") or getdate() date = doc.get("posting_date") or doc.get("transaction_date") or getdate()
company = doc.get("company") company = doc.get("company")
@@ -1233,7 +1229,6 @@ def parse_naming_series_variable(doc, variable):
date = getdate() date = getdate()
company = None company = None
return get_fiscal_year(date=date, company=company)[0] return get_fiscal_year(date=date, company=company)[0]
>>>>>>> d96a777edd (fix: date in master document for dictionary condition)
@frappe.whitelist() @frappe.whitelist()