Merge branch 'develop' into project-link-for-all-accounts

This commit is contained in:
rohitwaghchaure
2020-07-08 13:11:37 +05:30
committed by GitHub
48 changed files with 314 additions and 303 deletions

View File

@@ -238,6 +238,7 @@ def get_list_context(context=None):
"row_template": "templates/includes/projects/project_row.html"
}
@frappe.whitelist()
def get_users_for_project(doctype, txt, searchfield, start, page_len, filters):
conditions = []
return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name)

View File

@@ -183,7 +183,8 @@
{
"fieldname": "progress",
"fieldtype": "Percent",
"label": "% Progress"
"label": "% Progress",
"no_copy": 1
},
{
"default": "0",
@@ -356,6 +357,7 @@
"fieldname": "completed_by",
"fieldtype": "Link",
"label": "Completed By",
"no_copy": 1,
"options": "User"
}
],
@@ -364,7 +366,7 @@
"is_tree": 1,
"links": [],
"max_attachments": 5,
"modified": "2020-03-18 18:08:44.153211",
"modified": "2020-07-03 12:36:04.960457",
"modified_by": "Administrator",
"module": "Projects",
"name": "Task",

View File

@@ -188,6 +188,7 @@ def check_if_child_exists(name):
return child_tasks
@frappe.whitelist()
def get_project(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond
return frappe.db.sql(""" select name from `tabProject`