diff --git a/frappe/auth.py b/frappe/auth.py
index ab3624bee8..64fea36748 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -337,7 +337,7 @@ class CookieManager:
if frappe.session.session_country:
self.set_cookie("country", frappe.session.session_country)
- def set_cookie(self, key, value, expires=None, secure=False, httponly=False, samesite="Strict"):
+ def set_cookie(self, key, value, expires=None, secure=False, httponly=False, samesite="Lax"):
if not secure:
secure = frappe.local.request.scheme == "https"
self.cookies[key] = {
diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index ec80ee019d..26eb455338 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -631,6 +631,29 @@ def stop_recording(context):
if not context.sites:
raise SiteNotSpecifiedError
+@click.command('ngrok')
+@pass_context
+def start_ngrok(context):
+ from pyngrok import ngrok
+
+ site = get_site(context)
+ frappe.init(site=site)
+
+ port = frappe.conf.http_port or frappe.conf.webserver_port
+ public_url = ngrok.connect(port=port, options={
+ 'host_header': site
+ })
+ print(f'Public URL: {public_url}')
+ print('Inspect logs at http://localhost:4040')
+
+ ngrok_process = ngrok.get_ngrok_process()
+ try:
+ # Block until CTRL-C or some other terminating event
+ ngrok_process.proc.wait()
+ except KeyboardInterrupt:
+ print("Shutting down server...")
+ frappe.destroy()
+ ngrok.kill()
commands = [
add_system_manager,
@@ -656,5 +679,6 @@ commands = [
browse,
start_recording,
stop_recording,
- add_to_hosts
+ add_to_hosts,
+ start_ngrok
]
diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index 9be6b55d53..237b549433 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -13,7 +13,6 @@ frappe.ui.form.on('Dashboard', {
return {
filters: {
is_public: 1,
- is_standard: 1,
}
};
});
@@ -22,7 +21,6 @@ frappe.ui.form.on('Dashboard', {
return {
filters: {
is_public: 1,
- is_standard: 1,
}
};
});
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 6f071a6e2b..738d77ae27 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -175,6 +175,9 @@ frappe.ui.form.on('Dashboard Chart', {
set_chart_field_options: function(frm) {
let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
+ if (frm.doc.dynamic_filters_json.length > 2) {
+ filters = {...filters, ...JSON.parse(frm.doc.dynamic_filters_json)};
+ }
frappe.xcall(
'frappe.desk.query_report.run',
{
@@ -193,7 +196,7 @@ frappe.ui.form.on('Dashboard Chart', {
if (!frm.doc.is_custom) {
if (data.result.length) {
- frm.field_options = frappe.report_utils.get_possible_chart_options(data.columns, data);
+ frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
frm.set_df_property('x_field', 'options', frm.field_options.non_numeric_fields);
if (!frm.field_options.numeric_fields.length) {
frappe.msgprint(__(`Report has no numeric fields, please change the Report Name`));
@@ -435,49 +438,10 @@ frappe.ui.form.on('Dashboard Chart', {
frm.trigger('set_dynamic_filters_in_table');
let filters = JSON.parse(frm.doc.filters_json || '[]');
- let fields = [
- {
- fieldtype: 'HTML',
- fieldname: 'description',
- options:
- `
-
Set dynamic filter values in JavaScript for the required fields here.
-
-
Ex:
- frappe.defaults.get_user_default("Company")
-
-
+
+[{
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1
+},
+{
+ fieldname: "account",
+ label: __("Account"),
+ fieldtype: "Link",
+ options: "Account",
+ reqd: 1
+}]
+
`);
}
},
+ set_method_description: function(frm) {
+ if (frm.doc.type == 'Custom') {
+ frm.fields_dict.method.set_description(`
+ Set the path to a whitelisted function that will return the number on the card in the format:
+
+
+{
+ "value": value,
+ "fieldtype": "Currency"
+}
+
`);
+ }
+ },
+
+ type: function(frm) {
+ frm.trigger('set_filters_description');
+ if (frm.doc.type == 'Report') {
+ frm.set_query('report_name', () => {
+ return {
+ filters: {
+ 'report_type': ['!=', 'Report Builder']
+ }
+ };
+ });
+ }
+
+ },
+
+ report_name: function(frm) {
+ frm.set_value('filters_json', '{}');
+ frm.set_value('dynamic_filters_json', '{}');
+ frm.set_df_property('report_field', 'options', []);
+ frm.trigger('set_report_filters');
+ },
+
+ filters_config: function(frm) {
+ frm.filters = eval(frm.doc.filters_config);
+ const filter_values = frappe.report_utils.get_filter_values(frm.filters);
+ frm.set_value('filters_json', JSON.stringify(filter_values));
+ frm.trigger('render_filters_table');
+ },
+
document_type: function(frm) {
frm.set_query('document_type', function() {
return {
@@ -46,6 +168,10 @@ frappe.ui.form.on('Number Card', {
},
set_options: function(frm) {
+ if (frm.doc.type !== 'Document Type') {
+ return;
+ }
+
let aggregate_based_on_fields = [];
const doctype = frm.doc.document_type;
@@ -64,72 +190,60 @@ frappe.ui.form.on('Number Card', {
frm.set_df_property('aggregate_function_based_on', 'options', aggregate_based_on_fields);
});
+ frm.trigger('render_filters_table');
+ frm.trigger('render_dynamic_filters_table');
}
},
+ set_report_filters: function(frm) {
+ const report_name = frm.doc.report_name;
+ if (report_name) {
+ frappe.report_utils.get_report_filters(report_name).then(filters => {
+ if (filters) {
+ frm.filters = filters;
+ const filter_values = frappe.report_utils.get_filter_values(filters);
+ if (frm.doc.filters_json.length <= 2) {
+ frm.set_value('filters_json', JSON.stringify(filter_values));
+ }
+ }
+ frm.trigger('render_filters_table');
+ frm.trigger('set_report_field_options');
+ frm.trigger('render_dynamic_filters_table');
+ });
+ }
+ },
+
+ set_report_field_options: function(frm) {
+ let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
+ if (frm.doc.dynamic_filters_json.length > 2) {
+ filters = {...filters, ...JSON.parse(frm.doc.dynamic_filters_json)};
+ }
+ frappe.xcall(
+ 'frappe.desk.query_report.run',
+ {
+ report_name: frm.doc.report_name,
+ filters: filters,
+ ignore_prepared_report: 1
+ }
+ ).then(data => {
+ if (data.result.length) {
+ frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
+ frm.set_df_property('report_field', 'options', frm.field_options.numeric_fields);
+ if (!frm.field_options.numeric_fields.length) {
+ frappe.msgprint(__(`Report has no numeric fields, please change the Report Name`));
+ }
+ } else {
+ frappe.msgprint(__('Report has no data, please modify the filters or change the Report Name'));
+ }
+ });
+ },
+
render_filters_table: function(frm) {
frm.set_df_property("filters_section", "hidden", 0);
+ let is_document_type = frm.doc.type == 'Document Type';
+ let is_dynamic_filter = f => ['Date', 'DateRange'].includes(f.fieldtype) && f.default;
let wrapper = $(frm.get_field('filters_json').wrapper).empty();
- let table = $(`
-
-
- | ${__('Filter')} |
- ${__('Condition')} |
- ${__('Value')} |
-
-
-
-
`).appendTo(wrapper);
-
- frm.filters = JSON.parse(frm.doc.filters_json || '[]');
-
- set_filters_in_table(frm.filters, table);
-
- table.on('click', () => {
- let dialog = new frappe.ui.Dialog({
- title: __('Set Filters'),
- fields: [{
- fieldtype: 'HTML',
- fieldname: 'filter_area',
- }],
- primary_action: function() {
- let values = this.get_values();
- if (values) {
- this.hide();
- frm.filters = frm.filter_group.get_filters();
- frm.set_value('filters_json', JSON.stringify(frm.filters));
- set_filters_in_table(frm.filters, table);
- frm.trigger('render_dynamic_filters_table');
- }
- },
- primary_action_label: "Set"
- });
-
- frappe.dashboards.filters_dialog = dialog;
-
- frm.filter_group = new frappe.ui.FilterGroup({
- parent: dialog.get_field('filter_area').$wrapper,
- doctype: frm.doc.document_type,
- on_change: () => {},
- });
-
- frm.filter_group.add_filters_to_filter_group(frm.filters);
-
- dialog.show();
- dialog.set_values(frm.filters);
- });
-
- },
-
- render_dynamic_filters_table: function(frm) {
- if (!frappe.boot.developer_mode || !frm.doc.is_standard) {
- return;
- }
- let wrapper = $(frm.get_field('dynamic_filters_json').wrapper).empty();
-
- frm.set_df_property("dynamic_filters_section", "hidden", 0);
-
let table = $(`
@@ -140,92 +254,211 @@ frappe.ui.form.on('Number Card', {
`).appendTo(wrapper);
-
- frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || '[]');
-
- set_filters_in_table(frm.dynamic_filters, table);
+ $(`${__("Click table to edit")}
`).appendTo(wrapper);
let filters = JSON.parse(frm.doc.filters_json || '[]');
- let fields = [
- {
- fieldtype: 'HTML',
- fieldname: 'description',
- options:
- `
-
Set dynamic filter values in JavaScript for the required fields here.
-
-
Ex:
- frappe.defaults.get_user_default("Company")
-
-
+ | ${filter[1]} |
+ ${filter[2] || ""} |
+ ${filter[3]} |
+
`);
+
+ table.find('tbody').append(filter_row);
});
+ filters_set = true;
}
- });
+ } else if (frm.filters.length) {
+ fields = frm.filters.filter(f => f.fieldname);
+ fields.map(f => {
+ if (filters[f.fieldname]) {
+ let condition = '=';
+ const filter_row =
+ $(`
+ | ${f.label} |
+ ${condition} |
+ ${filters[f.fieldname] || ""} |
+
`);
+ table.find('tbody').append(filter_row);
+ if (!filters_set) filters_set = true;
+ }
+ });
+ }
+
+ if (!filters_set) {
+ const filter_row = $(`|
+ ${__("Click to Set Filters")} |
`);
+ table.find('tbody').append(filter_row);
+ }
table.on('click', () => {
let dialog = new frappe.ui.Dialog({
title: __('Set Filters'),
- fields: fields,
- primary_action: () => {
- let values = dialog.get_values();
+ fields: fields.filter(f => !is_dynamic_filter(f)),
+ primary_action: function() {
+ let values = this.get_values();
if (values) {
- dialog.hide();
- let dynamic_filters = [];
- for (let key of Object.keys(values)) {
- let [doctype, fieldname] = key.split(':');
- dynamic_filters.push([doctype, fieldname, '=', values[key]]);
+ this.hide();
+ if (is_document_type) {
+ let filters = frm.filter_group.get_filters();
+ frm.set_value('filters_json', JSON.stringify(filters));
+ } else {
+ frm.set_value('filters_json', JSON.stringify(values));
}
-
- frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
- frm.dynamic_filters = dynamic_filters;
- set_filters_in_table(frm.dynamic_filters, table);
+ frm.trigger('render_filters_table');
}
},
primary_action_label: "Set"
});
+ if (is_document_type) {
+ frm.filter_group = new frappe.ui.FilterGroup({
+ parent: dialog.get_field('filter_area').$wrapper,
+ doctype: frm.doc.document_type,
+ on_change: () => {},
+ });
+ filters && frm.filter_group.add_filters_to_filter_group(filters);
+ }
+
dialog.show();
+
+ if (frm.doc.type == 'Report') {
+ //Set query report object so that it can be used while fetching filter values in the report
+ frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
+ frappe.query_reports[frm.doc.report_name]
+ && frappe.query_reports[frm.doc.report_name].onload
+ && frappe.query_reports[frm.doc.report_name].onload(frappe.query_report);
+ }
+
dialog.set_values(filters);
});
},
-});
+ render_dynamic_filters_table(frm) {
+ if (!frappe.boot.developer_mode || !frm.doc.is_standard || frm.doc.type == 'Custom') {
+ return;
+ }
-function set_filters_in_table(filters, table) {
- if (!filters.length) {
- const filter_row = $(`|
- ${__("Click to Set Filters")} |
`);
- table.find('tbody').html(filter_row);
- } else {
- let filter_rows = '';
- filters.forEach(filter => {
- filter_rows +=
- `
- | ${filter[1]} |
- ${filter[2] || ""} |
- ${filter[3]} |
-
`;
+ frm.set_df_property("dynamic_filters_section", "hidden", 0);
+ let is_document_type = frm.doc.type == 'Document Type';
+
+ let wrapper = $(frm.get_field('dynamic_filters_json').wrapper).empty();
+
+ frm.dynamic_filter_table = $(`
+
+
+ | ${__('Filter')} |
+ ${__('Condition')} |
+ ${__('Value')} |
+
+
+
+
`).appendTo(wrapper);
+
+ frm.dynamic_filters = frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2
+ ? JSON.parse(frm.doc.dynamic_filters_json)
+ : null;
+
+ frm.trigger('set_dynamic_filters_in_table');
+
+ let filters = JSON.parse(frm.doc.filters_json || '[]');
+
+ let fields = frappe.dashboard_utils.get_fields_for_dynamic_filter_dialog(
+ is_document_type, filters, frm.dynamic_filters
+ );
+
+ frm.dynamic_filter_table.on('click', () => {
+ let dialog = new frappe.ui.Dialog({
+ title: __('Set Dynamic Filters'),
+ fields: fields,
+ primary_action: () => {
+ let values = dialog.get_values();
+ dialog.hide();
+ let dynamic_filters = [];
+ for (let key of Object.keys(values)) {
+ if (is_document_type) {
+ let [doctype, fieldname] = key.split(':');
+ dynamic_filters.push([doctype, fieldname, '=', values[key]]);
+ }
+ }
+
+ if (is_document_type) {
+ frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
+ } else {
+ frm.set_value('dynamic_filters_json', JSON.stringify(values));
+ }
+ frm.trigger('set_dynamic_filters_in_table');
+ },
+ primary_action_label: "Set"
+ });
+
+ dialog.show();
+ dialog.set_values(frm.dynamic_filters);
});
- table.find('tbody').html(filter_rows);
+ },
+
+ set_dynamic_filters_in_table: function(frm) {
+ frm.dynamic_filters = frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2
+ ? JSON.parse(frm.doc.dynamic_filters_json)
+ : null;
+
+ if (!frm.dynamic_filters) {
+ const filter_row = $(`|
+ ${__("Click to Set Dynamic Filters")} |
`);
+ frm.dynamic_filter_table.find('tbody').html(filter_row);
+ } else {
+ let filter_rows = '';
+ if ($.isArray(frm.dynamic_filters)) {
+ frm.dynamic_filters.forEach(filter => {
+ filter_rows +=
+ `
+ | ${filter[1]} |
+ ${filter[2] || ""} |
+ ${filter[3]} |
+
`;
+ });
+ } else {
+ let condition = '=';
+ for (let [key, val] of Object.entries(frm.dynamic_filters)) {
+ filter_rows +=
+ `
+ | ${key} |
+ ${condition} |
+ ${val || ""} |
+
`
+ ;
+ }
+ }
+
+ frm.dynamic_filter_table.find('tbody').html(filter_rows);
+ }
}
-}
+
+});
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 41362a8982..333885a7f9 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -9,11 +9,18 @@
"is_standard",
"module",
"label",
+ "type",
+ "report_name",
+ "method",
"function",
"aggregate_function_based_on",
"column_break_2",
"document_type",
+ "report_field",
+ "report_function",
"is_public",
+ "custom_configuration_section",
+ "filters_config",
"stats_section",
"show_percentage_stats",
"stats_time_interval",
@@ -26,20 +33,21 @@
],
"fields": [
{
+ "depends_on": "eval: doc.type == 'Document Type'",
"fieldname": "document_type",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Document Type",
- "options": "DocType",
- "reqd": 1
+ "mandatory_depends_on": "eval: doc.type == 'Document Type'",
+ "options": "DocType"
},
{
- "depends_on": "eval: doc.document_type",
+ "depends_on": "eval: doc.type == 'Document Type'",
"fieldname": "function",
"fieldtype": "Select",
"label": "Function",
- "options": "Count\nSum\nAverage\nMinimum\nMaximum",
- "reqd": 1
+ "mandatory_depends_on": "eval: doc.type == 'Document Type'",
+ "options": "Count\nSum\nAverage\nMinimum\nMaximum"
},
{
"depends_on": "eval: doc.function !== 'Count'",
@@ -98,6 +106,7 @@
"options": "Daily\nWeekly\nMonthly\nYearly"
},
{
+ "depends_on": "eval: doc.type == 'Document Type'",
"fieldname": "stats_section",
"fieldtype": "Section Break",
"label": "Stats"
@@ -114,34 +123,74 @@
"fieldtype": "Link",
"label": "Module",
"mandatory_depends_on": "eval: doc.is_standard",
- "options": "Module Def",
- "show_days": 1,
- "show_seconds": 1
+ "options": "Module Def"
},
{
"fieldname": "dynamic_filters_json",
"fieldtype": "Code",
"label": "Dynamic Filters JSON",
- "options": "JSON",
- "show_days": 1,
- "show_seconds": 1
+ "options": "JSON"
},
{
"fieldname": "section_break_16",
- "fieldtype": "Section Break",
- "show_days": 1,
- "show_seconds": 1
+ "fieldtype": "Section Break"
},
{
"fieldname": "dynamic_filters_section",
"fieldtype": "Section Break",
- "label": "Dynamic Filters Section",
- "show_days": 1,
- "show_seconds": 1
+ "label": "Dynamic Filters Section"
+ },
+ {
+ "fieldname": "type",
+ "fieldtype": "Select",
+ "label": "Type",
+ "options": "Document Type\nReport\nCustom"
+ },
+ {
+ "depends_on": "eval: doc.type == 'Report'",
+ "fieldname": "report_name",
+ "fieldtype": "Link",
+ "label": "Report Name",
+ "mandatory_depends_on": "eval: doc.type == 'Report'",
+ "options": "Report"
+ },
+ {
+ "depends_on": "eval: doc.type == 'Report'",
+ "fieldname": "report_field",
+ "fieldtype": "Select",
+ "label": "Field",
+ "mandatory_depends_on": "eval: doc.type == 'Report'"
+ },
+ {
+ "depends_on": "eval: doc.type == 'Custom'",
+ "fieldname": "method",
+ "fieldtype": "Data",
+ "label": "Method",
+ "mandatory_depends_on": "eval: doc.type == 'Custom'"
+ },
+ {
+ "depends_on": "eval: doc.type == 'Custom'",
+ "fieldname": "custom_configuration_section",
+ "fieldtype": "Section Break",
+ "label": "Custom Configuration"
+ },
+ {
+ "fieldname": "filters_config",
+ "fieldtype": "Code",
+ "label": "Filters Configuration",
+ "options": "JSON"
+ },
+ {
+ "depends_on": "eval: doc.type == 'Report'",
+ "fieldname": "report_function",
+ "fieldtype": "Select",
+ "label": "Function",
+ "mandatory_depends_on": "eval: doc.type == 'Report'",
+ "options": "Sum\nAverage\nMinimum\nMaximum"
}
],
"links": [],
- "modified": "2020-07-10 17:55:35.873222",
+ "modified": "2020-07-18 17:08:22.882538",
"modified_by": "Administrator",
"module": "Desk",
"name": "Number Card",
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 2f5cfb561c..5b52b60474 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -52,7 +52,7 @@ def has_permission(doc, ptype, user):
return False
@frappe.whitelist()
-def get_result(doc, to_date=None):
+def get_result(doc, filters, to_date=None):
doc = frappe.parse_json(doc)
fields = []
sql_function_map = {
@@ -70,13 +70,13 @@ def get_result(doc, to_date=None):
else:
fields = ['{function}({based_on}) as result'.format(function=function, based_on=doc.aggregate_function_based_on)]
- filters = frappe.parse_json(doc.filters_json)
+ filters = frappe.parse_json(filters)
if not filters:
filters = []
if to_date:
- filters.append([doc.document_type, 'creation', '<', to_date, False])
+ filters.append([doc.document_type, 'creation', '<', to_date])
res = frappe.db.get_list(doc.document_type, fields=fields, filters=filters)
number = res[0]['result'] if res else 0
@@ -84,7 +84,7 @@ def get_result(doc, to_date=None):
return cint(number)
@frappe.whitelist()
-def get_percentage_difference(doc, result):
+def get_percentage_difference(doc, filters, result):
doc = frappe.parse_json(doc)
result = frappe.parse_json(result)
@@ -93,13 +93,13 @@ def get_percentage_difference(doc, result):
if not doc.get('show_percentage_stats'):
return
- previous_result = calculate_previous_result(doc)
+ previous_result = calculate_previous_result(doc, filters)
difference = (result - previous_result)/100.0
return difference
-def calculate_previous_result(doc):
+def calculate_previous_result(doc, filters):
from frappe.utils import add_to_date
current_date = frappe.utils.now()
@@ -112,7 +112,7 @@ def calculate_previous_result(doc):
else:
previous_date = add_to_date(current_date, years=-1)
- number = get_result(doc, previous_date)
+ number = get_result(doc, filters, previous_date)
return number
@frappe.whitelist()
@@ -155,3 +155,22 @@ def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters):
search_conditions=search_conditions,
conditions=conditions
), values)
+
+@frappe.whitelist()
+def create_report_number_card(args):
+ card = create_number_card(args)
+ args = frappe.parse_json(args)
+ args.name = card.name
+ if args.dashboard:
+ add_card_to_dashboard(frappe.as_json(args))
+
+@frappe.whitelist()
+def add_card_to_dashboard(args):
+ args = frappe.parse_json(args)
+
+ dashboard = frappe.get_doc('Dashboard', args.dashboard)
+ dashboard_link = frappe.new_doc('Number Card Link')
+ dashboard_link.card = args.name
+
+ dashboard.append('cards', dashboard_link)
+ dashboard.save()
\ No newline at end of file
diff --git a/frappe/model/document.py b/frappe/model/document.py
index ea693167f8..69a781d6d1 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -403,9 +403,16 @@ class Document(BaseDocument):
def set_new_name(self, force=False, set_name=None, set_child_names=True):
"""Calls `frappe.naming.set_new_name` for parent and child docs."""
+
if self.flags.name_set and not force:
return
+ # If autoname has set as Prompt (name)
+ if self.get("__newname"):
+ self.name = self.get("__newname")
+ self.flags.name_set = True
+ return
+
if set_name:
self.name = set_name
else:
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 1108f1fb1b..f8c767f5a3 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -273,6 +273,7 @@ execute:frappe.delete_doc_if_exists('DocType', 'GSuite Templates')
execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Account')
execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings')
frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
+frappe.patches.v12_0.remove_example_email_thread_notify
execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
frappe.patches.v12_0.set_correct_url_in_files
frappe.patches.v13_0.website_theme_custom_scss
@@ -293,4 +294,4 @@ execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link")
frappe.patches.v13_0.update_date_filters_in_user_settings
frappe.patches.v13_0.update_duration_options
frappe.patches.v13_0.replace_old_data_import # 2020-06-24
-frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
\ No newline at end of file
+frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
diff --git a/frappe/patches/v12_0/remove_example_email_thread_notify.py b/frappe/patches/v12_0/remove_example_email_thread_notify.py
new file mode 100644
index 0000000000..94959b6077
--- /dev/null
+++ b/frappe/patches/v12_0/remove_example_email_thread_notify.py
@@ -0,0 +1,8 @@
+import frappe
+
+
+def execute():
+ # remove all example.com email user accounts from notifications
+ frappe.db.sql("""UPDATE `tabUser`
+ SET thread_notify=0, send_me_a_copy=0
+ WHERE email like '%@example.com'""")
diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index 68444c8a3b..2da7b8f236 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -240,13 +240,8 @@ frappe.ui.form.QuickEntryForm = Class.extend({
var me = this;
var data = this.dialog.get_values(true);
$.each(data, function(key, value) {
- if(key==='__newname') {
- me.dialog.doc.name = value;
- }
- else {
- if(!is_null(value)) {
- me.dialog.doc[key] = value;
- }
+ if (!is_null(value)) {
+ me.dialog.doc[key] = value;
}
});
return this.dialog.doc;
@@ -282,7 +277,7 @@ frappe.ui.form.QuickEntryForm = Class.extend({
field.doctype = me.doc.doctype;
field.docname = me.doc.name;
- if(!is_null(me.doc[fieldname])) {
+ if (!is_null(me.doc[fieldname])) {
field.set_input(me.doc[fieldname]);
}
});
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index f737c6ad12..8618f6dd59 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -119,6 +119,86 @@ frappe.dashboard_utils = {
}
return static_filters;
+ },
+
+ get_fields_for_dynamic_filter_dialog(is_document_type, filters, dynamic_filters) {
+ let fields = [
+ {
+ fieldtype: 'HTML',
+ fieldname: 'description',
+ options:
+ `
+
Set dynamic filter values in JavaScript for the required fields here.
+
+
Ex:
+ frappe.defaults.get_user_default("Company")
+
+
-
${this.number_html}
+
${this.formatted_number}
Error
+ "body": sanitize_html("""Error
Parameters doctype and name required
- %s
""" % repr(frappe.form_dict)
+ %s
""" % repr(frappe.form_dict))
}
if frappe.form_dict.doc:
diff --git a/requirements.txt b/requirements.txt
index 0d01886f05..e0ca1a6fad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,8 +13,8 @@ dropbox==9.1.0
email-reply-parser==0.5.9
Faker==2.0.4
future==0.18.2
-GitPython==2.1.15
gitdb2==2.0.6;python_version<'3.4'
+GitPython==2.1.15
google-api-python-client==1.9.3
google-auth-httplib2==0.0.3
google-auth-oauthlib==0.4.1
@@ -40,6 +40,7 @@ psycopg2-binary==2.8.4
pyasn1==0.4.8
PyJWT==1.7.1
PyMySQL==0.9.3
+pyngrok==4.1.6
pyOpenSSL==19.1.0
pyotp==2.3.0
PyPDF2==1.26.0
@@ -64,6 +65,6 @@ unittest-xml-reporting==2.5.2
urllib3==1.25.8
watchdog==0.8.0
Werkzeug==0.16.1
+Whoosh==2.7.4
xlrd==1.2.0
zxcvbn-python==4.4.24
-Whoosh==2.7.4