Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 183352c..a7a148a 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 7f847b9..d4a034f 100644
--- a/projects/doctype/project/project.js
+++ b/projects/doctype/project/project.js
@@ -26,6 +26,9 @@
.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 e15565a..8a8d8d0 100644
--- a/selling/doctype/sales_common/sales_common.js
+++ b/selling/doctype/sales_common/sales_common.js
@@ -860,9 +860,9 @@
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 @@
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']);
}
}