nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 09:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-08-29 13:34:58 +05:30
parent 6b539d65d7 d982e8fcda
commit a804d6d487
34 changed files with 584 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,7 @@ class Project(Document):
self.tasks = []
self.load_tasks()
self.send_welcome_email()
self.update_percent_complete()
def validate_project_name(self):
if self.get("__islocal") and frappe.db.exists("Project", self.project_name):
@@ -239,10 +240,13 @@ class Project(Document):
self.update_purchase_costing()
self.update_sales_amount()
self.update_billed_amount()
self.calculate_gross_margin()
self.gross_margin = flt(self.total_billed_amount) - (
flt(self.total_costing_amount) + flt(self.total_expense_claim) + flt(self.total_purchase_cost))
def calculate_gross_margin(self):
expense_amount = (flt(self.total_costing_amount) + flt(self.total_expense_claim)
+ flt(self.total_purchase_cost) + flt(self.get('total_consumed_material_cost', 0)))
self.gross_margin = flt(self.total_billed_amount) - expense_amount
if self.total_billed_amount:
self.per_gross_margin = (self.gross_margin / flt(self.total_billed_amount)) * 100