| commit | 99321cd538b06f1d809c4d8311e1a9ec1acaa485 | [log] [tgz] |
|---|---|---|
| author | Rucha Mahabal <ruchamahabal2@gmail.com> | Thu Feb 27 13:16:53 2020 +0530 |
| committer | Rucha Mahabal <ruchamahabal2@gmail.com> | Thu Feb 27 13:16:53 2020 +0530 |
| tree | 758e92f7bb0016f152932262763004517dd58e83 | |
| parent | e29d5c1d5ba079f4972d526b2381ec44809e6e12 [diff] [blame] |
fix: conflicts
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py index 4e5e903..7b3b466 100644 --- a/erpnext/config/hr.py +++ b/erpnext/config/hr.py
@@ -291,6 +291,10 @@ }, { "type": "doctype", + "name": "Appointment Letter", + }, + { + "type": "doctype", "name": "Staffing Plan", }, ]