From b42bbf1b6f6a9aeec100d9b3d3772ff0597ae986 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 10 Apr 2019 18:06:53 +0530 Subject: [PATCH] perf: Optimisation of project and task updation --- .../purchase_invoice/purchase_invoice.py | 3 +-- .../doctype/sales_invoice/sales_invoice.py | 3 +-- erpnext/projects/doctype/project/project.py | 24 ++++++++----------- erpnext/projects/doctype/task/task.py | 2 +- .../doctype/sales_order/sales_order.py | 3 +-- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 450f2d0eb7b..53db2086768 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -789,9 +789,8 @@ class PurchaseInvoice(BuyingController): for d in self.items: if d.project and d.project not in project_list: project = frappe.get_doc("Project", d.project) - project.flags.dont_sync_tasks = True project.update_purchase_costing() - project.save() + project.db_update() project_list.append(d.project) def validate_supplier_invoice(self): diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 489343c00c8..56d52069c69 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1022,9 +1022,8 @@ class SalesInvoice(SellingController): def update_project(self): if self.project: project = frappe.get_doc("Project", self.project) - project.flags.dont_sync_tasks = True project.update_billed_amount() - project.save() + project.db_update() def verify_payment_amount_is_positive(self): diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index e3fd1a8622b..ebb15997962 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -30,11 +30,13 @@ class Project(Document): self.update_costing() - def __setup__(self): + def before_print(self): self.onload() def load_tasks(self): """Load `tasks` from the database""" + project_task_custom_fields = frappe.get_all("Custom Field", {"dt": "Project Task"}, "fieldname") + self.tasks = [] for task in self.get_tasks(): task_map = { @@ -47,7 +49,7 @@ class Project(Document): "task_weight": task.task_weight } - self.map_custom_fields(task, task_map) + self.map_custom_fields(task, task_map, project_task_custom_fields) self.append("tasks", task_map) @@ -149,7 +151,7 @@ class Project(Document): "task_weight": t.task_weight }) - self.map_custom_fields(t, task) + self.map_custom_fields(t, task, custom_fields) task.flags.ignore_links = True task.flags.from_project = True @@ -173,10 +175,6 @@ class Project(Document): for t in frappe.get_all("Task", ["name"], {"project": self.name, "name": ("not in", task_names)}): self.deleted_task_list.append(t.name) - def update_costing_and_percentage_complete(self): - self.update_percent_complete() - self.update_costing() - def is_row_updated(self, row, existing_task_data, fields): if self.get("__islocal") or not existing_task_data: return True @@ -186,10 +184,8 @@ class Project(Document): if row.get(field) != d.get(field): return True - def map_custom_fields(self, source, target): - project_task_custom_fields = frappe.get_all("Custom Field", {"dt": "Project Task"}, "fieldname") - - for field in project_task_custom_fields: + def map_custom_fields(self, source, target, custom_fields): + for field in custom_fields: target.update({ field.fieldname: source.get(field.fieldname) }) @@ -197,8 +193,6 @@ class Project(Document): def update_project(self): self.update_percent_complete() self.update_costing() - self.flags.dont_sync_tasks = True - self.save(ignore_permissions=True) def after_insert(self): if self.sales_order: @@ -233,6 +227,7 @@ class Project(Document): self.status = "Completed" elif not self.status == "Cancelled": self.status = "Open" + self.db_update() def update_costing(self): from_time_sheet = frappe.db.sql("""select @@ -260,6 +255,7 @@ class Project(Document): self.update_sales_amount() self.update_billed_amount() self.calculate_gross_margin() + self.db_update() def calculate_gross_margin(self): expense_amount = (flt(self.total_costing_amount) + flt(self.total_expense_claim) @@ -313,7 +309,7 @@ class Project(Document): def on_update(self): self.delete_task() self.load_tasks() - self.update_costing_and_percentage_complete() + self.update_project() self.update_dependencies_on_duplicated_project() def delete_task(self): diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index 12302789a9b..83d3b7de5ec 100755 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -99,7 +99,7 @@ class Task(NestedSet): def update_project(self): if self.project and not self.flags.from_project: - frappe.get_doc("Project", self.project).update_project() + frappe.get_doc("Project", self.project).update_percent_complete() def check_recursion(self): if self.flags.ignore_recursion_check: return diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 8e81c13357c..bafe3c2cc6c 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -202,9 +202,8 @@ class SalesOrder(SellingController): if self.project: project = frappe.get_doc("Project", self.project) - project.flags.dont_sync_tasks = True project.update_sales_amount() - project.save() + project.db_update() def check_credit_limit(self): # if bypass credit limit check is set to true (1) at sales order level,