From c20c536f289fbd82f33aa26d9b3465a9e1c7d3b9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 25 Mar 2016 17:19:28 +0530 Subject: [PATCH] [fix] [wip] cleanup for collaborative pm --- .../purchase_invoice/purchase_invoice.json | 25 +--- .../doctype/sales_invoice/sales_invoice.json | 25 +--- .../purchase_order/purchase_order.json | 25 +--- .../supplier_quotation.json | 25 +--- erpnext/patches.txt | 3 +- .../v6_20x/remove_customer_supplier_roles.py | 18 +++ erpnext/projects/doctype/project/project.json | 56 +++++++- erpnext/projects/doctype/project/project.py | 21 ++- .../projects/doctype/project_user/__init__.py | 0 .../doctype/project_user/project_user.json | 58 ++++++++ .../doctype/project_user/project_user.py | 10 ++ erpnext/projects/doctype/task/task.json | 34 ++++- .../selling/doctype/quotation/quotation.json | 26 +--- .../doctype/sales_order/sales_order.json | 25 +--- .../doctype/delivery_note/delivery_note.json | 25 +--- .../purchase_receipt/purchase_receipt.json | 25 +--- erpnext/support/doctype/issue/issue.json | 25 +--- erpnext/templates/includes/projects.css | 14 +- .../templates/includes/projects/macros.html | 2 +- .../includes/projects/project_issues.html | 2 +- .../{ => projects}/project_search_box.html | 5 +- .../includes/projects/project_tasks.html | 27 ++-- erpnext/templates/pages/projects.html | 52 +++----- erpnext/templates/pages/projects.js | 126 ++++++++++-------- erpnext/templates/pages/projects.py | 62 +++++---- 25 files changed, 376 insertions(+), 340 deletions(-) create mode 100644 erpnext/patches/v6_20x/remove_customer_supplier_roles.py create mode 100644 erpnext/projects/doctype/project_user/__init__.py create mode 100644 erpnext/projects/doctype/project_user/project_user.json create mode 100644 erpnext/projects/doctype/project_user/project_user.py rename erpnext/templates/includes/{ => projects}/project_search_box.html (70%) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index a67f109f59..0e47a757fb 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -2692,7 +2692,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-03-21 13:13:43.694604", + "modified": "2016-03-25 07:32:03.043734", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", @@ -2738,26 +2738,6 @@ "submit": 0, "write": 0 }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Supplier", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 - }, { "amend": 1, "apply_user_permissions": 0, @@ -2825,5 +2805,6 @@ "sort_field": "modified", "sort_order": "DESC", "timeline_field": "supplier", - "title_field": "title" + "title_field": "title", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 20b8d1b60f..af690fb01c 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -3418,7 +3418,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-03-21 13:12:12.430038", + "modified": "2016-03-25 07:31:46.017116", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", @@ -3464,26 +3464,6 @@ "submit": 1, "write": 1 }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Customer", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 - }, { "amend": 0, "apply_user_permissions": 0, @@ -3531,5 +3511,6 @@ "sort_field": "modified", "sort_order": "DESC", "timeline_field": "customer", - "title_field": "title" + "title_field": "title", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 2b4b98943a..7a3202f781 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -2693,7 +2693,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-03-21 13:13:07.334625", + "modified": "2016-03-25 07:32:01.820327", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", @@ -2759,26 +2759,6 @@ "submit": 1, "write": 1 }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Supplier", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 - }, { "amend": 0, "apply_user_permissions": 0, @@ -2806,5 +2786,6 @@ "sort_field": "modified", "sort_order": "DESC", "timeline_field": "supplier", - "title_field": "title" + "title_field": "title", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index 646664386e..e12c9fff6f 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -1780,7 +1780,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-03-16 15:36:05.481917", + "modified": "2016-03-25 07:32:02.711099", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", @@ -1866,26 +1866,6 @@ "submit": 0, "write": 0 }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Supplier", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 - }, { "amend": 0, "apply_user_permissions": 0, @@ -1913,5 +1893,6 @@ "sort_field": "modified", "sort_order": "DESC", "timeline_field": "supplier", - "title_field": "title" + "title_field": "title", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index efcceb367b..d0b738fd43 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -257,4 +257,5 @@ erpnext.patches.v6_20x.set_compact_print execute:frappe.delete_doc_if_exists("Web Form", "contact") #2016-03-10 erpnext.patches.v6_20x.remove_fiscal_year_from_holiday_list erpnext.patches.v6_24.map_customer_address_to_shipping_address_on_po -erpnext.patches.v6_27.fix_recurring_order_status \ No newline at end of file +erpnext.patches.v6_27.fix_recurring_order_status +erpnext.patches.v6_20x.remove_customer_supplier_roles \ No newline at end of file diff --git a/erpnext/patches/v6_20x/remove_customer_supplier_roles.py b/erpnext/patches/v6_20x/remove_customer_supplier_roles.py new file mode 100644 index 0000000000..e5e3d3fc71 --- /dev/null +++ b/erpnext/patches/v6_20x/remove_customer_supplier_roles.py @@ -0,0 +1,18 @@ +from __future__ import unicode_literals +import frappe + +def execute(): + for role in ('Customer', 'Supplier'): + frappe.db.sql('''delete from `tabUserRole` + where role=%s and parent in ("Administrator", "Guest")''', role) + + if not frappe.db.sql('select name from `tabUserRole` where role=%s', role): + + # delete DocPerm + for doctype in frappe.db.sql('select parent from tabDocPerm where role=%s', role): + d = frappe.get_doc("DocType", doctype[0]) + d.permissions = [p for p in d.permissions if p.role != role] + d.save() + + # delete Role + frappe.delete_doc_if_exists('Role', role) diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json index 02a3fd0760..34bb36f320 100644 --- a/erpnext/projects/doctype/project/project.json +++ b/erpnext/projects/doctype/project/project.json @@ -323,6 +323,57 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 1, + "fieldname": "users_section", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Users", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "users", + "fieldtype": "Table", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Users", + "length": 0, + "no_copy": 0, + "options": "Project User", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -921,7 +972,7 @@ "issingle": 0, "istable": 0, "max_attachments": 4, - "modified": "2016-03-15 05:10:21.779365", + "modified": "2016-03-25 06:46:29.485193", "modified_by": "Administrator", "module": "Projects", "name": "Project", @@ -972,5 +1023,6 @@ "read_only_onload": 0, "search_fields": "customer, status, priority, is_active", "sort_order": "DESC", - "timeline_field": "customer" + "timeline_field": "customer", + "track_seen": 1 } \ No newline at end of file diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index c2b8fb1bba..fa2f6b4695 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -123,19 +123,30 @@ class Project(Document): from `tabPurchase Invoice Item` where project = %s and docstatus=1""", self.name) self.total_purchase_cost = total_purchase_cost and total_purchase_cost[0][0] or 0 - - + + def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20): - from frappe.templates.pages.list import get_list - return get_list(doctype, txt, filters, limit_start, limit_page_length, ignore_permissions=True) - + return frappe.db.sql('''select distinct project.* + from tabProject project, `tabProject User` project_user + where + (project_user.user = %(user)s + and project_user.parent = project.name) + or project.owner = %(user)s + order by project.modified desc + limit {0}, {1} + '''.format(limit_start, limit_page_length), + {'user':frappe.session.user}, + as_dict=True, + update={'doctype':'Project'}) + def get_list_context(context=None): return { "title": _("My Projects"), "get_list": get_project_list, "row_template": "templates/includes/project_row.html" } + @frappe.whitelist() def get_cost_center_name(project): return frappe.db.get_value("Project", project, "cost_center") diff --git a/erpnext/projects/doctype/project_user/__init__.py b/erpnext/projects/doctype/project_user/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/projects/doctype/project_user/project_user.json b/erpnext/projects/doctype/project_user/project_user.json new file mode 100644 index 0000000000..f808701c68 --- /dev/null +++ b/erpnext/projects/doctype/project_user/project_user.json @@ -0,0 +1,58 @@ +{ + "allow_copy": 0, + "allow_import": 0, + "allow_rename": 0, + "creation": "2016-03-25 02:52:19.283003", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "fields": [ + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "user", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 1, + "label": "User", + "length": 0, + "no_copy": 0, + "options": "User", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 1, + "set_only_once": 0, + "unique": 0 + } + ], + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "in_create": 0, + "in_dialog": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 1, + "max_attachments": 0, + "modified": "2016-03-25 03:01:08.629640", + "modified_by": "Administrator", + "module": "Projects", + "name": "Project User", + "name_case": "", + "owner": "Administrator", + "permissions": [], + "read_only": 0, + "read_only_onload": 0, + "sort_field": "modified", + "sort_order": "DESC" +} \ No newline at end of file diff --git a/erpnext/projects/doctype/project_user/project_user.py b/erpnext/projects/doctype/project_user/project_user.py new file mode 100644 index 0000000000..3198f3b089 --- /dev/null +++ b/erpnext/projects/doctype/project_user/project_user.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class ProjectUser(Document): + pass diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json index 9816df8bba..443ddbaebc 100644 --- a/erpnext/projects/doctype/task/task.json +++ b/erpnext/projects/doctype/task/task.json @@ -17,6 +17,7 @@ "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Subject", @@ -42,6 +43,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Project", @@ -68,6 +70,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -93,6 +96,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 1, "label": "Status", @@ -119,6 +123,7 @@ "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 1, "label": "Priority", @@ -145,6 +150,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -168,6 +174,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Expected Start Date", @@ -195,6 +202,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Expected Time (in hours)", @@ -220,6 +228,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -243,6 +252,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 1, "in_list_view": 0, "label": "Expected End Date", @@ -268,6 +278,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -292,6 +303,7 @@ "fieldtype": "Text Editor", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Details", @@ -319,6 +331,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Depends On", @@ -343,6 +356,7 @@ "fieldtype": "Table", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "depends_on", @@ -369,6 +383,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -395,6 +410,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Actual Start Date (via Time Logs)", @@ -422,6 +438,7 @@ "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Actual Time (in hours)", @@ -447,6 +464,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -470,6 +488,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Actual End Date (via Time Logs)", @@ -495,6 +514,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -518,6 +538,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Costing Amount (via Time Logs)", @@ -544,6 +565,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Expense Claim (via Expense Claim)", @@ -569,6 +591,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -592,6 +615,7 @@ "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Total Billing Amount (via Time Logs)", @@ -616,6 +640,7 @@ "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "", @@ -640,6 +665,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Review Date", @@ -666,6 +692,7 @@ "fieldtype": "Date", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Closing Date", @@ -691,6 +718,7 @@ "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "length": 0, @@ -713,6 +741,7 @@ "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, + "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, "label": "Company", @@ -741,7 +770,7 @@ "istable": 0, "max_attachments": 5, "menu_index": 0, - "modified": "2016-02-03 01:11:46.043538", + "modified": "2016-03-25 05:27:03.346334", "modified_by": "Administrator", "module": "Projects", "name": "Task", @@ -773,5 +802,6 @@ "search_fields": "subject", "sort_order": "DESC", "timeline_field": "project", - "title_field": "subject" + "title_field": "subject", + "track_seen": 1 } \ No newline at end of file diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 0a3d5b5f9e..7cfee77e62 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -2129,7 +2129,7 @@ "istable": 0, "max_attachments": 1, "menu_index": 0, - "modified": "2016-03-03 06:30:26.308629", + "modified": "2016-03-25 07:31:44.251525", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", @@ -2176,27 +2176,6 @@ "submit": 0, "write": 0 }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "match": "", - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Customer", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 - }, { "amend": 0, "apply_user_permissions": 0, @@ -2327,5 +2306,6 @@ "sort_field": "modified", "sort_order": "DESC", "timeline_field": "customer", - "title_field": "title" + "title_field": "title", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 7e37cb70f0..c0cb20147e 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -3018,7 +3018,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-03-21 13:11:32.654873", + "modified": "2016-03-25 07:31:45.471702", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", @@ -3104,26 +3104,6 @@ "submit": 0, "write": 0 }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 0, - "role": "Customer", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 - }, { "amend": 0, "apply_user_permissions": 0, @@ -3171,5 +3151,6 @@ "sort_field": "modified", "sort_order": "DESC", "timeline_field": "customer", - "title_field": "title" + "title_field": "title", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index b4bb456520..11890dc4e6 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -2799,7 +2799,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-03-18 05:10:56.813113", + "modified": "2016-03-25 07:31:44.919162", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", @@ -2885,26 +2885,6 @@ "submit": 0, "write": 0 }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Customer", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 - }, { "amend": 0, "apply_user_permissions": 0, @@ -2932,5 +2912,6 @@ "sort_field": "modified", "sort_order": "DESC", "timeline_field": "customer", - "title_field": "title" + "title_field": "title", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index b14a700094..3c5780a3e0 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -2416,7 +2416,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-03-16 15:52:17.581445", + "modified": "2016-03-25 07:32:02.276482", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", @@ -2502,26 +2502,6 @@ "submit": 0, "write": 0 }, - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Supplier", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 - }, { "amend": 0, "apply_user_permissions": 0, @@ -2549,5 +2529,6 @@ "sort_field": "modified", "sort_order": "DESC", "timeline_field": "supplier", - "title_field": "title" + "title_field": "title", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json index e0b38a888a..2591937bfa 100644 --- a/erpnext/support/doctype/issue/issue.json +++ b/erpnext/support/doctype/issue/issue.json @@ -702,32 +702,12 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-03-23 07:40:21.423217", + "modified": "2016-03-25 07:31:44.715945", "modified_by": "Administrator", "module": "Support", "name": "Issue", "owner": "Administrator", "permissions": [ - { - "amend": 0, - "apply_user_permissions": 1, - "cancel": 0, - "create": 1, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Customer", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 1 - }, { "amend": 0, "apply_user_permissions": 0, @@ -754,5 +734,6 @@ "search_fields": "status,customer,subject,raised_by", "sort_order": "ASC", "timeline_field": "customer", - "title_field": "subject" + "title_field": "subject", + "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/templates/includes/projects.css b/erpnext/templates/includes/projects.css index eede4e2d7c..99ec4c87d9 100644 --- a/erpnext/templates/includes/projects.css +++ b/erpnext/templates/includes/projects.css @@ -13,6 +13,18 @@ padding-bottom: 5px; } +#project-search { + border: none; +} + +.task-link { + font-weight: bold; +} + +.task-link.seen { + font-weight: normal; +} + .row-header { font-size: 14px; font-weight: 500; @@ -136,7 +148,7 @@ float: right;*/ color: #fff; } - + .timeline-centered .timeline-entry .timeline-entry-inner .timeline-label { position: relative; background: #f5f5f6; diff --git a/erpnext/templates/includes/projects/macros.html b/erpnext/templates/includes/projects/macros.html index a4abc94bb6..5b22583049 100644 --- a/erpnext/templates/includes/projects/macros.html +++ b/erpnext/templates/includes/projects/macros.html @@ -1,2 +1,2 @@ -{% macro back_link(doc) %}&back-to=/projects?project={{ doc.name }}|{{ doc.project_name }}{% endmacro %} +{% macro back_link(doc) %}&back-to=/projects?project={{ doc.name }}&back-to-title={{ doc.project_name }}{% endmacro %} diff --git a/erpnext/templates/includes/projects/project_issues.html b/erpnext/templates/includes/projects/project_issues.html index 5f9d26f811..f8924f5b3f 100644 --- a/erpnext/templates/includes/projects/project_issues.html +++ b/erpnext/templates/includes/projects/project_issues.html @@ -4,7 +4,7 @@
- + {% if issue.status == "Closed" %} {{ issue.subject }} resolved {{ frappe.utils.pretty_date(issue.resolution_date) }} diff --git a/erpnext/templates/includes/project_search_box.html b/erpnext/templates/includes/projects/project_search_box.html similarity index 70% rename from erpnext/templates/includes/project_search_box.html rename to erpnext/templates/includes/projects/project_search_box.html index 8788fcd807..59ebaa4d11 100644 --- a/erpnext/templates/includes/project_search_box.html +++ b/erpnext/templates/includes/projects/project_search_box.html @@ -1,7 +1,8 @@
+ placeholder="Search..."> +