From d49f9e417b86e02748d05447844c2a18575b081b Mon Sep 17 00:00:00 2001 From: Zarrar Date: Thu, 8 Mar 2018 10:52:57 +0530 Subject: [PATCH 1/6] Allow col_break & sec_break without label (#5123) --- frappe/custom/doctype/custom_field/custom_field.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py index a94608f25d..1f2445eb13 100644 --- a/frappe/custom/doctype/custom_field/custom_field.py +++ b/frappe/custom/doctype/custom_field/custom_field.py @@ -14,6 +14,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")) From e5a094e7af7a53ec74b2ccd420f90dbcf065280c Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Thu, 8 Mar 2018 10:54:03 +0530 Subject: [PATCH 2/6] fix quick entry prompt naming (#5125) --- frappe/public/js/frappe/form/quick_entry.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js index 69cf6c517f..681d74b559 100644 --- a/frappe/public/js/frappe/form/quick_entry.js +++ b/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; From 553702d6710d6a0d07cf31c8dbab4de8d141249a Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 8 Mar 2018 12:02:17 +0530 Subject: [PATCH 3/6] Read only fields not update if the field has already value (#5126) --- frappe/model/mapper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/model/mapper.py b/frappe/model/mapper.py index 8f77668204..871ba145f0 100644 --- a/frappe/model/mapper.py +++ b/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: From b4beb986e49ede27f6f7e19177c766271ee5877e Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Thu, 8 Mar 2018 14:19:28 +0530 Subject: [PATCH 4/6] [fix] checkbox alignment fixes frappe/erpnext#12727 (#5138) --- frappe/public/css/desk.css | 9 +++++++++ frappe/public/css/form.css | 4 ++-- frappe/public/less/desk.less | 11 +++++++++++ frappe/public/less/form.less | 3 ++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 0bd6a0b53b..6a5b4f0846 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -970,6 +970,15 @@ li.user-progress .progress-bar { .note-editor.note-frame .note-editing-area .note-editable { color: #36414C; } +.checkbox label { + padding-left: 0px; +} +.checkbox input[type=checkbox] { + margin-right: 5px; + margin-left: 0px; + position: relative; + height: 12px; +} input[type="checkbox"] { position: relative; height: 16px; diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css index 4c8ffb3eac..823735d44a 100644 --- a/frappe/public/css/form.css +++ b/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; @@ -723,7 +724,6 @@ body[data-route^="Form/Communication"] textarea[data-fieldname="subject"] { margin-top: 5px; } .frappe-control[data-fieldtype="Attach"] .attached-file .close { - margin-right: -7px; position: absolute; top: 0; right: 0; diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 1ae2427af8..92d5c47dff 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -894,6 +894,17 @@ li.user-progress { color: @text-color; } +.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; diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less index 3b0ebf0894..21b7689324 100644 --- a/frappe/public/less/form.less +++ b/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 { From d1c5cb7a9808f91dc7cc03136556fbec5c3828ea Mon Sep 17 00:00:00 2001 From: Raghavendra Kamath Date: Fri, 9 Mar 2018 12:32:01 +0530 Subject: [PATCH 5/6] Fix ellipsis problem in long titled subheading (#5144) --- frappe/public/less/page.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/public/less/page.less b/frappe/public/less/page.less index 378f91e481..b7373997b8 100644 --- a/frappe/public/less/page.less +++ b/frappe/public/less/page.less @@ -80,6 +80,11 @@ .page-actions { padding-top: 17px; padding-bottom: 17px; + + .sub-heading { + max-width: 50%; + overflow: hidden; + } } .page-icon-group { From af6e2b043e23a85dcba556bfd3460dc38f32588d Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 9 Mar 2018 17:02:15 +0600 Subject: [PATCH 6/6] bumped to version 10.1.3 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index c4ae62f0af..c6d7dacd0d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json 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()