From da03b996c80b2b90f644bf09293ac1607a6f5f88 Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:22:19 +0530 Subject: [PATCH 1/9] Made Designation a doctype --- .../doctype/designation/__init__.py | 0 .../doctype/designation/designation.js | 8 +++ .../doctype/designation/designation.json | 70 +++++++++++++++++++ .../doctype/designation/designation.py | 10 +++ .../doctype/designation/test_designation.py | 10 +++ .../doctype/member/member.json | 6 +- 6 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 pranali_reloaded/pranali_reloaded/doctype/designation/__init__.py create mode 100644 pranali_reloaded/pranali_reloaded/doctype/designation/designation.js create mode 100644 pranali_reloaded/pranali_reloaded/doctype/designation/designation.json create mode 100644 pranali_reloaded/pranali_reloaded/doctype/designation/designation.py create mode 100644 pranali_reloaded/pranali_reloaded/doctype/designation/test_designation.py diff --git a/pranali_reloaded/pranali_reloaded/doctype/designation/__init__.py b/pranali_reloaded/pranali_reloaded/doctype/designation/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pranali_reloaded/pranali_reloaded/doctype/designation/designation.js b/pranali_reloaded/pranali_reloaded/doctype/designation/designation.js new file mode 100644 index 0000000..791d43d --- /dev/null +++ b/pranali_reloaded/pranali_reloaded/doctype/designation/designation.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Rtr.Neil Trini Lasrado and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Designation', { + // refresh: function(frm) { + + // } +}); diff --git a/pranali_reloaded/pranali_reloaded/doctype/designation/designation.json b/pranali_reloaded/pranali_reloaded/doctype/designation/designation.json new file mode 100644 index 0000000..a847c1e --- /dev/null +++ b/pranali_reloaded/pranali_reloaded/doctype/designation/designation.json @@ -0,0 +1,70 @@ +{ + "actions": [], + "autoname": "field:designation", + "creation": "2020-06-28 21:18:40.566598", + "doctype": "DocType", + "document_type": "Setup", + "engine": "InnoDB", + "field_order": [ + "designation" + ], + "fields": [ + { + "fieldname": "designation", + "fieldtype": "Data", + "label": "Designation", + "unique": 1 + } + ], + "links": [], + "modified": "2020-06-28 21:18:40.566598", + "modified_by": "Administrator", + "module": "Pranali Reloaded", + "name": "Designation", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Administrator", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + }, + { + "read": 1, + "role": "Club Member - Full Access" + }, + { + "read": 1, + "role": "District Council Member" + }, + { + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Club Member - Limited Access", + "share": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC" +} \ No newline at end of file diff --git a/pranali_reloaded/pranali_reloaded/doctype/designation/designation.py b/pranali_reloaded/pranali_reloaded/doctype/designation/designation.py new file mode 100644 index 0000000..89c1f3a --- /dev/null +++ b/pranali_reloaded/pranali_reloaded/doctype/designation/designation.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Rtr.Neil Trini Lasrado and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class Designation(Document): + pass diff --git a/pranali_reloaded/pranali_reloaded/doctype/designation/test_designation.py b/pranali_reloaded/pranali_reloaded/doctype/designation/test_designation.py new file mode 100644 index 0000000..e66ce66 --- /dev/null +++ b/pranali_reloaded/pranali_reloaded/doctype/designation/test_designation.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Rtr.Neil Trini Lasrado and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestDesignation(unittest.TestCase): + pass diff --git a/pranali_reloaded/pranali_reloaded/doctype/member/member.json b/pranali_reloaded/pranali_reloaded/doctype/member/member.json index e9f63db..2266864 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/member/member.json +++ b/pranali_reloaded/pranali_reloaded/doctype/member/member.json @@ -92,9 +92,9 @@ }, { "fieldname": "designation", - "fieldtype": "Select", + "fieldtype": "Link", "label": "Designation", - "options": "Member\nPresident\nIPP\nVice - President\nSecretary\nJoint - Secretary\nDirector - Finance\nJoint Director - Finance\nChairman - Avenues\nSergeant-At-Arms\nDirector - Club Service\nJoint Director - Club Service\nDirector - Community Service\nJoint Director - Community Service\nDirector - International Service\nJoint Director - International Service\nDirector - Professional Development\nJoint Director - Professional Development\nDirector - Sports\nJoint Director - Sports\nDirector - ED\nJoint Director - ED\nDirector - Partners-In-Service\nJoint Director - Partners-In-Service\nDirector - Web Communications\nJoint Director - Web Communications\nDirector - PR\nJoint Director - PR\nDirector - HRD\nEditor\nJoint Editor\nClub Advisor" + "options": "Designation" }, { "fieldname": "column_break_14", @@ -135,7 +135,7 @@ ], "image_field": "image", "links": [], - "modified": "2020-06-13 01:02:04.230566", + "modified": "2020-06-28 21:19:53.785529", "modified_by": "Administrator", "module": "Pranali Reloaded", "name": "Member", From 58bc9943b4a93b7f1eac354e106d6683fb574537 Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:23:51 +0530 Subject: [PATCH 2/9] [feat] Removed Ambassodorial check --- .../pranali_reloaded/doctype/project/project.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pranali_reloaded/pranali_reloaded/doctype/project/project.json b/pranali_reloaded/pranali_reloaded/doctype/project/project.json index bb8436f..d566752 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/project/project.json +++ b/pranali_reloaded/pranali_reloaded/doctype/project/project.json @@ -44,12 +44,11 @@ "home_club", "dcm", "rotarians", - "ambassadorial", + "other_club", "column_break_32", "alumini", "pis", "guest", - "other_club", "total", "section_break_6", "joint_project", @@ -261,13 +260,6 @@ "label": "Rotarians" }, { - "default": "0", - "fieldname": "ambassadorial", - "fieldtype": "Check", - "label": "Ambassadorial" - }, - { - "depends_on": "ambassadorial", "fieldname": "other_club", "fieldtype": "Int", "label": "Other Club" @@ -364,7 +356,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2020-06-13 01:02:17.850395", + "modified": "2020-06-28 21:23:16.678989", "modified_by": "Administrator", "module": "Pranali Reloaded", "name": "Project", From 6c073aeac2db44d73d11f7928c11f3a6303b7b9c Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:27:14 +0530 Subject: [PATCH 3/9] [fix] Made attendance sections common --- .../pranali_reloaded/doctype/project/project.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pranali_reloaded/pranali_reloaded/doctype/project/project.json b/pranali_reloaded/pranali_reloaded/doctype/project/project.json index d566752..cd3b7bf 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/project/project.json +++ b/pranali_reloaded/pranali_reloaded/doctype/project/project.json @@ -44,11 +44,11 @@ "home_club", "dcm", "rotarians", - "other_club", + "guest", "column_break_32", "alumini", + "other_club", "pis", - "guest", "total", "section_break_6", "joint_project", @@ -276,7 +276,7 @@ { "fieldname": "pis", "fieldtype": "Int", - "label": "PIS" + "label": "Other PIS" }, { "fieldname": "guest", @@ -356,7 +356,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2020-06-28 21:23:16.678989", + "modified": "2020-06-28 21:26:31.569890", "modified_by": "Administrator", "module": "Pranali Reloaded", "name": "Project", From a916dec334de39edfea331655e209d918c70972e Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:30:38 +0530 Subject: [PATCH 4/9] [feat] Added Buddy Council member and instagram handle to club --- .../pranali_reloaded/doctype/club/club.json | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/pranali_reloaded/pranali_reloaded/doctype/club/club.json b/pranali_reloaded/pranali_reloaded/doctype/club/club.json index 9f56e5f..16ae864 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/club/club.json +++ b/pranali_reloaded/pranali_reloaded/doctype/club/club.json @@ -28,9 +28,14 @@ "column_break_13", "website", "blog", + "instagram_handle", "column_break_8", "facebook_page_address", - "twitter_handle" + "twitter_handle", + "section_break_24", + "buddy_council_member", + "column_break_26", + "buddy_council_name" ], "fields": [ { @@ -158,10 +163,35 @@ "fieldname": "twitter_handle", "fieldtype": "Data", "label": "Twitter Handle" + }, + { + "fieldname": "instagram_handle", + "fieldtype": "Data", + "label": "Instagram Handle" + }, + { + "fieldname": "section_break_24", + "fieldtype": "Section Break" + }, + { + "fieldname": "buddy_council_member", + "fieldtype": "Link", + "label": "Buddy Council Member", + "options": "User" + }, + { + "fieldname": "column_break_26", + "fieldtype": "Column Break" + }, + { + "fetch_from": "buddy_council_member.full_name", + "fieldname": "buddy_council_name", + "fieldtype": "Data", + "label": "Buddy Council Name" } ], "links": [], - "modified": "2020-06-13 01:01:29.650731", + "modified": "2020-06-28 21:30:01.057277", "modified_by": "Administrator", "module": "Pranali Reloaded", "name": "Club", From baf3a72faa5ad543d7e555b2ed445990558b83a0 Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:33:44 +0530 Subject: [PATCH 5/9] [Fix] Fixed typo in Ambassadorial Report --- .../ambassadorial_report.json | 16 ++++++++-------- .../ambassadorial_report/ambassadorial_report.py | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.json b/pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.json index 45ff316..11a020f 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.json +++ b/pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.json @@ -14,7 +14,7 @@ "section_break_4", "time_stamp", "column_break_8", - "total_attendence", + "total_attendance", "section_break_8", "club", "column_break_12", @@ -73,12 +73,6 @@ "fieldname": "column_break_8", "fieldtype": "Column Break" }, - { - "fieldname": "total_attendence", - "fieldtype": "Int", - "in_list_view": 1, - "label": "Total Attendence" - }, { "fieldname": "section_break_8", "fieldtype": "Section Break" @@ -118,11 +112,17 @@ "options": "Ambassadorial Report", "print_hide": 1, "read_only": 1 + }, + { + "fieldname": "total_attendance", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Total Attendance" } ], "is_submittable": 1, "links": [], - "modified": "2020-06-13 01:02:30.065535", + "modified": "2020-06-28 21:31:24.124249", "modified_by": "Administrator", "module": "Pranali Reloaded", "name": "Ambassadorial Report", diff --git a/pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.py b/pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.py index c8b9eee..4e69b3c 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.py +++ b/pranali_reloaded/pranali_reloaded/doctype/ambassadorial_report/ambassadorial_report.py @@ -19,7 +19,7 @@ def validate(self): def on_submit(self): self.time_stamp = now() frappe.db.set_value('Ambassadorial Report', self.name, 'document_status', 'submitted') - + def on_cancel(self): frappe.db.set_value('Ambassadorial Report', self.name, 'document_status', 'cancelled') @@ -32,9 +32,9 @@ def check_duplicates(self): if not d.member_id in members: members.append(d.member_id) else: - frappe.throw("Attendence for {0} appears multiple times.".format(d.member_name)) - + frappe.throw("Attendance for {0} appears multiple times.".format(d.member_name)) + def count_total(self): - self.total_attendence = 0 + self.total_attendance = 0 for d in self.members: - self.total_attendence +=1 \ No newline at end of file + self.total_attendance +=1 \ No newline at end of file From 8b0af11f38fefef551e6d9b04736e404895744c0 Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:36:05 +0530 Subject: [PATCH 6/9] [fix] Fixed issue with setting DCM user permssions --- pranali_reloaded/hook_events/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pranali_reloaded/hook_events/user.py b/pranali_reloaded/hook_events/user.py index 1a37f2e..fb821ea 100644 --- a/pranali_reloaded/hook_events/user.py +++ b/pranali_reloaded/hook_events/user.py @@ -2,7 +2,7 @@ def set_user_permissions_for_dcm(doc, method): for r in doc.roles: - if r.role =="DCM": + if r.role =="District Council Member": if not frappe.get_all("User Permission",filters={"user":doc.name}): perm = frappe.new_doc("User Permission") perm.user = doc.name From f70f76173a5e3016c1468d76e7c59f732f8960ea Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:37:40 +0530 Subject: [PATCH 7/9] [Fix] Fixed Type in Meetings --- .../pranali_reloaded/doctype/meeting/meeting.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pranali_reloaded/pranali_reloaded/doctype/meeting/meeting.json b/pranali_reloaded/pranali_reloaded/doctype/meeting/meeting.json index aadd4ff..74815a0 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/meeting/meeting.json +++ b/pranali_reloaded/pranali_reloaded/doctype/meeting/meeting.json @@ -14,7 +14,7 @@ "reporting_month", "section_break_5", "minutes", - "section_break_2", + "attendance_section", "home_club", "district_council_members", "rotarians", @@ -90,11 +90,6 @@ "label": "Minutes", "reqd": 1 }, - { - "fieldname": "section_break_2", - "fieldtype": "Section Break", - "label": "Attendence" - }, { "fieldname": "home_club", "fieldtype": "Int", @@ -187,11 +182,16 @@ "fieldname": "district_council_members", "fieldtype": "Int", "label": "District Council Members" + }, + { + "fieldname": "attendance_section", + "fieldtype": "Section Break", + "label": "Attendance" } ], "is_submittable": 1, "links": [], - "modified": "2020-06-13 00:57:49.310522", + "modified": "2020-06-28 21:37:09.182626", "modified_by": "Administrator", "module": "Pranali Reloaded", "name": "Meeting", From f3cdaa8639103282e07a3806e402a5b71692aded Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:42:49 +0530 Subject: [PATCH 8/9] [fix + Feat] Fixed errors in project & Made Avenue a Link --- .../doctype/avenue/__init__.py | 0 .../pranali_reloaded/doctype/avenue/avenue.js | 8 +++ .../doctype/avenue/avenue.json | 70 +++++++++++++++++++ .../pranali_reloaded/doctype/avenue/avenue.py | 10 +++ .../doctype/avenue/test_avenue.py | 10 +++ .../doctype/project/project.json | 10 +-- .../doctype/project/project.py | 15 ++-- 7 files changed, 108 insertions(+), 15 deletions(-) create mode 100644 pranali_reloaded/pranali_reloaded/doctype/avenue/__init__.py create mode 100644 pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.js create mode 100644 pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.json create mode 100644 pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.py create mode 100644 pranali_reloaded/pranali_reloaded/doctype/avenue/test_avenue.py diff --git a/pranali_reloaded/pranali_reloaded/doctype/avenue/__init__.py b/pranali_reloaded/pranali_reloaded/doctype/avenue/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.js b/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.js new file mode 100644 index 0000000..c439f2c --- /dev/null +++ b/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Rtr.Neil Trini Lasrado and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Avenue', { + // refresh: function(frm) { + + // } +}); diff --git a/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.json b/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.json new file mode 100644 index 0000000..98a0ced --- /dev/null +++ b/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.json @@ -0,0 +1,70 @@ +{ + "actions": [], + "autoname": "field:avenue", + "creation": "2020-06-28 21:38:51.355130", + "doctype": "DocType", + "document_type": "Setup", + "engine": "InnoDB", + "field_order": [ + "avenue" + ], + "fields": [ + { + "fieldname": "avenue", + "fieldtype": "Data", + "label": "Avenue", + "unique": 1 + } + ], + "links": [], + "modified": "2020-06-28 21:38:51.355130", + "modified_by": "Administrator", + "module": "Pranali Reloaded", + "name": "Avenue", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Administrator", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + }, + { + "read": 1, + "role": "Club Member - Full Access" + }, + { + "read": 1, + "role": "District Council Member" + }, + { + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Club Member - Limited Access", + "share": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC" +} \ No newline at end of file diff --git a/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.py b/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.py new file mode 100644 index 0000000..3ed373f --- /dev/null +++ b/pranali_reloaded/pranali_reloaded/doctype/avenue/avenue.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Rtr.Neil Trini Lasrado and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class Avenue(Document): + pass diff --git a/pranali_reloaded/pranali_reloaded/doctype/avenue/test_avenue.py b/pranali_reloaded/pranali_reloaded/doctype/avenue/test_avenue.py new file mode 100644 index 0000000..2af7d3a --- /dev/null +++ b/pranali_reloaded/pranali_reloaded/doctype/avenue/test_avenue.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Rtr.Neil Trini Lasrado and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestAvenue(unittest.TestCase): + pass diff --git a/pranali_reloaded/pranali_reloaded/doctype/project/project.json b/pranali_reloaded/pranali_reloaded/doctype/project/project.json index cd3b7bf..66865b7 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/project/project.json +++ b/pranali_reloaded/pranali_reloaded/doctype/project/project.json @@ -122,11 +122,11 @@ }, { "fieldname": "avenue_1", - "fieldtype": "Select", + "fieldtype": "Link", "in_list_view": 1, "in_standard_filter": 1, "label": "Avenue 1", - "options": "\nClub Service\nCommunity Service\nInternational Service\nProfessional Development\nSports\nED\nPR\nEditorial\nWeb Communications\nPIS\nHRD", + "options": "Avenue", "reqd": 1 }, { @@ -135,11 +135,11 @@ }, { "fieldname": "avenue_2", - "fieldtype": "Select", + "fieldtype": "Link", "in_list_view": 1, "in_standard_filter": 1, "label": "Avenue 2", - "options": "\nClub Service\nCommunity Service\nInternational Service\nProfessional Development\nSports\nED\nPR\nEditorial\nWeb Communications\nPIS\nHRD" + "options": "Avenue" }, { "fieldname": "section_break_10", @@ -356,7 +356,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2020-06-28 21:26:31.569890", + "modified": "2020-06-28 21:39:42.226201", "modified_by": "Administrator", "module": "Pranali Reloaded", "name": "Project", diff --git a/pranali_reloaded/pranali_reloaded/doctype/project/project.py b/pranali_reloaded/pranali_reloaded/doctype/project/project.py index 8034d97..ceb8c03 100644 --- a/pranali_reloaded/pranali_reloaded/doctype/project/project.py +++ b/pranali_reloaded/pranali_reloaded/doctype/project/project.py @@ -12,17 +12,16 @@ def validate(self): self.validate_account() self.validate_date() self.set_status() - self.validate_ambassadorial() self.calculate_totals() self.set_zone() self.document_status='draft' - + def on_submit(self): frappe.db.set_value('Project', self.name, 'document_status', 'submitted') - + def on_cancel(self): frappe.db.set_value('Project', self.name, 'document_status', 'cancelled') - + def set_status(self): self.time_stamp = now() self.reporting_month = getdate(self.end_time).strftime("%B") @@ -43,11 +42,7 @@ def set_status(self): self.quarter = "Three" elif self.reporting_month in ["April", "May", "June"]: self.quarter = "Four" - - def validate_ambassadorial(self): - if not self.ambassadorial: - self.other_club=0 - + def calculate_totals(self): self.total = cint(self.home_club) + cint(self.other_club) + cint(self.dcm) \ + cint(self.alumini) + cint(self.rotarians) + cint(self.pis) + cint(self.guest) @@ -58,7 +53,7 @@ def set_zone(self): def validate_date(self): if self.end_time > now(): frappe.throw("Did you fix the Flux Capacitor ? \n Project End Time is Greater than today.") - + if self.start_time > self.end_time: frappe.throw("Start Time cannot be greater than End Time.") From 815f09f3bcd9b5713cc10c271276119a6dd97242 Mon Sep 17 00:00:00 2001 From: Neil Lasrado Date: Sun, 28 Jun 2020 21:59:47 +0530 Subject: [PATCH 9/9] [Fix] Removed print --- pranali_reloaded/desk.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pranali_reloaded/desk.py b/pranali_reloaded/desk.py index bf7baf5..44f91d7 100644 --- a/pranali_reloaded/desk.py +++ b/pranali_reloaded/desk.py @@ -86,6 +86,5 @@ def set_desktop_icons(): hook_icons = frappe.get_hooks("icons") for icon in hook_icons: desktop.get(icon.get('module')).append(icon) - - print(desktop) + return desktop \ No newline at end of file