From 84bc5601eba9137bfd559ab50f44947710628579 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 16 Jun 2017 12:13:51 +0530 Subject: [PATCH] Total sales cost in Project should be updated based on base_grand_total (#9302) * Total sales cost in Project should be updated based on base_grand_total * Patch to update sales cost in Project in base currency --- erpnext/patches.txt | 3 ++- erpnext/patches/v8_0/update_sales_cost_in_project.py | 12 ++++++++++++ erpnext/projects/doctype/project/project.py | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 erpnext/patches/v8_0/update_sales_cost_in_project.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 3796c8293c..1fae69f9da 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -400,4 +400,5 @@ erpnext.patches.v8_0.delete_schools_depricated_doctypes erpnext.patches.v8_0.update_customer_pos_id erpnext.patches.v8_0.rename_items_in_status_field_of_material_request erpnext.patches.v8_0.delete_bin_indexes -erpnext.patches.v8_0.change_in_words_varchar_length \ No newline at end of file +erpnext.patches.v8_0.update_sales_cost_in_project +erpnext.patches.v8_0.change_in_words_varchar_length diff --git a/erpnext/patches/v8_0/update_sales_cost_in_project.py b/erpnext/patches/v8_0/update_sales_cost_in_project.py new file mode 100644 index 0000000000..cc3798e056 --- /dev/null +++ b/erpnext/patches/v8_0/update_sales_cost_in_project.py @@ -0,0 +1,12 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.db.sql(""" + update `tabProject` p + set total_sales_cost = (select sum(base_grand_total) + from `tabSales Order` where project=p.name and docstatus=1) + """) \ No newline at end of file diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index 0345f05861..de198a9cdc 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -178,7 +178,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