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

Update project completion percentage and costing after syncing task

Browse Source
This commit is contained in:
Nabin Hait 2015-07-01 16:53:19 +05:30
parent f92465981c
commit fdd0db3459
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/projects/doctype/project/project.py
View File

@ -46,6 +46,8 @@ class Project(Document):
"""sync tasks and remove table""" """sync tasks and remove table"""
if self.flags.dont_sync_tasks: return if self.flags.dont_sync_tasks: return
task_added_or_deleted = False
task_names = [] task_names = []
for t in self.tasks: for t in self.tasks:
if t.task_id: if t.task_id:
@ -53,6 +55,7 @@ class Project(Document):
else: else:
task = frappe.new_doc("Task") task = frappe.new_doc("Task")
task.project = self.name task.project = self.name
task_added_or_deleted = True
task.update({ task.update({
"subject": t.title, "subject": t.title,
@ -70,15 +73,22 @@ class Project(Document):
# delete # delete
for t in frappe.get_all("Task", ["name"], {"project": self.name, "name": ("not in", task_names)}): for t in frappe.get_all("Task", ["name"], {"project": self.name, "name": ("not in", task_names)}):
frappe.delete_doc("Task", t.name) frappe.delete_doc("Task", t.name)
task_added_or_deleted = True
if task_added_or_deleted:
self.update_project()
def update_project(self):
self.update_percent_complete()
self.update_costing()
def update_percent_complete(self): def update_percent_complete(self):
total = frappe.db.sql("""select count(*) from tabTask where project=%s""", total = frappe.db.sql("""select count(*) from tabTask where project=%s""", self.name)[0][0]
self.name)[0][0]
if total: if total:
completed = frappe.db.sql("""select count(*) from tabTask where completed = frappe.db.sql("""select count(*) from tabTask where
project=%s and status in ('Closed', 'Cancelled')""", self.name)[0][0] project=%s and status in ('Closed', 'Cancelled')""", self.name)[0][0]
frappe.db.set_value("Project", self.name, "percent_complete",
int(float(completed) / total * 100)) self.percent_complete = flt(completed) / total * 100
def update_costing(self): def update_costing(self):
total_cost = frappe.db.sql("""select sum(total_costing_amount) as costing_amount, total_cost = frappe.db.sql("""select sum(total_costing_amount) as costing_amount,

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

@ -43,15 +43,8 @@ class Task(Document):
def on_update(self): def on_update(self):
self.check_recursion() self.check_recursion()
self.reschedule_dependent_tasks() self.reschedule_dependent_tasks()
self.update_percentage()
self.update_project() self.update_project()
def update_percentage(self):
"""update percent complete in project"""
if self.project and not self.flags.from_project:
project = frappe.get_doc("Project", self.project)
project.run_method("update_percent_complete")
def update_total_expense_claim(self): def update_total_expense_claim(self):
self.total_expense_claim = frappe.db.sql("""select sum(total_sanctioned_amount) from `tabExpense Claim` self.total_expense_claim = frappe.db.sql("""select sum(total_sanctioned_amount) from `tabExpense Claim`
where project = %s and task = %s and approval_status = "Approved" and docstatus=1""",(self.project, self.name)) where project = %s and task = %s and approval_status = "Approved" and docstatus=1""",(self.project, self.name))
@ -70,10 +63,10 @@ class Task(Document):
self.act_end_date= tl.end_date self.act_end_date= tl.end_date
def update_project(self): def update_project(self):
if self.project and frappe.db.exists("Project", self.project): if self.project and not self.flags.from_project:
project = frappe.get_doc("Project", self.project) project = frappe.get_doc("Project", self.project)
project.flags.dont_sync_tasks = True project.flags.dont_sync_tasks = True
project.update_costing() project.update_project()
project.save() project.save()
def check_recursion(self): def check_recursion(self):