Merge branch 'develop' into global_search_modules

erpnext/__init__.py

@@ -5,7 +5,7 @@ import frappe
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '12.1.5'
+__version__ = '12.1.6'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/report/sales_register/sales_register.py

@@ -274,4 +274,4 @@ def get_mode_of_payments(invoice_list):
 		for d in inv_mop:
 			mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
 
-	return mode_of_payments
+	return mode_of_payments