feat: use Year Of Settlement for naming (LAN-852)

alyf-de · Aug 31, 2024 · 69dbbc8 · 69dbbc8
1 parent ba32b70
commit 69dbbc8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/landa/landa_sales/payment_entry/pament_entry.py b/landa/landa_sales/payment_entry/pament_entry.py
@@ -24,4 +24,4 @@ def autoname(doc, event):
 	"""Create Company-specific Payment Entry name."""
 	from landa.utils import get_new_name
 
-	doc.name = get_new_name("ZAHL", doc.company, "Payment Entry")
+	doc.name = get_new_name("ZAHL", doc.company, "Payment Entry", doc.year_of_settlement)
diff --git a/landa/landa_sales/sales_invoice/sales_invoice.py b/landa/landa_sales/sales_invoice/sales_invoice.py
@@ -17,9 +17,9 @@ def autoname(doc, event):
 	from landa.utils import get_new_name
 
 	if doc.is_return:
-		doc.name = get_new_name("GUTS", doc.company, "Sales Invoice")
+		doc.name = get_new_name("GUTS", doc.company, "Sales Invoice", doc.year_of_settlement)
 	else:
-		doc.name = get_new_name("RECH", doc.company, "Sales Invoice")
+		doc.name = get_new_name("RECH", doc.company, "Sales Invoice", doc.year_of_settlement)
 
 
 @frappe.whitelist()

diff --git a/landa/landa_sales/sales_order/sales_order.py b/landa/landa_sales/sales_order/sales_order.py
@@ -40,7 +40,7 @@ def autoname(doc, event):
 	"""Create Company-specific Sales Order name."""
 	from landa.utils import get_new_name
 
-	doc.name = get_new_name("BEST", doc.company, "Sales Order")
+	doc.name = get_new_name("BEST", doc.company, "Sales Order", doc.year_of_settlement)
 
 
 def get_dashboard_data(data):

diff --git a/landa/landa_stock/delivery_note/delivery_note.py b/landa/landa_stock/delivery_note/delivery_note.py
@@ -39,9 +39,9 @@ def autoname(doc, event):
 	from landa.utils import get_new_name
 
 	if doc.is_return:
-		doc.name = get_new_name("RET", doc.company, "Delivery Note")
+		doc.name = get_new_name("RET", doc.company, "Delivery Note", doc.year_of_settlement)
 	else:
-		doc.name = get_new_name("LIEF", doc.company, "Delivery Note")
+		doc.name = get_new_name("LIEF", doc.company, "Delivery Note", doc.year_of_settlement)
 
 
 @frappe.whitelist()

diff --git a/landa/utils.py b/landa/utils.py
@@ -8,7 +8,7 @@
 from frappe.utils.nestedset import get_ancestors_of
 
 
-def get_new_name(prefix, company, doctype):
+def get_new_name(prefix: str, company: str, doctype: str, year: str | None = None) -> str:
 	"""
 	Create a document name like prefix-company-year-####.
 
@@ -18,8 +18,11 @@ def get_new_name(prefix, company, doctype):
 	from frappe.utils.data import nowdate
 
 	company_abbr = frappe.get_value("Company", company, "abbr")
-	current_year = nowdate()[:4]  # note: y10k problem
-	return make_autoname(f"{prefix}-{company_abbr}-{current_year}-.####", doctype)
+
+	if not year:
+		year = nowdate()[:4]  # note: y10k problem
+
+	return make_autoname(f"{prefix}-{company_abbr}-{year}-.####", doctype)
 
 
 def welcome_email():