From d0a5a9a7ba7bbff9edadb6a306d468d14420983d Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Thu, 14 Nov 2019 00:06:53 +0100 Subject: [PATCH 01/77] :white_check_mark: Add JUnit XML reports to Travis Signed-off-by: mathieu.brunot --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index df66db88a7..0288c01f7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,12 +21,12 @@ matrix: - name: "Python 3.6 MariaDB" python: 3.6 env: DB=mariadb TYPE=server - script: bench --site test_site run-tests --coverage + script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml - name: "Python 3.6 PostgreSQL" python: 3.6 env: DB=postgres TYPE=server - script: bench --site test_site run-tests --coverage + script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml - name: "Cypress" python: 3.6 @@ -37,7 +37,7 @@ matrix: - name: "Python 2.7 MariaDB" python: 2.7 env: DB=mariadb TYPE=server - script: bench --site test_site run-tests --coverage + script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml install: - cd ~ From 0054206e431d6418447e3a117223aeeba6e80833 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Mon, 25 Nov 2019 23:23:49 +0100 Subject: [PATCH 02/77] :construction: Testing without TimeLogging Signed-off-by: mathieu.brunot --- frappe/test_runner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 76140e442c..4e5010ed38 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -131,7 +131,8 @@ def run_all_tests(app=None, verbose=False, profile=False, ui_tests=False, failfa pr = cProfile.Profile() pr.enable() - out = unittest_runner(resultclass=TimeLoggingTestResult, verbosity=1+(verbose and 1 or 0), failfast=failfast).run(test_suite) + # resultclass=TimeLoggingTestResult, + out = unittest_runner(verbosity=1+(verbose and 1 or 0), failfast=failfast).run(test_suite) if profile: pr.disable() From f3717bd7a69f2ab9088e87e481ddd5f64b1c2aaa Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Tue, 26 Nov 2019 03:11:14 +0100 Subject: [PATCH 03/77] :white_check_mark: Test XML reports Signed-off-by: mathieu.brunot --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0288c01f7e..a5c81f9631 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,11 +19,21 @@ cache: matrix: include: - name: "Python 3.6 MariaDB" + python: 3.6 + env: DB=mariadb TYPE=server + script: bench --site test_site run-tests --coverage + + - name: "Python 3.6 MariaDB XML Report" python: 3.6 env: DB=mariadb TYPE=server script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml - name: "Python 3.6 PostgreSQL" + python: 3.6 + env: DB=postgres TYPE=server + script: bench --site test_site run-tests --coverage + + - name: "Python 3.6 PostgreSQL XML Report" python: 3.6 env: DB=postgres TYPE=server script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml @@ -35,6 +45,11 @@ matrix: script: bench --site test_site run-ui-tests frappe --headless - name: "Python 2.7 MariaDB" + python: 2.7 + env: DB=mariadb TYPE=server + script: bench --site test_site run-tests --coverage + + - name: "Python 2.7 MariaDB XML Report" python: 2.7 env: DB=mariadb TYPE=server script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml From 3073515b1c2c40c14aeda5a2e4cb4a3a1b363c12 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Tue, 26 Nov 2019 03:11:40 +0100 Subject: [PATCH 04/77] :construction: Split runner init from test run Signed-off-by: mathieu.brunot --- frappe/test_runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 4e5010ed38..23ba00789d 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -131,8 +131,8 @@ def run_all_tests(app=None, verbose=False, profile=False, ui_tests=False, failfa pr = cProfile.Profile() pr.enable() - # resultclass=TimeLoggingTestResult, - out = unittest_runner(verbosity=1+(verbose and 1 or 0), failfast=failfast).run(test_suite) + runner = unittest_runner(resultclass=TimeLoggingTestResult, verbosity=1+(verbose and 1 or 0), failfast=failfast) + out = runner.run(test_suite) if profile: pr.disable() From cf50b52df7b2bf33044a619dbdbf0cb8d2b2c255 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Tue, 26 Nov 2019 03:21:23 +0100 Subject: [PATCH 05/77] :bug: Allow Unit Test XML to write binary Signed-off-by: mathieu.brunot --- frappe/test_runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 23ba00789d..86aa1b730e 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -38,7 +38,7 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), xmloutput_fh = None if junit_xml_output: - xmloutput_fh = open(junit_xml_output, 'w') + xmloutput_fh = open(junit_xml_output, 'wb') unittest_runner = xmlrunner_wrapper(xmloutput_fh) else: unittest_runner = unittest.TextTestRunner From 469944d2738fd9de1d468c2a9b357c6f65003001 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Tue, 26 Nov 2019 04:00:14 +0100 Subject: [PATCH 06/77] :bug: Change runner init if XML report on Signed-off-by: mathieu.brunot --- frappe/test_runner.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 86aa1b730e..e7ec13afe6 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -65,11 +65,11 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), frappe.get_attr(fn)() if doctype: - ret = run_tests_for_doctype(doctype, verbose, tests, force, profile) + ret = run_tests_for_doctype(doctype, verbose, tests, force, profile, junit_xml_output=junit_xml_output) elif module: - ret = run_tests_for_module(module, verbose, tests, profile) + ret = run_tests_for_module(module, verbose, tests, profile, junit_xml_output=junit_xml_output) else: - ret = run_all_tests(app, verbose, profile, ui_tests, failfast=failfast) + ret = run_all_tests(app, verbose, profile, ui_tests, failfast=failfast, junit_xml_output=junit_xml_output) frappe.db.commit() @@ -106,7 +106,7 @@ class TimeLoggingTestResult(unittest.TextTestResult): super(TimeLoggingTestResult, self).addSuccess(test) -def run_all_tests(app=None, verbose=False, profile=False, ui_tests=False, failfast=False): +def run_all_tests(app=None, verbose=False, profile=False, ui_tests=False, failfast=False, junit_xml_output=False): import os apps = [app] if app else frappe.get_installed_apps() @@ -127,11 +127,15 @@ def run_all_tests(app=None, verbose=False, profile=False, ui_tests=False, failfa _add_test(app, path, filename, verbose, test_suite, ui_tests) + if junit_xml_output: + runner = unittest_runner(verbosity=1+(verbose and 1 or 0), failfast=failfast) + else: + runner = unittest_runner(resultclass=TimeLoggingTestResult, verbosity=1+(verbose and 1 or 0), failfast=failfast) + if profile: pr = cProfile.Profile() pr.enable() - runner = unittest_runner(resultclass=TimeLoggingTestResult, verbosity=1+(verbose and 1 or 0), failfast=failfast) out = runner.run(test_suite) if profile: @@ -143,7 +147,7 @@ def run_all_tests(app=None, verbose=False, profile=False, ui_tests=False, failfa return out -def run_tests_for_doctype(doctypes, verbose=False, tests=(), force=False, profile=False): +def run_tests_for_doctype(doctypes, verbose=False, tests=(), force=False, profile=False, junit_xml_output=False): modules = [] if not isinstance(doctypes, (list, tuple)): doctypes = [doctypes] @@ -161,15 +165,15 @@ def run_tests_for_doctype(doctypes, verbose=False, tests=(), force=False, profil make_test_records(doctype, verbose=verbose, force=force) modules.append(importlib.import_module(test_module)) - return _run_unittest(modules, verbose=verbose, tests=tests, profile=profile) + return _run_unittest(modules, verbose=verbose, tests=tests, profile=profile, junit_xml_output=junit_xml_output) -def run_tests_for_module(module, verbose=False, tests=(), profile=False): +def run_tests_for_module(module, verbose=False, tests=(), profile=False, junit_xml_output=False): module = importlib.import_module(module) if hasattr(module, "test_dependencies"): for doctype in module.test_dependencies: make_test_records(doctype, verbose=verbose) - return _run_unittest(module, verbose=verbose, tests=tests, profile=profile) + return _run_unittest(module, verbose=verbose, tests=tests, profile=profile, junit_xml_output=junit_xml_output) def run_setup_wizard_ui_test(app=None, verbose=False, profile=False): '''Run setup wizard UI test using test_test_runner''' @@ -186,7 +190,7 @@ def run_ui_tests(app=None, test=None, test_list=None, verbose=False, profile=Fal frappe.flags.ui_test_path = test return _run_unittest(module, verbose=verbose, tests=(), profile=profile) -def _run_unittest(modules, verbose=False, tests=(), profile=False): +def _run_unittest(modules, verbose=False, tests=(), profile=False, junit_xml_output=False): test_suite = unittest.TestSuite() if not isinstance(modules, (list, tuple)): @@ -202,13 +206,18 @@ def _run_unittest(modules, verbose=False, tests=(), profile=False): else: test_suite.addTest(module_test_cases) + if junit_xml_output: + runner = unittest_runner(verbosity=1+(verbose and 1 or 0)) + else: + runner = unittest_runner(resultclass=TimeLoggingTestResult, verbosity=1+(verbose and 1 or 0)) + if profile: pr = cProfile.Profile() pr.enable() frappe.flags.tests_verbose = verbose - out = unittest_runner(verbosity=1+(verbose and 1 or 0)).run(test_suite) + out = runner.run(test_suite) if profile: From 598a0d1a45e4cd61258f740f0e367469b9c83a6b Mon Sep 17 00:00:00 2001 From: Mathieu Brunot Date: Tue, 31 Dec 2019 02:40:06 +0100 Subject: [PATCH 07/77] ci(coverage): Pin converage to 4.5.4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6990a0df8a..4962caf788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,5 +91,6 @@ install: - bench build --app frappe after_script: + - pip install coverage==4.5.4 - pip install python-coveralls - coveralls -b apps/frappe -d ../../sites/.coverage From 2b77c61f6b8eb0fae8f281ec17f30a5295ea9ca4 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 12 Jan 2020 13:43:53 +0530 Subject: [PATCH 08/77] style: fix leaderboard searchbox padding --- frappe/desk/page/leaderboard/leaderboard.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/desk/page/leaderboard/leaderboard.css b/frappe/desk/page/leaderboard/leaderboard.css index a3cb4d09c4..1c6c8b7726 100644 --- a/frappe/desk/page/leaderboard/leaderboard.css +++ b/frappe/desk/page/leaderboard/leaderboard.css @@ -55,3 +55,7 @@ max-width: 75px; } +.leaderboard-search { + padding: 5px; +} + From a6f516c9735140bc1effef7673c9ed02216bf875 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 12 Jan 2020 13:44:25 +0530 Subject: [PATCH 09/77] fix: fix leaderboard search --- frappe/desk/page/leaderboard/leaderboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/page/leaderboard/leaderboard.js b/frappe/desk/page/leaderboard/leaderboard.js index c64d2dcb4f..c4c8f5790d 100644 --- a/frappe/desk/page/leaderboard/leaderboard.js +++ b/frappe/desk/page/leaderboard/leaderboard.js @@ -363,7 +363,7 @@ class Leaderboard { const link = `#Form/${this.options.selected_doctype}/${item.name}`; const name_html = item.formatted_name ? - `${item.formatted_name}` + `${item.formatted_name}` : ` ${item.name} `; const html = `
From dd2fba419b225c403064131f8eabc032f4079b51 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 12 Jan 2020 14:17:10 +0530 Subject: [PATCH 10/77] fix: use form-group class for leaderboard search --- frappe/desk/page/leaderboard/leaderboard.css | 4 ---- frappe/desk/page/leaderboard/leaderboard.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/frappe/desk/page/leaderboard/leaderboard.css b/frappe/desk/page/leaderboard/leaderboard.css index 1c6c8b7726..a3cb4d09c4 100644 --- a/frappe/desk/page/leaderboard/leaderboard.css +++ b/frappe/desk/page/leaderboard/leaderboard.css @@ -55,7 +55,3 @@ max-width: 75px; } -.leaderboard-search { - padding: 5px; -} - diff --git a/frappe/desk/page/leaderboard/leaderboard.js b/frappe/desk/page/leaderboard/leaderboard.js index c4c8f5790d..5359e9eab8 100644 --- a/frappe/desk/page/leaderboard/leaderboard.js +++ b/frappe/desk/page/leaderboard/leaderboard.js @@ -187,7 +187,7 @@ class Leaderboard { render_search_box() { this.$search_box = - $(`
+ $(`
`); From c077d923782ab5613102a04ca4d86799c899bb6f Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Sun, 12 Jan 2020 22:06:59 +0530 Subject: [PATCH 11/77] feat: Enhancement in print grid --- frappe/public/js/frappe/views/reports/print_grid.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/print_grid.html b/frappe/public/js/frappe/views/reports/print_grid.html index ec8596b2ad..ea510fa7bd 100644 --- a/frappe/public/js/frappe/views/reports/print_grid.html +++ b/frappe/public/js/frappe/views/reports/print_grid.html @@ -29,13 +29,13 @@ {% for row in data %} - + {% for col in columns %} {% if col.name && col._id !== "_check" %} {% var value = col.fieldname ? row[col.fieldname] : row[col.id]; %} - + {{ col.formatter From fbf2e8812192e71e3478598425003e27b2d4cf73 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Mon, 13 Jan 2020 13:30:18 +0530 Subject: [PATCH 12/77] style(web-form): change delete button to an icon --- frappe/public/js/frappe/web_form/web_form.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index f1d1d5076e..17c284db4a 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -86,7 +86,11 @@ export default class WebForm extends frappe.ui.FieldGroup { } setup_delete_button() { - this.add_button_to_header("Delete", "danger", () => this.delete()); + this.add_button_to_header( + '', + "light", + () => this.delete() + ); } setup_print_button() { From f741d46fdb64dffed957aca1546613ae1a41d344 Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 15 Nov 2019 16:11:50 +0530 Subject: [PATCH 13/77] feat: cancel multiple documents in a single transaction - show all linked doc in a dialog box on cancel event - following changes only fetch cancelable docs - recursively build a list of linked submitted docs - cancel all linked documents before cancelling current document - add progress bar and group documents by doctype - added exempted doctype list in hooks --- frappe/desk/form/linked_with.py | 70 +++++++++++++++-- frappe/public/js/frappe/form/form.js | 110 ++++++++++++++++++++++++--- frappe/utils/boilerplate.py | 4 + 3 files changed, 168 insertions(+), 16 deletions(-) diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py index 734b99a003..3921378565 100644 --- a/frappe/desk/form/linked_with.py +++ b/frappe/desk/form/linked_with.py @@ -2,13 +2,71 @@ # MIT License. See license.txt from __future__ import unicode_literals -import frappe, json +import json +from collections import defaultdict + +from six import string_types + +import frappe +import frappe.desk.form.load +import frappe.desk.form.meta +from frappe import _ from frappe.model.meta import is_single from frappe.modules import load_doctype_module -import frappe.desk.form.meta -import frappe.desk.form.load -from six import string_types -from collections import defaultdict + + +@frappe.whitelist() +def get_submitted_linked_docs(doctype, name, docs=None): + if not docs: + docs = [] + + linkinfo = get_linked_doctypes(doctype) + linked_docs = get_linked_docs(doctype, name, linkinfo) + + link_count = 0 + CANCEL_EXEMPT_DOCTYPES = [] + for doctypes in frappe.get_hooks('cancel_exempt_doctypes'): + CANCEL_EXEMPT_DOCTYPES.extend(doctypes) + + for link_doctype, link_names in linked_docs.items(): + # skip non-submittable doctypes since they don't need to be cancelled + if not frappe.get_meta(link_doctype).is_submittable: + continue + + # skip other doctypes since they don't need to be cancelled + if link_doctype in CANCEL_EXEMPT_DOCTYPES: + continue + + for link in link_names: + if link.docstatus != 1: + continue + + link_count += 1 + if link.name in [doc.get("name") for doc in docs]: + continue + + links = get_submitted_linked_docs(link_doctype, link.name, docs) + docs.append({ + "doctype": link_doctype, + "name": link.name, + "link_count": links.get("count") + }) + + # sort linked documents by ascending number of links + docs.sort(key=lambda doc: doc.get("link_count")) + return { + "docs": docs, + "count": link_count + } + + +@frappe.whitelist() +def cancel_all_linked_docs(docs): + docs = json.loads(docs) + for i, doc in enumerate(docs, 1): + frappe.publish_progress(percent=i * 100 / len(docs), title=_("Cancelling documents")) + linked_doc = frappe.get_doc(doc.get("doctype"), doc.get("name")) + linked_doc.cancel() @frappe.whitelist() @@ -203,4 +261,4 @@ def get_dynamic_linked_fields(doctype, without_ignore_user_permissions_enabled=F "doctype_fieldname": df.doctype_fieldname } - return ret \ No newline at end of file + return ret diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 02aa8b78dc..3ed39f28c0 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -648,19 +648,103 @@ frappe.ui.form.Form = class FrappeForm { } savecancel(btn, callback, on_error) { - var me = this; + const me = this; + const handle_fail = () => { + $(btn).prop('disabled', false); + if (on_error) { + on_error(); + } + }; this.validate_form_action('Cancel'); - frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), function() { + + frappe.call({ + method: "frappe.desk.form.linked_with.get_submitted_linked_docs", + args: { + doctype: me.doc.doctype, + name: me.doc.name + }, + freeze: true, + callback: (r) => { + if (!r.exc && r.message.count > 0) { + me._cancel_all(r, btn, callback, handle_fail); + } else { + me._cancel(btn, callback, handle_fail, false); + } + } + }); + } + + _cancel_all(r, btn, callback, handle_fail) { + const me = this; + + // add confirmation message for cancelling all linked docs + let links_text = ""; + let links = r.message.docs; + const doctypes = Array.from(new Set(links.map(link => link.doctype))); + + for (let doctype of doctypes) { + let docnames = links + .filter((link) => link.doctype == doctype) + .map((link) => frappe.utils.get_form_link(link.doctype, link.name, true)) + .join(", "); + links_text += `
  • ${doctype}: ${docnames}
    • ` + } + links_text = "
      " + links_text + "
    " + + let confirm_message = `${me.doc.doctype} ${me.doc.name} is linked with the following submitted documents: ${links_text}` + let can_cancel = links.every((link) => frappe.model.can_cancel(link.doctype)); + if (can_cancel) { + confirm_message += `Do you want to cancel all linked documents?`; + } else { + confirm_message += `You do not have permissions to cancel all linked documents.`; + } + + // generate dialog box to cancel all linked docs + let d = new frappe.ui.Dialog({ + title: __("Cancel All Documents"), + fields: [{ + fieldtype: "HTML", + options: `

    ${confirm_message}

    ` + }] + }, () => handle_fail()); + + // if user can cancel all linked docs, add action to the dialog + if (can_cancel) { + d.set_primary_action("Cancel All", () => { + d.hide(); + frappe.call({ + method: "frappe.desk.form.linked_with.cancel_all_linked_docs", + args: { + docs: links + }, + freeze: true, + callback: (resp) => { + if (!resp.exc) { + me.reload_doc(); + me._cancel(btn, callback, handle_fail, true); + } + } + }) + }); + } + + d.show(); + }; + + _cancel(btn, callback, handle_fail, skip_confirm) { + const me = this; + const cancel_doc = () => { frappe.validated = true; - me.script_manager.trigger("before_cancel").then(function() { - if(!frappe.validated) { - return me.handle_save_fail(btn, on_error); + me.script_manager.trigger("before_cancel").then(() => { + if (!frappe.validated) { + handle_fail(); + return; } - var after_cancel = function(r) { - if(r.exc) { - me.handle_save_fail(btn, on_error); + const after_cancel(r) { + if (r.exc) { + handle_fail(); } else { frappe.utils.play_sound("cancel"); me.refresh(); @@ -670,8 +754,14 @@ frappe.ui.form.Form = class FrappeForm { }; frappe.ui.form.save(me, "cancel", after_cancel, btn); }); - }, () => me.handle_save_fail(btn, on_error)); - } + } + + if (skip_confirm) { + cancel_doc(); + } else { + frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, handle_fail); + } + }; savetrash() { this.validate_form_action("Delete"); diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 4a7b93751a..e1dde1f0d4 100755 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -256,6 +256,10 @@ app_license = "{app_license}" # "Task": "{app_name}.task.get_dashboard_data" # }} +# exempt linked doctypes from being automatically cancelled +# +# cancel_exempt_doctypes = ["Auto Repeat"] + """ desktop_template = """# -*- coding: utf-8 -*- From 95f04583e2e2479c98c7c121ce36e8d0c8d1e900 Mon Sep 17 00:00:00 2001 From: vishal Date: Mon, 2 Dec 2019 18:44:15 +0530 Subject: [PATCH 14/77] fix: validation added for cancel document --- frappe/desk/form/linked_with.py | 87 ++++++++++++++++++++++------ frappe/public/js/frappe/form/form.js | 4 +- 2 files changed, 70 insertions(+), 21 deletions(-) diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py index 3921378565..62f4f913ae 100644 --- a/frappe/desk/form/linked_with.py +++ b/frappe/desk/form/linked_with.py @@ -1,12 +1,9 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt from __future__ import unicode_literals - import json from collections import defaultdict - from six import string_types - import frappe import frappe.desk.form.load import frappe.desk.form.meta @@ -17,6 +14,20 @@ from frappe.modules import load_doctype_module @frappe.whitelist() def get_submitted_linked_docs(doctype, name, docs=None): + """ + Get all nested submitted linked doctype linkinfo + + Arguments: + doctype (str) - The doctype for which get all linked doctypes + name (str) - The docname for which get all linked doctypes + + Keyword Arguments: + docs [list of dict] - (Optional) Get list of dictionary for linked doctype (default: None) + + Returns: + dict - Return list of documents and link count + """ + if not docs: docs = [] @@ -24,21 +35,12 @@ def get_submitted_linked_docs(doctype, name, docs=None): linked_docs = get_linked_docs(doctype, name, linkinfo) link_count = 0 - CANCEL_EXEMPT_DOCTYPES = [] - for doctypes in frappe.get_hooks('cancel_exempt_doctypes'): - CANCEL_EXEMPT_DOCTYPES.extend(doctypes) - for link_doctype, link_names in linked_docs.items(): - # skip non-submittable doctypes since they don't need to be cancelled - if not frappe.get_meta(link_doctype).is_submittable: - continue - - # skip other doctypes since they don't need to be cancelled - if link_doctype in CANCEL_EXEMPT_DOCTYPES: - continue - for link in link_names: - if link.docstatus != 1: + docinfo = link.update({"doctype": link_doctype}) + validated_doc = validate_linked_doc(docinfo) + + if not validated_doc: continue link_count += 1 @@ -49,6 +51,7 @@ def get_submitted_linked_docs(doctype, name, docs=None): docs.append({ "doctype": link_doctype, "name": link.name, + "docstatus": link.docstatus, "link_count": links.get("count") }) @@ -62,11 +65,57 @@ def get_submitted_linked_docs(doctype, name, docs=None): @frappe.whitelist() def cancel_all_linked_docs(docs): + """ + Cancel all linked doctype + + Arguments: + docs [list of dict] - It contains all list of dictionaries of a linked documents. + """ + docs = json.loads(docs) for i, doc in enumerate(docs, 1): - frappe.publish_progress(percent=i * 100 / len(docs), title=_("Cancelling documents")) - linked_doc = frappe.get_doc(doc.get("doctype"), doc.get("name")) - linked_doc.cancel() + if validate_linked_doc(doc) is True: + frappe.publish_progress(percent=i * 100 / len(docs), title=_("Cancelling documents")) + linked_doc = frappe.get_doc(doc.get("doctype"), doc.get("name")) + linked_doc.cancel() + + +def validate_linked_doc(docinfo): + """ + Validate a document to be submitted and non-exempted from auto-cancel. + + Args: + docs (dict): The document to check for submitted and non-exempt from auto-cancel + + Returns: + bool: True if linked document passes all validations, else False + """ + + # skip non-submittable doctypes since they don't need to be cancelled + if not frappe.get_meta(docinfo.get('doctype')).is_submittable: + return False + + # skip draft or cancelled documents + if docinfo.get('docstatus') != 1: + return False + + # skip other doctypes since they don't need to be cancelled + auto_cancel_exempt_doctypes = get_exempted_doctypes() + if docinfo.get('doctype') in auto_cancel_exempt_doctypes: + return False + + return True + + +def get_exempted_doctypes(): + """ + Get list of doctypes exempted from being auto-cancelled + """ + + auto_cancel_exempt_doctypes = [] + for doctypes in frappe.get_hooks('auto_cancel_exempt_doctypes'): + auto_cancel_exempt_doctypes.append(doctypes) + return auto_cancel_exempt_doctypes @frappe.whitelist() diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 3ed39f28c0..ac5de519f2 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -725,7 +725,7 @@ frappe.ui.form.Form = class FrappeForm { me._cancel(btn, callback, handle_fail, true); } } - }) + }); }); } @@ -742,7 +742,7 @@ frappe.ui.form.Form = class FrappeForm { return; } - const after_cancel(r) { + var after_cancel = function(r) { if (r.exc) { handle_fail(); } else { From 9be267b96ac6faf31633a4b0f1851cca77caf083 Mon Sep 17 00:00:00 2001 From: vishal Date: Wed, 4 Dec 2019 16:08:52 +0530 Subject: [PATCH 15/77] fix: deepsource --- frappe/desk/form/linked_with.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py index 62f4f913ae..90bf229c7a 100644 --- a/frappe/desk/form/linked_with.py +++ b/frappe/desk/form/linked_with.py @@ -22,7 +22,7 @@ def get_submitted_linked_docs(doctype, name, docs=None): name (str) - The docname for which get all linked doctypes Keyword Arguments: - docs [list of dict] - (Optional) Get list of dictionary for linked doctype (default: None) + docs (list of dict) - (Optional) Get list of dictionary for linked doctype (default: None) Returns: dict - Return list of documents and link count @@ -69,7 +69,7 @@ def cancel_all_linked_docs(docs): Cancel all linked doctype Arguments: - docs [list of dict] - It contains all list of dictionaries of a linked documents. + docs (str) - It contains all list of dictionaries of a linked documents. """ docs = json.loads(docs) @@ -109,7 +109,7 @@ def validate_linked_doc(docinfo): def get_exempted_doctypes(): """ - Get list of doctypes exempted from being auto-cancelled + Get list of doctypes exempted from being auto-cancelled """ auto_cancel_exempt_doctypes = [] @@ -291,8 +291,7 @@ def get_dynamic_linked_fields(doctype, without_ignore_user_permissions_enabled=F if is_single(df.doctype): continue # optimized to get both link exists and parenttype - possible_link = frappe.db.sql("""select distinct `{doctype_fieldname}`, parenttype - from `tab{doctype}` where `{doctype_fieldname}`=%s""".format(**df), doctype, as_dict=True) + possible_link = frappe.get_all(df.doctype, filters={df.doctype_fieldname: doctype}, fields=['parenttype']) if not possible_link: continue From 1ad6fbc0bdc6534be8eef699f7744b9b2c5325c0 Mon Sep 17 00:00:00 2001 From: vishal Date: Thu, 5 Dec 2019 15:58:25 +0530 Subject: [PATCH 16/77] fix: Minor changes in hadle failed --- frappe/public/js/frappe/form/form.js | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index ac5de519f2..fb49b5a652 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -649,13 +649,6 @@ frappe.ui.form.Form = class FrappeForm { savecancel(btn, callback, on_error) { const me = this; - const handle_fail = () => { - $(btn).prop('disabled', false); - if (on_error) { - on_error(); - } - }; - this.validate_form_action('Cancel'); frappe.call({ @@ -667,15 +660,15 @@ frappe.ui.form.Form = class FrappeForm { freeze: true, callback: (r) => { if (!r.exc && r.message.count > 0) { - me._cancel_all(r, btn, callback, handle_fail); + me._cancel_all(r, btn, callback, on_error); } else { - me._cancel(btn, callback, handle_fail, false); + me._cancel(btn, callback, on_error, false); } } }); } - _cancel_all(r, btn, callback, handle_fail) { + _cancel_all(r, btn, callback, on_error) { const me = this; // add confirmation message for cancelling all linked docs @@ -707,7 +700,7 @@ frappe.ui.form.Form = class FrappeForm { fieldtype: "HTML", options: `

    ${confirm_message}

    ` }] - }, () => handle_fail()); + }, () => me.handle_save_fail(btn, on_error)); // if user can cancel all linked docs, add action to the dialog if (can_cancel) { @@ -722,7 +715,7 @@ frappe.ui.form.Form = class FrappeForm { callback: (resp) => { if (!resp.exc) { me.reload_doc(); - me._cancel(btn, callback, handle_fail, true); + me._cancel(btn, callback, on_error, true); } } }); @@ -732,14 +725,13 @@ frappe.ui.form.Form = class FrappeForm { d.show(); }; - _cancel(btn, callback, handle_fail, skip_confirm) { + _cancel(btn, callback, on_error, skip_confirm) { const me = this; const cancel_doc = () => { frappe.validated = true; me.script_manager.trigger("before_cancel").then(() => { if (!frappe.validated) { - handle_fail(); - return; + return me.handle_save_fail(btn, on_error); } var after_cancel = function(r) { @@ -759,7 +751,7 @@ frappe.ui.form.Form = class FrappeForm { if (skip_confirm) { cancel_doc(); } else { - frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, handle_fail); + frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, me.handle_save_fail(btn, on_error)); } }; From 038b2ad3c9e32414f796bf5a2a08af4f6a9e1e60 Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 6 Dec 2019 12:20:36 +0530 Subject: [PATCH 17/77] fix: minor changes in form js --- frappe/public/js/frappe/form/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index fb49b5a652..c3f5c23ae2 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -736,7 +736,7 @@ frappe.ui.form.Form = class FrappeForm { var after_cancel = function(r) { if (r.exc) { - handle_fail(); + me.handle_save_fail(btn, on_error); } else { frappe.utils.play_sound("cancel"); me.refresh(); From 9cf251e53e79352758a98eec1516cd14b13b326f Mon Sep 17 00:00:00 2001 From: vishal Date: Mon, 9 Dec 2019 13:42:19 +0530 Subject: [PATCH 18/77] fix: Distinct check added for possible links --- frappe/desk/form/linked_with.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py index 90bf229c7a..b497ad08ab 100644 --- a/frappe/desk/form/linked_with.py +++ b/frappe/desk/form/linked_with.py @@ -291,7 +291,7 @@ def get_dynamic_linked_fields(doctype, without_ignore_user_permissions_enabled=F if is_single(df.doctype): continue # optimized to get both link exists and parenttype - possible_link = frappe.get_all(df.doctype, filters={df.doctype_fieldname: doctype}, fields=['parenttype']) + possible_link = frappe.get_all(df.doctype, filters={df.doctype_fieldname: doctype}, fields=['parenttype'], distinct=True) if not possible_link: continue From 0b0b2f46fc9853ed2cb07f8678bb5b7d32492f2f Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 3 Jan 2020 17:23:04 +0530 Subject: [PATCH 19/77] Unit Test for cancel submitable doctype --- frappe/core/doctype/doctype/test_doctype.py | 55 ++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 8d8731e012..5ba90432eb 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -26,7 +26,10 @@ class TestDocType(unittest.TestCase): }], "permissions": [{ "role": "System Manager", - "read": 1 + "read": 1, + "submit": 1, + "cancel": 1, + }], "name": name }) @@ -295,3 +298,53 @@ class TestDocType(unittest.TestCase): field_1.search_index = 1 self.assertRaises(CannotIndexedError, doc.insert) + + def test_cancel_link_doctype(self): + import json + from frappe.desk.form.linked_with import get_submitted_linked_docs, cancel_all_linked_docs + + #create doctype + link_doc = self.new_doctype('Test Linked Doctype') + link_doc.is_submittable = 1 + field_1 = link_doc.append('fields', {}) + link_doc.insert() + + doc = self.new_doctype('Test Doctype') + doc.is_submittable = 1 + field_2 = doc.append('fields', {}) + field_2.label = 'Test Linked Doctype' + field_2.fieldname = 'test_linked_doctype' + field_2.fieldtype = 'Link' + field_2.options = 'Test Linked Doctype' + doc.insert() + + # create doctype data + data_link_doc = frappe.new_doc('Test Linked Doctype') + data_link_doc.some_fieldname = 'Data1' + data_link_doc.insert() + data_link_doc.save() + data_link_doc.submit() + + data_doc = frappe.new_doc('Test Doctype') + data_doc.some_fieldname = 'Data1' + data_doc.test_linked_doctype = data_link_doc.name + data_doc.insert() + data_doc.save() + data_doc.submit() + + docs = get_submitted_linked_docs(link_doc.name, data_link_doc.name) + dump_docs = json.dumps(docs.get('docs')) + cancel_all_linked_docs(dump_docs) + data_link_doc.cancel() + data_doc.load_from_db() + self.assertEqual(data_link_doc.docstatus, 2) + self.assertEqual(data_doc.docstatus, 2) + + # delete doctype record + data_doc.delete() + data_link_doc.delete() + + # delete doctype + link_doc.delete() + doc.delete() + frappe.db.commit() \ No newline at end of file From df4313cca517792e9f6862de9616b87a90592f9a Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 3 Jan 2020 18:56:23 +0530 Subject: [PATCH 20/77] [wip] Unit test for cancel --- frappe/core/doctype/doctype/test_doctype.py | 11 ++-- .../test_field_order_doctype/__init__.py | 0 .../test_field_order_doctype.js | 8 +++ .../test_field_order_doctype.json | 59 +++++++++++++++++++ .../test_field_order_doctype.py | 10 ++++ .../test_test_field_order_doctype.py | 10 ++++ 6 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 frappe/core/doctype/test_field_order_doctype/__init__.py create mode 100644 frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.js create mode 100644 frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.json create mode 100644 frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.py create mode 100644 frappe/core/doctype/test_field_order_doctype/test_test_field_order_doctype.py diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 5ba90432eb..311723011e 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -26,10 +26,7 @@ class TestDocType(unittest.TestCase): }], "permissions": [{ "role": "System Manager", - "read": 1, - "submit": 1, - "cancel": 1, - + "read": 1 }], "name": name }) @@ -307,6 +304,9 @@ class TestDocType(unittest.TestCase): link_doc = self.new_doctype('Test Linked Doctype') link_doc.is_submittable = 1 field_1 = link_doc.append('fields', {}) + for data in link_doc.get('permissions'): + data.submit = 1 + data.cancel = 1 link_doc.insert() doc = self.new_doctype('Test Doctype') @@ -316,6 +316,9 @@ class TestDocType(unittest.TestCase): field_2.fieldname = 'test_linked_doctype' field_2.fieldtype = 'Link' field_2.options = 'Test Linked Doctype' + for data in link_doc.get('permissions'): + data.submit = 1 + data.cancel = 1 doc.insert() # create doctype data diff --git a/frappe/core/doctype/test_field_order_doctype/__init__.py b/frappe/core/doctype/test_field_order_doctype/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.js b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.js new file mode 100644 index 0000000000..305327847b --- /dev/null +++ b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Test Field Order DocType', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.json b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.json new file mode 100644 index 0000000000..85832985bc --- /dev/null +++ b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.json @@ -0,0 +1,59 @@ +{ + "actions": [], + "creation": "2020-01-03 18:55:50.307774", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "field_4", + "field_5", + "field_1", + "field_2" + ], + "fields": [ + { + "fieldname": "field_1", + "fieldtype": "Data", + "label": "Field 1" + }, + { + "fieldname": "field_2", + "fieldtype": "Data", + "label": "Field 2" + }, + { + "fieldname": "field_4", + "fieldtype": "Data", + "label": "Field 4" + }, + { + "fieldname": "field_5", + "fieldtype": "Data", + "label": "Field 5" + } + ], + "links": [], + "modified": "2020-01-03 18:55:50.877047", + "modified_by": "Administrator", + "module": "Core", + "name": "Test Field Order DocType", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.py b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.py new file mode 100644 index 0000000000..87fc991f9d --- /dev/null +++ b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class TestFieldOrderDocType(Document): + pass diff --git a/frappe/core/doctype/test_field_order_doctype/test_test_field_order_doctype.py b/frappe/core/doctype/test_field_order_doctype/test_test_field_order_doctype.py new file mode 100644 index 0000000000..349b3095be --- /dev/null +++ b/frappe/core/doctype/test_field_order_doctype/test_test_field_order_doctype.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestTestFieldOrderDocType(unittest.TestCase): + pass From d31a66288144d1e2fab24287ff325326bc97f7e7 Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 3 Jan 2020 22:11:55 +0530 Subject: [PATCH 21/77] Revert "[wip] Unit test for cancel" This reverts commit 1312202c83fff2f1a75a378d8c8176d9340dfa25. --- frappe/core/doctype/doctype/test_doctype.py | 11 ++-- .../test_field_order_doctype/__init__.py | 0 .../test_field_order_doctype.js | 8 --- .../test_field_order_doctype.json | 59 ------------------- .../test_field_order_doctype.py | 10 ---- .../test_test_field_order_doctype.py | 10 ---- 6 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 frappe/core/doctype/test_field_order_doctype/__init__.py delete mode 100644 frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.js delete mode 100644 frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.json delete mode 100644 frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.py delete mode 100644 frappe/core/doctype/test_field_order_doctype/test_test_field_order_doctype.py diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 311723011e..5ba90432eb 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -26,7 +26,10 @@ class TestDocType(unittest.TestCase): }], "permissions": [{ "role": "System Manager", - "read": 1 + "read": 1, + "submit": 1, + "cancel": 1, + }], "name": name }) @@ -304,9 +307,6 @@ class TestDocType(unittest.TestCase): link_doc = self.new_doctype('Test Linked Doctype') link_doc.is_submittable = 1 field_1 = link_doc.append('fields', {}) - for data in link_doc.get('permissions'): - data.submit = 1 - data.cancel = 1 link_doc.insert() doc = self.new_doctype('Test Doctype') @@ -316,9 +316,6 @@ class TestDocType(unittest.TestCase): field_2.fieldname = 'test_linked_doctype' field_2.fieldtype = 'Link' field_2.options = 'Test Linked Doctype' - for data in link_doc.get('permissions'): - data.submit = 1 - data.cancel = 1 doc.insert() # create doctype data diff --git a/frappe/core/doctype/test_field_order_doctype/__init__.py b/frappe/core/doctype/test_field_order_doctype/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.js b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.js deleted file mode 100644 index 305327847b..0000000000 --- a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2020, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Test Field Order DocType', { - // refresh: function(frm) { - - // } -}); diff --git a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.json b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.json deleted file mode 100644 index 85832985bc..0000000000 --- a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "actions": [], - "creation": "2020-01-03 18:55:50.307774", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "field_4", - "field_5", - "field_1", - "field_2" - ], - "fields": [ - { - "fieldname": "field_1", - "fieldtype": "Data", - "label": "Field 1" - }, - { - "fieldname": "field_2", - "fieldtype": "Data", - "label": "Field 2" - }, - { - "fieldname": "field_4", - "fieldtype": "Data", - "label": "Field 4" - }, - { - "fieldname": "field_5", - "fieldtype": "Data", - "label": "Field 5" - } - ], - "links": [], - "modified": "2020-01-03 18:55:50.877047", - "modified_by": "Administrator", - "module": "Core", - "name": "Test Field Order DocType", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "quick_entry": 1, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.py b/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.py deleted file mode 100644 index 87fc991f9d..0000000000 --- a/frappe/core/doctype/test_field_order_doctype/test_field_order_doctype.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -# import frappe -from frappe.model.document import Document - -class TestFieldOrderDocType(Document): - pass diff --git a/frappe/core/doctype/test_field_order_doctype/test_test_field_order_doctype.py b/frappe/core/doctype/test_field_order_doctype/test_test_field_order_doctype.py deleted file mode 100644 index 349b3095be..0000000000 --- a/frappe/core/doctype/test_field_order_doctype/test_test_field_order_doctype.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -# import frappe -import unittest - -class TestTestFieldOrderDocType(unittest.TestCase): - pass From 0f5e7fa0555af7617657afa86b80537da31c8889 Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 3 Jan 2020 22:31:12 +0530 Subject: [PATCH 22/77] fix: Unit test for cancel submitable doctype --- frappe/core/doctype/doctype/test_doctype.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 5ba90432eb..20be684c30 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -27,9 +27,6 @@ class TestDocType(unittest.TestCase): "permissions": [{ "role": "System Manager", "read": 1, - "submit": 1, - "cancel": 1, - }], "name": name }) @@ -307,6 +304,9 @@ class TestDocType(unittest.TestCase): link_doc = self.new_doctype('Test Linked Doctype') link_doc.is_submittable = 1 field_1 = link_doc.append('fields', {}) + for data in link_doc.get('permissions'): + data.submit = 1 + data.cancel = 1 link_doc.insert() doc = self.new_doctype('Test Doctype') @@ -316,6 +316,9 @@ class TestDocType(unittest.TestCase): field_2.fieldname = 'test_linked_doctype' field_2.fieldtype = 'Link' field_2.options = 'Test Linked Doctype' + for data in link_doc.get('permissions'): + data.submit = 1 + data.cancel = 1 doc.insert() # create doctype data From 9cc39377fe2bcf779ac5f05e65a37bb8fdd5c602 Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 3 Jan 2020 22:55:49 +0530 Subject: [PATCH 23/77] fix: deepsource --- frappe/core/doctype/doctype/test_doctype.py | 1 - frappe/desk/form/linked_with.py | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 20be684c30..969a71ab7d 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -303,7 +303,6 @@ class TestDocType(unittest.TestCase): #create doctype link_doc = self.new_doctype('Test Linked Doctype') link_doc.is_submittable = 1 - field_1 = link_doc.append('fields', {}) for data in link_doc.get('permissions'): data.submit = 1 data.cancel = 1 diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py index b497ad08ab..1d6881ace2 100644 --- a/frappe/desk/form/linked_with.py +++ b/frappe/desk/form/linked_with.py @@ -22,7 +22,7 @@ def get_submitted_linked_docs(doctype, name, docs=None): name (str) - The docname for which get all linked doctypes Keyword Arguments: - docs (list of dict) - (Optional) Get list of dictionary for linked doctype (default: None) + docs (list of dict) - (Optional) Get list of dictionary for linked doctype. Returns: dict - Return list of documents and link count @@ -108,9 +108,7 @@ def validate_linked_doc(docinfo): def get_exempted_doctypes(): - """ - Get list of doctypes exempted from being auto-cancelled - """ + """ Get list of doctypes exempted from being auto-cancelled """ auto_cancel_exempt_doctypes = [] for doctypes in frappe.get_hooks('auto_cancel_exempt_doctypes'): @@ -291,7 +289,8 @@ def get_dynamic_linked_fields(doctype, without_ignore_user_permissions_enabled=F if is_single(df.doctype): continue # optimized to get both link exists and parenttype - possible_link = frappe.get_all(df.doctype, filters={df.doctype_fieldname: doctype}, fields=['parenttype'], distinct=True) + possible_link = frappe.get_all(df.doctype, filters={df.doctype_fieldname: doctype}, + fields=['parenttype'], distinct=True) if not possible_link: continue From e2c7afd33393a3069f35a670cd27e99ab0938fc5 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 13 Jan 2020 09:09:22 +0530 Subject: [PATCH 24/77] fix: Make strings translatable --- frappe/public/js/frappe/form/form.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index c3f5c23ae2..b55c822ba6 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -681,16 +681,18 @@ frappe.ui.form.Form = class FrappeForm { .filter((link) => link.doctype == doctype) .map((link) => frappe.utils.get_form_link(link.doctype, link.name, true)) .join(", "); - links_text += `
  • ${doctype}: ${docnames}
    • ` + links_text += `
  • ${doctype}: ${docnames}
    • `; } - links_text = "
      " + links_text + "
    " + links_text = `
      ${links_text}
    `; + + let confirm_message = __('{0} {1} is linked with the following submitted documents: {2}', + [(me.doc.doctype).bold(), me.doc.name, links_text]); - let confirm_message = `${me.doc.doctype} ${me.doc.name} is linked with the following submitted documents: ${links_text}` let can_cancel = links.every((link) => frappe.model.can_cancel(link.doctype)); if (can_cancel) { - confirm_message += `Do you want to cancel all linked documents?`; + confirm_message += __('Do you want to cancel all linked documents?'); } else { - confirm_message += `You do not have permissions to cancel all linked documents.`; + confirm_message += __('You do not have permissions to cancel all linked documents.'); } // generate dialog box to cancel all linked docs From b2a44e922ea22ed00e9b5abc1e223437eae36cbf Mon Sep 17 00:00:00 2001 From: vishal Date: Mon, 13 Jan 2020 13:30:40 +0530 Subject: [PATCH 25/77] fix: added auto_cancel_exempted_doctypes in boilerplate --- frappe/desk/form/linked_with.py | 2 +- frappe/utils/boilerplate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py index 1d6881ace2..6c679bf312 100644 --- a/frappe/desk/form/linked_with.py +++ b/frappe/desk/form/linked_with.py @@ -111,7 +111,7 @@ def get_exempted_doctypes(): """ Get list of doctypes exempted from being auto-cancelled """ auto_cancel_exempt_doctypes = [] - for doctypes in frappe.get_hooks('auto_cancel_exempt_doctypes'): + for doctypes in frappe.get_hooks('auto_cancel_exempted_doctypes'): auto_cancel_exempt_doctypes.append(doctypes) return auto_cancel_exempt_doctypes diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index e1dde1f0d4..b81d802a07 100755 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -258,7 +258,7 @@ app_license = "{app_license}" # exempt linked doctypes from being automatically cancelled # -# cancel_exempt_doctypes = ["Auto Repeat"] +# auto_cancel_exempted_doctypes = ["Auto Repeat"] """ From 0aa9b024c12cc8a898e3c06398d568fed62867d6 Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 13 Jan 2020 09:35:12 +0100 Subject: [PATCH 26/77] allow again fairlogin as ID provider See discussion https://github.com/frappe/frappe/pull/8720#issuecomment-571486691 --- frappe/integrations/oauth2_logins.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/integrations/oauth2_logins.py b/frappe/integrations/oauth2_logins.py index a3ee98ad4e..14a6bcc417 100644 --- a/frappe/integrations/oauth2_logins.py +++ b/frappe/integrations/oauth2_logins.py @@ -31,6 +31,10 @@ def login_via_office365(code, state): def login_via_salesforce(code, state): login_via_oauth2("salesforce", code, state, decoder=decoder_compat) +@frappe.whitelist(allow_guest=True) +def login_via_fairlogin(code, state): + login_via_oauth2("fairlogin", code, state, decoder=decoder_compat) + @frappe.whitelist(allow_guest=True) def custom(code, state): """ From c234336ddcc89a3c1ec464d074d23536abc83a11 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Mon, 13 Jan 2020 15:02:43 +0530 Subject: [PATCH 27/77] feat: add security headers to webhook --- .../integrations/doctype/webhook/webhook.js | 10 ++++++- .../integrations/doctype/webhook/webhook.json | 29 ++++++++++++++++++- .../integrations/doctype/webhook/webhook.py | 10 +++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.js b/frappe/integrations/doctype/webhook/webhook.js index 90b5b12dc6..8154cf82a0 100644 --- a/frappe/integrations/doctype/webhook/webhook.js +++ b/frappe/integrations/doctype/webhook/webhook.js @@ -66,7 +66,15 @@ frappe.ui.form.on('Webhook', { webhook_doctype: (frm) => { frappe.webhook.set_fieldname_select(frm); - } + }, + + enable_security: (frm) => { + frm.toggle_reqd('webhook_secret', frm.doc.enable_security); + }, + + generate_secret: (frm) => { + frm.call("generate_secret"); + }, }); frappe.ui.form.on("Webhook Data", { diff --git a/frappe/integrations/doctype/webhook/webhook.json b/frappe/integrations/doctype/webhook/webhook.json index 8aa96e6859..4c02a4403e 100644 --- a/frappe/integrations/doctype/webhook/webhook.json +++ b/frappe/integrations/doctype/webhook/webhook.json @@ -19,6 +19,10 @@ "request_url", "cb_webhook", "request_structure", + "sb_security", + "enable_security", + "webhook_secret", + "generate_secret", "sb_webhook_headers", "webhook_headers", "sb_webhook_data", @@ -127,10 +131,33 @@ "fieldtype": "Select", "label": "Naming Series", "options": "\nHOOK-.####" + }, + { + "fieldname": "sb_security", + "fieldtype": "Section Break", + "label": "Webhook Security" + }, + { + "default": "0", + "fieldname": "enable_security", + "fieldtype": "Check", + "label": "Enable Security" + }, + { + "depends_on": "eval:doc.enable_security == 1", + "fieldname": "webhook_secret", + "fieldtype": "Password", + "label": "Webhook Secret" + }, + { + "depends_on": "eval:doc.enable_security == 1", + "fieldname": "generate_secret", + "fieldtype": "Button", + "label": "Generate Secret" } ], "links": [], - "modified": "2020-01-06 02:51:07.997566", + "modified": "2020-01-13 01:11:29.392078", "modified_by": "Administrator", "module": "Integrations", "name": "Webhook", diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 0a97022f66..070d0177b9 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -16,6 +16,8 @@ from frappe import _ from frappe.model.document import Document from frappe.utils.jinja import validate_template +WEBHOOK_SECRET_HEADER = "X-Frappe-Webhook-Key" + class Webhook(Document): def validate(self): @@ -67,6 +69,9 @@ class Webhook(Document): if len(webhook_data) != len(set(webhook_data)): frappe.throw(_("Same Field is entered more than once")) + def generate_secret(self): + self.webhook_secret = frappe.generate_hash(length=32) + def get_context(doc): return {"doc": doc, "utils": frappe.utils} @@ -94,10 +99,15 @@ def enqueue_webhook(doc, webhook): def get_webhook_headers(doc, webhook): headers = {} + + if webhook.enable_security: + headers[WEBHOOK_SECRET_HEADER] = webhook.get_password("webhook_secret") + if webhook.webhook_headers: for h in webhook.webhook_headers: if h.get("key") and h.get("value"): headers[h.get("key")] = h.get("value") + return headers From ed71b275a26c895009ac7a97009e7b279e5da2a3 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Mon, 13 Jan 2020 15:24:11 +0530 Subject: [PATCH 28/77] fix: remove auto-generation of secret --- frappe/integrations/doctype/webhook/webhook.js | 6 +----- frappe/integrations/doctype/webhook/webhook.json | 9 +-------- frappe/integrations/doctype/webhook/webhook.py | 3 --- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.js b/frappe/integrations/doctype/webhook/webhook.js index 8154cf82a0..09c296113a 100644 --- a/frappe/integrations/doctype/webhook/webhook.js +++ b/frappe/integrations/doctype/webhook/webhook.js @@ -70,11 +70,7 @@ frappe.ui.form.on('Webhook', { enable_security: (frm) => { frm.toggle_reqd('webhook_secret', frm.doc.enable_security); - }, - - generate_secret: (frm) => { - frm.call("generate_secret"); - }, + } }); frappe.ui.form.on("Webhook Data", { diff --git a/frappe/integrations/doctype/webhook/webhook.json b/frappe/integrations/doctype/webhook/webhook.json index 4c02a4403e..9f979099c9 100644 --- a/frappe/integrations/doctype/webhook/webhook.json +++ b/frappe/integrations/doctype/webhook/webhook.json @@ -22,7 +22,6 @@ "sb_security", "enable_security", "webhook_secret", - "generate_secret", "sb_webhook_headers", "webhook_headers", "sb_webhook_data", @@ -148,16 +147,10 @@ "fieldname": "webhook_secret", "fieldtype": "Password", "label": "Webhook Secret" - }, - { - "depends_on": "eval:doc.enable_security == 1", - "fieldname": "generate_secret", - "fieldtype": "Button", - "label": "Generate Secret" } ], "links": [], - "modified": "2020-01-13 01:11:29.392078", + "modified": "2020-01-13 01:53:04.459968", "modified_by": "Administrator", "module": "Integrations", "name": "Webhook", diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 070d0177b9..152ffada97 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -69,9 +69,6 @@ class Webhook(Document): if len(webhook_data) != len(set(webhook_data)): frappe.throw(_("Same Field is entered more than once")) - def generate_secret(self): - self.webhook_secret = frappe.generate_hash(length=32) - def get_context(doc): return {"doc": doc, "utils": frappe.utils} From 43ccae0327cf8d9b81ee527778a5d86793592722 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Mon, 13 Jan 2020 15:35:15 +0530 Subject: [PATCH 29/77] fix: hash secret before assigning to header --- frappe/integrations/doctype/webhook/webhook.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 152ffada97..5cbe7c0a02 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -4,7 +4,10 @@ from __future__ import unicode_literals +import base64 import datetime +import hashlib +import hmac import json from time import sleep @@ -16,7 +19,7 @@ from frappe import _ from frappe.model.document import Document from frappe.utils.jinja import validate_template -WEBHOOK_SECRET_HEADER = "X-Frappe-Webhook-Key" +WEBHOOK_SECRET_HEADER = "X-Frappe-Webhook-Signature" class Webhook(Document): @@ -98,7 +101,15 @@ def get_webhook_headers(doc, webhook): headers = {} if webhook.enable_security: - headers[WEBHOOK_SECRET_HEADER] = webhook.get_password("webhook_secret") + data = get_webhook_data(doc, webhook) + signature = base64.b64encode( + hmac.new( + webhook.get_password("webhook_secret").encode("utf8"), + json.dumps(data).encode("utf8"), + hashlib.sha256 + ).digest() + ) + headers[WEBHOOK_SECRET_HEADER] = signature if webhook.webhook_headers: for h in webhook.webhook_headers: From 2a3601ade87bdc525021f78aae31b1973ea45e79 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 13 Jan 2020 16:25:43 +0530 Subject: [PATCH 30/77] fix: set doctype in timeline item --- frappe/public/js/frappe/form/footer/timeline.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index 6dbb7904c2..747e59b410 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -371,6 +371,10 @@ frappe.ui.form.Timeline = class Timeline { c.sender = c.sender.split("<")[1].split(">")[0]; } + if (!c.doctype && c.communication_type == 'Comment' || c.communication_type == 'Communication') { + c.doctype = c.communication_type; + } + c.user_info = frappe.user_info(c.sender); c["delete"] = ""; From 4f7c46e140df8ec4d96ec21dc075244d93018675 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Mon, 13 Jan 2020 11:57:12 +0100 Subject: [PATCH 31/77] :ok_hand: Remove XML reports from CI Signed-off-by: mathieu.brunot --- .travis.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e35a97208..6990a0df8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,21 +22,11 @@ matrix: env: DB=mariadb TYPE=server script: bench --site test_site run-tests --coverage - - name: "Python 3.6 MariaDB XML Report" - python: 3.6 - env: DB=mariadb TYPE=server - script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml - - name: "Python 3.6 PostgreSQL" python: 3.6 env: DB=postgres TYPE=server script: bench --site test_site run-tests --coverage - - name: "Python 3.6 PostgreSQL XML Report" - python: 3.6 - env: DB=postgres TYPE=server - script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml - - name: "Cypress" python: 3.6 env: DB=mariadb TYPE=ui @@ -48,11 +38,6 @@ matrix: env: DB=mariadb TYPE=server script: bench --site test_site run-tests --coverage - - name: "Python 2.7 MariaDB XML Report" - python: 2.7 - env: DB=mariadb TYPE=server - script: bench --site test_site run-tests --coverage --junit-xml-output frappe_unit_tests.xml - before_install: # install wkhtmltopdf - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz From dfa9bf463dc724bf56f498ee76b49a8468790cfb Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Mon, 13 Jan 2020 17:22:23 +0530 Subject: [PATCH 32/77] fix: stripe api payment receipt email --- frappe/integrations/doctype/stripe_settings/stripe_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/integrations/doctype/stripe_settings/stripe_settings.py b/frappe/integrations/doctype/stripe_settings/stripe_settings.py index 35beef7faa..70ca6002e4 100644 --- a/frappe/integrations/doctype/stripe_settings/stripe_settings.py +++ b/frappe/integrations/doctype/stripe_settings/stripe_settings.py @@ -76,7 +76,7 @@ class StripeSettings(Document): def create_charge_on_stripe(self): import stripe try: - charge = stripe.Charge.create(amount=cint(flt(self.data.amount)*100), currency=self.data.currency, source=self.data.stripe_token_id, description=self.data.description) + charge = stripe.Charge.create(amount=cint(flt(self.data.amount)*100), currency=self.data.currency, source=self.data.stripe_token_id, description=self.data.description, receipt_email=self.data.payer_email) if charge.captured == True: self.integration_request.db_set('status', 'Completed', update_modified=False) From b9ac4a409436ab0b8a84e23309698cab7472ca66 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 14 Jan 2020 11:06:33 +0530 Subject: [PATCH 33/77] fix: code formatting --- frappe/public/js/frappe/form/footer/timeline.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index 747e59b410..8294c3f7b8 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -371,7 +371,7 @@ frappe.ui.form.Timeline = class Timeline { c.sender = c.sender.split("<")[1].split(">")[0]; } - if (!c.doctype && c.communication_type == 'Comment' || c.communication_type == 'Communication') { + if (!c.doctype && ['Comment', 'Communication'].includes(c.communication_type)) { c.doctype = c.communication_type; } From e28ae2f4ab3b61820ae00c5c13ba771380ff856f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 14 Jan 2020 11:32:00 +0530 Subject: [PATCH 34/77] fix: update message --- frappe/public/js/frappe/desk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 23d7bffec2..5e642f907b 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -481,7 +481,7 @@ frappe.Application = Class.extend({ // Iterate over changelog var change_log_dialog = frappe.msgprint({ message: frappe.render_template("change_log", {"change_log": change_log}), - title: __("Updated To New Version 🎉"), + title: __("Updated To A New Version 🎉"), wide: true, scroll: true }); From f056f63ee106c249e20add924b9042075598447e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 14 Jan 2020 13:01:43 +0530 Subject: [PATCH 35/77] fix: Set correct doctype on clicking Customize button --- frappe/public/js/frappe/form/toolbar.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index f6bc6f7cc8..b760e8682c 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -267,14 +267,21 @@ frappe.ui.form.Toolbar = Class.extend({ }); } - if(frappe.user_roles.includes("System Manager") && me.frm.meta.issingle === 0) { + if (frappe.user_roles.includes("System Manager") && me.frm.meta.issingle === 0) { + let doctype = me.frm.doctype; + if (me.frm.doctype == 'DocType') { + if (me.frm.docname == 'DocType') return; + else { + doctype = me.frm.docname; + } + } this.page.add_menu_item(__("Customize"), function() { if (me.frm.meta && me.frm.meta.custom) { - frappe.set_route('Form', 'DocType', me.frm.doctype); + frappe.set_route('Form', 'DocType', doctype); } else { frappe.set_route('Form', 'Customize Form', { - doc_type: me.frm.doctype + doc_type: doctype }); } }, true); From 2004e2e4cf6cdf9630fe6c2a1fa8de7f227958e5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 14 Jan 2020 13:22:10 +0530 Subject: [PATCH 36/77] fix(Report): group by reports not being saved --- frappe/public/js/frappe/ui/group_by/group_by.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js index 6a1c877635..fa2e2552c2 100644 --- a/frappe/public/js/frappe/ui/group_by/group_by.js +++ b/frappe/public/js/frappe/ui/group_by/group_by.js @@ -81,7 +81,11 @@ frappe.ui.GroupBy = class { } apply_settings(settings) { - this.groupby_select.val(settings.group_by); + + // Extract fieldname from `tabdoctype`.`fieldname` + let group_by_fieldname = settings.group_by.split('.')[1].slice(1, -1); + + this.groupby_select.val(group_by_fieldname); this.aggregate_function_select.val(settings.aggregate_function); this.show_hide_aggregate_on(); this.aggregate_on_select.val(settings.aggregate_on); From 26e426d7042ea8aa6746db8886ba6c7962449712 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 14 Jan 2020 13:32:50 +0530 Subject: [PATCH 37/77] fix: Do not show customize button for custom doctype --- frappe/public/js/frappe/form/toolbar.js | 30 ++++++++++++------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index b760e8682c..f772d453e4 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -268,23 +268,21 @@ frappe.ui.form.Toolbar = Class.extend({ } if (frappe.user_roles.includes("System Manager") && me.frm.meta.issingle === 0) { - let doctype = me.frm.doctype; - if (me.frm.doctype == 'DocType') { - if (me.frm.docname == 'DocType') return; - else { - doctype = me.frm.docname; - } - } - this.page.add_menu_item(__("Customize"), function() { + let is_doctype_form = me.frm.doctype === 'DocType'; + let doctype = is_doctype_form ? me.frm.docname : me.frm.doctype; + let is_doctype_custom = is_doctype_form ? me.frm.doc.custom : false; - if (me.frm.meta && me.frm.meta.custom) { - frappe.set_route('Form', 'DocType', doctype); - } else { - frappe.set_route('Form', 'Customize Form', { - doc_type: doctype - }); - } - }, true); + if (doctype != 'DocType' && !is_doctype_custom) { + this.page.add_menu_item(__("Customize"), function() { + if (me.frm.meta && me.frm.meta.custom) { + frappe.set_route('Form', 'DocType', doctype); + } else { + frappe.set_route('Form', 'Customize Form', { + doc_type: doctype + }); + } + }, true); + } if (frappe.boot.developer_mode===1) { // edit doctype From c29cd3a335c76a7f1ede0953f0bf7b8c2aaa2d3a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 14 Jan 2020 13:36:59 +0530 Subject: [PATCH 38/77] fix: Do not show Edit DocType button in DocType form --- frappe/public/js/frappe/form/toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index f772d453e4..528c874935 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -284,7 +284,7 @@ frappe.ui.form.Toolbar = Class.extend({ }, true); } - if (frappe.boot.developer_mode===1) { + if (frappe.boot.developer_mode===1 && !is_doctype_form) { // edit doctype this.page.add_menu_item(__("Edit DocType"), function() { frappe.set_route('Form', 'DocType', me.frm.doctype); From 273a64ff44a30577f623ff59cc70b6bf435c9bed Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Tue, 14 Jan 2020 17:25:01 +0530 Subject: [PATCH 39/77] fix(background_job): use status as get_status is not accessible in html --- frappe/core/page/background_jobs/background_jobs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/page/background_jobs/background_jobs.html b/frappe/core/page/background_jobs/background_jobs.html index 08177ecf8a..c5d598ccd3 100644 --- a/frappe/core/page/background_jobs/background_jobs.html +++ b/frappe/core/page/background_jobs/background_jobs.html @@ -11,7 +11,7 @@ {% for j in jobs %} - {{ j.queue.split(".").slice(-1)[0] }} + {{ j.queue.split(".").slice(-1)[0] }}
    {{ frappe.utils.encode_tags(j.job_name) }} From ee5f83695b5e134361c1d08e06e6b6ad461c48b8 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 15 Jan 2020 12:04:52 +0530 Subject: [PATCH 40/77] feat(Report View): show status field derived from docstatus or workflow, if not a doctype field --- .../js/frappe/views/reports/report_view.js | 47 +++++++++++++++---- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index ff4ea56404..a1060b09f1 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -684,7 +684,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } build_fields() { - this.fields.push(['docstatus', this.doctype]); super.build_fields(); } @@ -778,12 +777,24 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { let doctype_fields = frappe.meta.get_docfields(this.doctype).filter(standard_fields_filter); + // filter out docstatus field from picker + let std_fields = frappe.model.std_fields.filter( df => !in_list('docstatus', df.fieldname)); + + // add status field derived from docstatus, if status is not a standard field + if (!frappe.meta.has_field(this.doctype, 'status')) { + doctype_fields = [{ + label: __('Status'), + fieldname: 'docstatus', + fieldtype: 'Data' + }].concat(doctype_fields, std_fields); + } + doctype_fields = [{ label: __('ID'), fieldname: 'name', fieldtype: 'Data', reqd: 1 - }].concat(doctype_fields, frappe.model.std_fields); + }].concat(doctype_fields); out[this.doctype] = doctype_fields; @@ -858,16 +869,23 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { this.columns_map = {}; for (let f of this.fields) { + let column; if (f[0]!=='docstatus') { - let column = this.build_column(f); - if (column) { - if (column_widths) { - column.width = column_widths[column.id] || column.width || 120; - } - this.columns.push(column); - this.columns_map[column.id] = column; + column = this.build_column(f); + } else { + // if status is not in fields append status column derived from docstatus + if (!this.fields.includes(['status', this.doctype]) && !frappe.meta.has_field(this.doctype, 'status')) { + column = this.build_column(['status', this.doctype]); } } + + if (column) { + if (column_widths) { + column.width = column_widths[column.id] || column.width || 120; + } + this.columns.push(column); + this.columns_map[column.id] = column; + } } } @@ -1003,7 +1021,16 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } }; } - + if (col.field == 'status') { + // get status from docstatus + let status = frappe.get_indicator(d, this.doctype)[0]; + return { + name: d.name, + doctype: col.docfield.parent, + content: status, + editable: this.is_editable(col.docfield, d) + } + } if (col.field in d) { const value = d[col.field]; return { From b83452022a9e203619a855268933a04e9e5bce8c Mon Sep 17 00:00:00 2001 From: thefalconx33 Date: Wed, 15 Jan 2020 12:43:40 +0530 Subject: [PATCH 41/77] fix: report doesn't have attribute custom report --- frappe/desk/query_report.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 7dc561193f..48c1123d75 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -229,8 +229,9 @@ def get_prepared_report_result(report, filters, dn="", user=None): "status": "Completed", "filters": json.dumps(filters), "owner": user, - "report_name": report.report_name - } + "report_name": report.get('custom_report') or report.get('report_name') + }, + order_by = 'creation desc' ) if doc_list: From 34d23575264664a2c8c4ffbbb382db55854c33bb Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Wed, 15 Jan 2020 13:15:31 +0530 Subject: [PATCH 42/77] fix(patch): reload Prepared Report doctype --- frappe/patches/v11_0/delete_all_prepared_reports.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches/v11_0/delete_all_prepared_reports.py b/frappe/patches/v11_0/delete_all_prepared_reports.py index de36db66af..1d722da7e6 100644 --- a/frappe/patches/v11_0/delete_all_prepared_reports.py +++ b/frappe/patches/v11_0/delete_all_prepared_reports.py @@ -3,7 +3,7 @@ import frappe def execute(): if frappe.db.table_exists('Prepared Report'): - frappe.reload_doc("core", "doctype", "prepared_doctype") + frappe.reload_doc("core", "doctype", "prepared_report") prepared_reports = frappe.get_all("Prepared Report") for report in prepared_reports: frappe.delete_doc("Prepared Report", report.name) From 09548a881b345029a2e7d7fc785fca738acbb799 Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 15 Jan 2020 14:31:45 +0530 Subject: [PATCH 43/77] fix: use replace instead of slice Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/ui/group_by/group_by.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js index fa2e2552c2..3aebeae12f 100644 --- a/frappe/public/js/frappe/ui/group_by/group_by.js +++ b/frappe/public/js/frappe/ui/group_by/group_by.js @@ -83,7 +83,7 @@ frappe.ui.GroupBy = class { apply_settings(settings) { // Extract fieldname from `tabdoctype`.`fieldname` - let group_by_fieldname = settings.group_by.split('.')[1].slice(1, -1); + let group_by_fieldname = settings.group_by.split('.')[1].replace('`', ''); this.groupby_select.val(group_by_fieldname); this.aggregate_function_select.val(settings.aggregate_function); From ee5004acaf8031a431504620feb6d45bf9d7a918 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 15 Jan 2020 15:35:37 +0530 Subject: [PATCH 44/77] fix: Geolocation field Field inherits from ControlData instead of ControlCode fixes https://github.com/frappe/erpnext/issues/20221 --- frappe/public/js/frappe/form/controls/geolocation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/geolocation.js b/frappe/public/js/frappe/form/controls/geolocation.js index d68f6254b9..a193973c8a 100644 --- a/frappe/public/js/frappe/form/controls/geolocation.js +++ b/frappe/public/js/frappe/form/controls/geolocation.js @@ -1,4 +1,4 @@ -frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlCode.extend({ +frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ make_wrapper() { // Create the elements for map area this._super(); From 31a27a73b54b8953f0fc09176550dfc1218af10f Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 15 Jan 2020 15:49:29 +0530 Subject: [PATCH 45/77] fix: remove type=reset for grid buttons --- frappe/public/js/frappe/form/grid.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 6c66362426..3960833028 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -65,26 +65,22 @@ export default class Grid {
    - - - -
    From 8724bbb3dd079bed3658c1ecfa8b4c91136ee311 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 15 Jan 2020 15:53:31 +0530 Subject: [PATCH 46/77] fix: filter out js type print formats in customize form --- frappe/custom/doctype/customize_form/customize_form.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js index f1eadaaf2e..089f2a733b 100644 --- a/frappe/custom/doctype/customize_form/customize_form.js +++ b/frappe/custom/doctype/customize_form/customize_form.js @@ -17,6 +17,14 @@ frappe.ui.form.on("Customize Form", { }; }); + frm.set_query("default_print_format", function() { + return { + filters: { + 'print_format_type': ['!=', 'JS'] + } + } + }); + $(frm.wrapper).on("grid-row-render", function(e, grid_row) { if(grid_row.doc && grid_row.doc.fieldtype=="Section Break") { $(grid_row.row).css({"font-weight": "bold"}); From 2909040c54672ff95f15b5d3eb36654da532fc36 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 15 Jan 2020 16:04:57 +0530 Subject: [PATCH 47/77] fix: set editable property of derived status field to false --- frappe/public/js/frappe/views/reports/report_view.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index a1060b09f1..e328e2eec8 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -1021,17 +1021,16 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } }; } - if (col.field == 'status') { + if (col.field === 'status' && !frappe.meta.has_field(this.doctype, 'status')) { // get status from docstatus let status = frappe.get_indicator(d, this.doctype)[0]; return { name: d.name, doctype: col.docfield.parent, content: status, - editable: this.is_editable(col.docfield, d) - } - } - if (col.field in d) { + editable: false + }; + } else if (col.field in d) { const value = d[col.field]; return { name: d.name, From 095b4548d8bb26a375d8f64ca4c1a2cfdbf8dca7 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 15 Jan 2020 16:06:27 +0530 Subject: [PATCH 48/77] fix: test status column --- cypress/integration/report_view.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js index c7aeaa92de..5ce853c730 100644 --- a/cypress/integration/report_view.js +++ b/cypress/integration/report_view.js @@ -19,11 +19,13 @@ context('Report View', () => { cy.server(); cy.route('POST', 'api/method/frappe.client.set_value').as('value-update'); cy.visit(`/desk#List/${doctype_name}/Report`); - let cell = cy.get('.dt-row-0 > .dt-cell--col-3'); + // check status column added from docstatus + cy.get('.dt-row-0 > .dt-cell--col-3').should('contain', 'Submitted'); + let cell = cy.get('.dt-row-0 > .dt-cell--col-4'); // select the cell cell.dblclick(); cell.find('input[data-fieldname="enabled"]').check({force: true}); - cy.get('.dt-row-0 > .dt-cell--col-4').click(); + cy.get('.dt-row-0 > .dt-cell--col-5').click(); cy.wait('@value-update'); cy.get('@doc').then(doc => { cy.call('frappe.client.get_value', { From 27a5a920d40f13ab138c1ba31bcfca3dd8b9484e Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Wed, 15 Jan 2020 16:19:34 +0530 Subject: [PATCH 49/77] fix: change message content for errors without a title --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 4ab86e6b5d..2fa3e7a66c 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1546,7 +1546,7 @@ def log_error(message=None, title=None): # this hack tries to be smart about whats a title (single line ;-)) and fixes it if message: - if '\n' not in message: + if '\n' not in message and not title: title = message error = get_traceback() else: From 039cd2b9207ccf286194295e2a1688c1ef59e400 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Wed, 15 Jan 2020 16:51:19 +0530 Subject: [PATCH 50/77] fix: Geolocation field width make field full width --- frappe/public/js/frappe/form/controls/geolocation.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/js/frappe/form/controls/geolocation.js b/frappe/public/js/frappe/form/controls/geolocation.js index a193973c8a..9dfad09299 100644 --- a/frappe/public/js/frappe/form/controls/geolocation.js +++ b/frappe/public/js/frappe/form/controls/geolocation.js @@ -1,4 +1,6 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ + horizontal: false, + make_wrapper() { // Create the elements for map area this._super(); From b67faf4f52b6704763bda31de38cf62684c2d68b Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 15 Jan 2020 17:32:16 +0530 Subject: [PATCH 51/77] fix: Style of result image in search (#9294) --- frappe/public/less/desk.less | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 6232f7feae..555216e7ee 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -713,6 +713,7 @@ li.user-progress { height: 60px; width: 60px; background-color: #fafbfc; + overflow: hidden; .flex-text { display: flex; From abc1a9a5d65d6a12fc143a58c25ee3b92b84d19d Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 16 Jan 2020 09:03:07 +0530 Subject: [PATCH 52/77] fix: Dashboard chart filter (#9295) --- frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index a330f7e97e..d51231097e 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -114,9 +114,8 @@ frappe.ui.form.on('Dashboard Chart', { } else { // standard filters if (frm.doc.document_type) { - // allow all link and select fields as filters - frm.chart_filters = []; frappe.model.with_doctype(frm.doc.document_type, () => { + frm.chart_filters = []; frappe.get_meta(frm.doc.document_type).fields.map(df => { if (['Link', 'Select'].includes(df.fieldtype)) { let _df = copy_dict(df); @@ -131,8 +130,8 @@ frappe.ui.form.on('Dashboard Chart', { frm.chart_filters.push(_df); } - frm.trigger('render_filters_table'); }); + frm.trigger('render_filters_table'); }); } } @@ -158,7 +157,7 @@ frappe.ui.form.on('Dashboard Chart', { let filters = JSON.parse(frm.doc.filters_json || '{}'); var filters_set = false; - fields.map( f => { + fields.map(f => { if (filters[f.fieldname]) { const filter_row = $(`${f.label}${filters[f.fieldname] || ""}`); table.find('tbody').append(filter_row); From a4569172e499085ed6f2e18ca3632c4415ae8846 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 16 Jan 2020 15:22:17 +0530 Subject: [PATCH 53/77] fix: swap message with title containing newline character --- frappe/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 2fa3e7a66c..01187541d3 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1537,7 +1537,7 @@ def logger(module=None, with_more_info=True): from frappe.utils.logger import get_logger return get_logger(module or 'default', with_more_info=with_more_info) -def log_error(message=None, title=None): +def log_error(message=None, title=_("Error")): '''Log error to Error Log''' # AI ALERT: @@ -1546,9 +1546,8 @@ def log_error(message=None, title=None): # this hack tries to be smart about whats a title (single line ;-)) and fixes it if message: - if '\n' not in message and not title: - title = message - error = get_traceback() + if '\n' in title: + error, title = title, message else: error = message else: From 369c9ade94a04127793b07a9d5a9db84d54dadec Mon Sep 17 00:00:00 2001 From: Er-Naren719 <49683121+Er-Naren719@users.noreply.github.com> Date: Thu, 16 Jan 2020 15:25:55 +0530 Subject: [PATCH 54/77] refactor(Kanban): Use anchor tag for the ability to open card in new tab (#9217) * feat: open task in a new tab * fix: url updated using frappe util * feat: open kanban task in new tab using anchor tag * feat: element class name updated * feat: variable name updated in js file * feat: hack to retrieve document number removed * feat: target attribute of anchor tag is removed --- .../public/js/frappe/views/kanban/kanban_board.js | 10 ++++------ .../public/js/frappe/views/kanban/kanban_card.html | 14 ++++++++------ frappe/public/less/kanban.less | 9 +++++++++ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js index bf777a9b7c..d97cb5f68b 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_board.js +++ b/frappe/public/js/frappe/views/kanban/kanban_board.js @@ -538,7 +538,7 @@ frappe.provide("frappe.views"); if(!card) return; make_dom(); render_card_meta(); - bind_edit_card(); + add_task_link(); // edit_card_title(); } @@ -576,11 +576,9 @@ frappe.provide("frappe.views"); self.$card.find(".kanban-card-meta").empty().append(html); } - function bind_edit_card() { - self.$card.find('.kanban-card.content').on('click', function() { - frappe.set_route('Form', card.doctype, card.name); - // setup_edit_card(); - }); + function add_task_link() { + let taskLink = frappe.utils.get_form_link(card.doctype, card.name); + self.$card.find('.kanban-card-redirect').attr('href', taskLink); } function refresh_dialog() { diff --git a/frappe/public/js/frappe/views/kanban/kanban_card.html b/frappe/public/js/frappe/views/kanban/kanban_card.html index 8d749132ce..7f2d8fb619 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_card.html +++ b/frappe/public/js/frappe/views/kanban/kanban_card.html @@ -1,9 +1,11 @@
    -
    -
    - {{ title }} + +
    +
    + {{ title }} +
    +
    +
    -
    -
    -
    +
    \ No newline at end of file diff --git a/frappe/public/less/kanban.less b/frappe/public/less/kanban.less index 5991120076..1878e39421 100644 --- a/frappe/public/less/kanban.less +++ b/frappe/public/less/kanban.less @@ -87,6 +87,15 @@ .kanban-card-wrapper { position: relative; + + .kanban-card-redirect { + display: block; + + &:hover, + &:focus { + text-decoration: none; + } + } } .kanban-card:hover, .new-card-area, .edit-card-area { From 6dd807b3a7912c194d7f22618e3382929733c885 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 16 Jan 2020 16:14:06 +0530 Subject: [PATCH 55/77] fix: switch status column deleting field --- .../js/frappe/views/reports/report_view.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index e328e2eec8..5b1aff52c8 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -778,7 +778,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { let doctype_fields = frappe.meta.get_docfields(this.doctype).filter(standard_fields_filter); // filter out docstatus field from picker - let std_fields = frappe.model.std_fields.filter( df => !in_list('docstatus', df.fieldname)); + let std_fields = frappe.model.std_fields.filter( df => df.fieldname !== 'docstatus'); // add status field derived from docstatus, if status is not a standard field if (!frappe.meta.has_field(this.doctype, 'status')) { @@ -786,7 +786,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { label: __('Status'), fieldname: 'docstatus', fieldtype: 'Data' - }].concat(doctype_fields, std_fields); + }].concat(doctype_fields); } doctype_fields = [{ @@ -794,7 +794,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { fieldname: 'name', fieldtype: 'Data', reqd: 1 - }].concat(doctype_fields); + }].concat(doctype_fields, std_fields); out[this.doctype] = doctype_fields; @@ -875,7 +875,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } else { // if status is not in fields append status column derived from docstatus if (!this.fields.includes(['status', this.doctype]) && !frappe.meta.has_field(this.doctype, 'status')) { - column = this.build_column(['status', this.doctype]); + column = this.build_column(['docstatus', this.doctype]); } } @@ -910,9 +910,14 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } } docfield.parent = this.doctype; - if (fieldname == "name") { + if (fieldname == 'name') { docfield.options = this.doctype; } + if (fieldname == 'docstatus' && !frappe.meta.has_field(this.doctype, 'status')) { + docfield.label = 'Status'; + docfield.fieldtype = 'Data'; + docfield.name = 'status'; + } } } if (!docfield) return; @@ -1000,7 +1005,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { totals_row[0].content = __('Totals').bold(); out.push(totals_row); } - return out; } @@ -1021,7 +1025,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } }; } - if (col.field === 'status' && !frappe.meta.has_field(this.doctype, 'status')) { + if (col.field === 'docstatus' && !frappe.meta.has_field(this.doctype, 'status')) { // get status from docstatus let status = frappe.get_indicator(d, this.doctype)[0]; return { From 3b24fe5c45946d5c245d47e363b6f5dff2e85c36 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 16 Jan 2020 22:14:56 +0530 Subject: [PATCH 56/77] fix: add status dependency column --- .../js/frappe/views/reports/report_view.js | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 5b1aff52c8..cf3e387346 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -741,6 +741,16 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } } + add_status_dependency_column(col, doctype) { + // Adds dependent column from which status is derived if required + if (!this.fields.find(f => f[0] === col)) { + const field = [col, doctype]; + this.fields.push(field); + this.refresh(); + frappe.show_alert(__('Also adding the status dependency field {0}', [field[0].bold()])); + } + } + remove_column_from_datatable(column) { const index = this.fields.findIndex(f => column.field === f[0]); if (index === -1) return; @@ -1027,11 +1037,17 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { } if (col.field === 'docstatus' && !frappe.meta.has_field(this.doctype, 'status')) { // get status from docstatus - let status = frappe.get_indicator(d, this.doctype)[0]; + let status = frappe.get_indicator(d, this.doctype); + if (!status[0]) { + // get_indicator returns the dependent field's condition as the 3rd parameter + let dependent_col = status[2].split(',')[0]; + // add status dependency column + this.add_status_dependency_column(dependent_col, this.doctype); + } return { name: d.name, doctype: col.docfield.parent, - content: status, + content: status[0], editable: false }; } else if (col.field in d) { From ec9814d46b74b9e9be0cc36234ab44fd92f32e9f Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 17 Jan 2020 13:15:52 +0530 Subject: [PATCH 57/77] fix: barcode issue --- frappe/public/js/frappe/form/controls/barcode.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/barcode.js b/frappe/public/js/frappe/form/controls/barcode.js index 08bb7b763f..859cbbb22a 100644 --- a/frappe/public/js/frappe/form/controls/barcode.js +++ b/frappe/public/js/frappe/form/controls/barcode.js @@ -27,7 +27,11 @@ frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({ set_formatted_input(value) { // Set values to display let svg = value; - const barcode_value = $(svg).attr('data-barcode-value'); + let barcode_value = ''; + + if (value && value.startsWith(' Date: Sat, 18 Jan 2020 10:39:00 +0530 Subject: [PATCH 58/77] fix: Update vulnerable dependencies (#9303) * fix: Update vulnerable dependencies * chore: update PyYAML to 5.1 Co-authored-by: Chinmay Pai --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 77f49156e9..a5d76a5181 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,11 +20,11 @@ google-auth-httplib2==0.0.3 google-auth-oauthlib==0.4.1 google-auth==1.7.1 googlemaps==3.1.1 -gunicorn==19.9.0 +gunicorn==19.10.0 html2text==2016.9.19 ipython==5.8.0 Jinja2==2.10.3 -markdown2==2.3.6 +markdown2==2.3.7 maxminddb-geolite2==2018.703 ndg-httpsclient==0.5.1 num2words==0.5.5 @@ -32,7 +32,7 @@ oauthlib==3.1.0 openpyxl==2.6.4 passlib==1.7.1 pdfkit==0.6.1 -Pillow==6.2.1 +Pillow==6.2.2 premailer==3.6.1 psycopg2-binary==2.8.4 pyasn1==0.4.7 @@ -46,7 +46,7 @@ pypng==0.0.20 PyQRCode==1.2.1 python-dateutil==2.8.1 pytz==2019.3 -PyYAML==3.13 +PyYAML==5.1 rauth==0.7.3 redis>=3.0 requests-oauthlib==1.3.0 From fa1af204b0cef124b633f86f810b09e4d112780f Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Mon, 20 Jan 2020 12:26:53 +0530 Subject: [PATCH 59/77] fix: Consider "Small Text" and "Long Text" as text_field in print macro (#9308) --- frappe/templates/print_formats/standard_macros.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index 8f2fd82f24..45228587f8 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -3,7 +3,7 @@ {{ render_table(df, doc) }} {%- elif df.fieldtype=="HTML" and df.options -%}
    {{ frappe.render_template(df.options, {"doc": doc}) or "" }}
    - {%- elif df.fieldtype in ("Text", "Text Editor", "Code") -%} + {%- elif df.fieldtype in ("Text", "Text Editor", "Code", "Small Text", "Long Text") -%} {{ render_text_field(df, doc) }} {%- elif df.fieldtype in ("Image", "Attach Image", "Attach") and (guess_mimetype(doc[df.fieldname])[0] or "").startswith("image/") -%} From 3ce806b61139a18413bc8cc62000290f5a2f3114 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 20 Jan 2020 13:51:19 +0530 Subject: [PATCH 60/77] fix: typo in hooks for after insert breaking cache rebuild (#9314) * fix: typo in hooks for after insert breaking cache rebuild * fix: accept args --- frappe/cache_manager.py | 6 +++--- frappe/hooks.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index 1e785e12f1..1faa02ec63 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -116,7 +116,7 @@ def clear_doctype_map(doctype, name): cache_key = frappe.scrub(doctype) + '_map' frappe.cache().hdel(cache_key, name) -def build_table_count_cache(): +def build_table_count_cache(*args, **kwargs): if frappe.flags.in_patch or frappe.flags.in_install or frappe.flags.in_import: return _cache = frappe.cache() @@ -137,7 +137,7 @@ def build_table_count_cache(): return counts -def build_domain_restriced_doctype_cache(): +def build_domain_restriced_doctype_cache(*args, **kwargs): if frappe.flags.in_patch or frappe.flags.in_install or frappe.flags.in_import: return _cache = frappe.cache() @@ -148,7 +148,7 @@ def build_domain_restriced_doctype_cache(): return doctypes -def build_domain_restriced_page_cache(): +def build_domain_restriced_page_cache(*args, **kwargs): if frappe.flags.in_patch or frappe.flags.in_install or frappe.flags.in_import: return _cache = frappe.cache() diff --git a/frappe/hooks.py b/frappe/hooks.py index 4922911e82..340a49be17 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -139,7 +139,7 @@ doc_events = { "on_change": [ "frappe.social.doctype.energy_point_rule.energy_point_rule.process_energy_points" ], - "aftet_insert": "frappe.cache_manager.build_table_count_cache", + "after_insert": "frappe.cache_manager.build_table_count_cache", }, "Event": { "after_insert": "frappe.integrations.doctype.google_calendar.google_calendar.insert_event_in_google_calendar", From 39850513ed2fa9859111db4fd6a0bb8e42a8d34a Mon Sep 17 00:00:00 2001 From: Himanshu Date: Mon, 20 Jan 2020 15:07:19 +0530 Subject: [PATCH 61/77] fix: refresh email link (#9270) * fix: refresh email link * Update load.py * Update timeline.js * Update load.py * chore: rename to document_email in docinfo --- frappe/desk/form/load.py | 17 ++++++++-- .../doctype/email_account/email_account.py | 4 --- .../public/js/frappe/form/footer/timeline.js | 31 ++++--------------- .../js/frappe/form/templates/timeline.html | 4 +-- 4 files changed, 22 insertions(+), 34 deletions(-) diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index 4044a3dcfc..f24f33df07 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -11,6 +11,7 @@ from frappe.model.utils.user_settings import get_user_settings from frappe.permissions import get_doc_permissions from frappe.desk.form.document_follow import is_document_followed from frappe import _ +from six.moves.urllib.parse import quote @frappe.whitelist() def getdoc(doctype, name, user=None): @@ -101,7 +102,8 @@ def get_docinfo(doc=None, doctype=None, name=None): "energy_point_logs": get_point_logs(doc.doctype, doc.name), "milestones": get_milestones(doc.doctype, doc.name), "is_document_followed": is_document_followed(doc.doctype, doc.name, frappe.session.user), - "tags": get_tags(doc.doctype, doc.name) + "tags": get_tags(doc.doctype, doc.name), + "document_email": get_document_email(doc.doctype, doc.name) } def get_milestones(doctype, name): @@ -263,4 +265,15 @@ def get_tags(doctype, name): "document_name": name }, fields=["tag"])] - return ",".join([tag for tag in tags]) \ No newline at end of file + return ",".join(tags) + +def get_document_email(doctype, name): + email = get_automatic_email_link() + if not email: + return None + + email = email.split("@") + return "{0}+{1}+{2}@{3}".format(email[0], quote(doctype), quote(name), email[1]) + +def get_automatic_email_link(): + return frappe.db.get_value("Email Account", {"enable_incoming": 1, "enable_automatic_linking": 1}, "email_id") diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index a108225a48..41b47a1fa2 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -765,7 +765,3 @@ def get_max_email_uid(email_account): else: max_uid = cint(result[0].get("uid", 0)) + 1 return max_uid - -@frappe.whitelist() -def get_automatic_email_link(): - return frappe.db.get_value("Email Account", {"enable_incoming": 1, "enable_automatic_linking": 1}, "email_id") diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index 8294c3f7b8..e7f5f4023f 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -15,7 +15,7 @@ frappe.ui.form.Timeline = class Timeline { var me = this; this.wrapper = $(frappe.render_template("timeline",{doctype: me.frm.doctype,allow_events_in_timeline: me.frm.meta.allow_events_in_timeline})).appendTo(me.parent); - this.set_automatic_link_email(); + this.display_automatic_link_email(); this.list = this.wrapper.find(".timeline-items"); this.email_link = this.wrapper.find(".timeline-email-import"); @@ -117,31 +117,12 @@ frappe.ui.form.Timeline = class Timeline { }); } - set_automatic_link_email() { - if (!frappe.email.automatic_link_email){ - frappe.call("frappe.email.doctype.email_account.email_account.get_automatic_email_link").then((r) => { - if (r && r.message) { - frappe.email.automatic_link_email = r.message; - } else { - frappe.email.automatic_link_email = null; - } - this.display_automatic_link_email(); - }); - } else { - this.display_automatic_link_email(); - } - } - display_automatic_link_email() { - var me = this; - if (frappe.email.automatic_link_email){ - let email_id = frappe.email.automatic_link_email; - email_id = email_id.split("@")[0] +"+"+ encodeURIComponent(me.frm.doctype) +"+"+ encodeURIComponent(me.frm.docname) - +"@"+ email_id.split("@")[1]; + let docinfo = this.frm.get_docinfo(); - $(".timeline-email-import-link").text(email_id); - } else { - $('.timeline-email-import').addClass("hide"); + if (docinfo.document_email){ + let link = __("Send an email to {0} to link it here", [`${docinfo.document_email}`]); + $('.timeline-email-import').html(link); } } @@ -211,7 +192,7 @@ frappe.ui.form.Timeline = class Timeline { me.render_timeline_item(d); }); - + me.display_automatic_link_email(); // more btn if (this.more===undefined && timeline.length===20) { diff --git a/frappe/public/js/frappe/form/templates/timeline.html b/frappe/public/js/frappe/form/templates/timeline.html index c80a26bfc4..ead3bdb870 100644 --- a/frappe/public/js/frappe/form/templates/timeline.html +++ b/frappe/public/js/frappe/form/templates/timeline.html @@ -18,9 +18,7 @@ {% } %}
    -

    - {%= __("Send an email to {0} to link it here.", [``]) %} -

    +
    From d8c826ff1937eb80495f8c5e292bbed5e933ffbb Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Mon, 20 Jan 2020 16:18:46 +0530 Subject: [PATCH 62/77] fix: Small Text should not be rendered as text_field (#9318) --- frappe/templates/print_formats/standard_macros.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index 45228587f8..f879dd7e08 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -3,7 +3,7 @@ {{ render_table(df, doc) }} {%- elif df.fieldtype=="HTML" and df.options -%}
    {{ frappe.render_template(df.options, {"doc": doc}) or "" }}
    - {%- elif df.fieldtype in ("Text", "Text Editor", "Code", "Small Text", "Long Text") -%} + {%- elif df.fieldtype in ("Text", "Text Editor", "Code", "Long Text") -%} {{ render_text_field(df, doc) }} {%- elif df.fieldtype in ("Image", "Attach Image", "Attach") and (guess_mimetype(doc[df.fieldname])[0] or "").startswith("image/") -%} @@ -95,7 +95,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" {%- macro render_text_field(df, doc) -%} {%- if doc.get(df.fieldname) != None -%}
    - {%- if df.fieldtype in ("Text", "Code") %}{%- endif %} + {%- if df.fieldtype in ("Text", "Code", "Long Text") %}{%- endif %} {%- if df.fieldtype=="Code" %} 
    {{ doc.get(df.fieldname) }}
    {% else -%} From 5956e8c39722a21b9dce55e9a883859848653605 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 20 Jan 2020 18:57:58 +0530 Subject: [PATCH 63/77] fix: replace all occurrences of string in group by field --- frappe/public/js/frappe/ui/group_by/group_by.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js index 3aebeae12f..98d4531c5e 100644 --- a/frappe/public/js/frappe/ui/group_by/group_by.js +++ b/frappe/public/js/frappe/ui/group_by/group_by.js @@ -83,7 +83,7 @@ frappe.ui.GroupBy = class { apply_settings(settings) { // Extract fieldname from `tabdoctype`.`fieldname` - let group_by_fieldname = settings.group_by.split('.')[1].replace('`', ''); + let group_by_fieldname = settings.group_by.split('.')[1].replace(/`/g, ''); this.groupby_select.val(group_by_fieldname); this.aggregate_function_select.val(settings.aggregate_function); From aa9e4fc056bcb95b3f4f73be3d273a89a3520aba Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 20 Jan 2020 19:04:37 +0530 Subject: [PATCH 64/77] fix: regex to validate email id (#9323) --- frappe/website/js/website.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 98959e114f..471dfbc81c 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -375,7 +375,8 @@ $.extend(frappe, { window.valid_email = function(id) { // eslint-disable-next-line - return /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/.test(id.toLowerCase()); + // copied regex from frappe/utils.js validate_type + return /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/.test(id.toLowerCase()); } window.validate_email = valid_email; From 7e45035c18e46eef0da1d1e889badeaaadd0a3c8 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 20 Jan 2020 21:28:39 +0530 Subject: [PATCH 65/77] fix: check for df options in set fieldin case field type for both conditions is the same --- frappe/public/js/frappe/ui/filters/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index 08b6524afc..818612d442 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -195,7 +195,7 @@ frappe.ui.Filter = class { // called when condition is changed, // don't change if all is well if(this.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype && - df.parent == cur.parent) { + df.parent == cur.parent && df.options == cur.options) { return; } From c73d81cf438b137482bdfb4e1558e2040954bbdd Mon Sep 17 00:00:00 2001 From: lijiming Date: Tue, 21 Jan 2020 09:52:36 +0800 Subject: [PATCH 66/77] Add translation for Leaderboard Title --- frappe/desk/page/leaderboard/leaderboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/page/leaderboard/leaderboard.js b/frappe/desk/page/leaderboard/leaderboard.js index 5359e9eab8..3d480eb00e 100644 --- a/frappe/desk/page/leaderboard/leaderboard.js +++ b/frappe/desk/page/leaderboard/leaderboard.js @@ -13,7 +13,7 @@ class Leaderboard { constructor(parent) { frappe.ui.make_app_page({ parent: parent, - title: "Leaderboard", + title: __("Leaderboard"), single_column: false }); this.parent = parent; From 73ad4d62eb2cd9f758394ba99ff27a6db1ac772e Mon Sep 17 00:00:00 2001 From: lijiming Date: Tue, 21 Jan 2020 09:57:05 +0800 Subject: [PATCH 67/77] Add Simplified Chinese translation for Leaderboard --- frappe/translations/zh.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/translations/zh.csv b/frappe/translations/zh.csv index fd55618f5f..46faf24089 100644 --- a/frappe/translations/zh.csv +++ b/frappe/translations/zh.csv @@ -4046,3 +4046,5 @@ apps/frappe/frappe/public/js/frappe/web_form/web_form.js,Saved Successfully,保 apps/frappe/frappe/core/doctype/user/user.py,Please ask your administrator to verify your sign-up,请向管理员询问，以确认您的注册 DocType: Domain Settings,Active Domains,活动域 apps/frappe/frappe/public/js/integrations/razorpay.js,Show Log,显示日志 +apps/frappe/frappe/desk/page/leaderboard/leaderboard.js,Leaderboard,排行榜 +apps/frappe/frappe/config/desktop.py,Leaderboard,排行榜 From a916f17a54f80eadc8abc4fd3c13697ff808be1d Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 21 Jan 2020 09:58:59 +0530 Subject: [PATCH 68/77] fix: Set communication sender while creating event (#9317) --- frappe/desk/doctype/event/event.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/desk/doctype/event/event.py b/frappe/desk/doctype/event/event.py index 637904b35c..45dc5d86c7 100644 --- a/frappe/desk/doctype/event/event.py +++ b/frappe/desk/doctype/event/event.py @@ -73,6 +73,8 @@ class Event(Document): communication.subject = self.subject communication.content = self.description if self.description else self.subject communication.communication_date = self.starts_on + communication.sender = self.owner + communication.sender_full_name = frappe.utils.get_fullname(self.owner) communication.reference_doctype = self.doctype communication.reference_name = self.name communication.communication_medium = communication_mapping.get(self.event_category) if self.event_category else "" From 87248a1a11c502bd8ec2fa7115f9034c7b124bd5 Mon Sep 17 00:00:00 2001 From: Jigar Tarpara Date: Wed, 22 Jan 2020 11:37:03 +0530 Subject: [PATCH 69/77] Fix: Create User Email> Email Account (In User Doctype) Create User Email not working properly becuase of response empty --- frappe/core/doctype/user/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js index 82ecdbddca..950b8b219c 100644 --- a/frappe/core/doctype/user/user.js +++ b/frappe/core/doctype/user/user.js @@ -168,7 +168,7 @@ frappe.ui.form.on('User', { email: frm.doc.email }, callback: function(r) { - if (r.message == undefined) { + if (r.message == undefined || r.message == "") { frappe.route_options = { "email_id": frm.doc.email, "awaiting_password": 1, From 69d76499694608f66a21754164ac135ffa901121 Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Sat, 28 Dec 2019 16:49:54 +0500 Subject: [PATCH 70/77] fix(get_permlevel_access): Lazy load handle different permission types --- frappe/model/document.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index c58e09ef5a..0539f8806d 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -577,14 +577,17 @@ class Document(BaseDocument): def get_permlevel_access(self, permission_type='write'): if not hasattr(self, "_has_access_to"): + self._has_access_to = frappe._dict() + + if not self._has_access_to.get(permission_type): + self._has_access_to[permission_type] = [] roles = frappe.get_roles() - self._has_access_to = [] for perm in self.get_permissions(): if perm.role in roles and perm.permlevel > 0 and perm.get(permission_type): - if perm.permlevel not in self._has_access_to: - self._has_access_to.append(perm.permlevel) + if perm.permlevel not in self._has_access_to[permission_type]: + self._has_access_to[permission_type].append(perm.permlevel) - return self._has_access_to + return self._has_access_to[permission_type] def has_permlevel_access_to(self, fieldname, df=None, permission_type='read'): if not df: From dd72d5e022cbcaeac9273b44b3d2e8a9fd56269c Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Sat, 28 Dec 2019 16:58:12 +0500 Subject: [PATCH 71/77] chore: No need for frappe._dict() --- frappe/model/document.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index 0539f8806d..9a6baf63c4 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -577,7 +577,7 @@ class Document(BaseDocument): def get_permlevel_access(self, permission_type='write'): if not hasattr(self, "_has_access_to"): - self._has_access_to = frappe._dict() + self._has_access_to = {} if not self._has_access_to.get(permission_type): self._has_access_to[permission_type] = [] From c9adf965eb6b637e45f53addc650859a50e2603e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 21 Jan 2020 15:41:03 +0530 Subject: [PATCH 72/77] test: Fix fieldlevel permission test --- frappe/tests/test_form_load.py | 95 ++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 44 deletions(-) diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py index 95dc19c0f1..e934aed222 100644 --- a/frappe/tests/test_form_load.py +++ b/frappe/tests/test_form_load.py @@ -4,8 +4,10 @@ from __future__ import unicode_literals import frappe, unittest from frappe.desk.form.load import getdoctype, getdoc -from frappe.core.page.permission_manager.permission_manager import update, reset +from frappe.core.page.permission_manager.permission_manager import update, reset, add +from frappe.custom.doctype.property_setter.property_setter import make_property_setter +test_dependencies = ['Blog Category', 'Blogger'] class TestFormLoad(unittest.TestCase): def test_load(self): @@ -20,56 +22,61 @@ class TestFormLoad(unittest.TestCase): self.assertTrue(meta.get("__calendar_js")) def test_fieldlevel_permissions_in_load(self): + blog = frappe.get_doc({ + "doctype": "Blog Post", + "blog_category": "_Test Blog Category 1", + "blog_intro": "Test Blog Intro", + "blogger": "_Test Blogger 1", + "content": "Test Blog Content", + "doctype": "Blog Post", + "title": "_Test Blog Post {}".format(frappe.utils.now()), + "published": 0 + }) + + blog.insert() + user = frappe.get_doc('User', 'test@example.com') - user.remove_roles('Website Manager') + user.remove_roles('Website Manager', 'System Manager') user.add_roles('Blogger') - reset('Blog Post') - frappe.db.set_value('DocField', { - 'fieldname': 'published', - 'parent': 'Blog Post' - }, 'permlevel', 1) - - update('Blog Post', 'Website Manager', 0, 'permlevel', 1) + make_property_setter('Blog Post', 'published', 'permlevel', 1, 'Int') + add('Blog Post', 'Website Manager', 1) + update('Blog Post', 'Website Manager', 1, 'write', 1) frappe.set_user(user.name) - # print frappe.as_json(get_valid_perms('Blog Post')) + blog_doc = get_blog(blog.name) - frappe.clear_cache(doctype='Blog Post') + self.assertEqual(blog_doc.name, blog.name) + # since published field has higher permlevel + self.assertEqual(blog_doc.published, None) - blog = frappe.db.get_value('Blog Post', {'title': '_Test Blog Post'}) - - getdoc('Blog Post', blog) - - checked = False - - for doc in frappe.response.docs: - if doc.name == blog: - self.assertEqual(doc.published, None) - checked = True - - self.assertTrue(checked, True) - - frappe.db.set_value('DocField', { - 'fieldname': 'published', - 'parent': 'Blog Post' - }, 'permlevel', 0) - - reset('Blog Post') - - frappe.clear_cache(doctype='Blog Post') - - frappe.response.docs = [] - getdoc('Blog Post', blog) - - checked = False - - for doc in frappe.response.docs: - if doc.name == blog: - self.assertEqual(doc.published, 1) - checked = True - - self.assertTrue(checked, True) + # this will be ignored because user does not + # have write access on `published` field (or on permlevel 1 fields) + blog_doc.published = 1 + blog_doc.save() + # since published field has higher permlevel + self.assertEqual(blog_doc.published, 0) frappe.set_user('Administrator') + user.add_roles('Website Manager') + frappe.cache().hdel("roles", user.name) + frappe.set_user(user.name) + + doc = frappe.get_doc('Blog Post', blog.name) + doc.published = 1 + doc.save() + + blog_doc = get_blog(blog.name) + # now user should be allowed to read field with higher permlevel + # (after adding Website Manager role) + self.assertEqual(blog_doc.published, 1) + + frappe.set_user('Administrator') + + +def get_blog(blog_name): + getdoc('Blog Post', blog_name) + doc = frappe.response.docs[0] + frappe.response.docs = [] + return doc \ No newline at end of file From 5cbe2170e83bca2c18c4c07c9d954da8221f31bd Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 21 Jan 2020 15:55:19 +0530 Subject: [PATCH 73/77] test: Reset Blog Post doc perms --- frappe/tests/test_form_load.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py index e934aed222..34df5bc882 100644 --- a/frappe/tests/test_form_load.py +++ b/frappe/tests/test_form_load.py @@ -40,6 +40,7 @@ class TestFormLoad(unittest.TestCase): user.add_roles('Blogger') make_property_setter('Blog Post', 'published', 'permlevel', 1, 'Int') + reset('Blog Post') add('Blog Post', 'Website Manager', 1) update('Blog Post', 'Website Manager', 1, 'write', 1) @@ -60,7 +61,6 @@ class TestFormLoad(unittest.TestCase): frappe.set_user('Administrator') user.add_roles('Website Manager') - frappe.cache().hdel("roles", user.name) frappe.set_user(user.name) doc = frappe.get_doc('Blog Post', blog.name) From 02453fa7e070a4787b70441cb73a34580830c4da Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 21 Jan 2020 19:03:40 +0530 Subject: [PATCH 74/77] style: Fix codacy --- frappe/tests/test_form_load.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py index 34df5bc882..5c9abd04f6 100644 --- a/frappe/tests/test_form_load.py +++ b/frappe/tests/test_form_load.py @@ -28,7 +28,6 @@ class TestFormLoad(unittest.TestCase): "blog_intro": "Test Blog Intro", "blogger": "_Test Blogger 1", "content": "Test Blog Content", - "doctype": "Blog Post", "title": "_Test Blog Post {}".format(frappe.utils.now()), "published": 0 }) @@ -76,7 +75,7 @@ class TestFormLoad(unittest.TestCase): def get_blog(blog_name): + frappe.response.docs = [] getdoc('Blog Post', blog_name) doc = frappe.response.docs[0] - frappe.response.docs = [] return doc \ No newline at end of file From 5eaaaf03dbdfde95b376098f9202fc5d4a97280b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 22 Jan 2020 11:03:47 +0530 Subject: [PATCH 75/77] test: Fix user permission test --- frappe/tests/test_form_load.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py index 5c9abd04f6..fc53e21fef 100644 --- a/frappe/tests/test_form_load.py +++ b/frappe/tests/test_form_load.py @@ -35,7 +35,9 @@ class TestFormLoad(unittest.TestCase): blog.insert() user = frappe.get_doc('User', 'test@example.com') - user.remove_roles('Website Manager', 'System Manager') + + user_roles = frappe.get_roles() + user.remove_roles(*user_roles) user.add_roles('Blogger') make_property_setter('Blog Post', 'published', 'permlevel', 1, 'Int') @@ -73,6 +75,9 @@ class TestFormLoad(unittest.TestCase): frappe.set_user('Administrator') + # reset user roles + user.remove_roles('Blogger', 'Website Manager') + user.add_roles(*user_roles) def get_blog(blog_name): frappe.response.docs = [] From b1169c0b319a8a302f0d0f271198227e590f6411 Mon Sep 17 00:00:00 2001 From: Jigar Tarpara Date: Wed, 22 Jan 2020 19:40:24 +0530 Subject: [PATCH 76/77] Update frappe/core/doctype/user/user.js Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/core/doctype/user/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js index 950b8b219c..c4873ee40e 100644 --- a/frappe/core/doctype/user/user.js +++ b/frappe/core/doctype/user/user.js @@ -168,7 +168,7 @@ frappe.ui.form.on('User', { email: frm.doc.email }, callback: function(r) { - if (r.message == undefined || r.message == "") { + if (!Array.isArray(r.message)) { frappe.route_options = { "email_id": frm.doc.email, "awaiting_password": 1, From 54a54dd3c80117cae5630ac8efd0075142884e05 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 22 Jan 2020 19:42:59 +0530 Subject: [PATCH 77/77] fix: auto email report not working for the prepared report --- frappe/core/doctype/report/report.py | 6 ++++-- frappe/desk/query_report.py | 4 ++-- frappe/email/doctype/auto_email_report/auto_email_report.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 099c279dab..2d49915f59 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -126,13 +126,15 @@ class Report(Document): safe_exec(self.report_script, None, loc) return loc['data'] - def get_data(self, filters=None, limit=None, user=None, as_dict=False): + def get_data(self, filters=None, limit=None, user=None, as_dict=False, ignore_prepared_report=False): columns = [] out = [] if self.report_type in ('Query Report', 'Script Report', 'Custom Report'): # query and script reports - data = frappe.desk.query_report.run(self.name, filters=filters, user=user) + data = frappe.desk.query_report.run(self.name, + filters=filters, user=user, ignore_prepared_report=ignore_prepared_report) + for d in data.get('columns'): if isinstance(d, dict): col = frappe._dict(d) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index f5d2d58e04..99e3c2e96f 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -158,7 +158,7 @@ def get_script(report_name): @frappe.whitelist() @frappe.read_only() -def run(report_name, filters=None, user=None): +def run(report_name, filters=None, user=None, ignore_prepared_report=False): report = get_report_doc(report_name) if not user: @@ -169,7 +169,7 @@ def run(report_name, filters=None, user=None): result = None - if report.prepared_report and not report.disable_prepared_report: + if report.prepared_report and not report.disable_prepared_report and not ignore_prepared_report: if filters: if isinstance(filters, string_types): filters = json.loads(filters) diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index b06d3f7dfe..d31c3a67e4 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -66,7 +66,7 @@ class AutoEmailReport(Document): self.prepare_dynamic_filters() columns, data = report.get_data(limit=self.no_of_rows or 100, user = self.user, - filters = self.filters, as_dict=True) + filters = self.filters, as_dict=True, ignore_prepared_report=True) # add serial numbers columns.insert(0, frappe._dict(fieldname='idx', label='', width='30px'))