From 5a0a9aac66d8596082c256d8ef4cb4dc26a9e8e6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 9 Sep 2014 14:47:10 +0530 Subject: [PATCH] [refactor] frappe.widgets > frappe.desk --- frappe/__init__.py | 4 +- frappe/api.py | 4 +- frappe/boot.py | 6 +- frappe/config/setup.py | 2 +- .../core/doctype/letter_head/letter_head.json | 84 -------- .../doctype/print_format/print_format.json | 183 ------------------ .../print_settings/print_settings.json | 96 --------- frappe/core/doctype/user/user.py | 2 +- frappe/core/notifications.py | 2 +- frappe/core/report/todo/todo.py | 2 +- .../doctype/letter_head => desk}/__init__.py | 0 frappe/{widgets => desk}/calendar.py | 0 .../doctype}/__init__.py | 0 .../doctype/event/README.md | 0 .../doctype/event}/__init__.py | 0 .../doctype/event/event.js | 0 .../doctype/event/event.json | 2 +- .../doctype/event/event.py | 0 .../doctype/event/event_calendar.js | 2 +- .../doctype/event/test_event.py | 2 +- .../doctype/event/test_records.json | 0 .../doctype/event_role/README.md | 0 .../doctype/event_role}/__init__.py | 0 .../doctype/event_role/event_role.json | 2 +- .../doctype/event_role/event_role.py | 0 .../doctype/event_user/README.md | 0 .../doctype/event_user}/__init__.py | 0 .../doctype/event_user/event_user.json | 2 +- .../doctype/event_user/event_user.py | 0 .../doctype/todo/README.md | 0 .../doctype/todo}/__init__.py | 0 .../{desk_apps => desk}/doctype/todo/todo.js | 0 .../doctype/todo/todo.json | 2 +- .../{desk_apps => desk}/doctype/todo/todo.py | 0 .../doctype/todo/todo_list.html | 0 .../doctype/todo/todo_list.js | 0 .../doctype/todo => desk/form}/__init__.py | 0 frappe/{widgets => desk}/form/assign_to.py | 2 +- frappe/{widgets => desk}/form/load.py | 6 +- frappe/{widgets => desk}/form/meta.py | 0 frappe/{widgets => desk}/form/run_method.py | 0 frappe/{widgets => desk}/form/save.py | 2 +- frappe/{widgets => desk}/form/test_form.py | 2 +- frappe/{widgets => desk}/form/utils.py | 12 +- frappe/{widgets => desk}/moduleview.py | 2 +- frappe/{widgets => desk}/page.py | 0 frappe/{desk_apps => desk/page}/__init__.py | 0 .../page/applications}/__init__.py | 0 .../page/applications/applications.js | 0 .../page/applications/applications.json | 2 +- .../page/applications/applications.py | 0 .../page/messages/README.md | 0 .../page/messages/__init__.py | 0 .../page/messages/messages.html | 0 .../page/messages/messages.js | 0 .../page/messages/messages.json | 0 .../page/messages/messages.py | 0 frappe/{widgets => desk}/page_body.py | 0 frappe/{widgets => desk}/query_builder.py | 2 +- frappe/{widgets => desk}/query_report.py | 4 +- frappe/{widgets => desk}/report_dump.py | 0 frappe/{widgets => desk}/reportview.py | 0 frappe/{widgets => desk}/search.py | 4 +- frappe/{widgets => desk}/tags.py | 0 frappe/handler.py | 4 +- frappe/hooks.py | 10 +- frappe/modules.txt | 3 +- frappe/{desk_apps/page => print}/__init__.py | 0 .../doctype}/__init__.py | 0 .../doctype/letter_head/README.md | 0 .../doctype/letter_head}/__init__.py | 0 .../doctype/letter_head/letter_head.js | 0 .../doctype/letter_head/letter_head.json | 84 ++++++++ .../doctype/letter_head/letter_head.py | 0 .../doctype/letter_head/test_letter_head.py | 0 .../doctype/letter_head/test_records.json | 0 .../doctype/print_format/README.md | 0 .../doctype/print_format}/__init__.py | 0 .../doctype/print_format/print_format.js | 0 .../doctype/print_format/print_format.json | 157 +++++++++++++++ .../doctype/print_format/print_format.py | 0 .../doctype/print_format/test_print_format.py | 0 .../doctype/print_format/test_records.json | 0 .../print/doctype/print_settings/__init__.py | 0 .../doctype/print_settings/print_settings.js | 0 .../print_settings/print_settings.json | 96 +++++++++ .../doctype/print_settings/print_settings.py | 0 frappe/public/js/frappe/form/assign_to.js | 4 +- frappe/public/js/frappe/form/attachments.js | 2 +- frappe/public/js/frappe/form/comments.js | 2 +- frappe/public/js/frappe/form/control.js | 2 +- frappe/public/js/frappe/form/infobar.js | 2 +- frappe/public/js/frappe/form/link_selector.js | 2 +- frappe/public/js/frappe/form/linked_with.js | 2 +- frappe/public/js/frappe/form/save.js | 4 +- .../public/js/frappe/form/script_manager.js | 2 +- frappe/public/js/frappe/model/model.js | 4 +- frappe/public/js/frappe/ui/listing.js | 2 +- frappe/public/js/frappe/ui/tags.js | 4 +- frappe/public/js/frappe/views/calendar.js | 4 +- frappe/public/js/frappe/views/doclistview.js | 4 +- frappe/public/js/frappe/views/grid_report.js | 2 +- frappe/public/js/frappe/views/moduleview.js | 6 +- frappe/public/js/frappe/views/pageview.js | 2 +- frappe/public/js/frappe/views/query_report.js | 4 +- frappe/public/js/frappe/views/reportview.js | 8 +- .../public/js/frappe/views/sidebar_stats.js | 2 +- frappe/public/js/legacy/globals.js | 4 +- frappe/tests/test_assign.py | 6 +- frappe/tests/test_form_load.py | 4 +- frappe/utils/boilerplate.py | 6 +- frappe/widgets/event.py | 43 ---- 112 files changed, 424 insertions(+), 492 deletions(-) delete mode 100644 frappe/core/doctype/letter_head/letter_head.json delete mode 100644 frappe/core/doctype/print_format/print_format.json delete mode 100644 frappe/core/doctype/print_settings/print_settings.json rename frappe/{core/doctype/letter_head => desk}/__init__.py (100%) rename frappe/{widgets => desk}/calendar.py (100%) rename frappe/{core/doctype/print_settings => desk/doctype}/__init__.py (100%) rename frappe/{desk_apps => desk}/doctype/event/README.md (100%) rename frappe/{core/doctype/print_format => desk/doctype/event}/__init__.py (100%) rename frappe/{desk_apps => desk}/doctype/event/event.js (100%) rename frappe/{desk_apps => desk}/doctype/event/event.json (99%) rename frappe/{desk_apps => desk}/doctype/event/event.py (100%) rename frappe/{desk_apps => desk}/doctype/event/event_calendar.js (77%) rename frappe/{desk_apps => desk}/doctype/event/test_event.py (98%) rename frappe/{desk_apps => desk}/doctype/event/test_records.json (100%) rename frappe/{desk_apps => desk}/doctype/event_role/README.md (100%) rename frappe/{desk_apps/doctype/event => desk/doctype/event_role}/__init__.py (100%) rename frappe/{desk_apps => desk}/doctype/event_role/event_role.json (95%) rename frappe/{desk_apps => desk}/doctype/event_role/event_role.py (100%) rename frappe/{desk_apps => desk}/doctype/event_user/README.md (100%) rename frappe/{desk_apps/doctype/event_role => desk/doctype/event_user}/__init__.py (100%) rename frappe/{desk_apps => desk}/doctype/event_user/event_user.json (96%) rename frappe/{desk_apps => desk}/doctype/event_user/event_user.py (100%) rename frappe/{desk_apps => desk}/doctype/todo/README.md (100%) rename frappe/{desk_apps/doctype/event_user => desk/doctype/todo}/__init__.py (100%) rename frappe/{desk_apps => desk}/doctype/todo/todo.js (100%) rename frappe/{desk_apps => desk}/doctype/todo/todo.json (99%) rename frappe/{desk_apps => desk}/doctype/todo/todo.py (100%) rename frappe/{desk_apps => desk}/doctype/todo/todo_list.html (100%) rename frappe/{desk_apps => desk}/doctype/todo/todo_list.js (100%) rename frappe/{desk_apps/doctype/todo => desk/form}/__init__.py (100%) rename frappe/{widgets => desk}/form/assign_to.py (98%) rename frappe/{widgets => desk}/form/load.py (95%) rename frappe/{widgets => desk}/form/meta.py (100%) rename frappe/{widgets => desk}/form/run_method.py (100%) rename frappe/{widgets => desk}/form/save.py (97%) rename frappe/{widgets => desk}/form/test_form.py (88%) rename frappe/{widgets => desk}/form/utils.py (93%) rename frappe/{widgets => desk}/moduleview.py (99%) rename frappe/{widgets => desk}/page.py (100%) rename frappe/{desk_apps => desk/page}/__init__.py (100%) rename frappe/{desk_apps/doctype => desk/page/applications}/__init__.py (100%) rename frappe/{desk_apps => desk}/page/applications/applications.js (100%) rename frappe/{desk_apps => desk}/page/applications/applications.json (93%) rename frappe/{desk_apps => desk}/page/applications/applications.py (100%) rename frappe/{desk_apps => desk}/page/messages/README.md (100%) rename frappe/{desk_apps => desk}/page/messages/__init__.py (100%) rename frappe/{desk_apps => desk}/page/messages/messages.html (100%) rename frappe/{desk_apps => desk}/page/messages/messages.js (100%) rename frappe/{desk_apps => desk}/page/messages/messages.json (100%) rename frappe/{desk_apps => desk}/page/messages/messages.py (100%) rename frappe/{widgets => desk}/page_body.py (100%) rename frappe/{widgets => desk}/query_builder.py (99%) rename frappe/{widgets => desk}/query_report.py (98%) rename frappe/{widgets => desk}/report_dump.py (100%) rename frappe/{widgets => desk}/reportview.py (100%) rename frappe/{widgets => desk}/search.py (97%) rename frappe/{widgets => desk}/tags.py (100%) rename frappe/{desk_apps/page => print}/__init__.py (100%) rename frappe/{desk_apps/page/applications => print/doctype}/__init__.py (100%) rename frappe/{core => print}/doctype/letter_head/README.md (100%) rename frappe/{widgets => print/doctype/letter_head}/__init__.py (100%) rename frappe/{core => print}/doctype/letter_head/letter_head.js (100%) create mode 100644 frappe/print/doctype/letter_head/letter_head.json rename frappe/{core => print}/doctype/letter_head/letter_head.py (100%) rename frappe/{core => print}/doctype/letter_head/test_letter_head.py (100%) rename frappe/{core => print}/doctype/letter_head/test_records.json (100%) rename frappe/{core => print}/doctype/print_format/README.md (100%) rename frappe/{widgets/form => print/doctype/print_format}/__init__.py (100%) rename frappe/{core => print}/doctype/print_format/print_format.js (100%) create mode 100644 frappe/print/doctype/print_format/print_format.json rename frappe/{core => print}/doctype/print_format/print_format.py (100%) rename frappe/{core => print}/doctype/print_format/test_print_format.py (100%) rename frappe/{core => print}/doctype/print_format/test_records.json (100%) create mode 100644 frappe/print/doctype/print_settings/__init__.py rename frappe/{core => print}/doctype/print_settings/print_settings.js (100%) create mode 100644 frappe/print/doctype/print_settings/print_settings.json rename frappe/{core => print}/doctype/print_settings/print_settings.py (100%) delete mode 100644 frappe/widgets/event.py diff --git a/frappe/__init__.py b/frappe/__init__.py index 9ee6f0124d..5dd11fd72f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -598,8 +598,8 @@ def respond_as_web_page(title, html, success=None, http_status_code=None): local.response['http_status_code'] = http_status_code def build_match_conditions(doctype, as_condition=True): - import frappe.widgets.reportview - return frappe.widgets.reportview.build_match_conditions(doctype, as_condition) + import frappe.desk.reportview + return frappe.desk.reportview.build_match_conditions(doctype, as_condition) def get_list(doctype, filters=None, fields=None, or_filters=None, docstatus=None, group_by=None, order_by=None, limit_start=0, limit_page_length=None, diff --git a/frappe/api.py b/frappe/api.py index f16c73b172..784e671036 100644 --- a/frappe/api.py +++ b/frappe/api.py @@ -5,7 +5,7 @@ import json import frappe import frappe.handler import frappe.client -import frappe.widgets.reportview +import frappe.desk.reportview from frappe.utils.response import build_response from frappe import _ @@ -90,7 +90,7 @@ def handle(): if frappe.local.form_dict.get('fields'): frappe.local.form_dict['fields'] = json.loads(frappe.local.form_dict['fields']) frappe.local.response.update({ - "data": frappe.call(frappe.widgets.reportview.execute, + "data": frappe.call(frappe.desk.reportview.execute, doctype, **frappe.local.form_dict)}) if frappe.local.request.method=="POST": diff --git a/frappe/boot.py b/frappe/boot.py index 6623abcc4d..8a55f0008e 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -8,7 +8,7 @@ bootstrap client session import frappe import frappe.defaults -import frappe.widgets.page +import frappe.desk.page from frappe.utils import get_gravatar def get_bootinfo(): @@ -132,10 +132,10 @@ def add_home_page(bootinfo, docs): return home_page = frappe.db.get_default("desktop:home_page") try: - page = frappe.widgets.page.get(home_page) + page = frappe.desk.page.get(home_page) except (frappe.DoesNotExistError, frappe.PermissionError): frappe.message_log.pop() - page = frappe.widgets.page.get('desktop') + page = frappe.desk.page.get('desktop') bootinfo['home_page'] = page.name docs.append(page) diff --git a/frappe/config/setup.py b/frappe/config/setup.py index 389757e632..777053944e 100644 --- a/frappe/config/setup.py +++ b/frappe/config/setup.py @@ -1,5 +1,5 @@ from frappe import _ -from frappe.widgets.moduleview import add_setup_section +from frappe.desk.moduleview import add_setup_section def get_data(): data = [ diff --git a/frappe/core/doctype/letter_head/letter_head.json b/frappe/core/doctype/letter_head/letter_head.json deleted file mode 100644 index ba04b34611..0000000000 --- a/frappe/core/doctype/letter_head/letter_head.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "autoname": "field:letter_head_name", - "creation": "2012-11-22 17:45:46", - "docstatus": 0, - "doctype": "DocType", - "fields": [ - { - "fieldname": "letter_head_name", - "fieldtype": "Data", - "in_filter": 0, - "in_list_view": 1, - "label": "Letter Head Name", - "oldfieldname": "letter_head_name", - "oldfieldtype": "Data", - "permlevel": 0, - "reqd": 1 - }, - { - "depends_on": "letter_head_name", - "fieldname": "disabled", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Disabled", - "oldfieldname": "disabled", - "oldfieldtype": "Check", - "permlevel": 0 - }, - { - "depends_on": "letter_head_name", - "description": "Check this to make this the default letter head in all prints", - "fieldname": "is_default", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Is Default", - "oldfieldname": "is_default", - "oldfieldtype": "Check", - "permlevel": 0, - "search_index": 1 - }, - { - "depends_on": "letter_head_name", - "description": "Letter Head in HTML", - "fieldname": "content", - "fieldtype": "Text Editor", - "in_list_view": 1, - "label": "Content", - "oldfieldname": "content", - "oldfieldtype": "Text Editor", - "permlevel": 0 - } - ], - "icon": "icon-font", - "idx": 1, - "max_attachments": 3, - "modified": "2014-07-21 05:57:56.052191", - "modified_by": "Administrator", - "module": "Core", - "name": "Letter Head", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "submit": 0, - "write": 1 - }, - { - "apply_user_permissions": 1, - "delete": 0, - "email": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 0, - "role": "All" - } - ] -} \ No newline at end of file diff --git a/frappe/core/doctype/print_format/print_format.json b/frappe/core/doctype/print_format/print_format.json deleted file mode 100644 index ef2306509a..0000000000 --- a/frappe/core/doctype/print_format/print_format.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "allow_copy": 0, - "allow_rename": 0, - "autoname": "Prompt", - "creation": "2013-01-23 19:54:43", - "docstatus": 0, - "doctype": "DocType", - "fields": [ - { - "description": "Belongs to", - "fieldname": "doc_type", - "fieldtype": "Link", - "in_filter": 1, - "in_list_view": 1, - "label": "DocType", - "options": "DocType", - "permlevel": 0, - "reqd": 1, - "search_index": 0 - }, - { - "allow_on_submit": 0, - "fieldname": "module", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 1, - "in_list_view": 1, - "label": "Module", - "no_copy": 0, - "oldfieldname": "module", - "oldfieldtype": "Select", - "options": "Module Def", - "permlevel": 0, - "print_hide": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 1 - }, - { - "fieldname": "column_break_3", - "fieldtype": "Column Break", - "permlevel": 0 - }, - { - "allow_on_submit": 0, - "default": "No", - "fieldname": "standard", - "fieldtype": "Select", - "hidden": 0, - "in_filter": 1, - "in_list_view": 1, - "label": "Standard", - "no_copy": 1, - "oldfieldname": "standard", - "oldfieldtype": "Select", - "options": "No\nYes", - "permlevel": 1, - "print_hide": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 1 - }, - { - "default": "Server", - "description": "Client-side formats are now deprecated", - "fieldname": "print_format_type", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Print Format Type", - "options": "Server\nClient", - "permlevel": 0, - "read_only": 0 - }, - { - "fieldname": "disabled", - "fieldtype": "Check", - "label": "Disabled", - "permlevel": 0 - }, - { - "fieldname": "section_break_6", - "fieldtype": "Section Break", - "permlevel": 0 - }, - { - "allow_on_submit": 0, - "depends_on": "", - "fieldname": "html", - "fieldtype": "Code", - "hidden": 0, - "in_filter": 0, - "label": "HTML", - "no_copy": 0, - "oldfieldname": "html", - "oldfieldtype": "Text Editor", - "options": "HTML", - "permlevel": 0, - "print_hide": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0 - }, - { - "fieldname": "print_format_help", - "fieldtype": "HTML", - "label": "Print Format Help", - "options": "

Print Format Help

\n
\n

Introduction

\n

Print Formats are rendered on the server side using the Jinja Templating Language. All forms have access to the doc object which contains information about the document that is being formatted. You can also access common utilities via the frappe module.

\n

For styling, the Boostrap CSS framework is provided and you can enjoy the full range of classes.

\n
\n

References

\n
    \n\t
  1. Jinja Tempalting Language: Reference
    2. \n\t
  2. Bootstrap CSS Framework
    3. \n
\n
\n

Example

\n
<h3>{{ doc.select_print_heading or \"Invoice\" }}</h3>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Customer Name</div>\n\t<div class=\"col-md-9\">{{ doc.customer_name }}</div>\n</div>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Date</div>\n\t<div class=\"col-md-9\">{{ doc.get_formatted(\"invoice_date\") }}</div>\n</div>\n<table class=\"table table-bordered\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<th>Sr</th>\n\t\t\t<th>Item Name</th>\n\t\t\t<th>Description</th>\n\t\t\t<th class=\"text-right\">Qty</th>\n\t\t\t<th class=\"text-right\">Rate</th>\n\t\t\t<th class=\"text-right\">Amount</th>\n\t\t</tr>\n\t\t{%- for row in doc.entries -%}\n\t\t<tr>\n\t\t\t<td style=\"width: 3%;\">{{ row.idx }}</td>\n\t\t\t<td style=\"width: 20%;\">\n\t\t\t\t{{ row.item_name }}\n\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t<br>Item Code: {{ row.item_code}}\n\t\t\t\t{%- endif %}\n\t\t\t</td>\n\t\t\t<td style=\"width: 37%;\">\n\t\t\t\t<div style=\"border: 0px;\">{{ row.description }}</div></td>\n\t\t\t<td style=\"width: 10%; text-align: right;\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"rate\", doc) }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"amount\", doc) }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>
\n
\n

Common Functions

\n\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\n
doc.get_formatted(\"[fieldname]\", [parent_doc])Get document value formatted as Date, Currency etc. Pass parent doc for curreny type fields.
frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")Get value from another document.
\n", - "permlevel": 0 - } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "icon-print", - "idx": 1, - "in_create": 0, - "in_dialog": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2014-07-31 03:39:35.898711", - "modified_by": "Administrator", - "module": "Core", - "name": "Print Format", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Administrator", - "submit": 0, - "write": 1 - }, - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "submit": 0, - "write": 1 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "permlevel": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "submit": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "permlevel": 1, - "read": 1, - "report": 1, - "role": "Administrator", - "submit": 0, - "write": 1 - } - ], - "read_only": 0, - "read_only_onload": 0, - "sort_field": "modified", - "sort_order": "DESC" -} \ No newline at end of file diff --git a/frappe/core/doctype/print_settings/print_settings.json b/frappe/core/doctype/print_settings/print_settings.json deleted file mode 100644 index 87daa526cf..0000000000 --- a/frappe/core/doctype/print_settings/print_settings.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "creation": "2014-07-17 06:54:20.782907", - "docstatus": 0, - "doctype": "DocType", - "document_type": "System", - "fields": [ - { - "fieldname": "pdf_settings", - "fieldtype": "Section Break", - "label": "PDF Settings", - "permlevel": 0 - }, - { - "default": "1", - "description": "Send Email Print Attachments as PDF (Recommended)", - "fieldname": "send_print_as_pdf", - "fieldtype": "Check", - "label": "Send Print as PDF", - "permlevel": 0 - }, - { - "default": "A4", - "fieldname": "pdf_page_size", - "fieldtype": "Select", - "label": "PDF Page Size", - "options": "A4\nLetter", - "permlevel": 0 - }, - { - "fieldname": "print_style_section", - "fieldtype": "Section Break", - "label": "Print Style", - "permlevel": 0 - }, - { - "default": "", - "fieldname": "print_style", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Print Style", - "options": "Modern\nClassic\nStandard\nMonochrome", - "permlevel": 0 - }, - { - "fieldname": "column_break_6", - "fieldtype": "Column Break", - "permlevel": 0 - }, - { - "description": "In points. Default is 9.", - "fieldname": "font_size", - "fieldtype": "Float", - "label": "Font Size", - "permlevel": 0 - }, - { - "default": "1", - "description": "Print with Letterhead, unless unchecked in a particular Document", - "fieldname": "with_letterhead", - "fieldtype": "Check", - "label": "With Letterhead", - "permlevel": 0, - "reqd": 0 - }, - { - "fieldname": "section_break_8", - "fieldtype": "Section Break", - "permlevel": 0 - }, - { - "fieldname": "print_style_preview", - "fieldtype": "HTML", - "label": "Print Style Preview", - "permlevel": 0 - } - ], - "icon": "icon-cog", - "issingle": 1, - "modified": "2014-08-05 09:03:02.337355", - "modified_by": "Administrator", - "module": "Core", - "name": "Print Settings", - "name_case": "", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "permlevel": 0, - "read": 1, - "role": "System Manager", - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC" -} \ No newline at end of file diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 3b1f94dc20..e1180fe3bd 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -356,7 +356,7 @@ def reset_password(user): return _("User {0} does not exist").format(user) def user_query(doctype, txt, searchfield, start, page_len, filters): - from frappe.widgets.reportview import get_match_cond + from frappe.desk.reportview import get_match_cond txt = "%{}%".format(txt) return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name) from `tabUser` diff --git a/frappe/core/notifications.py b/frappe/core/notifications.py index e212cbc948..c528e51f58 100644 --- a/frappe/core/notifications.py +++ b/frappe/core/notifications.py @@ -29,7 +29,7 @@ def get_things_todo(): def get_todays_events(): """Returns a count of todays events in calendar""" - from frappe.desk_apps.doctype.event.event import get_events + from frappe.desk.doctype.event.event import get_events from frappe.utils import nowdate today = nowdate() return len(get_events(today, today)) diff --git a/frappe/core/report/todo/todo.py b/frappe/core/report/todo/todo.py index 87f9496f6d..7b1042209f 100644 --- a/frappe/core/report/todo/todo.py +++ b/frappe/core/report/todo/todo.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.widgets.reportview import execute as runreport +from frappe.desk.reportview import execute as runreport from frappe.utils import getdate def execute(filters=None): diff --git a/frappe/core/doctype/letter_head/__init__.py b/frappe/desk/__init__.py similarity index 100% rename from frappe/core/doctype/letter_head/__init__.py rename to frappe/desk/__init__.py diff --git a/frappe/widgets/calendar.py b/frappe/desk/calendar.py similarity index 100% rename from frappe/widgets/calendar.py rename to frappe/desk/calendar.py diff --git a/frappe/core/doctype/print_settings/__init__.py b/frappe/desk/doctype/__init__.py similarity index 100% rename from frappe/core/doctype/print_settings/__init__.py rename to frappe/desk/doctype/__init__.py diff --git a/frappe/desk_apps/doctype/event/README.md b/frappe/desk/doctype/event/README.md similarity index 100% rename from frappe/desk_apps/doctype/event/README.md rename to frappe/desk/doctype/event/README.md diff --git a/frappe/core/doctype/print_format/__init__.py b/frappe/desk/doctype/event/__init__.py similarity index 100% rename from frappe/core/doctype/print_format/__init__.py rename to frappe/desk/doctype/event/__init__.py diff --git a/frappe/desk_apps/doctype/event/event.js b/frappe/desk/doctype/event/event.js similarity index 100% rename from frappe/desk_apps/doctype/event/event.js rename to frappe/desk/doctype/event/event.js diff --git a/frappe/desk_apps/doctype/event/event.json b/frappe/desk/doctype/event/event.json similarity index 99% rename from frappe/desk_apps/doctype/event/event.json rename to frappe/desk/doctype/event/event.json index 1c64a4a1e9..6c013ab9a2 100644 --- a/frappe/desk_apps/doctype/event/event.json +++ b/frappe/desk/doctype/event/event.json @@ -248,7 +248,7 @@ "in_create": 1, "modified": "2014-06-20 06:40:05.415415", "modified_by": "Administrator", - "module": "Desk Apps", + "module": "Desk", "name": "Event", "owner": "Administrator", "permissions": [ diff --git a/frappe/desk_apps/doctype/event/event.py b/frappe/desk/doctype/event/event.py similarity index 100% rename from frappe/desk_apps/doctype/event/event.py rename to frappe/desk/doctype/event/event.py diff --git a/frappe/desk_apps/doctype/event/event_calendar.js b/frappe/desk/doctype/event/event_calendar.js similarity index 77% rename from frappe/desk_apps/doctype/event/event_calendar.js rename to frappe/desk/doctype/event/event_calendar.js index 99ac5f7109..c99e9f9334 100644 --- a/frappe/desk_apps/doctype/event/event_calendar.js +++ b/frappe/desk/doctype/event/event_calendar.js @@ -11,5 +11,5 @@ frappe.views.calendar["Event"] = { "Public": "success", "Private": "info" }, - get_events_method: "frappe.desk_apps.doctype.event.event.get_events" + get_events_method: "frappe.desk.doctype.event.event.get_events" } \ No newline at end of file diff --git a/frappe/desk_apps/doctype/event/test_event.py b/frappe/desk/doctype/event/test_event.py similarity index 98% rename from frappe/desk_apps/doctype/event/test_event.py rename to frappe/desk/doctype/event/test_event.py index ab9260b0c5..51a5cf6374 100644 --- a/frappe/desk_apps/doctype/event/test_event.py +++ b/frappe/desk/doctype/event/test_event.py @@ -55,7 +55,7 @@ class TestEvent(unittest.TestCase): self.assertEquals(ev.name, name) def test_assign(self): - from frappe.widgets.form.assign_to import add + from frappe.desk.form.assign_to import add ev = frappe.get_doc(test_records[0]).insert() diff --git a/frappe/desk_apps/doctype/event/test_records.json b/frappe/desk/doctype/event/test_records.json similarity index 100% rename from frappe/desk_apps/doctype/event/test_records.json rename to frappe/desk/doctype/event/test_records.json diff --git a/frappe/desk_apps/doctype/event_role/README.md b/frappe/desk/doctype/event_role/README.md similarity index 100% rename from frappe/desk_apps/doctype/event_role/README.md rename to frappe/desk/doctype/event_role/README.md diff --git a/frappe/desk_apps/doctype/event/__init__.py b/frappe/desk/doctype/event_role/__init__.py similarity index 100% rename from frappe/desk_apps/doctype/event/__init__.py rename to frappe/desk/doctype/event_role/__init__.py diff --git a/frappe/desk_apps/doctype/event_role/event_role.json b/frappe/desk/doctype/event_role/event_role.json similarity index 95% rename from frappe/desk_apps/doctype/event_role/event_role.json rename to frappe/desk/doctype/event_role/event_role.json index dee817251c..e568592ec6 100644 --- a/frappe/desk_apps/doctype/event_role/event_role.json +++ b/frappe/desk/doctype/event_role/event_role.json @@ -21,7 +21,7 @@ "istable": 1, "modified": "2013-12-20 19:23:12.000001", "modified_by": "Administrator", - "module": "Desk Apps", + "module": "Desk", "name": "Event Role", "owner": "Administrator" } diff --git a/frappe/desk_apps/doctype/event_role/event_role.py b/frappe/desk/doctype/event_role/event_role.py similarity index 100% rename from frappe/desk_apps/doctype/event_role/event_role.py rename to frappe/desk/doctype/event_role/event_role.py diff --git a/frappe/desk_apps/doctype/event_user/README.md b/frappe/desk/doctype/event_user/README.md similarity index 100% rename from frappe/desk_apps/doctype/event_user/README.md rename to frappe/desk/doctype/event_user/README.md diff --git a/frappe/desk_apps/doctype/event_role/__init__.py b/frappe/desk/doctype/event_user/__init__.py similarity index 100% rename from frappe/desk_apps/doctype/event_role/__init__.py rename to frappe/desk/doctype/event_user/__init__.py diff --git a/frappe/desk_apps/doctype/event_user/event_user.json b/frappe/desk/doctype/event_user/event_user.json similarity index 96% rename from frappe/desk_apps/doctype/event_user/event_user.json rename to frappe/desk/doctype/event_user/event_user.json index 8d1c14cc94..66a2cdfce3 100644 --- a/frappe/desk_apps/doctype/event_user/event_user.json +++ b/frappe/desk/doctype/event_user/event_user.json @@ -22,7 +22,7 @@ "istable": 1, "modified": "2014-05-09 02:12:32.374018", "modified_by": "Administrator", - "module": "Desk Apps", + "module": "Desk", "name": "Event User", "owner": "Administrator", "permissions": [], diff --git a/frappe/desk_apps/doctype/event_user/event_user.py b/frappe/desk/doctype/event_user/event_user.py similarity index 100% rename from frappe/desk_apps/doctype/event_user/event_user.py rename to frappe/desk/doctype/event_user/event_user.py diff --git a/frappe/desk_apps/doctype/todo/README.md b/frappe/desk/doctype/todo/README.md similarity index 100% rename from frappe/desk_apps/doctype/todo/README.md rename to frappe/desk/doctype/todo/README.md diff --git a/frappe/desk_apps/doctype/event_user/__init__.py b/frappe/desk/doctype/todo/__init__.py similarity index 100% rename from frappe/desk_apps/doctype/event_user/__init__.py rename to frappe/desk/doctype/todo/__init__.py diff --git a/frappe/desk_apps/doctype/todo/todo.js b/frappe/desk/doctype/todo/todo.js similarity index 100% rename from frappe/desk_apps/doctype/todo/todo.js rename to frappe/desk/doctype/todo/todo.js diff --git a/frappe/desk_apps/doctype/todo/todo.json b/frappe/desk/doctype/todo/todo.json similarity index 99% rename from frappe/desk_apps/doctype/todo/todo.json rename to frappe/desk/doctype/todo/todo.json index 7f878090d5..b0651dcd78 100644 --- a/frappe/desk_apps/doctype/todo/todo.json +++ b/frappe/desk/doctype/todo/todo.json @@ -172,7 +172,7 @@ "max_attachments": 0, "modified": "2014-06-30 05:40:15.471435", "modified_by": "Administrator", - "module": "Desk Apps", + "module": "Desk", "name": "ToDo", "owner": "Administrator", "permissions": [ diff --git a/frappe/desk_apps/doctype/todo/todo.py b/frappe/desk/doctype/todo/todo.py similarity index 100% rename from frappe/desk_apps/doctype/todo/todo.py rename to frappe/desk/doctype/todo/todo.py diff --git a/frappe/desk_apps/doctype/todo/todo_list.html b/frappe/desk/doctype/todo/todo_list.html similarity index 100% rename from frappe/desk_apps/doctype/todo/todo_list.html rename to frappe/desk/doctype/todo/todo_list.html diff --git a/frappe/desk_apps/doctype/todo/todo_list.js b/frappe/desk/doctype/todo/todo_list.js similarity index 100% rename from frappe/desk_apps/doctype/todo/todo_list.js rename to frappe/desk/doctype/todo/todo_list.js diff --git a/frappe/desk_apps/doctype/todo/__init__.py b/frappe/desk/form/__init__.py similarity index 100% rename from frappe/desk_apps/doctype/todo/__init__.py rename to frappe/desk/form/__init__.py diff --git a/frappe/widgets/form/assign_to.py b/frappe/desk/form/assign_to.py similarity index 98% rename from frappe/widgets/form/assign_to.py rename to frappe/desk/form/assign_to.py index e4429b247a..3b9d54a846 100644 --- a/frappe/widgets/form/assign_to.py +++ b/frappe/desk/form/assign_to.py @@ -7,7 +7,7 @@ from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils import cint -from frappe.widgets.form.load import get_docinfo +from frappe.desk.form.load import get_docinfo def get(args=None): """get assigned to""" diff --git a/frappe/widgets/form/load.py b/frappe/desk/form/load.py similarity index 95% rename from frappe/widgets/form/load.py rename to frappe/desk/form/load.py index e0030ed33c..56d94625e7 100644 --- a/frappe/widgets/form/load.py +++ b/frappe/desk/form/load.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe, json import frappe.utils import frappe.defaults -import frappe.widgets.form.meta +import frappe.desk.form.meta from frappe.permissions import get_doc_permissions from frappe import _ @@ -69,10 +69,10 @@ def getdoctype(doctype, with_parent=False, cached_timestamp=None): frappe.response.docs.extend(docs) def get_meta_bundle(doctype): - bundle = [frappe.widgets.form.meta.get_meta(doctype)] + bundle = [frappe.desk.form.meta.get_meta(doctype)] for df in bundle[0].fields: if df.fieldtype=="Table": - bundle.append(frappe.widgets.form.meta.get_meta(df.options)) + bundle.append(frappe.desk.form.meta.get_meta(df.options)) return bundle def get_docinfo(doc): diff --git a/frappe/widgets/form/meta.py b/frappe/desk/form/meta.py similarity index 100% rename from frappe/widgets/form/meta.py rename to frappe/desk/form/meta.py diff --git a/frappe/widgets/form/run_method.py b/frappe/desk/form/run_method.py similarity index 100% rename from frappe/widgets/form/run_method.py rename to frappe/desk/form/run_method.py diff --git a/frappe/widgets/form/save.py b/frappe/desk/form/save.py similarity index 97% rename from frappe/widgets/form/save.py rename to frappe/desk/form/save.py index dadb51cd92..a968cda563 100644 --- a/frappe/widgets/form/save.py +++ b/frappe/desk/form/save.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe, json -from frappe.widgets.form.load import run_onload +from frappe.desk.form.load import run_onload @frappe.whitelist() def savedocs(): diff --git a/frappe/widgets/form/test_form.py b/frappe/desk/form/test_form.py similarity index 88% rename from frappe/widgets/form/test_form.py rename to frappe/desk/form/test_form.py index e228de197e..94f88b4dbb 100644 --- a/frappe/widgets/form/test_form.py +++ b/frappe/desk/form/test_form.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe, unittest -from frappe.widgets.form.utils import get_linked_docs +from frappe.desk.form.utils import get_linked_docs class TestForm(unittest.TestCase): def test_linked_with(self): diff --git a/frappe/widgets/form/utils.py b/frappe/desk/form/utils.py similarity index 93% rename from frappe/widgets/form/utils.py rename to frappe/desk/form/utils.py index 1440671cc6..fd5ee450bc 100644 --- a/frappe/widgets/form/utils.py +++ b/frappe/desk/form/utils.py @@ -3,8 +3,8 @@ from __future__ import unicode_literals import frappe, json -import frappe.widgets.form.meta -import frappe.widgets.form.load +import frappe.desk.form.meta +import frappe.desk.form.load from frappe import _ @@ -67,7 +67,7 @@ def add_comment(doc): @frappe.whitelist() def get_next(doctype, value, prev, filters=None, order_by="modified desc"): - import frappe.widgets.reportview + import frappe.desk.reportview prev = not int(prev) sort_field, sort_order = order_by.split(" ") @@ -89,7 +89,7 @@ def get_next(doctype, value, prev, filters=None, order_by="modified desc"): if not order_by[0] in [f[1] for f in filters]: filters.append([doctype, sort_field, condition, value]) - res = frappe.widgets.reportview.execute(doctype, + res = frappe.desk.reportview.execute(doctype, fields = ["name"], filters = filters, order_by = sort_field + " " + sort_order, @@ -104,12 +104,12 @@ def get_next(doctype, value, prev, filters=None, order_by="modified desc"): @frappe.whitelist() def get_linked_docs(doctype, name, metadata_loaded=None, no_metadata=False): if not metadata_loaded: metadata_loaded = [] - meta = frappe.widgets.form.meta.get_meta(doctype) + meta = frappe.desk.form.meta.get_meta(doctype) linkinfo = meta.get("__linked_with") results = {} for dt, link in linkinfo.items(): link["doctype"] = dt - link_meta_bundle = frappe.widgets.form.load.get_meta_bundle(dt) + link_meta_bundle = frappe.desk.form.load.get_meta_bundle(dt) linkmeta = link_meta_bundle[0] if not linkmeta.get("issingle"): fields = [d.fieldname for d in linkmeta.get("fields", {"in_list_view":1, diff --git a/frappe/widgets/moduleview.py b/frappe/desk/moduleview.py similarity index 99% rename from frappe/widgets/moduleview.py rename to frappe/desk/moduleview.py index 462e498ae5..601aa8b75f 100644 --- a/frappe/widgets/moduleview.py +++ b/frappe/desk/moduleview.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.widgets import reportview +from frappe.desk import reportview from frappe.utils import cint from frappe import _ diff --git a/frappe/widgets/page.py b/frappe/desk/page.py similarity index 100% rename from frappe/widgets/page.py rename to frappe/desk/page.py diff --git a/frappe/desk_apps/__init__.py b/frappe/desk/page/__init__.py similarity index 100% rename from frappe/desk_apps/__init__.py rename to frappe/desk/page/__init__.py diff --git a/frappe/desk_apps/doctype/__init__.py b/frappe/desk/page/applications/__init__.py similarity index 100% rename from frappe/desk_apps/doctype/__init__.py rename to frappe/desk/page/applications/__init__.py diff --git a/frappe/desk_apps/page/applications/applications.js b/frappe/desk/page/applications/applications.js similarity index 100% rename from frappe/desk_apps/page/applications/applications.js rename to frappe/desk/page/applications/applications.js diff --git a/frappe/desk_apps/page/applications/applications.json b/frappe/desk/page/applications/applications.json similarity index 93% rename from frappe/desk_apps/page/applications/applications.json rename to frappe/desk/page/applications/applications.json index 25c89b6baa..2db36c1954 100644 --- a/frappe/desk_apps/page/applications/applications.json +++ b/frappe/desk/page/applications/applications.json @@ -6,7 +6,7 @@ "idx": 1, "modified": "2013-12-23 11:01:52.000001", "modified_by": "Administrator", - "module": "Desk Apps", + "module": "Desk", "name": "applications", "owner": "Administrator", "page_name": "applications", diff --git a/frappe/desk_apps/page/applications/applications.py b/frappe/desk/page/applications/applications.py similarity index 100% rename from frappe/desk_apps/page/applications/applications.py rename to frappe/desk/page/applications/applications.py diff --git a/frappe/desk_apps/page/messages/README.md b/frappe/desk/page/messages/README.md similarity index 100% rename from frappe/desk_apps/page/messages/README.md rename to frappe/desk/page/messages/README.md diff --git a/frappe/desk_apps/page/messages/__init__.py b/frappe/desk/page/messages/__init__.py similarity index 100% rename from frappe/desk_apps/page/messages/__init__.py rename to frappe/desk/page/messages/__init__.py diff --git a/frappe/desk_apps/page/messages/messages.html b/frappe/desk/page/messages/messages.html similarity index 100% rename from frappe/desk_apps/page/messages/messages.html rename to frappe/desk/page/messages/messages.html diff --git a/frappe/desk_apps/page/messages/messages.js b/frappe/desk/page/messages/messages.js similarity index 100% rename from frappe/desk_apps/page/messages/messages.js rename to frappe/desk/page/messages/messages.js diff --git a/frappe/desk_apps/page/messages/messages.json b/frappe/desk/page/messages/messages.json similarity index 100% rename from frappe/desk_apps/page/messages/messages.json rename to frappe/desk/page/messages/messages.json diff --git a/frappe/desk_apps/page/messages/messages.py b/frappe/desk/page/messages/messages.py similarity index 100% rename from frappe/desk_apps/page/messages/messages.py rename to frappe/desk/page/messages/messages.py diff --git a/frappe/widgets/page_body.py b/frappe/desk/page_body.py similarity index 100% rename from frappe/widgets/page_body.py rename to frappe/desk/page_body.py diff --git a/frappe/widgets/query_builder.py b/frappe/desk/query_builder.py similarity index 99% rename from frappe/widgets/query_builder.py rename to frappe/desk/query_builder.py index 22ac898e3d..3f9dd74da9 100644 --- a/frappe/widgets/query_builder.py +++ b/frappe/desk/query_builder.py @@ -56,7 +56,7 @@ def get_sql_meta(tl): return meta def add_match_conditions(q, tl): - from frappe.widgets.reportview import build_match_conditions + from frappe.desk.reportview import build_match_conditions sl = [] for dt in tl: s = build_match_conditions(dt) diff --git a/frappe/widgets/query_report.py b/frappe/desk/query_report.py similarity index 98% rename from frappe/widgets/query_report.py rename to frappe/desk/query_report.py index e7e82f95ee..7a14bc8af0 100644 --- a/frappe/widgets/query_report.py +++ b/frappe/desk/query_report.py @@ -10,7 +10,7 @@ from frappe import _ from frappe.modules import scrub, get_module_path from frappe.utils import flt, cint, get_html_format from frappe.translate import send_translations -import frappe.widgets.reportview +import frappe.desk.reportview def get_report_doc(report_name): doc = frappe.get_doc("Report", report_name) @@ -208,7 +208,7 @@ def get_user_match_filters(doctypes, ref_doctype): match_filters = {} for dt in doctypes: - filter_list = frappe.widgets.reportview.build_match_conditions(dt, False) + filter_list = frappe.desk.reportview.build_match_conditions(dt, False) if filter_list: match_filters[dt] = filter_list diff --git a/frappe/widgets/report_dump.py b/frappe/desk/report_dump.py similarity index 100% rename from frappe/widgets/report_dump.py rename to frappe/desk/report_dump.py diff --git a/frappe/widgets/reportview.py b/frappe/desk/reportview.py similarity index 100% rename from frappe/widgets/reportview.py rename to frappe/desk/reportview.py diff --git a/frappe/widgets/search.py b/frappe/desk/search.py similarity index 97% rename from frappe/widgets/search.py rename to frappe/desk/search.py index 5be24c05f2..cd71167bda 100644 --- a/frappe/widgets/search.py +++ b/frappe/desk/search.py @@ -4,7 +4,7 @@ # Search from __future__ import unicode_literals import frappe -import frappe.widgets.reportview +import frappe.desk.reportview from frappe.utils import cstr, unique # this is called by the Link Field @@ -77,7 +77,7 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, fields.append("""locate("{_txt}", `tab{doctype}`.`name`) as `_relevance`""".format( _txt=frappe.db.escape((txt or "").replace("%", "")), doctype=doctype)) - values = frappe.widgets.reportview.execute(doctype, + values = frappe.desk.reportview.execute(doctype, filters=filters, fields=fields, or_filters = or_filters, limit_start = start, limit_page_length=page_len, diff --git a/frappe/widgets/tags.py b/frappe/desk/tags.py similarity index 100% rename from frappe/widgets/tags.py rename to frappe/desk/tags.py diff --git a/frappe/handler.py b/frappe/handler.py index b9ed28f93c..de7df3f12a 100755 --- a/frappe/handler.py +++ b/frappe/handler.py @@ -7,7 +7,7 @@ from frappe import _ import frappe.utils import frappe.sessions import frappe.utils.file_manager -import frappe.widgets.form.run_method +import frappe.desk.form.run_method from frappe.utils.response import build_response @frappe.whitelist(allow_guest=True) @@ -16,7 +16,7 @@ def startup(): @frappe.whitelist() def runserverobj(method, docs=None, dt=None, dn=None, arg=None, args=None): - frappe.widgets.form.run_method.runserverobj(method, docs=docs, dt=dt, dn=dn, arg=arg, args=args) + frappe.desk.form.run_method.runserverobj(method, docs=docs, dt=dt, dn=dn, arg=arg, args=args) @frappe.whitelist(allow_guest=True) def logout(): diff --git a/frappe/hooks.py b/frappe/hooks.py index 8df820fda0..1d41320030 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -38,14 +38,14 @@ website_generators = ["Web Page", "Blog Post", "Website Group", "Blog Category", # permissions permission_query_conditions = { - "Event": "frappe.desk_apps.doctype.event.event.get_permission_query_conditions", - "ToDo": "frappe.desk_apps.doctype.todo.todo.get_permission_query_conditions", + "Event": "frappe.desk.doctype.event.event.get_permission_query_conditions", + "ToDo": "frappe.desk.doctype.todo.todo.get_permission_query_conditions", "User": "frappe.core.doctype.user.user.get_permission_query_conditions" } has_permission = { - "Event": "frappe.desk_apps.doctype.event.event.has_permission", - "ToDo": "frappe.desk_apps.doctype.todo.todo.has_permission", + "Event": "frappe.desk.doctype.event.event.has_permission", + "ToDo": "frappe.desk.doctype.todo.todo.has_permission", "User": "frappe.core.doctype.user.user.has_permission" } @@ -75,7 +75,7 @@ scheduler_events = { "daily": [ "frappe.email.bulk.clear_outbox", "frappe.core.doctype.notification_count.notification_count.clear_notifications", - "frappe.desk_apps.doctype.event.event.send_event_digest", + "frappe.desk.doctype.event.event.send_event_digest", "frappe.sessions.clear_expired_sessions", "frappe.email.doctype.email_alert.email_alert.trigger_daily_alerts", ], diff --git a/frappe/modules.txt b/frappe/modules.txt index f3498e4cd5..298bd6cfdd 100644 --- a/frappe/modules.txt +++ b/frappe/modules.txt @@ -4,4 +4,5 @@ Workflow Email Custom Geo -Desk Apps \ No newline at end of file +Desk Apps +Print \ No newline at end of file diff --git a/frappe/desk_apps/page/__init__.py b/frappe/print/__init__.py similarity index 100% rename from frappe/desk_apps/page/__init__.py rename to frappe/print/__init__.py diff --git a/frappe/desk_apps/page/applications/__init__.py b/frappe/print/doctype/__init__.py similarity index 100% rename from frappe/desk_apps/page/applications/__init__.py rename to frappe/print/doctype/__init__.py diff --git a/frappe/core/doctype/letter_head/README.md b/frappe/print/doctype/letter_head/README.md similarity index 100% rename from frappe/core/doctype/letter_head/README.md rename to frappe/print/doctype/letter_head/README.md diff --git a/frappe/widgets/__init__.py b/frappe/print/doctype/letter_head/__init__.py similarity index 100% rename from frappe/widgets/__init__.py rename to frappe/print/doctype/letter_head/__init__.py diff --git a/frappe/core/doctype/letter_head/letter_head.js b/frappe/print/doctype/letter_head/letter_head.js similarity index 100% rename from frappe/core/doctype/letter_head/letter_head.js rename to frappe/print/doctype/letter_head/letter_head.js diff --git a/frappe/print/doctype/letter_head/letter_head.json b/frappe/print/doctype/letter_head/letter_head.json new file mode 100644 index 0000000000..e02ee7cf2e --- /dev/null +++ b/frappe/print/doctype/letter_head/letter_head.json @@ -0,0 +1,84 @@ +{ + "autoname": "field:letter_head_name", + "creation": "2012-11-22 17:45:46", + "docstatus": 0, + "doctype": "DocType", + "fields": [ + { + "fieldname": "letter_head_name", + "fieldtype": "Data", + "in_filter": 0, + "in_list_view": 1, + "label": "Letter Head Name", + "oldfieldname": "letter_head_name", + "oldfieldtype": "Data", + "permlevel": 0, + "reqd": 1 + }, + { + "depends_on": "letter_head_name", + "fieldname": "disabled", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Disabled", + "oldfieldname": "disabled", + "oldfieldtype": "Check", + "permlevel": 0 + }, + { + "depends_on": "letter_head_name", + "description": "Check this to make this the default letter head in all prints", + "fieldname": "is_default", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Is Default", + "oldfieldname": "is_default", + "oldfieldtype": "Check", + "permlevel": 0, + "search_index": 1 + }, + { + "depends_on": "letter_head_name", + "description": "Letter Head in HTML", + "fieldname": "content", + "fieldtype": "Text Editor", + "in_list_view": 1, + "label": "Content", + "oldfieldname": "content", + "oldfieldtype": "Text Editor", + "permlevel": 0 + } + ], + "icon": "icon-font", + "idx": 1, + "max_attachments": 3, + "modified": "2014-07-21 05:57:56.052192", + "modified_by": "Administrator", + "module": "Print", + "name": "Letter Head", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "submit": 0, + "write": 1 + }, + { + "apply_user_permissions": 1, + "delete": 0, + "email": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "All" + } + ] +} diff --git a/frappe/core/doctype/letter_head/letter_head.py b/frappe/print/doctype/letter_head/letter_head.py similarity index 100% rename from frappe/core/doctype/letter_head/letter_head.py rename to frappe/print/doctype/letter_head/letter_head.py diff --git a/frappe/core/doctype/letter_head/test_letter_head.py b/frappe/print/doctype/letter_head/test_letter_head.py similarity index 100% rename from frappe/core/doctype/letter_head/test_letter_head.py rename to frappe/print/doctype/letter_head/test_letter_head.py diff --git a/frappe/core/doctype/letter_head/test_records.json b/frappe/print/doctype/letter_head/test_records.json similarity index 100% rename from frappe/core/doctype/letter_head/test_records.json rename to frappe/print/doctype/letter_head/test_records.json diff --git a/frappe/core/doctype/print_format/README.md b/frappe/print/doctype/print_format/README.md similarity index 100% rename from frappe/core/doctype/print_format/README.md rename to frappe/print/doctype/print_format/README.md diff --git a/frappe/widgets/form/__init__.py b/frappe/print/doctype/print_format/__init__.py similarity index 100% rename from frappe/widgets/form/__init__.py rename to frappe/print/doctype/print_format/__init__.py diff --git a/frappe/core/doctype/print_format/print_format.js b/frappe/print/doctype/print_format/print_format.js similarity index 100% rename from frappe/core/doctype/print_format/print_format.js rename to frappe/print/doctype/print_format/print_format.js diff --git a/frappe/print/doctype/print_format/print_format.json b/frappe/print/doctype/print_format/print_format.json new file mode 100644 index 0000000000..877402a290 --- /dev/null +++ b/frappe/print/doctype/print_format/print_format.json @@ -0,0 +1,157 @@ +{ + "allow_copy": 0, + "allow_rename": 0, + "autoname": "Prompt", + "creation": "2013-01-23 19:54:43", + "docstatus": 0, + "doctype": "DocType", + "fields": [ + { + "description": "Belongs to", + "fieldname": "doc_type", + "fieldtype": "Link", + "in_filter": 1, + "in_list_view": 1, + "label": "DocType", + "options": "DocType", + "permlevel": 0, + "reqd": 1, + "search_index": 0 + }, + { + "allow_on_submit": 0, + "fieldname": "module", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 1, + "in_list_view": 1, + "label": "Module", + "no_copy": 0, + "oldfieldname": "module", + "oldfieldtype": "Select", + "options": "Module Def", + "permlevel": 0, + "print_hide": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 1 + }, + { + "fieldname": "column_break_3", + "fieldtype": "Column Break", + "permlevel": 0 + }, + { + "allow_on_submit": 0, + "default": "No", + "fieldname": "standard", + "fieldtype": "Select", + "hidden": 0, + "in_filter": 1, + "in_list_view": 1, + "label": "Standard", + "no_copy": 1, + "oldfieldname": "standard", + "oldfieldtype": "Select", + "options": "No\nYes", + "permlevel": 1, + "print_hide": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 1 + }, + { + "default": "Server", + "description": "Client-side formats are now deprecated", + "fieldname": "print_format_type", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Print Format Type", + "options": "Server\nClient", + "permlevel": 0, + "read_only": 0 + }, + { + "fieldname": "disabled", + "fieldtype": "Check", + "label": "Disabled", + "permlevel": 0 + }, + { + "fieldname": "section_break_6", + "fieldtype": "Section Break", + "permlevel": 0 + }, + { + "allow_on_submit": 0, + "depends_on": "", + "fieldname": "html", + "fieldtype": "Code", + "hidden": 0, + "in_filter": 0, + "label": "HTML", + "no_copy": 0, + "oldfieldname": "html", + "oldfieldtype": "Text Editor", + "options": "HTML", + "permlevel": 0, + "print_hide": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0 + }, + { + "fieldname": "print_format_help", + "fieldtype": "HTML", + "label": "Print Format Help", + "options": "

Print Format Help

\n
\n

Introduction

\n

Print Formats are rendered on the server side using the Jinja Templating Language. All forms have access to the doc object which contains information about the document that is being formatted. You can also access common utilities via the frappe module.

\n

For styling, the Boostrap CSS framework is provided and you can enjoy the full range of classes.

\n
\n

References

\n
    \n\t
  1. Jinja Tempalting Language: Reference
    2. \n\t
  2. Bootstrap CSS Framework
    3. \n
\n
\n

Example

\n
<h3>{{ doc.select_print_heading or \"Invoice\" }}</h3>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Customer Name</div>\n\t<div class=\"col-md-9\">{{ doc.customer_name }}</div>\n</div>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Date</div>\n\t<div class=\"col-md-9\">{{ doc.get_formatted(\"invoice_date\") }}</div>\n</div>\n<table class=\"table table-bordered\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<th>Sr</th>\n\t\t\t<th>Item Name</th>\n\t\t\t<th>Description</th>\n\t\t\t<th class=\"text-right\">Qty</th>\n\t\t\t<th class=\"text-right\">Rate</th>\n\t\t\t<th class=\"text-right\">Amount</th>\n\t\t</tr>\n\t\t{%- for row in doc.entries -%}\n\t\t<tr>\n\t\t\t<td style=\"width: 3%;\">{{ row.idx }}</td>\n\t\t\t<td style=\"width: 20%;\">\n\t\t\t\t{{ row.item_name }}\n\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t<br>Item Code: {{ row.item_code}}\n\t\t\t\t{%- endif %}\n\t\t\t</td>\n\t\t\t<td style=\"width: 37%;\">\n\t\t\t\t<div style=\"border: 0px;\">{{ row.description }}</div></td>\n\t\t\t<td style=\"width: 10%; text-align: right;\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"rate\", doc) }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"amount\", doc) }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>
\n
\n

Common Functions

\n\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\n
doc.get_formatted(\"[fieldname]\", [parent_doc])Get document value formatted as Date, Currency etc. Pass parent doc for curreny type fields.
frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")Get value from another document.
\n", + "permlevel": 0 + } + ], + "hide_heading": 0, + "hide_toolbar": 0, + "icon": "icon-print", + "idx": 1, + "in_create": 0, + "in_dialog": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2014-07-31 03:39:35.898712", + "modified_by": "Administrator", + "module": "Print", + "name": "Print Format", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "submit": 0, + "write": 1 + }, + { + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "permlevel": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "submit": 0 + }, + ], + "read_only": 0, + "read_only_onload": 0, + "sort_field": "modified", + "sort_order": "DESC" +} diff --git a/frappe/core/doctype/print_format/print_format.py b/frappe/print/doctype/print_format/print_format.py similarity index 100% rename from frappe/core/doctype/print_format/print_format.py rename to frappe/print/doctype/print_format/print_format.py diff --git a/frappe/core/doctype/print_format/test_print_format.py b/frappe/print/doctype/print_format/test_print_format.py similarity index 100% rename from frappe/core/doctype/print_format/test_print_format.py rename to frappe/print/doctype/print_format/test_print_format.py diff --git a/frappe/core/doctype/print_format/test_records.json b/frappe/print/doctype/print_format/test_records.json similarity index 100% rename from frappe/core/doctype/print_format/test_records.json rename to frappe/print/doctype/print_format/test_records.json diff --git a/frappe/print/doctype/print_settings/__init__.py b/frappe/print/doctype/print_settings/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/print_settings/print_settings.js b/frappe/print/doctype/print_settings/print_settings.js similarity index 100% rename from frappe/core/doctype/print_settings/print_settings.js rename to frappe/print/doctype/print_settings/print_settings.js diff --git a/frappe/print/doctype/print_settings/print_settings.json b/frappe/print/doctype/print_settings/print_settings.json new file mode 100644 index 0000000000..47cda13e7a --- /dev/null +++ b/frappe/print/doctype/print_settings/print_settings.json @@ -0,0 +1,96 @@ +{ + "creation": "2014-07-17 06:54:20.782907", + "docstatus": 0, + "doctype": "DocType", + "document_type": "System", + "fields": [ + { + "fieldname": "pdf_settings", + "fieldtype": "Section Break", + "label": "PDF Settings", + "permlevel": 0 + }, + { + "default": "1", + "description": "Send Email Print Attachments as PDF (Recommended)", + "fieldname": "send_print_as_pdf", + "fieldtype": "Check", + "label": "Send Print as PDF", + "permlevel": 0 + }, + { + "default": "A4", + "fieldname": "pdf_page_size", + "fieldtype": "Select", + "label": "PDF Page Size", + "options": "A4\nLetter", + "permlevel": 0 + }, + { + "fieldname": "print_style_section", + "fieldtype": "Section Break", + "label": "Print Style", + "permlevel": 0 + }, + { + "default": "", + "fieldname": "print_style", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Print Style", + "options": "Modern\nClassic\nStandard\nMonochrome", + "permlevel": 0 + }, + { + "fieldname": "column_break_6", + "fieldtype": "Column Break", + "permlevel": 0 + }, + { + "description": "In points. Default is 9.", + "fieldname": "font_size", + "fieldtype": "Float", + "label": "Font Size", + "permlevel": 0 + }, + { + "default": "1", + "description": "Print with Letterhead, unless unchecked in a particular Document", + "fieldname": "with_letterhead", + "fieldtype": "Check", + "label": "With Letterhead", + "permlevel": 0, + "reqd": 0 + }, + { + "fieldname": "section_break_8", + "fieldtype": "Section Break", + "permlevel": 0 + }, + { + "fieldname": "print_style_preview", + "fieldtype": "HTML", + "label": "Print Style Preview", + "permlevel": 0 + } + ], + "icon": "icon-cog", + "issingle": 1, + "modified": "2014-08-05 09:03:02.337356", + "modified_by": "Administrator", + "module": "Print", + "name": "Print Settings", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "permlevel": 0, + "read": 1, + "role": "System Manager", + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC" +} diff --git a/frappe/core/doctype/print_settings/print_settings.py b/frappe/print/doctype/print_settings/print_settings.py similarity index 100% rename from frappe/core/doctype/print_settings/print_settings.py rename to frappe/print/doctype/print_settings/print_settings.py diff --git a/frappe/public/js/frappe/form/assign_to.js b/frappe/public/js/frappe/form/assign_to.js index 7fb81f3cfb..c8a9eac9c3 100644 --- a/frappe/public/js/frappe/form/assign_to.js +++ b/frappe/public/js/frappe/form/assign_to.js @@ -105,7 +105,7 @@ frappe.ui.form.AssignTo = Class.extend({ var args = me.dialog.get_values(); if(args && assign_to) { return frappe.call({ - method:'frappe.widgets.form.assign_to.add', + method:'frappe.desk.form.assign_to.add', args: $.extend(args, { doctype: me.frm.doctype, name: me.frm.docname, @@ -135,7 +135,7 @@ frappe.ui.form.AssignTo = Class.extend({ remove: function(owner) { var me = this; frappe.call({ - method:'frappe.widgets.form.assign_to.remove', + method:'frappe.desk.form.assign_to.remove', args: { doctype: me.frm.doctype, name: me.frm.docname, diff --git a/frappe/public/js/frappe/form/attachments.js b/frappe/public/js/frappe/form/attachments.js index 580d7c73e9..f94cbb4ba9 100644 --- a/frappe/public/js/frappe/form/attachments.js +++ b/frappe/public/js/frappe/form/attachments.js @@ -132,7 +132,7 @@ frappe.ui.form.Attachments = Class.extend({ var me = this; return frappe.call({ - method: 'frappe.widgets.form.utils.remove_attach', + method: 'frappe.desk.form.utils.remove_attach', args: { fid: fileid, dt: me.frm.doctype, diff --git a/frappe/public/js/frappe/form/comments.js b/frappe/public/js/frappe/form/comments.js index c56494ab8d..fd3494a129 100644 --- a/frappe/public/js/frappe/form/comments.js +++ b/frappe/public/js/frappe/form/comments.js @@ -144,7 +144,7 @@ frappe.ui.form.Comments = Class.extend({ insert_comment: function(comment_type, comment, btn) { var me = this; return frappe.call({ - method: "frappe.widgets.form.utils.add_comment", + method: "frappe.desk.form.utils.add_comment", args: { doc:{ doctype: "Comment", diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index d042f65a67..1676b01da7 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -894,7 +894,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ return frappe.call({ type: "GET", - method:'frappe.widgets.search.search_link', + method:'frappe.desk.search.search_link', no_spinner: true, args: args, callback: function(r) { diff --git a/frappe/public/js/frappe/form/infobar.js b/frappe/public/js/frappe/form/infobar.js index 66f7a93133..86ff005560 100644 --- a/frappe/public/js/frappe/form/infobar.js +++ b/frappe/public/js/frappe/form/infobar.js @@ -130,7 +130,7 @@ frappe.ui.form.InfoBar = Class.extend({ } return frappe.call({ - method: "frappe.widgets.form.utils.get_next", + method: "frappe.desk.form.utils.get_next", args: { doctype: me.frm.doctype, value: me.frm.doc[order_by.split(" ")[0]], diff --git a/frappe/public/js/frappe/form/link_selector.js b/frappe/public/js/frappe/form/link_selector.js index 5e80122dcb..848df941f0 100644 --- a/frappe/public/js/frappe/form/link_selector.js +++ b/frappe/public/js/frappe/form/link_selector.js @@ -65,7 +65,7 @@ frappe.ui.form.LinkSelector = Class.extend({ } return frappe.call({ - method: "frappe.widgets.search.search_widget", + method: "frappe.desk.search.search_widget", type: "GET", args: args, callback: function(r) { diff --git a/frappe/public/js/frappe/form/linked_with.js b/frappe/public/js/frappe/form/linked_with.js index 61e3c527f9..999bdf02cf 100644 --- a/frappe/public/js/frappe/form/linked_with.js +++ b/frappe/public/js/frappe/form/linked_with.js @@ -50,7 +50,7 @@ frappe.ui.form.LinkedWith = Class.extend({ '); frappe.call({ - method:"frappe.widgets.form.utils.get_linked_docs", + method:"frappe.desk.form.utils.get_linked_docs", args: { doctype: me.frm.doctype, name: me.frm.docname, diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js index a788ed79c7..eb96ba6360 100644 --- a/frappe/public/js/frappe/form/save.js +++ b/frappe/public/js/frappe/form/save.js @@ -10,7 +10,7 @@ frappe.ui.form.save = function(frm, action, callback, btn) { check_name(); if(check_mandatory()) { _call({ - method: "frappe.widgets.form.save.savedocs", + method: "frappe.desk.form.save.savedocs", args: { doc: frm.doc, action:action}, callback: function(r) { $(document).trigger("save", [frm.doc]); @@ -25,7 +25,7 @@ frappe.ui.form.save = function(frm, action, callback, btn) { var cancel = function() { _call({ - method: "frappe.widgets.form.save.cancel", + method: "frappe.desk.form.save.cancel", args: { doctype: frm.doc.doctype, name: frm.doc.name }, callback: function(r) { $(document).trigger("save", [frm.doc]); diff --git a/frappe/public/js/frappe/form/script_manager.js b/frappe/public/js/frappe/form/script_manager.js index 50a2d19933..f92efc4734 100644 --- a/frappe/public/js/frappe/form/script_manager.js +++ b/frappe/public/js/frappe/form/script_manager.js @@ -94,7 +94,7 @@ frappe.ui.form.ScriptManager = Class.extend({ fetch = this.frm.fetch_dict[df.fieldname].columns.join(', '); return frappe.call({ - method:'frappe.widgets.form.utils.validate_link', + method:'frappe.desk.form.utils.validate_link', type: "GET", args: { 'value': value, diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js index eef536d262..b7fbeb97e9 100644 --- a/frappe/public/js/frappe/model/model.js +++ b/frappe/public/js/frappe/model/model.js @@ -54,7 +54,7 @@ $.extend(frappe.model, { cached_timestamp = cached_doc.modified; } return frappe.call({ - method:'frappe.widgets.form.load.getdoctype', + method:'frappe.desk.form.load.getdoctype', type: "GET", args: { doctype: doctype, @@ -99,7 +99,7 @@ $.extend(frappe.model, { callback(name); } else { return frappe.call({ - method: 'frappe.widgets.form.load.getdoc', + method: 'frappe.desk.form.load.getdoc', type: "GET", args: { doctype: doctype, diff --git a/frappe/public/js/frappe/ui/listing.js b/frappe/public/js/frappe/ui/listing.js index ffaaeb09c4..a224002672 100644 --- a/frappe/public/js/frappe/ui/listing.js +++ b/frappe/public/js/frappe/ui/listing.js @@ -232,7 +232,7 @@ frappe.ui.Listing = Class.extend({ me.set_working(true); return frappe.call({ - method: this.opts.method || 'frappe.widgets.query_builder.runquery', + method: this.opts.method || 'frappe.desk.query_builder.runquery', type: "GET", args: this.get_call_args(), callback: function(r) { diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js index 38b1a5cae7..2dfeda7f0f 100644 --- a/frappe/public/js/frappe/ui/tags.js +++ b/frappe/public/js/frappe/ui/tags.js @@ -22,7 +22,7 @@ frappe.ui.TagEditor = Class.extend({ if(me.initialized && !me.refreshing) { var tag = tag.find('.tagit-label').text(); return frappe.call({ - method: 'frappe.widgets.tags.add_tag', + method: 'frappe.desk.tags.add_tag', args: me.get_args(tag), callback: function(r) { var user_tags = me.user_tags.split(","); @@ -37,7 +37,7 @@ frappe.ui.TagEditor = Class.extend({ if(!me.refreshing) { var tag = tag.find('.tagit-label').text(); return frappe.call({ - method: 'frappe.widgets.tags.remove_tag', + method: 'frappe.desk.tags.remove_tag', args: me.get_args(tag), callback: function(r) { var user_tags = me.user_tags.split(","); diff --git a/frappe/public/js/frappe/views/calendar.js b/frappe/public/js/frappe/views/calendar.js index 44f1bcb2b2..39e60d28f2 100644 --- a/frappe/public/js/frappe/views/calendar.js +++ b/frappe/public/js/frappe/views/calendar.js @@ -97,7 +97,7 @@ frappe.views.Calendar = Class.extend({ selectHelper: true, events: function(start, end, callback) { return frappe.call({ - method: me.get_events_method || "frappe.widgets.calendar.get_events", + method: me.get_events_method || "frappe.desk.calendar.get_events", type: "GET", args: me.get_args(start, end), callback: function(r) { @@ -185,7 +185,7 @@ frappe.views.Calendar = Class.extend({ var me = this; frappe.model.remove_from_locals(me.doctype, event.name); return frappe.call({ - method: me.update_event_method || "frappe.widgets.calendar.update_event", + method: me.update_event_method || "frappe.desk.calendar.update_event", args: me.get_update_args(event), callback: function(r) { if(r.exc) { diff --git a/frappe/public/js/frappe/views/doclistview.js b/frappe/public/js/frappe/views/doclistview.js index 6385aabab6..453c6432ef 100644 --- a/frappe/public/js/frappe/views/doclistview.js +++ b/frappe/public/js/frappe/views/doclistview.js @@ -202,7 +202,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ var me = this; // init list this.make({ - method: 'frappe.widgets.reportview.get', + method: 'frappe.desk.reportview.get', get_args: this.get_args, parent: this.wrapper, freeze: true, @@ -375,7 +375,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ function() { me.set_working(true); return frappe.call({ - method: 'frappe.widgets.reportview.delete_items', + method: 'frappe.desk.reportview.delete_items', args: { items: $.map(dl, function(d, i) { return d.name }), doctype: me.doctype diff --git a/frappe/public/js/frappe/views/grid_report.js b/frappe/public/js/frappe/views/grid_report.js index 5a55629dd2..438d12589d 100644 --- a/frappe/public/js/frappe/views/grid_report.js +++ b/frappe/public/js/frappe/views/grid_report.js @@ -9,7 +9,7 @@ $.extend(frappe.report_dump, { with_data: function(doctypes, callback, progress_bar) { var pre_loaded = keys(frappe.report_dump.last_modified); return frappe.call({ - method: "frappe.widgets.report_dump.get_data", + method: "frappe.desk.report_dump.get_data", type: "GET", args: { doctypes: doctypes, diff --git a/frappe/public/js/frappe/views/moduleview.js b/frappe/public/js/frappe/views/moduleview.js index 3ebb775213..0767a5c7c9 100644 --- a/frappe/public/js/frappe/views/moduleview.js +++ b/frappe/public/js/frappe/views/moduleview.js @@ -14,7 +14,7 @@ frappe.views.ModuleFactory = frappe.views.Factory.extend({ }); frappe.views.moduleview.make = function(wrapper, module, method) { - if(!method) method = "frappe.widgets.moduleview.get"; + if(!method) method = "frappe.desk.moduleview.get"; wrapper.module_view = new frappe.views.moduleview.ModuleView(wrapper, module, method); @@ -100,7 +100,7 @@ frappe.views.moduleview.ModuleView = Class.extend({ make: function(wrapper, module) { var me = this; return frappe.call({ - method: "frappe.widgets.moduleview.get", + method: "frappe.desk.moduleview.get", args: { module: module }, @@ -303,7 +303,7 @@ frappe.views.moduleview.ModuleView = Class.extend({ var section_label = $(this).parent().attr("data-section-label"); if(!me.item_count || me.item_count[section_label]==null) { frappe.call({ - "method": "frappe.widgets.moduleview.get_section_count", + "method": "frappe.desk.moduleview.get_section_count", "args": { "module": me.module, "section_label": section_label, diff --git a/frappe/public/js/frappe/views/pageview.js b/frappe/public/js/frappe/views/pageview.js index 950b8be475..7c984b50c8 100644 --- a/frappe/public/js/frappe/views/pageview.js +++ b/frappe/public/js/frappe/views/pageview.js @@ -24,7 +24,7 @@ frappe.views.pageview = { } else { // get fresh return frappe.call({ - method: 'frappe.widgets.page.getpage', + method: 'frappe.desk.page.getpage', args: {'name':name }, callback: function(r) { localStorage["_page:" + name] = JSON.stringify(r.docs); diff --git a/frappe/public/js/frappe/views/query_report.js b/frappe/public/js/frappe/views/query_report.js index 53d670a143..9fcc2a3fd3 100644 --- a/frappe/public/js/frappe/views/query_report.js +++ b/frappe/public/js/frappe/views/query_report.js @@ -102,7 +102,7 @@ frappe.views.QueryReport = Class.extend({ frappe.model.with_doctype(me.report_doc.ref_doctype, function() { if(!frappe.query_reports[me.report_name]) { return frappe.call({ - method:"frappe.widgets.query_report.get_script", + method:"frappe.desk.query_report.get_script", args: { report_name: me.report_name }, @@ -243,7 +243,7 @@ frappe.views.QueryReport = Class.extend({ } this.report_ajax = frappe.call({ - method: "frappe.widgets.query_report.run", + method: "frappe.desk.query_report.run", type: "GET", args: { "report_name": me.report_name, diff --git a/frappe/public/js/frappe/views/reportview.js b/frappe/public/js/frappe/views/reportview.js index 3e34258249..b9b0901049 100644 --- a/frappe/public/js/frappe/views/reportview.js +++ b/frappe/public/js/frappe/views/reportview.js @@ -93,7 +93,7 @@ frappe.views.ReportView = frappe.ui.Listing.extend({ this.page.appframe.set_title(this.page_title) this.make({ appframe: this.page.appframe, - method: 'frappe.widgets.reportview.get', + method: 'frappe.desk.reportview.get', get_args: this.get_args, parent: $(this.page).find('.layout-main'), start: 0, @@ -480,7 +480,7 @@ frappe.views.ReportView = frappe.ui.Listing.extend({ } var export_btn = this.page.appframe.add_button(__('Export'), function() { var args = me.get_args(); - args.cmd = 'frappe.widgets.reportview.export_query' + args.cmd = 'frappe.desk.reportview.export_query' open_url_post(frappe.request.url, args); }, 'icon-download-alt'); }, @@ -502,7 +502,7 @@ frappe.views.ReportView = frappe.ui.Listing.extend({ // callback return frappe.call({ - method: 'frappe.widgets.reportview.save_report', + method: 'frappe.desk.reportview.save_report', args: { name: name, doctype: me.doctype, @@ -550,7 +550,7 @@ frappe.views.ReportView = frappe.ui.Listing.extend({ if(frappe.confirm(__("This is PERMANENT action and you cannot undo. Continue?"), function() { return frappe.call({ - method: 'frappe.widgets.reportview.delete_items', + method: 'frappe.desk.reportview.delete_items', args: { items: delete_list, doctype: me.doctype diff --git a/frappe/public/js/frappe/views/sidebar_stats.js b/frappe/public/js/frappe/views/sidebar_stats.js index dd30a373d1..d4f6393fdf 100644 --- a/frappe/public/js/frappe/views/sidebar_stats.js +++ b/frappe/public/js/frappe/views/sidebar_stats.js @@ -19,7 +19,7 @@ frappe.views.SidebarStats = Class.extend({ var me = this return frappe.call({ type: "GET", - method: 'frappe.widgets.reportview.get_stats', + method: 'frappe.desk.reportview.get_stats', args: { stats: me.stats, doctype: me.doctype diff --git a/frappe/public/js/legacy/globals.js b/frappe/public/js/legacy/globals.js index 4697c0ce52..80600a855f 100644 --- a/frappe/public/js/legacy/globals.js +++ b/frappe/public/js/legacy/globals.js @@ -1,8 +1,8 @@ // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // MIT License. See license.txt -frappe.provide('frappe.widgets.form'); -frappe.provide('frappe.widgets.report'); +frappe.provide('frappe.desk.form'); +frappe.provide('frappe.desk.report'); frappe.provide('frappe.utils'); frappe.provide('frappe.model'); frappe.provide('frappe.user'); diff --git a/frappe/tests/test_assign.py b/frappe/tests/test_assign.py index eefdfc2bc9..487d8e10c0 100644 --- a/frappe/tests/test_assign.py +++ b/frappe/tests/test_assign.py @@ -2,7 +2,7 @@ # MIT License. See license.txt import frappe, unittest -import frappe.widgets.form.assign_to +import frappe.desk.form.assign_to class TestAssign(unittest.TestCase): def test_assign(self): @@ -10,7 +10,7 @@ class TestAssign(unittest.TestCase): if not frappe.db.exists("User", "test@example.com"): frappe.get_doc({"doctype":"User", "email":"test@example.com", "first_name":"Test"}) - added = frappe.widgets.form.assign_to.add({ + added = frappe.desk.form.assign_to.add({ "assign_to": "test@example.com", "doctype": todo.doctype, "name": todo.name, @@ -19,5 +19,5 @@ class TestAssign(unittest.TestCase): self.assertTrue("test@example.com" in [d.owner for d in added]) - removed = frappe.widgets.form.assign_to.remove(todo.doctype, todo.name, "test@example.com") + removed = frappe.desk.form.assign_to.remove(todo.doctype, todo.name, "test@example.com") self.assertTrue("test@example.com" not in [d.owner for d in removed]) diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py index 79e7f3ecf4..b4b62094b5 100644 --- a/frappe/tests/test_form_load.py +++ b/frappe/tests/test_form_load.py @@ -2,8 +2,8 @@ # MIT License. See license.txt import frappe, unittest -from frappe.widgets.form.meta import get_meta -from frappe.widgets.form.load import getdoctype, getdoc +from frappe.desk.form.meta import get_meta +from frappe.desk.form.load import getdoctype, getdoc class TestFormLoad(unittest.TestCase): def test_load(self): diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 0812602828..187b138add 100644 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -142,11 +142,11 @@ app_version = "0.0.1" # Permissions evaluated in scripted ways # permission_query_conditions = {{ -# "Event": "frappe.desk_apps.doctype.event.event.get_permission_query_conditions", +# "Event": "frappe.desk.doctype.event.event.get_permission_query_conditions", # }} # # has_permission = {{ -# "Event": "frappe.desk_apps.doctype.event.event.has_permission", +# "Event": "frappe.desk.doctype.event.event.has_permission", # }} # Document Events @@ -191,7 +191,7 @@ app_version = "0.0.1" # ------------------------------ # # override_whitelisted_methods = {{ -# "frappe.desk_apps.doctype.event.event.get_events": "{app_name}.event.get_events" +# "frappe.desk.doctype.event.event.get_events": "{app_name}.event.get_events" # }} """ diff --git a/frappe/widgets/event.py b/frappe/widgets/event.py deleted file mode 100644 index 68c2f2ebb6..0000000000 --- a/frappe/widgets/event.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -# Event -# ------------- -from __future__ import unicode_literals -import frappe - -@frappe.whitelist() -def get_cal_events(m_st, m_end): - # load owned events - res1 = frappe.db.sql("""select name from `tabEvent` - WHERE ifnull(event_date,'2000-01-01') between %s and %s and owner = %s - and event_type != 'Public' and event_type != 'Cancel'""", - (m_st, m_end, frappe.user.name)) - - # load individual events - res2 = frappe.db.sql("""select t1.name from `tabEvent` t1, `tabEvent User` t2 - where ifnull(t1.event_date,'2000-01-01') between %s and %s and t2.person = %s - and t1.name = t2.parent and t1.event_type != 'Cancel'""", - (m_st, m_end, frappe.user.name)) - - # load role events - roles = frappe.user.get_roles() - myroles = ['t2.role = "%s"' % r.replace('"', '\"') for r in roles] - myroles = '(' + (' OR '.join(myroles)) + ')' - res3 = frappe.db.sql("""select t1.name from `tabEvent` t1, `tabEvent Role` t2 - where ifnull(t1.event_date,'2000-01-01') between %s and %s - and t1.name = t2.parent and t1.event_type != 'Cancel' and %s""" % - ('%s', '%s', myroles), (m_st, m_end)) - - # load public events - res4 = frappe.db.sql("select name from `tabEvent` \ - where ifnull(event_date,'2000-01-01') between %s and %s and event_type='Public'", - (m_st, m_end)) - - doclist, rl = [], [] - for r in res1 + res2 + res3 + res4: - if not r in rl: - doclist += frappe.get_doc('Event', r[0]) - rl.append(r) - - return doclist