Fixed merge conflict

frappe/__init__.py

@@ -15,7 +15,7 @@ from past.builtins import cmp
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.2'
+__version__ = '10.1.3'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/custom/doctype/custom_field/custom_field.py

@@ -15,6 +15,8 @@ class CustomField(Document):
 		self.name = self.dt + "-" + self.fieldname
 
 	def set_fieldname(self):
+		if self.fieldtype in ["Section Break", "Column Break"]:
+			self.fieldname = self.fieldtype.lower().replace(" ","_") + "_" + str(self.idx)
 		if not self.fieldname:
 			if not self.label:
 				frappe.throw(_("Label is mandatory"))

frappe/model/mapper.py

@@ -179,7 +179,8 @@ def map_fetch_fields(target_doc, df, no_copy_fields):
 		if not (fetch_df.fieldtype == "Read Only" or fetch_df.read_only):
 			continue
 
-		if not target_doc.get(fetch_df.fieldname) and fetch_df.fieldname not in no_copy_fields:
+		if ((not target_doc.get(fetch_df.fieldname) or fetch_df.fieldtype == "Read Only")
+			and fetch_df.fieldname not in no_copy_fields):
 			source_fieldname = fetch_df.options.split(".")[1]
 
 			if not linked_doc:

frappe/public/css/desk.css

@@ -981,12 +981,21 @@ li.user-progress .progress-bar {
 .note-editor.note-frame .note-editing-area .note-editable {
   color: #36414C;
 }
-.checkbox input[type=checkbox] {
-  margin-left: 0;
-}
+
 .input-area input[type=checkbox] {
   margin-left: -20px;
 }
+
+.checkbox label {
+  padding-left: 0px;
+}
+.checkbox input[type=checkbox] {
+  margin-right: 5px;
+  margin-left: 0px;
+  position: relative;
+  height: 12px;
+}
+
 input[type="checkbox"] {
   position: relative;
   left: -999999px;

frappe/public/css/form.css

@@ -537,8 +537,9 @@ h6.uppercase,
 }
 .disabled-check {
   color: #f5f7fa;
-  margin-right: 3px;
+  margin-right: 5px;
   margin-bottom: -2px;
+  margin-left: 20px;
 }
 .like-disabled-input.for-description {
   font-weight: normal;

frappe/public/js/frappe/form/quick_entry.js

@@ -183,8 +183,13 @@ frappe.ui.form.QuickEntryForm = Class.extend({
 		var me = this;
 		var data = this.dialog.get_values(true);
 		$.each(data, function(key, value) {
-			if(!is_null(value)) {
-				me.dialog.doc[key] = value;
+			if(key==='__newname') {
+				me.dialog.doc.name = value;
+			}
+			else {
+				if(!is_null(value)) {
+					me.dialog.doc[key] = value;
+				}
 			}
 		});
 		return this.dialog.doc;

frappe/public/less/desk.less

@@ -898,14 +898,21 @@ li.user-progress {
 	color: @text-color;
 }
 
-.checkbox input[type=checkbox] {
-	margin-left: 0;
-}
-
 .input-area input[type=checkbox] {
 	margin-left: -20px;
 }
 
+.checkbox label {
+	padding-left: 0px;
+}
+
+.checkbox input[type=checkbox] {
+	margin-right: 5px;
+	margin-left: 0px;
+	position: relative;
+	height: 12px;
+}
+
 // custom font awesome checkbox
 input[type="checkbox"] {
 	position: relative;

frappe/public/less/form.less

@@ -671,8 +671,9 @@ h6.uppercase, .h6.uppercase {
 
 .disabled-check {
 	color: @navbar-bg;
-	margin-right: 3px;
+	margin-right: 5px;
 	margin-bottom: -2px;
+	margin-left: 20px;
 }
 
 .like-disabled-input.for-description {