nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflicts

Browse Source
This commit is contained in:
mbauskar
2017-06-21 14:38:06 +05:30
parent 9b5d1fc458 654ccb84f4
commit 196f3b1fb8
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,7 @@ class Project(Document):
self.total_purchase_cost = total_purchase_cost and total_purchase_cost[0][0] or 0
def update_sales_costing(self):
total_sales_cost = frappe.db.sql("""select sum(grand_total)
total_sales_cost = frappe.db.sql("""select sum(base_grand_total)
from `tabSales Order` where project = %s and docstatus=1""", self.name)
self.total_sales_cost = total_sales_cost and total_sales_cost[0][0] or 0