diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index a94030cd64..6f9509b9ca 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -361,6 +361,7 @@ class BaseDocument(object): def _get_missing_mandatory_fields(self): """Get mandatory fields that do not have any values""" def get_msg(df): + print df if df.fieldtype == "Table": return "{}: {}: {}".format(_("Error"), _("Data missing in table"), _(df.label)) diff --git a/frappe/templates/generators/web_form.html b/frappe/templates/generators/web_form.html index 8d667ea50f..e79aa90591 100644 --- a/frappe/templates/generators/web_form.html +++ b/frappe/templates/generators/web_form.html @@ -56,7 +56,10 @@ {{ field.read_only and "disabled" or "" }} {% endmacro -%} -{%- macro value(field) -%}{% if doc %}{{ doc.get(field.fieldname) or field.default or "" }}{% else %}{{ getCookie(field.options) or field.default or "" }}{% endif %}{%- endmacro -%} +{%- macro value(field) -%}{% if doc %}{{ + doc.get(field.fieldname) or + field.default or + frappe.form_dict.get(field.fieldname) or "" }}{% else %}{{ getCookie(field.options) or field.default or "" }}{% endif %}{%- endmacro -%} {%- macro help(field) -%} {% if field.description -%} diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 7ad03b8a95..80803a29bd 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -134,10 +134,10 @@ class WebForm(WebsiteGenerator): def get_parents(self, context): parents = None - if context.parents: - parents = context.parents - elif self.breadcrumbs: + if self.breadcrumbs: parents = json.loads(self.breadcrumbs) + elif context.parents: + parents = context.parents elif context.is_list: parents = [{"title": _("My Account"), "name": "me"}]