Merge branch 'develop'
This commit is contained in:
commit
93ba358621
5 changed files with 24 additions and 7 deletions
|
|
@ -1,2 +1,2 @@
|
|||
from __future__ import unicode_literals
|
||||
__version__ = "6.19.2"
|
||||
__version__ = "6.19.3"
|
||||
|
|
|
|||
|
|
@ -37,6 +37,15 @@ class DocType(Document):
|
|||
for c in [".", "/", "#", "&", "=", ":", "'", '"']:
|
||||
if c in self.name:
|
||||
frappe.throw(_("{0} not allowed in name").format(c))
|
||||
|
||||
if self.issingle:
|
||||
self.allow_import = 0
|
||||
self.is_submittable = 0
|
||||
self.istable = 0
|
||||
|
||||
elif self.istable:
|
||||
self.allow_import = 0
|
||||
|
||||
self.validate_series()
|
||||
self.scrub_field_names()
|
||||
self.validate_document_type()
|
||||
|
|
@ -50,9 +59,6 @@ class DocType(Document):
|
|||
|
||||
self.make_amendable()
|
||||
|
||||
if self.istable:
|
||||
self.allow_import = 0
|
||||
|
||||
def check_developer_mode(self):
|
||||
"""Throw exception if not developer mode or via patch"""
|
||||
if frappe.flags.in_patch:
|
||||
|
|
@ -298,6 +304,10 @@ def validate_fields(meta):
|
|||
frappe.throw(_("Precision should be between 1 and 6"))
|
||||
|
||||
def check_unique_and_text(d):
|
||||
if meta.issingle:
|
||||
d.unique = 0
|
||||
d.search_index = 0
|
||||
|
||||
if getattr(d, "unique", False):
|
||||
if d.fieldtype not in ("Data", "Link", "Read Only"):
|
||||
frappe.throw(_("Fieldtype {0} for {1} cannot be unique").format(d.fieldtype, d.label))
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
|
|||
app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
|
||||
|
||||
app_icon = "octicon octicon-circuit-board"
|
||||
app_version = "6.19.2"
|
||||
app_version = "6.19.3"
|
||||
app_color = "orange"
|
||||
source_link = "https://github.com/frappe/frappe"
|
||||
app_license = "MIT"
|
||||
|
|
|
|||
|
|
@ -672,7 +672,14 @@ frappe.ui.form.ControlCheck = frappe.ui.form.ControlData.extend({
|
|||
set_input: function(value) {
|
||||
this.input.checked = value ? 1 : 0;
|
||||
this.last_value = value;
|
||||
}
|
||||
},
|
||||
get_value: function() {
|
||||
if (!this.$input) {
|
||||
return;
|
||||
}
|
||||
|
||||
return this.$input.prop("checked") ? 1 : 0;
|
||||
},
|
||||
});
|
||||
|
||||
frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -1,7 +1,7 @@
|
|||
from setuptools import setup, find_packages
|
||||
from pip.req import parse_requirements
|
||||
|
||||
version = "6.19.2"
|
||||
version = "6.19.3"
|
||||
requirements = parse_requirements("requirements.txt", session="")
|
||||
|
||||
setup(
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue