From a380db49a845faa3e14d8248f58971878d76bbb6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 27 Sep 2018 09:16:36 +0530 Subject: [PATCH 1/4] Validation fix (#6138) * Validate set_only_once only on doc update * Remove redundant error message --- frappe/model/base_document.py | 1 - frappe/model/document.py | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index a8125e213d..694fcba1c2 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -310,7 +310,6 @@ class BaseDocument(object): self.db_insert() return - frappe.msgprint(_("Duplicate name {0} {1}").format(self.doctype, self.name)) raise frappe.DuplicateEntryError(self.doctype, self.name, e) elif "Duplicate" in cstr(e.args[1]): diff --git a/frappe/model/document.py b/frappe/model/document.py index 0e232fc006..1ea3216acf 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -454,13 +454,12 @@ class Document(BaseDocument): d._extract_images_from_text_editor() d._sanitize_content() d._save_passwords() - - self.validate_set_only_once() - if self.is_new(): # don't set fields like _assign, _comments for new doc for fieldname in optional_fields: self.set(fieldname, None) + else: + self.validate_set_only_once() def validate_set_only_once(self): '''Validate that fields are not changed if not in insert''' From 8fe95f2876cc5112c3b030b7fd22fa51a71aca76 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sun, 30 Sep 2018 21:11:01 +0530 Subject: [PATCH 2/4] Submit the attendance if it's in draft mode (#6156) --- frappe/utils/csvutils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py index 26394c28bb..a0259f960e 100644 --- a/frappe/utils/csvutils.py +++ b/frappe/utils/csvutils.py @@ -140,6 +140,8 @@ def import_doc(d, doctype, overwrite, row_idx, submit=False, ignore_links=False) doc.update(d) if d.get("docstatus") == 1: doc.update_after_submit() + elif d.get("docstatus") == 0 and submit: + doc.submit() else: doc.save() return 'Updated row (#%d) %s' % (row_idx + 1, getlink(doctype, d['name'])) From 1c8db8fee31336188e912ca182c0fd80c27f503f Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 2 Oct 2018 10:08:59 +0530 Subject: [PATCH 3/4] [Fix] Permlevel 1 with read permission fields are not disaplying in the form (#6160) --- frappe/model/document.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index 1ea3216acf..05adb8e0a1 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -566,7 +566,7 @@ class Document(BaseDocument): if not df: df = self.meta.get_field(fieldname) - return df.permlevel in self.get_permlevel_access() + return df.permlevel in self.get_permlevel_access(permission_type) def get_permissions(self): if self.meta.istable: From 00d9c2e29015bedad1c27d20a1c183414f303709 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Wed, 3 Oct 2018 14:51:29 +0000 Subject: [PATCH 4/4] bumped to version 10.1.49-beta.1 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 818ffc40c5..f650b72a1c 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.49' +__version__ = '10.1.49-beta.1' __title__ = "Frappe Framework" local = Local()