From 72e1ccc8f98995809e10837cc52e39f2121b19db Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Fri, 21 Dec 2018 11:05:20 +0530 Subject: [PATCH 01/10] Changed modified timing to pickup changes (#6649) * Changed modified timing to pickup changes * Update address.json --- frappe/contacts/doctype/address/address.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/contacts/doctype/address/address.json b/frappe/contacts/doctype/address/address.json index de6ceaa523..2947af03ec 100644 --- a/frappe/contacts/doctype/address/address.json +++ b/frappe/contacts/doctype/address/address.json @@ -660,7 +660,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-11-27 17:57:21.913972", + "modified": "2018-11-27 17:57:22.913973", "modified_by": "Administrator", "module": "Contacts", "name": "Address", @@ -773,4 +773,4 @@ "track_changes": 0, "track_seen": 0, "track_views": 0 -} \ No newline at end of file +} From 4b336622ae7195b7554428e9f77b6f7fd8d39131 Mon Sep 17 00:00:00 2001 From: Frappe Bot Date: Fri, 21 Dec 2018 05:45:40 +0000 Subject: [PATCH 02/10] bumped to version 11.0.3-beta.40 --- frappe/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 742599377b..40e088fc00 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe" app_license = "MIT" develop_version = '12.x.x-develop' -staging_version = '11.0.3-beta.39' +staging_version = '11.0.3-beta.40' app_email = "info@frappe.io" From 5d658f251d60046b18e9c36131878b0faebe3052 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 23 Dec 2018 17:55:22 +0530 Subject: [PATCH 03/10] fix(style): show some margin on headings for quill editor --- frappe/public/less/quill.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less index 29ad35ef89..a2c8d55b01 100644 --- a/frappe/public/less/quill.less +++ b/frappe/public/less/quill.less @@ -8,6 +8,13 @@ font-family: inherit; } +.ql-editor { + h1, h2, h3, h4, h5 { + margin-top: 0.5em; + margin-bottom: 0.25em; + } +} + .ql-toolbar.ql-snow { border-top-left-radius: 4px; border-top-right-radius: 4px; From fafabac492dfef54ee57a3d3c1f783ff4e7f6991 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 23 Dec 2018 19:26:23 +0530 Subject: [PATCH 04/10] fix(test): test_report.py --- frappe/core/doctype/report/test_report.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/report/test_report.py b/frappe/core/doctype/report/test_report.py index a8b756804e..258734743f 100644 --- a/frappe/core/doctype/report/test_report.py +++ b/frappe/core/doctype/report/test_report.py @@ -29,7 +29,7 @@ class TestReport(unittest.TestCase): self.assertTrue('User' in [d[0] for d in data]) def test_report_permisisons(self): - frappe.db.sql("""delete from `tabHas Role` where parent = %s + frappe.db.sql("""delete from `tabHas Role` where parent = %s and role = 'Test Has Role'""", frappe.session.user, auto_commit=1) if not frappe.db.exists('Role', 'Test Has Role'): @@ -61,6 +61,7 @@ class TestReport(unittest.TestCase): with open(os.path.join(os.path.dirname(__file__), 'user_activity_report_without_sort.json'), 'r') as f: frappe.get_doc(json.loads(f.read())).insert() + report = frappe.get_doc('Report', 'User Activity Report Without Sort') columns, data = report.get_data() self.assertEqual(columns[0].get('label'), 'ID') From 1d461ab5cc88e604aa75e808c9520756f14387d6 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 24 Dec 2018 13:05:58 +0530 Subject: [PATCH 05/10] fix: Update datatable to 1.7.2 (#6665) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c0246539bc..b4a50f9f34 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "awesomplete": "^1.1.2", "cookie": "^0.3.1", "express": "^4.16.2", - "frappe-datatable": "^1.7.1", + "frappe-datatable": "^1.7.2", "frappe-gantt": "^0.1.0", "fuse.js": "^3.2.0", "highlight.js": "^9.12.0", diff --git a/yarn.lock b/yarn.lock index b6c07445c1..117d454d78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1219,10 +1219,10 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -frappe-datatable@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.7.1.tgz#5badb1138c7019e9dce50d6cbbd81c2fdc97e391" - integrity sha512-ePD4IDaLDCZCrchqT+TsPquOdnm72oYxh/KYMPfYBxUGSzWUoi2uRgzQD4MBR+uq1WxJhFQNoXe/fD3yOqNNUQ== +frappe-datatable@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.7.2.tgz#9a2cb3d643959b759b6bc3a883667b58d2ba78fe" + integrity sha512-yUSBy46Bkbo4evP4nEcXzPVC0cMLBIcOLV6J509RJfmM+IEoQbhEeOcxta0fQ9RcgvzRHbL+TX+wkib53HsfSw== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5" From ed80e9dff11da3ebb956a69dffe56705737b763d Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Mon, 24 Dec 2018 13:06:30 +0530 Subject: [PATCH 06/10] [Fix]Quick entry with geolocation field issue fix (#6662) * Quick entry with geolocation field issue fix * Codacy issue fix --- .../public/js/frappe/form/controls/geolocation.js | 13 ++++++++++++- frappe/public/js/frappe/form/quick_entry.js | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/geolocation.js b/frappe/public/js/frappe/form/controls/geolocation.js index 7dd0c7f64e..7ba1b0b822 100644 --- a/frappe/public/js/frappe/form/controls/geolocation.js +++ b/frappe/public/js/frappe/form/controls/geolocation.js @@ -12,6 +12,17 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlCode.extend({ ); this.map_area.prependTo($input_wrapper); this.$wrapper.find('.control-input').addClass("hidden"); + + if ($input_wrapper.is(':visible')) { + this.make_map(); + } else { + $(document).on('quick-entry-dialog-open', () => { + this.make_map(); + }); + } + }, + + make_map() { this.bind_leaflet_map(); this.bind_leaflet_draw_control(); this.bind_leaflet_locate_control(); @@ -19,6 +30,7 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlCode.extend({ }, format_for_input(value) { + if (!this.map) return; // render raw value from db into map this.clear_editable_layers(); if(value) { @@ -52,7 +64,6 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlCode.extend({ }, bind_leaflet_map() { - var circleToGeoJSON = L.Circle.prototype.toGeoJSON; L.Circle.include({ toGeoJSON: function() { diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js index e7857c3bf7..a0cd22163e 100644 --- a/frappe/public/js/frappe/form/quick_entry.js +++ b/frappe/public/js/frappe/form/quick_entry.js @@ -116,6 +116,10 @@ frappe.ui.form.QuickEntryForm = Class.extend({ this.dialog.onhide = () => frappe.quick_entry = null; this.dialog.show(); + this.dialog.$wrapper.on('shown.bs.modal', function() { + $(document).trigger('quick-entry-dialog-open'); + }); + this.dialog.refresh_dependency(); this.set_defaults(); From 574446e092b6989dbdf7959b71bd27ca87f29e43 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 24 Dec 2018 13:10:58 +0530 Subject: [PATCH 07/10] [Fix] Notification count not showing for the doctypes like purchase order, sales invoice (#6657) --- frappe/core/page/desktop/desktop.js | 2 +- frappe/core/page/desktop/desktop_module_icon.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js index eb6e772c35..24dd0c3b4e 100644 --- a/frappe/core/page/desktop/desktop.js +++ b/frappe/core/page/desktop/desktop.js @@ -323,7 +323,7 @@ $.extend(frappe.desktop, { // if module found if(module._id.indexOf('/')===-1 && !module._report) { - var notifier = $(".module-count-" + module._id); + var notifier = $(".module-count-" + frappe.scrub(module._id)); if(notifier.length) { notifier.toggle(sum ? true : false); var circle = notifier.find(".circle-text"); diff --git a/frappe/core/page/desktop/desktop_module_icon.html b/frappe/core/page/desktop/desktop_module_icon.html index f2681944f7..3e9a451eec 100644 --- a/frappe/core/page/desktop/desktop_module_icon.html +++ b/frappe/core/page/desktop/desktop_module_icon.html @@ -2,7 +2,7 @@ data-name="{{ module_name }}" data-link="{{ link }}" title="{{ _label }}"> {{ app_icon }}
-