nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes] to task test case and fix tree ui for mobile

Browse Source
This commit is contained in:
Rushabh Mehta
2015-09-02 12:18:37 +05:30
parent 4223d7c044
commit be9edae961
6 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,8 +97,11 @@ class Project(Document):
sum(hours) as time
from `tabTime Log` where project = %s and docstatus = 1""", self.name, as_dict=1)[0]
from_expense_claim = frappe.db.sql("""select sum(ifnull(total_sanctioned_amount, 0))
from `tabExpense Claim` where project = %s""", self.name, as_dict=1)[0]
from_expense_claim = frappe.db.sql("""select
sum(ifnull(total_sanctioned_amount, 0)) as total_sanctioned_amount
from `tabExpense Claim` where project = %s and approval_status='Approved'
and docstatus = 1""",
self.name, as_dict=1)[0]
self.actual_start_date = from_time_log.start_date
self.actual_end_date = from_time_log.end_date