fix(minor): fix fieldame in apply_property_setters in model/meta.py

frappe/model/meta.py

@@ -325,7 +325,7 @@ class Meta(Document):
 
 			elif ps.doctype_or_field=='DocField':
 				for d in self.fields:
-					if d.fieldname == ps.fieldname:
+					if d.fieldname == ps.field_name:
 						d.set(ps.property, cast_fieldtype(ps.property_type, ps.value))
 						break
 

frappe/patches/v13_0/web_template_set_module.py

@@ -6,9 +6,14 @@ import frappe
 
 def execute():
 	"""Set default module for standard Web Template, if none."""
+<<<<<<< d5ee3032d494ed35a409a36116679a3d3cb96103
 	frappe.reload_doc('website', 'doctype', 'Web Template Field')
 	frappe.reload_doc('website', 'doctype', 'web_template')
 
+=======
+	frappe.reload_doc('website', 'doctype', 'Web Template')
+	frappe.reload_doc('website', 'doctype', 'Web Template Field')
+>>>>>>> fix(minor): fix fieldame in apply_property_setters in model/meta.py
 	standard_templates = frappe.get_list('Web Template', {'standard': 1})
 	for template in standard_templates:
 		doc = frappe.get_doc('Web Template', template.name)

frappe/tests/test_form_load.py

@@ -57,6 +57,7 @@ class TestFormLoad(unittest.TestCase):
 		# have write access on `published` field (or on permlevel 1 fields)
 		blog_doc.published = 1
 		blog_doc.save()
+
 		# since published field has higher permlevel
 		self.assertEqual(blog_doc.published, 0)
 
@@ -94,7 +95,7 @@ class TestFormLoad(unittest.TestCase):
 		user.remove_roles(*user_roles)
 		user.add_roles('Accounts User')
 
-		make_property_setter('Contact Phone', 'phone', 'permlevel', 1, 'Data')
+		make_property_setter('Contact Phone', 'phone', 'permlevel', 1, 'Int')
 		reset('Contact Phone')
 		add('Contact', 'Sales User', 1)
 		update('Contact', 'Sales User', 1, 'write', 1)
@@ -124,6 +125,8 @@ class TestFormLoad(unittest.TestCase):
 		user.remove_roles('Accounts User', 'Sales User')
 		user.add_roles(*user_roles)
 
+		contact.delete()
+
 
 def get_blog(blog_name):
 	frappe.response.docs = []

frappe/website/doctype/blog_category/blog_category.json

@@ -43,7 +43,7 @@
  "index_web_pages_for_search": 1,
  "is_published_field": "published",
  "links": [],
- "modified": "2020-09-29 10:45:48.810348",
+ "modified": "2020-09-29 10:48:36.886753",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Blog Category",
@@ -69,7 +69,6 @@
   }
  ],
  "quick_entry": 1,
- "route": "/category",
  "sort_field": "modified",
  "sort_order": "DESC",
  "title_field": "title",