Disable Capacity Planning label changed to Disable Capacity Planning & Time Tracking in Manufacturing Settings
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 4c00280..eb770a8 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -19,7 +19,7 @@
    "description": "Disables creation of time logs against Production Orders.\nOperations shall not be tracked against Production Order", 
    "fieldname": "disable_capacity_planning", 
    "fieldtype": "Check", 
-   "label": "Disable Capacity Planning", 
+   "label": "Disable Capacity Planning and Time Tracking", 
    "permlevel": 0, 
    "precision": ""
   }, 
@@ -80,7 +80,7 @@
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-07-21 08:51:01.651774", 
+ "modified": "2015-07-23 08:12:33.889753", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Manufacturing Settings",