commit c18b54fc08d0ab3cbc51178c68d945bae7b3ac23
author Himanshu <himanshuwarekar@yahoo.com> Wed Oct 02 16:39:38 2019 +0530
committer GitHub <noreply@github.com> Wed Oct 02 16:39:38 2019 +0530
tree c7a1eaf5cf3e1100fda807a4b93ee4ed8d85caf8
parent 2985cffc529b348de47e3cc2bb5c7bb90d39ae1f
parent c5a6e9da154d2ff4c1e3809037c887df4ba483ea

Merge branch 'develop' into global_search_modules

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index ce9731e..686d549 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 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

diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index 1d13ed1..0e2821a 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -274,4 +274,4 @@
 		for d in inv_mop:
 			mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
 
-	return mode_of_payments
\ No newline at end of file
+	return mode_of_payments