Resolved merge conflicts

2018-07-18 17:08:16 +05:30
parent 9baa3bef8b 8ca5940f76
commit d7897f1c53
30 changed files with 298 additions and 398 deletions
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -41,6 +41,16 @@ def get_data():
 					"type": "doctype",
 					"name": "Leave Policy",
 				},
+				{
+					"type": "doctype",
+					"name": "Job Opening",
+					"description": _("Opening for a Job."),
+				},
+				{
+					"type": "doctype",
+					"name": "Job Applicant",
+					"description": _("Applicant for a Job."),
+				},
 				{
 					"type": "doctype",
 					"name": "Leave Application",