Bläddra i källkod

Merge branch 'develop'

version-14
Rushabh Mehta 9 år sedan
förälder
incheckning
4a27a330dc
2 ändrade filer med 6 tillägg och 5 borttagningar
  1. +1
    -1
      frappe/__init__.py
  2. +5
    -4
      frappe/custom/doctype/custom_field/custom_field.py

+ 1
- 1
frappe/__init__.py Visa fil

@@ -13,7 +13,7 @@ import os, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template from .utils.jinja import get_jenv, get_template, render_template


__version__ = "7.0.5"
__version__ = "7.0.6"


local = Local() local = Local()




+ 5
- 4
frappe/custom/doctype/custom_field/custom_field.py Visa fil

@@ -46,10 +46,11 @@ class CustomField(Document):
validate_fields_for_doctype(self.dt) validate_fields_for_doctype(self.dt)


# update the schema # update the schema
if (self.fieldname not in frappe.db.get_table_columns(self.dt)
or getattr(self, "_old_fieldtype", None) != self.fieldtype):
from frappe.model.db_schema import updatedb
updatedb(self.dt)
if not frappe.db.get_value('DocType', self.dt, 'issingle'):
if (self.fieldname not in frappe.db.get_table_columns(self.dt)
or getattr(self, "_old_fieldtype", None) != self.fieldtype):
from frappe.model.db_schema import updatedb
updatedb(self.dt)


def on_trash(self): def on_trash(self):
# delete property setter entries # delete property setter entries


Laddar…
Avbryt
Spara