Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Minor] Fix adding child to root task issue (#12121)

Browse Source 
* make parent_task none

* adding multiple tasks - set project of parent
This commit is contained in:
Zarrar 2017-12-22 11:00:19 +05:30 committed by Nabin Hait
parent 3909bd4e9f
commit adc184c872
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/projects/doctype/task/task.py
View File

@ -202,25 +202,26 @@ def get_children(doctype, parent, task=None, project=None, is_root=False):
@frappe.whitelist() @frappe.whitelist()
def add_node(): def add_node():
from frappe.desk.treeview import make_tree_args from frappe.desk.treeview import make_tree_args
args = frappe.form_dict args = frappe.form_dict
args.update({ args.update({
"name_field": "subject" "name_field": "subject"
}) })
args = make_tree_args(**args) args = make_tree_args(**args)
if args.parent_task == 'All Tasks': if args.parent_task == 'All Tasks' or args.parent_task == args.project:
args.parent_task = None args.parent_task = None
frappe.get_doc(args).insert() frappe.get_doc(args).insert()
@frappe.whitelist() @frappe.whitelist()
def add_multiple_tasks(data, parent): def add_multiple_tasks(data, parent):
data = json.loads(data)['tasks'] data = json.loads(data)['tasks']
tasks = data.split('\n') tasks = data.split('\n')
new_doc = {'doctype': 'Task', 'parent_task': parent} new_doc = {'doctype': 'Task', 'parent_task': parent}
new_doc['project'] = frappe.db.get_value('Task', {"name": parent}, 'project')
for d in tasks: for d in tasks:
new_doc['subject'] = d new_doc['subject'] = d
new_task = frappe.get_doc(new_doc) new_task = frappe.get_doc(new_doc)
new_task.insert() new_task.insert()

1
erpnext/tests/ui/tests.txt
View File

@ -99,7 +99,6 @@ erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_repack.js
erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_serialize_item.js erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_serialize_item.js
erpnext/accounts/doctype/payment_entry/tests/test_payment_against_invoice.js erpnext/accounts/doctype/payment_entry/tests/test_payment_against_invoice.js
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
erpnext/projects/doctype/task/tests/test_task_tree.js
erpnext/stock/doctype/item_price/test_item_price.js erpnext/stock/doctype/item_price/test_item_price.js
erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js
erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js