From 330fae8652ecafa1f5a88d0826d3b6e1057a01a3 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 7 May 2018 16:11:35 +0530 Subject: [PATCH] minor fixes --- .../doctype/sales_invoice/sales_invoice.py | 18 +- erpnext/config/hr.py | 16 - .../employee_benefit_claim.json | 2 + .../employee_lifecycle_activity/__init__.py | 0 .../employee_lifecycle_activity.js | 8 - .../employee_lifecycle_activity.json | 227 ------------- .../employee_lifecycle_activity.py | 10 - .../test_employee_lifecycle_activity.js | 23 -- .../test_employee_lifecycle_activity.py | 10 - .../__init__.py | 0 .../employee_lifecycle_activity_type.js | 8 - .../employee_lifecycle_activity_type.json | 163 --------- .../employee_lifecycle_activity_type.py | 10 - .../test_employee_lifecycle_activity_type.js | 23 -- .../test_employee_lifecycle_activity_type.py | 10 - .../employee_lifecycle_process/__init__.py | 0 .../employee_lifecycle_process.js | 8 - .../employee_lifecycle_process.json | 320 ------------------ .../employee_lifecycle_process.py | 10 - .../test_employee_lifecycle_process.js | 23 -- .../test_employee_lifecycle_process.py | 10 - .../__init__.py | 0 .../employee_lifecycle_process_template.js | 8 - .../employee_lifecycle_process_template.json | 194 ----------- .../employee_lifecycle_process_template.py | 10 - ...est_employee_lifecycle_process_template.js | 23 -- ...est_employee_lifecycle_process_template.py | 10 - .../__init__.py | 0 ...e_lifecycle_process_template_activity.json | 137 -------- ...plate_activity.py~Added links in HR module | 10 - ...ifecycle_process_template_activity.py~HEAD | 10 - ...y.py~HEAD => employee_property_history.py} | 0 ...se] Patch and child table changes (#13656) | 10 - .../shift_assignment/shift_assignment.json | 4 - .../create_salary_structure_assignments.py | 6 - 35 files changed, 12 insertions(+), 1309 deletions(-) delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity/__init__.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.js delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.json delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity/test_employee_lifecycle_activity.js delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity/test_employee_lifecycle_activity.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity_type/__init__.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.js delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.json delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity_type/test_employee_lifecycle_activity_type.js delete mode 100644 erpnext/hr/doctype/employee_lifecycle_activity_type/test_employee_lifecycle_activity_type.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process/__init__.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.js delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.json delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process/test_employee_lifecycle_process.js delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process/test_employee_lifecycle_process.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template/__init__.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.js delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.json delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template/test_employee_lifecycle_process_template.js delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template/test_employee_lifecycle_process_template.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template_activity/__init__.py delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.json delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.py~Added links in HR module delete mode 100644 erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.py~HEAD rename erpnext/hr/doctype/employee_property_history/{employee_property_history.py~HEAD => employee_property_history.py} (100%) delete mode 100644 erpnext/hr/doctype/employee_property_history/employee_property_history.py~[Enterprise] Patch and child table changes (#13656) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 17e45ac971..f27d3775b7 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1097,20 +1097,22 @@ def make_inter_company_invoice(doctype, source_name, target_doc=None): target_doc.customer = details.get("party") target_doc.selling_price_list = source_doc.buying_price_list - def update_item(source_doc, target_doc, source_parent): - target_doc.income_account = "" - target_doc.expense_account = "" - target_doc.cost_center = "" - target_doc.warehouse = "" - doclist = get_mapped_doc(doctype, source_name, { doctype: { "doctype": target_doctype, - "postprocess": update_details + "postprocess": update_details, + "field_no_map": [ + "taxes_and_charges" + ] }, doctype +" Item": { "doctype": target_doctype + " Item", - "postprocess": update_item + "field_no_map": [ + "income_account", + "expense_account", + "cost_center", + "warehouse" + ] } }, target_doc, set_missing_values) diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py index cdb7180756..4e9e91ef3b 100644 --- a/erpnext/config/hr.py +++ b/erpnext/config/hr.py @@ -196,22 +196,6 @@ def get_data(): { "type": "doctype", "name": "Employee Promotion", - }, - { - "type": "doctype", - "name": "Employee Lifecycle Activity", - }, - { - "type": "doctype", - "name": "Employee Lifecycle Activity Type", - }, - { - "type": "doctype", - "name": "Employee Lifecycle Process Template", - }, - { - "type": "doctype", - "name": "Employee Lifecycle Process", } ] }, diff --git a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.json b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.json index fed15edf84..00d5159c51 100644 --- a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.json +++ b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.json @@ -459,3 +459,5 @@ "sort_order": "DESC", "title_field": "employee_name", "track_changes": 1, + "track_seen": 0 +} \ No newline at end of file diff --git a/erpnext/hr/doctype/employee_lifecycle_activity/__init__.py b/erpnext/hr/doctype/employee_lifecycle_activity/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.js b/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.js deleted file mode 100644 index 4cd5f0f06d..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Employee Lifecycle Activity', { - refresh: function(frm) { - - } -}); diff --git a/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.json b/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.json deleted file mode 100644 index 28b22fd318..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "prompt", - "beta": 0, - "creation": "2018-04-13 17:58:34.106717", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "activity_type", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Activity Type", - "length": 0, - "no_copy": 0, - "options": "Activity Type", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "employee_lifecycle_process", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Employee Lifecycle Process", - "length": 0, - "no_copy": 0, - "options": "Employee Lifecycle Process", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "status", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Status", - "length": 0, - "no_copy": 0, - "options": "Pending\nCompleted", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "amended_from", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Amended From", - "length": 0, - "no_copy": 1, - "options": "Employee Lifecycle Activity", - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 1, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-04-13 18:48:06.800183", - "modified_by": "Administrator", - "module": "HR", - "name": "Employee Lifecycle Activity", - "name_case": "", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Employee", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR User", - "set_user_permissions": 0, - "share": 1, - "submit": 1, - "write": 1 - }, - { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 1, - "write": 1 - } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.py b/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.py deleted file mode 100644 index a8770310aa..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity/employee_lifecycle_activity.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class EmployeeLifecycleActivity(Document): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_activity/test_employee_lifecycle_activity.js b/erpnext/hr/doctype/employee_lifecycle_activity/test_employee_lifecycle_activity.js deleted file mode 100644 index 64a28d9d68..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity/test_employee_lifecycle_activity.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Employee Lifecycle Activity", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Employee Lifecycle Activity - () => frappe.tests.make('Employee Lifecycle Activity', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/erpnext/hr/doctype/employee_lifecycle_activity/test_employee_lifecycle_activity.py b/erpnext/hr/doctype/employee_lifecycle_activity/test_employee_lifecycle_activity.py deleted file mode 100644 index e90de0f6f9..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity/test_employee_lifecycle_activity.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors -# See license.txt -from __future__ import unicode_literals - -import frappe -import unittest - -class TestEmployeeLifecycleActivity(unittest.TestCase): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_activity_type/__init__.py b/erpnext/hr/doctype/employee_lifecycle_activity_type/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.js b/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.js deleted file mode 100644 index 7935e4fd34..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Employee Lifecycle Activity Type', { - refresh: function(frm) { - - } -}); diff --git a/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.json b/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.json deleted file mode 100644 index 793b79a71b..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "ELAT.#####", - "beta": 0, - "creation": "2018-04-13 17:34:21.728815", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "activity_type", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Activity Type", - "length": 0, - "no_copy": 0, - "options": "Activity Type", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "before_employee_creation", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Before Employee Creation", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-04-13 19:02:22.731902", - "modified_by": "Administrator", - "module": "HR", - "name": "Employee Lifecycle Activity Type", - "name_case": "", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Employee", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 1 - }, - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR User", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 1 - } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.py b/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.py deleted file mode 100644 index aca6bd495b..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity_type/employee_lifecycle_activity_type.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class EmployeeLifecycleActivityType(Document): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_activity_type/test_employee_lifecycle_activity_type.js b/erpnext/hr/doctype/employee_lifecycle_activity_type/test_employee_lifecycle_activity_type.js deleted file mode 100644 index b775086ee5..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity_type/test_employee_lifecycle_activity_type.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Employee Lifecycle Activity Type", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Employee Lifecycle Activity Type - () => frappe.tests.make('Employee Lifecycle Activity Type', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/erpnext/hr/doctype/employee_lifecycle_activity_type/test_employee_lifecycle_activity_type.py b/erpnext/hr/doctype/employee_lifecycle_activity_type/test_employee_lifecycle_activity_type.py deleted file mode 100644 index ff3e2c7aa3..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_activity_type/test_employee_lifecycle_activity_type.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors -# See license.txt -from __future__ import unicode_literals - -import frappe -import unittest - -class TestEmployeeLifecycleActivityType(unittest.TestCase): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_process/__init__.py b/erpnext/hr/doctype/employee_lifecycle_process/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.js b/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.js deleted file mode 100644 index 406436e05c..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Employee Lifecycle Process', { - refresh: function(frm) { - - } -}); diff --git a/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.json b/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.json deleted file mode 100644 index 86b01582f1..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.json +++ /dev/null @@ -1,320 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "ELP.#####", - "beta": 0, - "creation": "2018-04-13 17:55:47.341454", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "employee", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Employee", - "length": 0, - "no_copy": 0, - "options": "Employee", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "job_applicant", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Job Applicant", - "length": 0, - "no_copy": 0, - "options": "Job Applicant", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_3", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "status", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Status", - "length": 0, - "no_copy": 0, - "options": "Pending\nComplated", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "lifecycle_process_details", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Lifecycle Process Details", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "process_section", - "fieldtype": "Table", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Employee Lifecycle Process Template Detail", - "length": 0, - "no_copy": 0, - "options": "Employee Lifecycle Process Template Detail", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "amended_from", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Amended From", - "length": 0, - "no_copy": 1, - "options": "Employee Lifecycle Process", - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 1, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-04-13 19:00:17.008613", - "modified_by": "Administrator", - "module": "HR", - "name": "Employee Lifecycle Process", - "name_case": "", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Employee", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR User", - "set_user_permissions": 0, - "share": 1, - "submit": 1, - "write": 1 - }, - { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 1, - "write": 1 - } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.py b/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.py deleted file mode 100644 index 8f051184b7..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process/employee_lifecycle_process.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class EmployeeLifecycleProcess(Document): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_process/test_employee_lifecycle_process.js b/erpnext/hr/doctype/employee_lifecycle_process/test_employee_lifecycle_process.js deleted file mode 100644 index cd892d9a0f..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process/test_employee_lifecycle_process.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Employee Lifecycle Process", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Employee Lifecycle Process - () => frappe.tests.make('Employee Lifecycle Process', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/erpnext/hr/doctype/employee_lifecycle_process/test_employee_lifecycle_process.py b/erpnext/hr/doctype/employee_lifecycle_process/test_employee_lifecycle_process.py deleted file mode 100644 index f680311d51..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process/test_employee_lifecycle_process.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors -# See license.txt -from __future__ import unicode_literals - -import frappe -import unittest - -class TestEmployeeLifecycleProcess(unittest.TestCase): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template/__init__.py b/erpnext/hr/doctype/employee_lifecycle_process_template/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.js b/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.js deleted file mode 100644 index c9ce3d10c7..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Employee Lifecycle Process Template', { - refresh: function(frm) { - - } -}); diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.json b/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.json deleted file mode 100644 index 582a94f4ac..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "ELCP.#####", - "beta": 0, - "creation": "2018-04-13 17:40:38.806266", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "process_section", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Lifecycle Process Details", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "process_details", - "fieldtype": "Table", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Employee Lifecycle Process Template Detail", - "length": 0, - "no_copy": 0, - "options": "Employee Lifecycle Process Template Activity", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "amended_from", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Amended From", - "length": 0, - "no_copy": 1, - "options": "Employee Lifecycle Process Template", - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 1, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-04-14 11:35:19.465613", - "modified_by": "Administrator", - "module": "HR", - "name": "Employee Lifecycle Process Template", - "name_case": "", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Employee", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 0, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR User", - "set_user_permissions": 0, - "share": 1, - "submit": 1, - "write": 1 - }, - { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 1, - "write": 1 - } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.py b/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.py deleted file mode 100644 index b6f3a438a0..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process_template/employee_lifecycle_process_template.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class EmployeeLifecycleProcessTemplate(Document): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template/test_employee_lifecycle_process_template.js b/erpnext/hr/doctype/employee_lifecycle_process_template/test_employee_lifecycle_process_template.js deleted file mode 100644 index 607ccd52fa..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process_template/test_employee_lifecycle_process_template.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Employee Lifecycle Process Template", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Employee Lifecycle Process Template - () => frappe.tests.make('Employee Lifecycle Process Template', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template/test_employee_lifecycle_process_template.py b/erpnext/hr/doctype/employee_lifecycle_process_template/test_employee_lifecycle_process_template.py deleted file mode 100644 index 916cfe1fd1..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process_template/test_employee_lifecycle_process_template.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors -# See license.txt -from __future__ import unicode_literals - -import frappe -import unittest - -class TestEmployeeLifecycleProcessTemplate(unittest.TestCase): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template_activity/__init__.py b/erpnext/hr/doctype/employee_lifecycle_process_template_activity/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.json b/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.json deleted file mode 100644 index 6d3c96cf4b..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2018-04-14 11:34:30.508196", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "employee_lifecycle_activity_type", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Employee Lifecycle Activity Type ", - "length": 0, - "no_copy": 0, - "options": "Employee Lifecycle Activity Type", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "role", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Role", - "length": 0, - "no_copy": 0, - "options": "Role", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "user", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "User", - "length": 0, - "no_copy": 0, - "options": "User", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2018-04-14 11:34:30.508196", - "modified_by": "Administrator", - "module": "HR", - "name": "Employee Lifecycle Process Template Activity", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.py~Added links in HR module b/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.py~Added links in HR module deleted file mode 100644 index eeea2366b1..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.py~Added links in HR module +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class EmployeeLifecycleProcessTemplateActivity(Document): - pass diff --git a/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.py~HEAD b/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.py~HEAD deleted file mode 100644 index eeea2366b1..0000000000 --- a/erpnext/hr/doctype/employee_lifecycle_process_template_activity/employee_lifecycle_process_template_activity.py~HEAD +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class EmployeeLifecycleProcessTemplateActivity(Document): - pass diff --git a/erpnext/hr/doctype/employee_property_history/employee_property_history.py~HEAD b/erpnext/hr/doctype/employee_property_history/employee_property_history.py similarity index 100% rename from erpnext/hr/doctype/employee_property_history/employee_property_history.py~HEAD rename to erpnext/hr/doctype/employee_property_history/employee_property_history.py diff --git a/erpnext/hr/doctype/employee_property_history/employee_property_history.py~[Enterprise] Patch and child table changes (#13656) b/erpnext/hr/doctype/employee_property_history/employee_property_history.py~[Enterprise] Patch and child table changes (#13656) deleted file mode 100644 index fb67852d16..0000000000 --- a/erpnext/hr/doctype/employee_property_history/employee_property_history.py~[Enterprise] Patch and child table changes (#13656) +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class EmployeePropertyHistory(Document): - pass diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.json b/erpnext/hr/doctype/shift_assignment/shift_assignment.json index 86c1708f5f..897cfed68a 100644 --- a/erpnext/hr/doctype/shift_assignment/shift_assignment.json +++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.json @@ -307,11 +307,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, -<<<<<<< HEAD "modified": "2018-04-17 14:50:09.125737", -======= - "modified": "2018-04-14 15:42:12.617715", ->>>>>>> Removed employee table from Salary Structure and added employee name in all forms "modified_by": "Administrator", "module": "HR", "name": "Shift Assignment", diff --git a/erpnext/patches/v11_0/create_salary_structure_assignments.py b/erpnext/patches/v11_0/create_salary_structure_assignments.py index cf7646bcf5..289554ee1a 100644 --- a/erpnext/patches/v11_0/create_salary_structure_assignments.py +++ b/erpnext/patches/v11_0/create_salary_structure_assignments.py @@ -7,14 +7,8 @@ import frappe def execute(): frappe.reload_doc("hr", "doctype", "salary_structure_assignment") for d in frappe.db.sql(""" -<<<<<<< HEAD select sse.*, ss.company from `tabSalary Structure Employee` sse, `tabSalary Structure` ss where ss.name = sse.parent""", as_dict=1): -======= - select * from `tabSalary Structure Employee` sse, `tabSalary Structure` ss - where ss.name = sse.parent""", as_dict=1): - ->>>>>>> Removed employee table from Salary Structure and added employee name in all forms s = frappe.new_doc("Salary Structure Assignment") s.employee = d.employee s.employee_name = d.employee_name