From e329962756c2ee7dd33a28032bc4fd4611969e8e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 30 Jan 2017 15:30:44 +0530 Subject: [PATCH] [minor] remove in_fitler, fixes #7381 (#2649) --- frappe/core/doctype/docfield/docfield.json | 75 +++++++++++-------- frappe/core/doctype/doctype/doctype.js | 4 + .../doctype/custom_field/custom_field.json | 66 ++++++++-------- .../doctype/customize_form/customize_form.py | 1 - .../customize_form_field.json | 42 ++--------- frappe/data/Framework.sql | 1 - frappe/model/__init__.py | 2 +- frappe/model/sync.py | 4 +- frappe/public/js/frappe/form/control.js | 3 - .../js/frappe/views/reports/reportview.js | 2 +- 10 files changed, 95 insertions(+), 105 deletions(-) diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json index bbec8ac810..5fdcfad7a8 100644 --- a/frappe/core/doctype/docfield/docfield.json +++ b/frappe/core/doctype/docfield/docfield.json @@ -31,6 +31,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -60,6 +61,7 @@ "print_hide_if_no_value": 0, "print_width": "163", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 1, @@ -91,6 +93,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 1, "search_index": 1, @@ -119,6 +122,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 1, @@ -148,6 +152,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -178,6 +183,7 @@ "print_hide": 1, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -206,6 +212,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -235,6 +242,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -263,6 +271,7 @@ "print_hide_if_no_value": 0, "print_width": "70px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -291,6 +300,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -318,6 +328,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -346,6 +357,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -374,6 +386,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -399,6 +412,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -428,6 +442,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -456,6 +471,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -482,6 +498,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -510,6 +527,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -539,6 +557,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -567,6 +586,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -595,6 +615,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -622,6 +643,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -647,6 +669,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -677,6 +700,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -705,6 +729,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -734,6 +759,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -764,6 +790,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -784,6 +811,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Remember Last Selected Value", "length": 0, "no_copy": 0, @@ -792,6 +820,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -802,6 +831,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "Don't HTML Encode HTML tags like <script> or just characters like < or >, as they could be intentionally used in this field", "fieldname": "ignore_xss_filter", "fieldtype": "Check", @@ -819,6 +849,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -845,42 +876,13 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "in_filter", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "In Filter", - "length": 0, - "no_copy": 0, - "oldfieldname": "in_filter", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": "50px", - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "50px" - }, { "allow_on_submit": 0, "bold": 0, @@ -904,6 +906,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -934,6 +937,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -963,6 +967,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -989,6 +994,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1018,6 +1024,7 @@ "print_hide_if_no_value": 0, "print_width": "50px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1048,6 +1055,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1073,6 +1081,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1102,6 +1111,7 @@ "print_hide_if_no_value": 0, "print_width": "300px", "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1130,6 +1140,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1157,6 +1168,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1174,7 +1186,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-01-06 07:29:04.205496", + "modified": "2017-01-30 02:31:32.591687", "modified_by": "Administrator", "module": "Core", "name": "DocField", @@ -1184,5 +1196,6 @@ "read_only": 0, "read_only_onload": 0, "sort_order": "ASC", + "track_changes": 0, "track_seen": 0 } \ No newline at end of file diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js index fc9c594006..18217a85e5 100644 --- a/frappe/core/doctype/doctype/doctype.js +++ b/frappe/core/doctype/doctype/doctype.js @@ -26,6 +26,10 @@ frappe.ui.form.on('DocType', { if(!frm.doc.__islocal) { frm.toggle_enable("engine", 0); } + + // set label for "In List View" for child tables + frm.get_docfield('fields', 'in_list_view').label = frm.doc.istable ? + __('In Grid View') : __('In List View'); } }) diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json index faa97b5ab4..5252a70ddd 100644 --- a/frappe/custom/doctype/custom_field/custom_field.json +++ b/frappe/custom/doctype/custom_field/custom_field.json @@ -23,6 +23,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, + "in_standard_filter": 0, "label": "Document", "length": 0, "no_copy": 0, @@ -52,6 +53,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, + "in_standard_filter": 0, "label": "Label", "length": 0, "no_copy": 1, @@ -80,6 +82,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Label Help", "length": 0, "no_copy": 0, @@ -107,6 +110,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, + "in_standard_filter": 0, "label": "Fieldname", "length": 0, "no_copy": 1, @@ -137,6 +141,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Insert After", "length": 0, "no_copy": 1, @@ -165,6 +170,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -192,6 +198,7 @@ "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, + "in_standard_filter": 0, "label": "Field Type", "length": 0, "no_copy": 0, @@ -223,6 +230,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Precision", "length": 0, "no_copy": 0, @@ -251,6 +259,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, + "in_standard_filter": 0, "label": "Options", "length": 0, "no_copy": 0, @@ -279,6 +288,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Options Help", "length": 0, "no_copy": 0, @@ -306,6 +316,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -333,6 +344,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Collapsible", "length": 0, "no_copy": 0, @@ -361,6 +373,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Collapsible Depends On", "length": 0, "no_copy": 0, @@ -388,6 +401,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Default Value", "length": 0, "no_copy": 0, @@ -416,6 +430,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Depends On", "length": 255, "no_copy": 0, @@ -442,6 +457,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Field Description", "length": 0, "no_copy": 0, @@ -473,6 +489,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Permission Level", "length": 0, "no_copy": 0, @@ -501,6 +518,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Width", "length": 0, "no_copy": 0, @@ -529,6 +547,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "", "length": 0, "no_copy": 0, @@ -558,6 +577,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, + "in_standard_filter": 0, "label": "Is Mandatory Field", "length": 0, "no_copy": 0, @@ -586,6 +606,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Unique", "length": 0, "no_copy": 0, @@ -613,6 +634,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Read Only", "length": 0, "no_copy": 0, @@ -640,6 +662,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Ignore User Permissions", "length": 0, "no_copy": 0, @@ -666,6 +689,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Hidden", "length": 0, "no_copy": 0, @@ -692,6 +716,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Print Hide", "length": 0, "no_copy": 0, @@ -721,6 +746,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Print Hide If No Value", "length": 0, "no_copy": 0, @@ -748,6 +774,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Print Width", "length": 0, "no_copy": 1, @@ -774,6 +801,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "No Copy", "length": 0, "no_copy": 0, @@ -802,6 +830,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Allow on Submit", "length": 0, "no_copy": 0, @@ -818,34 +847,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "in_filter", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "In Report Filter", - "length": 0, - "no_copy": 0, - "oldfieldname": "in_filter", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -858,6 +859,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "In List View", "length": 0, "no_copy": 0, @@ -884,6 +886,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "In Standard Filter", "length": 0, "no_copy": 0, @@ -911,6 +914,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Report Hide", "length": 0, "no_copy": 0, @@ -939,6 +943,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Index", "length": 0, "no_copy": 1, @@ -966,6 +971,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Ignore XSS Filter", "length": 0, "no_copy": 0, @@ -993,7 +999,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-01-06 12:24:04.186289", + "modified": "2017-01-30 02:31:54.746159", "modified_by": "Administrator", "module": "Custom", "name": "Custom Field", @@ -1009,7 +1015,6 @@ "export": 0, "if_owner": 0, "import": 0, - "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -1030,7 +1035,6 @@ "export": 0, "if_owner": 0, "import": 0, - "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 4bd49215bf..42a833dbd7 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -41,7 +41,6 @@ docfield_properties = { 'reqd': 'Check', 'unique': 'Check', 'ignore_user_permissions': 'Check', - 'in_filter': 'Check', 'in_list_view': 'Check', 'in_standard_filter': 'Check', 'hidden': 'Check', diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json index ee924c370e..5226a2134f 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -139,7 +139,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, - "in_list_view": 0, + "in_list_view": 1, "in_standard_filter": 0, "label": "Mandatory", "length": 0, @@ -235,6 +235,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -679,6 +680,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:(doc.fieldtype == 'Link')", "fieldname": "remember_last_selected_value", "fieldtype": "Check", @@ -687,6 +689,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Remember Last Selected Value", "length": 0, "no_copy": 0, @@ -759,37 +762,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "in_filter", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "In Filter", - "length": 0, - "no_copy": 0, - "oldfieldname": "in_filter", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": "50px", - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "50px" - }, { "allow_on_submit": 0, "bold": 0, @@ -959,6 +931,7 @@ "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, + "remember_last_selected_value": 0, "report_hide": 0, "reqd": 0, "search_index": 0, @@ -1035,7 +1008,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-01-05 17:29:44.206837", + "modified": "2017-01-30 02:49:36.834130", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form Field", @@ -1045,5 +1018,6 @@ "read_only": 0, "read_only_onload": 0, "sort_order": "ASC", + "track_changes": 0, "track_seen": 0 -} +} \ No newline at end of file diff --git a/frappe/data/Framework.sql b/frappe/data/Framework.sql index cbfaf485a3..630dea481c 100644 --- a/frappe/data/Framework.sql +++ b/frappe/data/Framework.sql @@ -45,7 +45,6 @@ CREATE TABLE `tabDocField` ( `columns` int(11) NOT NULL DEFAULT 0, `default` text, `description` text, - `in_filter` int(1) NOT NULL DEFAULT 0, `in_list_view` int(1) NOT NULL DEFAULT 0, `in_standard_filter` int(1) NOT NULL DEFAULT 0, `read_only` int(1) NOT NULL DEFAULT 0, diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 45eaa1164a..5a42af398e 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -14,7 +14,7 @@ default_fields = ('doctype','name','owner','creation','modified','modified_by', 'parent','parentfield','parenttype','idx','docstatus') integer_docfield_properties = ("reqd", "search_index", "in_list_view", "permlevel", "hidden", "read_only", "ignore_user_permissions", "allow_on_submit", "report_hide", - "in_filter", "no_copy", "print_hide", "unique") + "no_copy", "print_hide", "unique") optional_fields = ("_user_tags", "_comments", "_assign", "_liked_by", "_seen") def rename(doctype, old, new, debug=False): diff --git a/frappe/model/sync.py b/frappe/model/sync.py index d61dd65f94..b815265186 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -41,14 +41,14 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe l = len(files) if l: for i, doc_path in enumerate(files): - import_file_by_path(doc_path, force=force, ignore_version=True, + import_file_by_path(doc_path, force=force, ignore_version=True, reset_permissions=reset_permissions) #print module_name + ' | ' + doctype + ' | ' + name frappe.db.commit() # show progress bar - update_progress_bar("Updating {0}".format(app_name), i, l) + update_progress_bar("Updating DocTypes for {0}".format(app_name), i, l) print "" diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 48ac898218..8db91e08f6 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -1115,9 +1115,6 @@ frappe.ui.form.ControlSelect = frappe.ui.form.ControlData.extend({ if(typeof this.df.options==="string") { options = this.df.options.split("\n"); } - if(this.in_filter && options[0] != "") { - options = add_lists([''], options); - } // nothing changed if(options.toString() === this.last_options) { diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js index a5699aa4fc..75081701ed 100644 --- a/frappe/public/js/frappe/views/reports/reportview.js +++ b/frappe/public/js/frappe/views/reports/reportview.js @@ -150,7 +150,7 @@ frappe.views.ReportView = frappe.ui.Listing.extend({ if(!columns.length) { var columns = [['name', this.doctype],]; $.each(frappe.meta.docfield_list[this.doctype], function(i, df) { - if((df.in_filter || df.in_list_view) && df.fieldname!='naming_series' + if((df.in_standard_filter || df.in_list_view) && df.fieldname!='naming_series' && !in_list(frappe.model.no_value_type, df.fieldtype)) { columns.push([df.fieldname, df.parent]); }