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

erpnext/__init__.py

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

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -138,7 +138,7 @@ class GLEntry(Document):
 			frappe.throw(_("{0} {1}: Cost Center {2} does not belong to Company {3}")
 				.format(self.voucher_type, self.voucher_no, self.cost_center, self.company))
 
-		if self.cost_center and _check_is_group():
+		if not self.flags.from_repost and self.cost_center and _check_is_group():
 			frappe.throw(_("""{0} {1}: Cost Center {2} is a group cost center and group cost centers cannot
 				be used in transactions""").format(self.voucher_type, self.voucher_no, frappe.bold(self.cost_center)))
 

erpnext/controllers/accounts_controller.py

@@ -1195,11 +1195,11 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
 		try:
 			doc.check_permission(perm_type)
 		except frappe.PermissionError:
-			actions = { 'create': 'add', 'write': 'update', 'cancel': 'remove' }
+			actions = { 'create': 'add', 'write': 'update'}
 
 			frappe.throw(_("You do not have permissions to {} items in a {}.")
 				.format(actions[perm_type], parent_doctype), title=_("Insufficient Permissions"))
-	
+
 	def validate_workflow_conditions(doc):
 		workflow = get_workflow_name(doc.doctype)
 		if not workflow:
@@ -1237,8 +1237,8 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
 
 	sales_doctypes = ['Sales Order', 'Sales Invoice', 'Delivery Note', 'Quotation']
 	parent = frappe.get_doc(parent_doctype, parent_doctype_name)
-	
-	check_doc_permissions(parent, 'cancel')
+
+	check_doc_permissions(parent, 'write')
 	validate_and_delete_children(parent, data)
 
 	for d in data:

erpnext/public/js/website_theme.js

@@ -4,7 +4,7 @@
 frappe.ui.form.on('Website Theme', {
 	validate(frm) {
 		let theme_scss = frm.doc.theme_scss;
-		if (theme_scss.includes('frappe/public/scss/website')
+		if (theme_scss && theme_scss.includes('frappe/public/scss/website')
 			&& !theme_scss.includes('erpnext/public/scss/website')
 		) {
 			frm.set_value('theme_scss',