From b6c117957fa4996a8d36d6c40eecda63e65cce08 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 26 Mar 2013 13:02:22 +0530 Subject: [PATCH] [fields, project] [fix] NaN bug, project gantt refresh bug --- home/page/latest_updates/latest_updates.js | 1 + projects/doctype/project/project.js | 3 +++ selling/doctype/sales_common/sales_common.js | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 183352ce04..a7a148a662 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,4 +1,5 @@ erpnext.updates = [ + ["27th March", ["Rename multiple items together. Go to Setup > Rename Tool"]], ["19th March", ["Sales and Purchase Return Tool deprecated. Use Stock Entry instead."]], ["12th March", ["Updates to website module. Added more options in Style Settings and Website Settings."]], ["5th March", ["Refactored Upload Attendance Tool"]], diff --git a/projects/doctype/project/project.js b/projects/doctype/project/project.js index 7f847b97f8..d4a034fd76 100644 --- a/projects/doctype/project/project.js +++ b/projects/doctype/project/project.js @@ -26,6 +26,9 @@ cur_frm.cscript.refresh = function(doc) { .appendTo(cur_frm.fields_dict.project_tasks.wrapper); cur_frm.gantt_area.empty(); erpnext.show_task_gantt(cur_frm.gantt_area, cur_frm.docname); + } else { + if(cur_frm.gantt_area) + cur_frm.gantt_area.empty(); } } diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js index e15565aa74..8a8d8d0a6c 100644 --- a/selling/doctype/sales_common/sales_common.js +++ b/selling/doctype/sales_common/sales_common.js @@ -860,9 +860,9 @@ cur_frm.cscript.commission_rate = function(doc, cdt, cdn) { alert("Commision rate cannot be greater than 100."); doc.total_commission = 0; doc.commission_rate = 0; - } - else + } else { doc.total_commission = doc.net_total * doc.commission_rate / 100; + } refresh_many(['total_commission','commission_rate']); } @@ -874,9 +874,9 @@ cur_frm.cscript.total_commission = function(doc, cdt, cdn) { alert("Total commission cannot be greater than net total."); doc.total_commission = 0; doc.commission_rate = 0; - } - else + } else { doc.commission_rate = doc.total_commission * 100 / doc.net_total; + } refresh_many(['total_commission','commission_rate']); } }