Merge branch 'staging' into production

Author: sahil28297

frappe/__init__.py

@@ -24,7 +24,7 @@
 	sys.setdefaultencoding("utf-8")
 
 __frappe_version__ = '12.8.1'
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/docfield/docfield.json

@@ -81,7 +81,7 @@
    "label": "Type",
    "oldfieldname": "fieldtype",
    "oldfieldtype": "Select",
-   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nText Editor Alt\nTime\nSignature",
    "reqd": 1,
    "search_index": 1
   },
@@ -425,7 +425,7 @@
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2020-03-17 21:29:59.983533",
+ "modified": "2021-04-15 23:05:58.400774",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocField",

frappe/core/doctype/doctype/doctype.py

@@ -799,7 +799,7 @@ def check_unique_and_text(docname, d):
 				if has_non_unique_values and has_non_unique_values[0][0]:
 					frappe.throw(_("{0}: Field '{1}' cannot be set as Unique as it has non-unique values").format(docname, d.label), NonUniqueError)
 
-		if d.search_index and d.fieldtype in ("Text", "Long Text", "Small Text", "Code", "Text Editor"):
+		if d.search_index and d.fieldtype in ("Text", "Long Text", "Small Text", "Code", "Text Editor", "Text Editor Alt"):
 			frappe.throw(_("{0}:Fieldtype {1} for {2} cannot be indexed").format(docname, d.fieldtype, d.label), CannotIndexedError)
 
 

frappe/custom/doctype/custom_field/custom_field.json

@@ -112,7 +112,7 @@
    "label": "Field Type",
    "oldfieldname": "fieldtype",
    "oldfieldtype": "Select",
-   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nGeolocation\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nGeolocation\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nText Editor Alt\nTime\nSignature",
    "reqd": 1
   },
   {
@@ -360,7 +360,7 @@
  ],
  "icon": "fa fa-glass",
  "idx": 1,
- "modified": "2021-01-15 21:30:18.102333",
+ "modified": "2021-04-21 04:10:16.193767",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Custom Field",
@@ -393,4 +393,4 @@
  "sort_field": "modified",
  "sort_order": "ASC",
  "track_changes": 1
-}
+}

frappe/custom/doctype/customize_form/customize_form.py

@@ -77,7 +77,7 @@
 }
 
 allowed_fieldtype_change = (('Currency', 'Float', 'Percent'), ('Small Text', 'Data'),
-	('Text', 'Data'), ('Text', 'Text Editor', 'Code', 'Signature', 'HTML Editor'), ('Data', 'Select'),
+	('Text', 'Data'), ('Text', 'Text Editor', 'Text Editor Alt', 'Code', 'Signature', 'HTML Editor'), ('Data', 'Select'),
 	('Text', 'Small Text'), ('Text', 'Data', 'Barcode'), ('Code', 'Geolocation'), ('Table', 'Table MultiSelect'))
 
 allowed_fieldtype_for_options_change = ('Read Only', 'HTML', 'Select', 'Data')

frappe/custom/doctype/customize_form_field/customize_form_field.json

@@ -72,7 +72,7 @@
    "label": "Type",
    "oldfieldname": "fieldtype",
    "oldfieldtype": "Select",
-   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime",
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nText Editor Alt\nTime",
    "reqd": 1,
    "search_index": 1
   },
@@ -358,7 +358,7 @@
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2020-03-17 21:31:35.714416",
+ "modified": "2021-04-21 04:10:35.722929",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form Field",

frappe/database/mariadb/database.py

@@ -37,6 +37,7 @@ def setup_type_map(self):
 			'Long Text':	('longtext', ''),
 			'Code':			('longtext', ''),
 			'Text Editor':	('longtext', ''),
+			'Text Editor Alt':	('longtext', ''),
 			'Markdown Editor':	('longtext', ''),
 			'HTML Editor':	('longtext', ''),
 			'Date':			('date', ''),

frappe/database/postgres/database.py

@@ -42,6 +42,7 @@ def setup_type_map(self):
 			'Long Text':	('text', ''),
 			'Code':			('text', ''),
 			'Text Editor':	('text', ''),
+			'Text Editor Alt':	('text', ''),
 			'Markdown Editor':	('text', ''),
 			'HTML Editor':	('text', ''),
 			'Date':			('date', ''),

frappe/desk/doctype/number_card/number_card.py

@@ -9,6 +9,7 @@
 from frappe.model.naming import append_number_if_name_exists
 from frappe.modules.export_file import export_to_files
 from frappe.utils.safe_exec import safe_exec
+from six import string_types
 
 class NumberCard(Document):
 	def autoname(self):
@@ -58,7 +59,7 @@ def has_permission(doc, ptype, user):
 
 @frappe.whitelist()
 def get_result(doc, filters, to_date=None):
-	number_card = frappe._dict(frappe.parse_json(doc))
+	number_card = frappe._dict(frappe.parse_json(doc)) if isinstance(doc, string_types) else doc
 
 	# For Servcer Script Enabled Number Cards
 	if number_card.type == "Script" and number_card.script:
@@ -200,4 +201,4 @@ def add_card_to_dashboard(args):
 		card.save()
 
 	dashboard.append('cards', dashboard_link)
-	dashboard.save()
+	dashboard.save()