feild rename fixes in Project
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 1148efe..aa55876 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -27,7 +27,7 @@
cur_frm.cscript.refresh = function(doc) {
if(!doc.__islocal) {
cur_frm.add_custom_button(__("Gantt Chart"), function() {
- frappe.route_options = {"project": doc.name, "start": doc.project_start_date, "end": doc.completion_date};
+ frappe.route_options = {"project": doc.name, "start": doc.expected_start_date, "end": doc.expected_end_date};
frappe.set_route("Gantt", "Task");
}, "icon-tasks", true);
cur_frm.add_custom_button(__("Tasks"), function() {
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index d2741e2..89cf523 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -25,14 +25,6 @@
"task_id": task.name
})
- def get_gross_profit(self):
- pft, per_pft =0, 0
- pft = flt(self.project_value) - flt(self.est_material_cost)
- #if pft > 0:
- per_pft = (flt(pft) / flt(self.project_value)) * 100
- ret = {'gross_margin_value': pft, 'per_gross_margin': per_pft}
- return ret
-
def validate(self):
self.validate_dates()
self.sync_tasks()
diff --git a/erpnext/projects/doctype/project/project_list.js b/erpnext/projects/doctype/project/project_list.js
index 8281c7d..b0d1ae8 100644
--- a/erpnext/projects/doctype/project/project_list.js
+++ b/erpnext/projects/doctype/project/project_list.js
@@ -1,5 +1,5 @@
frappe.listview_settings['Project'] = {
- add_fields: ["status", "priority", "is_active", "percent_complete", "completion_date"],
+ add_fields: ["status", "priority", "is_active", "percent_complete", "expected_end_date"],
filters:[["status","=", "Open"]],
get_indicator: function(doc) {
if(doc.status=="Open" && doc.percent_complete) {
diff --git a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
index 1ef760e..5800156 100644
--- a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
+++ b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
@@ -17,8 +17,8 @@
data.append([project.name, pr_item_map.get(project.name, 0),
se_item_map.get(project.name, 0), dn_item_map.get(project.name, 0),
project.project_name, project.status, project.company,
- project.customer, project.project_value, project.project_start_date,
- project.completion_date])
+ project.customer, project.estimated_costing, project.expected_start_date,
+ project.expected_end_date])
return columns, data
@@ -30,8 +30,8 @@
_("Project Start Date") + ":Date:120", _("Completion Date") + ":Date:120"]
def get_project_details():
- return frappe.db.sql(""" select name, project_name, status, company, customer, project_value,
- project_start_date, completion_date from tabProject where docstatus < 2""", as_dict=1)
+ return frappe.db.sql(""" select name, project_name, status, company, customer, estimated_costing,
+ expected_start_date, expected_end_date from tabProject where docstatus < 2""", as_dict=1)
def get_purchased_items_cost():
pr_items = frappe.db.sql("""select project_name, sum(base_net_amount) as amount