[fixes] hours in time-log #3644, project buttons on condition, removed Guest permission in notification_control
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index aa55876..8999f85 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -26,22 +26,29 @@
// show tasks
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.expected_start_date, "end": doc.expected_end_date};
- frappe.set_route("Gantt", "Task");
- }, "icon-tasks", true);
- cur_frm.add_custom_button(__("Tasks"), function() {
- frappe.route_options = {"project": doc.name}
- frappe.set_route("List", "Task");
- }, "icon-list", true);
- cur_frm.add_custom_button(__("Time Logs"), function() {
- frappe.route_options = {"project": doc.name}
- frappe.set_route("List", "Time Log");
- }, "icon-list", true);
- cur_frm.add_custom_button(__("Expense Claims"), function() {
- frappe.route_options = {"project": doc.name}
- frappe.set_route("List", "Expense Claim");
- }, "icon-list", true);
+ if(frappe.model.can_read("Task")) {
+ cur_frm.add_custom_button(__("Gantt Chart"), function() {
+ 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() {
+ frappe.route_options = {"project": doc.name}
+ frappe.set_route("List", "Task");
+ }, "icon-list", true);
+ }
+ if(frappe.model.can_read("Time Log")) {
+ cur_frm.add_custom_button(__("Time Logs"), function() {
+ frappe.route_options = {"project": doc.name}
+ frappe.set_route("List", "Time Log");
+ }, "icon-list", true);
+ }
+
+ if(frappe.model.can_read("Expense Claim")) {
+ cur_frm.add_custom_button(__("Expense Claims"), function() {
+ frappe.route_options = {"project": doc.name}
+ frappe.set_route("List", "Expense Claim");
+ }, "icon-list", true);
+ }
}
}
@@ -56,5 +63,5 @@
filters:{
'project_name': doc.name
}
- }
+ }
}
diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
index 536ddf8..776a75b 100644
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ b/erpnext/projects/doctype/time_log/time_log.js
@@ -42,7 +42,7 @@
frappe.ui.form.on("Time Log", "to_time", function(frm) {
if(frm._setting_hours) return;
frm.set_value("hours", moment(cur_frm.doc.to_time).diff(moment(cur_frm.doc.from_time),
- "hours"));
+ "minutes") / 60);
});
@@ -98,5 +98,5 @@
filters:{
'project': doc.project
}
- }
+ }
}
diff --git a/erpnext/setup/doctype/notification_control/notification_control.json b/erpnext/setup/doctype/notification_control/notification_control.json
index f81801d..a77fe67 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.json
+++ b/erpnext/setup/doctype/notification_control/notification_control.json
@@ -176,20 +176,13 @@
"icon": "icon-envelope",
"idx": 1,
"issingle": 1,
- "modified": "2015-03-04 01:13:46.715113",
+ "modified": "2015-07-13 06:24:05.436127",
"modified_by": "Administrator",
"module": "Setup",
"name": "Notification Control",
"owner": "Administrator",
"permissions": [
{
- "create": 0,
- "permlevel": 0,
- "read": 1,
- "role": "Guest",
- "write": 0
- },
- {
"create": 1,
"permlevel": 0,
"read": 1,