From 28ad58905d2fdf9061ac333135929b0df86513c7 Mon Sep 17 00:00:00 2001
From: pawan <pawan@erpnext.com>
Date: Fri, 21 Oct 2016 09:40:45 +0530
Subject: [PATCH] [fix] #6363

---
 erpnext/projects/doctype/project/project.json | 54 +++++++++----------
 erpnext/projects/doctype/project/project.py   |  6 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index b9365611b8..e1f0ebe490 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -129,7 +129,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "default": "Task Completion", 
-   "fieldname": "pct_comp_method", 
+   "fieldname": "percent_complete_method", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -258,31 +258,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "percent_complete", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "% Tasks Completed", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -498,6 +473,31 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "percent_complete", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "% Tasks Completed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1041,7 +1041,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 4, 
- "modified": "2016-10-20 03:48:02.436539", 
+ "modified": "2016-10-21 00:04:33.705380", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project", 
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index df710bdd95..388f43e93d 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -104,17 +104,17 @@ class Project(Document):
 
 	def update_percent_complete(self):
 		total = frappe.db.sql("""select count(name) from tabTask where project=%s""", self.name)[0][0]
-		if (self.pct_comp_method == "Task Completion" and total > 0) or (not self.pct_comp_method and total > 0):
+		if (self.percent_complete_method == "Task Completion" and total > 0) or (not self.percent_complete_method and total > 0):
 			completed = frappe.db.sql("""select count(name) from tabTask where
 				project=%s and status in ('Closed', 'Cancelled')""", self.name)[0][0]
 			self.percent_complete = flt(flt(completed) / total * 100, 2)
 
-		if (self.pct_comp_method == "Task Progress" and total > 0):
+		if (self.percent_complete_method == "Task Progress" and total > 0):
 			progress = frappe.db.sql("""select sum(progress) from tabTask where
 				project=%s""", self.name)[0][0]
 			self.percent_complete = flt(flt(progress) / total, 2)
 
-		if (self.pct_comp_method == "Task Weight" and total > 0):
+		if (self.percent_complete_method == "Task Weight" and total > 0):
 			weight_sum = frappe.db.sql("""select sum(task_weight) from tabTask where
 				project=%s""", self.name)[0][0]
 			if weight_sum == 1: