From 11cd4f6c30b432a4d9dceea740ab2b5ba1e3523f Mon Sep 17 00:00:00 2001
From: Neil Trini Lasrado <neil@frappe.io>
Date: Wed, 4 Feb 2015 12:31:11 +0530
Subject: [PATCH] time log activity type made mandatory, new activity type
 manufacturing created

---
 .../doctype/production_order/production_order.py |  1 +
 erpnext/projects/doctype/time_log/time_log.js    |  6 ++++++
 erpnext/projects/doctype/time_log/time_log.json  |  7 +++----
 erpnext/projects/doctype/time_log/time_log.py    | 16 +++++-----------
 .../setup/page/setup_wizard/install_fixtures.py  |  3 ++-
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 396ec98c51..a96224882c 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -291,6 +291,7 @@ def make_time_log(name, operation, from_time, to_time, qty=None,  project=None,
 	time_log.project = project
 	time_log.operation= operation
 	time_log.workstation= workstation
+	time_log.activity_type= "Manufacturing"
 	time_log.completed_qty = flt(qty)
 	if from_time and to_time :
 		time_log.calculate_total_hours()
diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
index cfcd35cfe6..3e28e7074f 100644
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ b/erpnext/projects/doctype/time_log/time_log.js
@@ -68,5 +68,11 @@ $.extend(cur_frm.cscript, {
 				}
 			}
 		});
+	},
+	
+	time_log_for: function(doc) {
+		if (doc.time_log_for == 'Manufacturing') {
+			cur_frm.set_value("activity_type", "Manufacturing")
+		}
 	}
 });
diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json
index 16102d744e..9dc2d5932b 100644
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ b/erpnext/projects/doctype/time_log/time_log.json
@@ -68,7 +68,7 @@
    "reqd": 0
   }, 
   {
-   "depends_on": "eval:doc.time_log_for != 'Manufacturing'", 
+   "depends_on": "", 
    "fieldname": "activity_type", 
    "fieldtype": "Link", 
    "in_list_view": 0, 
@@ -76,7 +76,7 @@
    "options": "Activity Type", 
    "permlevel": 0, 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 1
   }, 
   {
    "depends_on": "eval:doc.time_log_for != 'Manufacturing'", 
@@ -116,7 +116,6 @@
    "read_only": 1
   }, 
   {
-   "depends_on": "eval:doc.time_log_for == 'Manufacturing'", 
    "description": "Operation completed for how many finished goods?", 
    "fieldname": "completed_qty", 
    "fieldtype": "Float", 
@@ -237,5 +236,5 @@
    "write": 1
   }
  ], 
- "title_field": ""
+ "title_field": "activity_type"
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
index b1d4b8aead..a7401b4abf 100644
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ b/erpnext/projects/doctype/time_log/time_log.py
@@ -24,7 +24,6 @@ class TimeLog(Document):
 		self.check_workstation_timings()
 		self.validate_production_order()
 		self.validate_project()
-		self.validate_activity()
 		self.validate_manufacturing()
 
 	def on_submit(self):
@@ -136,15 +135,7 @@ class TimeLog(Document):
 			if not self.project:
 				frappe.throw(_("Project is Mandatory."))
 		if self.time_log_for == "":
-			self.project = None
-			
-	def validate_activity(self):
-		if self.time_log_for != 'Manufacturing':
-			if not self.activity_type:
-				frappe.throw(_("Activity is Mandatory."))
-			self.production_order = None
-			self.operation = None
-			self.quantity = None
+			self.project = None			
 		
 	def validate_manufacturing(self):
 		if self.time_log_for == 'Manufacturing':
@@ -154,7 +145,10 @@ class TimeLog(Document):
 				frappe.throw(_("Operation is Mandatory"))
 			if not self.completed_qty:
 				self.completed_qty=0
-			self.activity_type = None
+		else:
+			self.production_order = None
+			self.operation = None
+			self.quantity = None
 
 @frappe.whitelist()
 def get_workstation(production_order, operation):
diff --git a/erpnext/setup/page/setup_wizard/install_fixtures.py b/erpnext/setup/page/setup_wizard/install_fixtures.py
index 531219281d..f83ab35053 100644
--- a/erpnext/setup/page/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/page/setup_wizard/install_fixtures.py
@@ -135,7 +135,8 @@ def install(country=None):
 		{'doctype': 'Activity Type', 'activity_type': _('Proposal Writing')},
 		{'doctype': 'Activity Type', 'activity_type': _('Execution')},
 		{'doctype': 'Activity Type', 'activity_type': _('Communication')},
-
+		{'doctype': 'Activity Type', 'activity_type': _('Manufacturing')},
+		
 		# Industry Type
 		{'doctype': 'Industry Type', 'industry': _('Accounting')},
 		{'doctype': 'Industry Type', 'industry': _('Advertising')},