Merge branch 'master' into develop

2026-09-15 09:53:09 +00:00 · 2019-01-30 12:38:58 +05:30
parent f97c5dad82 5fdcd91847
commit a342138625
20 changed files with 183 additions and 136 deletions
--- a/erpnext/projects/doctype/activity_cost/activity_cost.json
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.json
@@ -1,5 +1,6 @@
 {
 "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
 "allow_guest_to_view": 0, 
 "allow_import": 1, 
 "allow_rename": 1, 
@@ -350,7 +351,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2018-08-21 16:15:35.363505", 
+ "modified": "2019-01-30 11:28:17.991944", 
 "modified_by": "Administrator", 
 "module": "Projects", 
 "name": "Activity Cost", 
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -1000,7 +1000,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2018-11-15 07:58:42.629845", 
+ "modified": "2019-01-30 11:28:18.518590", 
 "modified_by": "Administrator", 
 "module": "Projects", 
 "name": "Timesheet",