Merge branch 'v12-pre-release' into version-12

Author: nabinhait

.eslintrc

@@ -140,6 +140,7 @@
 		"Cypress": true,
 		"cy": true,
 		"it": true,
+		"describe": true,
 		"expect": true,
 		"context": true,
 		"before": true,

frappe/__init__.py

@@ -23,7 +23,7 @@
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.17.0'
+__version__ = '12.18.0'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/change_log/v12/v12_18_0.md

@@ -0,0 +1,21 @@
+## Version 12.18.0 Release Notes
+
+### Fixes & Enhancements
+
+- Moving Site folder across different FileSystems failed ([#13033](https://github.com/frappe/frappe/pull/13033))
+- Revert naming for custom naming series ([#13178](https://github.com/frappe/frappe/pull/13178))
+- Show delete button on portal if user has permission to delete document ([#13183](https://github.com/frappe/frappe/pull/13183))
+- Conditionally hide grid Add Row & Add Multiple buttons ([#12960](https://github.com/frappe/frappe/pull/12960))
+- Grid Form buttons Insert Above, Insert Below not hidden when can… ([#12906](https://github.com/frappe/frappe/pull/12906))
+- Do not skip data in save while using shortcut ([#13181](https://github.com/frappe/frappe/pull/13181))
+- Multi currency in print view shows same currency symbol ([#12569](https://github.com/frappe/frappe/pull/12569))
+- Reverting of series with a variable ([#12811](https://github.com/frappe/frappe/pull/12811))
+- Grid Form buttons Insert Above, Insert Below not hidden when can… ([#12931](https://github.com/frappe/frappe/pull/12931))
+- Check if same value is set to avoid unnecessary change triggers ([#12963](https://github.com/frappe/frappe/pull/12963))
+- Default values were not triggering change event ([#12975](https://github.com/frappe/frappe/pull/12975))
+- Preload URLs breaking for external requests ([#13058](https://github.com/frappe/frappe/pull/13058))
+- Forward message action in communication form view not working ([#12800](https://github.com/frappe/frappe/pull/12800))
+- Redirect Web Form user directly to success URL, if no amount is due ([#12661](https://github.com/frappe/frappe/pull/12661))
+- Check if response contains signature before setting ([#13185](https://github.com/frappe/frappe/pull/13185))
+- Replace parseFloat by Number ([#13011](https://github.com/frappe/frappe/pull/13011))
+- Only allow user's attachments to show in attachments tree ([#12822](https://github.com/frappe/frappe/pull/12822))

frappe/commands/site.py

@@ -513,7 +513,7 @@ def move(dest_dir, site):
 		site_dump_exists = os.path.exists(final_new_path)
 		count = int(count or 0) + 1
 
-	os.rename(old_path, final_new_path)
+	shutil.move(old_path, final_new_path)
 	frappe.destroy()
 	return final_new_path
 

frappe/core/doctype/file/file.py

@@ -947,10 +947,18 @@ def validate_filename(filename):
 
 @frappe.whitelist()
 def get_files_in_folder(folder):
-	return frappe.db.get_all('File',
+	attachment_folder = frappe.db.get_value('File',
+		'Home/Attachments',
+		['name', 'file_name', 'file_url', 'is_folder', 'modified'],
+		as_dict=1
+	)
+	files = frappe.db.get_list('File',
 		{ 'folder': folder },
 		['name', 'file_name', 'file_url', 'is_folder', 'modified']
 	)
+	if folder == 'Home' and attachment_folder not in files:
+		files.insert(0, attachment_folder)
+	return files
 
 def update_existing_file_docs(doc):
 	# Update is private and file url of all file docs that point to the same file

frappe/core/doctype/file/test_file.py

@@ -8,7 +8,7 @@
 import os
 import unittest
 from frappe import _
-from frappe.core.doctype.file.file import move_file
+from frappe.core.doctype.file.file import move_file, get_files_in_folder
 from frappe.utils import get_files_path
 # test_records = frappe.get_test_records('File')
 
@@ -390,3 +390,61 @@ def test_parent_directory_validation_in_file_url(self):
 		file1.reload()
 		file1.file_url = '/private/files/parent_dir2.txt'
 		file1.save()
+
+
+class TestAttachmentsAccess(unittest.TestCase):
+
+	def test_attachments_access(self):
+
+		frappe.set_user('test4@example.com')
+		self.attached_to_doctype, self.attached_to_docname = make_test_doc()
+
+		frappe.get_doc({
+			"doctype": "File",
+			"file_name": 'test_user.txt',
+			"attached_to_doctype": self.attached_to_doctype,
+			"attached_to_name": self.attached_to_docname,
+			"content": 'Testing User'
+		}).insert()
+
+		frappe.get_doc({
+			"doctype": "File",
+			"file_name": "test_user_home.txt",
+			"content": 'User Home',
+		}).insert()
+
+		frappe.set_user('test@example.com')
+
+		frappe.get_doc({
+			"doctype": "File",
+			"file_name": 'test_system_manager.txt',
+			"attached_to_doctype": self.attached_to_doctype,
+			"attached_to_name": self.attached_to_docname,
+			"content": 'Testing System Manager'
+		}).insert()
+
+		frappe.get_doc({
+			"doctype": "File",
+			"file_name": "test_sm_home.txt",
+			"content": 'System Manager Home',
+		}).insert()
+
+		system_manager_files = [file.file_name for file in get_files_in_folder('Home')]
+		system_manager_attachments_files = [file.file_name for file in get_files_in_folder('Home/Attachments')]
+
+		frappe.set_user('test4@example.com')
+		user_files = [file.file_name for file in get_files_in_folder('Home')]
+		user_attachments_files = [file.file_name for file in get_files_in_folder('Home/Attachments')]
+
+		self.assertIn('test_sm_home.txt', system_manager_files)
+		self.assertNotIn('test_sm_home.txt', user_files)
+		self.assertIn('test_user_home.txt', system_manager_files)
+		self.assertIn('test_user_home.txt', user_files)
+
+		self.assertIn('test_system_manager.txt', system_manager_attachments_files)
+		self.assertNotIn('test_system_manager.txt', user_attachments_files)
+		self.assertIn('test_user.txt', system_manager_attachments_files)
+		self.assertIn('test_user.txt', user_attachments_files)
+
+		frappe.set_user('Administrator')
+		frappe.db.rollback()

frappe/core/doctype/user/test_records.json

@@ -38,6 +38,13 @@
   "new_password": "Eastern_43A1W",
   "enabled": 1
  },
+ {
+  "doctype": "User",
+  "email": "test4@example.com",
+  "first_name": "_Test4",
+  "new_password": "Eastern_43A1W",
+  "enabled": 1
+ },
  {
   "doctype": "User",
   "email": "testperm@example.com",

frappe/integrations/oauth2.py

@@ -101,7 +101,7 @@ def get_token(*args, **kwargs):
 	http_method = r.method
 	body = r.form
 	headers = r.headers
-	
+
 	#Check whether frappe server URL is set
 	frappe_server_url = frappe.db.get_value("Social Login Key", "frappe", "base_url") or None
 	if not frappe_server_url:
@@ -130,7 +130,7 @@ def get_token(*args, **kwargs):
 			}
 			import jwt
 			id_token_encoded = jwt.encode(id_token, client_secret, algorithm='HS256', headers=id_token_header)
-			out.update({"id_token":str(id_token_encoded)})
+			out.update({"id_token": frappe.safe_decode(id_token_encoded)})
 		frappe.local.response = out
 
 	except FatalClientError as e:
@@ -177,7 +177,7 @@ def openid_profile(*args, **kwargs):
 			"email": name,
 			"picture": picture
 		})
-	
+
 	frappe.local.response = user_profile
 
 def validate_url(url_string):
@@ -188,4 +188,4 @@ def validate_url(url_string):
 		else:
 			return False
 	except:
-		return False
+		return False

frappe/model/base_document.py

@@ -743,6 +743,11 @@ def get_formatted(self, fieldname, doc=None, currency=None, absolute_value=False
 			from frappe.model.meta import get_default_df
 			df = get_default_df(fieldname)
 
+		if not currency:
+			currency = self.get(df.get("options"))
+			if not frappe.db.exists('Currency', currency, cache=True):
+				currency = None
+
 		val = self.get(fieldname)
 
 		if translated:

frappe/model/delete_doc.py

@@ -153,10 +153,10 @@ def update_naming_series(doc):
 	if doc.meta.autoname:
 		if doc.meta.autoname.startswith("naming_series:") \
 			and getattr(doc, "naming_series", None):
-			revert_series_if_last(doc.naming_series, doc.name)
+			revert_series_if_last(doc.naming_series, doc.name, doc)
 
 		elif doc.meta.autoname.split(":")[0] not in ("Prompt", "field", "hash"):
-			revert_series_if_last(doc.meta.autoname, doc.name)
+			revert_series_if_last(doc.meta.autoname, doc.name, doc)
 
 def delete_from_table(doctype, name, ignore_doctypes, doc):
 	if doctype!="DocType" and doctype==name: