From feed313a6689fbebfea655cc33b433d7d7636344 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 30 Jul 2016 15:58:06 +0530 Subject: [PATCH 1/3] Delete old salary earning and deduction doctypes --- erpnext/hr/doctype/deduction_type/README.md | 3 - erpnext/hr/doctype/deduction_type/__init__.py | 1 - .../doctype/deduction_type/deduction_type.js | 8 - .../deduction_type/deduction_type.json | 110 -------------- .../doctype/deduction_type/deduction_type.py | 10 -- .../deduction_type/test_deduction_type.py | 7 - .../doctype/deduction_type/test_records.json | 10 -- erpnext/hr/doctype/earning_type/README.md | 3 - erpnext/hr/doctype/earning_type/__init__.py | 1 - .../hr/doctype/earning_type/earning_type.js | 8 - .../hr/doctype/earning_type/earning_type.json | 110 -------------- .../hr/doctype/earning_type/earning_type.py | 10 -- .../doctype/earning_type/test_earning_type.py | 7 - .../hr/doctype/earning_type/test_records.json | 12 -- .../doctype/salary_slip_deduction/README.md | 5 - .../doctype/salary_slip_deduction/__init__.py | 1 - .../salary_slip_deduction.json | 140 ------------------ .../salary_slip_deduction.py | 10 -- .../hr/doctype/salary_slip_earning/README.md | 6 - .../doctype/salary_slip_earning/__init__.py | 1 - .../salary_slip_earning.json | 140 ------------------ .../salary_slip_earning.py | 10 -- .../salary_structure_deduction/README.md | 1 - .../salary_structure_deduction/__init__.py | 1 - .../salary_structure_deduction.json | 116 --------------- .../salary_structure_deduction.py | 10 -- .../salary_structure_earning/README.md | 1 - .../salary_structure_earning/__init__.py | 1 - .../salary_structure_earning.json | 116 --------------- .../salary_structure_earning.py | 10 -- erpnext/patches.txt | 3 +- .../remove_old_earning_deduction_doctypes.py | 12 ++ 32 files changed, 14 insertions(+), 870 deletions(-) delete mode 100644 erpnext/hr/doctype/deduction_type/README.md delete mode 100644 erpnext/hr/doctype/deduction_type/__init__.py delete mode 100644 erpnext/hr/doctype/deduction_type/deduction_type.js delete mode 100644 erpnext/hr/doctype/deduction_type/deduction_type.json delete mode 100644 erpnext/hr/doctype/deduction_type/deduction_type.py delete mode 100644 erpnext/hr/doctype/deduction_type/test_deduction_type.py delete mode 100644 erpnext/hr/doctype/deduction_type/test_records.json delete mode 100644 erpnext/hr/doctype/earning_type/README.md delete mode 100644 erpnext/hr/doctype/earning_type/__init__.py delete mode 100644 erpnext/hr/doctype/earning_type/earning_type.js delete mode 100644 erpnext/hr/doctype/earning_type/earning_type.json delete mode 100644 erpnext/hr/doctype/earning_type/earning_type.py delete mode 100644 erpnext/hr/doctype/earning_type/test_earning_type.py delete mode 100644 erpnext/hr/doctype/earning_type/test_records.json delete mode 100644 erpnext/hr/doctype/salary_slip_deduction/README.md delete mode 100644 erpnext/hr/doctype/salary_slip_deduction/__init__.py delete mode 100644 erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json delete mode 100644 erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.py delete mode 100644 erpnext/hr/doctype/salary_slip_earning/README.md delete mode 100644 erpnext/hr/doctype/salary_slip_earning/__init__.py delete mode 100644 erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json delete mode 100644 erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.py delete mode 100644 erpnext/hr/doctype/salary_structure_deduction/README.md delete mode 100644 erpnext/hr/doctype/salary_structure_deduction/__init__.py delete mode 100644 erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json delete mode 100644 erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.py delete mode 100644 erpnext/hr/doctype/salary_structure_earning/README.md delete mode 100644 erpnext/hr/doctype/salary_structure_earning/__init__.py delete mode 100644 erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json delete mode 100644 erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.py create mode 100644 erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.py diff --git a/erpnext/hr/doctype/deduction_type/README.md b/erpnext/hr/doctype/deduction_type/README.md deleted file mode 100644 index 2a22774935..0000000000 --- a/erpnext/hr/doctype/deduction_type/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Type of salary deduction. - -e.g. Tax paid on behalf of the employee that is deducted from the salary. \ No newline at end of file diff --git a/erpnext/hr/doctype/deduction_type/__init__.py b/erpnext/hr/doctype/deduction_type/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/erpnext/hr/doctype/deduction_type/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/hr/doctype/deduction_type/deduction_type.js b/erpnext/hr/doctype/deduction_type/deduction_type.js deleted file mode 100644 index b1d4ac62c5..0000000000 --- a/erpnext/hr/doctype/deduction_type/deduction_type.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Deduction Type', { - refresh: function(frm) { - - } -}); diff --git a/erpnext/hr/doctype/deduction_type/deduction_type.json b/erpnext/hr/doctype/deduction_type/deduction_type.json deleted file mode 100644 index 58445706ed..0000000000 --- a/erpnext/hr/doctype/deduction_type/deduction_type.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "allow_copy": 0, - "allow_import": 1, - "allow_rename": 1, - "autoname": "field:deduction_name", - "beta": 0, - "creation": "2013-01-22 16:50:30", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 0, - "fields": [ - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "deduction_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Name", - "length": 0, - "no_copy": 0, - "oldfieldname": "deduction_name", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "description", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Description", - "length": 0, - "no_copy": 0, - "oldfieldname": "description", - "oldfieldtype": "Small Text", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "300px" - } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "icon-flag", - "idx": 1, - "image_view": 0, - "in_create": 0, - "in_dialog": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2016-07-25 05:24:26.194533", - "modified_by": "Administrator", - "module": "HR", - "name": "Deduction Type", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "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, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/deduction_type/deduction_type.py b/erpnext/hr/doctype/deduction_type/deduction_type.py deleted file mode 100644 index d2c8c9f0df..0000000000 --- a/erpnext/hr/doctype/deduction_type/deduction_type.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import frappe - -from frappe.model.document import Document - -class DeductionType(Document): - pass \ No newline at end of file diff --git a/erpnext/hr/doctype/deduction_type/test_deduction_type.py b/erpnext/hr/doctype/deduction_type/test_deduction_type.py deleted file mode 100644 index f1d9812366..0000000000 --- a/erpnext/hr/doctype/deduction_type/test_deduction_type.py +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt -from __future__ import unicode_literals - - -import frappe -test_records = frappe.get_test_records('Deduction Type') \ No newline at end of file diff --git a/erpnext/hr/doctype/deduction_type/test_records.json b/erpnext/hr/doctype/deduction_type/test_records.json deleted file mode 100644 index 25dab0fe16..0000000000 --- a/erpnext/hr/doctype/deduction_type/test_records.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "doctype": "Deduction Type", - "deduction_name": "_Test Professional Tax" - }, - { - "doctype": "Deduction Type", - "deduction_name": "_Test TDS" - } -] \ No newline at end of file diff --git a/erpnext/hr/doctype/earning_type/README.md b/erpnext/hr/doctype/earning_type/README.md deleted file mode 100644 index 50aa1b3bf5..0000000000 --- a/erpnext/hr/doctype/earning_type/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Type of earning that is a part of the salary. - -e.g. basic salary, bonus etc. \ No newline at end of file diff --git a/erpnext/hr/doctype/earning_type/__init__.py b/erpnext/hr/doctype/earning_type/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/erpnext/hr/doctype/earning_type/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/hr/doctype/earning_type/earning_type.js b/erpnext/hr/doctype/earning_type/earning_type.js deleted file mode 100644 index 1dd6412b1c..0000000000 --- a/erpnext/hr/doctype/earning_type/earning_type.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Earning Type', { - refresh: function(frm) { - - } -}); diff --git a/erpnext/hr/doctype/earning_type/earning_type.json b/erpnext/hr/doctype/earning_type/earning_type.json deleted file mode 100644 index f380b4699b..0000000000 --- a/erpnext/hr/doctype/earning_type/earning_type.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "allow_copy": 0, - "allow_import": 1, - "allow_rename": 1, - "autoname": "field:earning_name", - "beta": 0, - "creation": "2013-01-24 11:03:32", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 0, - "fields": [ - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "earning_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Name", - "length": 0, - "no_copy": 0, - "oldfieldname": "earning_name", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "description", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Description", - "length": 0, - "no_copy": 0, - "oldfieldname": "description", - "oldfieldtype": "Small Text", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "300px" - } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "icon-flag", - "idx": 1, - "image_view": 0, - "in_create": 0, - "in_dialog": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2016-07-25 05:24:26.055240", - "modified_by": "Administrator", - "module": "HR", - "name": "Earning Type", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "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, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/earning_type/earning_type.py b/erpnext/hr/doctype/earning_type/earning_type.py deleted file mode 100644 index d774989812..0000000000 --- a/erpnext/hr/doctype/earning_type/earning_type.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import frappe - -from frappe.model.document import Document - -class EarningType(Document): - pass \ No newline at end of file diff --git a/erpnext/hr/doctype/earning_type/test_earning_type.py b/erpnext/hr/doctype/earning_type/test_earning_type.py deleted file mode 100644 index e68a2741ee..0000000000 --- a/erpnext/hr/doctype/earning_type/test_earning_type.py +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt -from __future__ import unicode_literals - - -import frappe -test_records = frappe.get_test_records('Earning Type') \ No newline at end of file diff --git a/erpnext/hr/doctype/earning_type/test_records.json b/erpnext/hr/doctype/earning_type/test_records.json deleted file mode 100644 index 659ab52040..0000000000 --- a/erpnext/hr/doctype/earning_type/test_records.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "doctype": "Earning Type", - "earning_name": "_Test Basic Salary", - "taxable": "Yes" - }, - { - "doctype": "Earning Type", - "earning_name": "_Test Allowance", - "taxable": "Yes" - } -] \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_slip_deduction/README.md b/erpnext/hr/doctype/salary_slip_deduction/README.md deleted file mode 100644 index d0f2219e83..0000000000 --- a/erpnext/hr/doctype/salary_slip_deduction/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Deduction detail in parent Salary Slip. - -e.g. - -- Tax paid on employee's behalf \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_slip_deduction/__init__.py b/erpnext/hr/doctype/salary_slip_deduction/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/erpnext/hr/doctype/salary_slip_deduction/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json deleted file mode 100644 index 89a1f21c52..0000000000 --- a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "allow_copy": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2013-02-22 01:27:48", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 1, - "fields": [ - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "deduction_type", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Type", - "length": 0, - "no_copy": 0, - "oldfieldname": "d_type", - "oldfieldtype": "Data", - "options": "Deduction Type", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": "200px", - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "200px" - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "d_amount", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Default Amount", - "length": 0, - "no_copy": 0, - "oldfieldname": "d_amount", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "d_depends_on_lwp", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Depends on Leave Without Pay", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "deduction_amount", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Amount", - "length": 0, - "no_copy": 0, - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 1, - "image_view": 0, - "in_create": 0, - "in_dialog": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2016-07-11 03:28:07.000106", - "modified_by": "Administrator", - "module": "HR", - "name": "Salary Slip Deduction", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "sort_order": "ASC", - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.py b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.py deleted file mode 100644 index f42c34dd12..0000000000 --- a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import frappe - -from frappe.model.document import Document - -class SalarySlipDeduction(Document): - pass \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_slip_earning/README.md b/erpnext/hr/doctype/salary_slip_earning/README.md deleted file mode 100644 index 9da0167f5b..0000000000 --- a/erpnext/hr/doctype/salary_slip_earning/README.md +++ /dev/null @@ -1,6 +0,0 @@ -Earning detail in parent Salary Slip. - -e.g. - -- Basic Salary -- Performance Bonus diff --git a/erpnext/hr/doctype/salary_slip_earning/__init__.py b/erpnext/hr/doctype/salary_slip_earning/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/erpnext/hr/doctype/salary_slip_earning/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json deleted file mode 100644 index 076d009579..0000000000 --- a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "allow_copy": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2013-02-22 01:27:48", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 1, - "fields": [ - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "earning_type", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Type", - "length": 0, - "no_copy": 0, - "oldfieldname": "e_type", - "oldfieldtype": "Data", - "options": "Earning Type", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": "", - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "80px" - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "e_amount", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Default Amount", - "length": 0, - "no_copy": 0, - "oldfieldname": "e_amount", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 1, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "e_depends_on_lwp", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Depends on Leave Without Pay", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "earning_amount", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Amount", - "length": 0, - "no_copy": 0, - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 1, - "image_view": 0, - "in_create": 0, - "in_dialog": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2016-07-11 03:28:07.074773", - "modified_by": "Administrator", - "module": "HR", - "name": "Salary Slip Earning", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "sort_order": "ASC", - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.py b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.py deleted file mode 100644 index 92e48c2e25..0000000000 --- a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import frappe - -from frappe.model.document import Document - -class SalarySlipEarning(Document): - pass \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_structure_deduction/README.md b/erpnext/hr/doctype/salary_structure_deduction/README.md deleted file mode 100644 index 085353910d..0000000000 --- a/erpnext/hr/doctype/salary_structure_deduction/README.md +++ /dev/null @@ -1 +0,0 @@ -Deduction details in parent Salary Structure. \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_structure_deduction/__init__.py b/erpnext/hr/doctype/salary_structure_deduction/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/erpnext/hr/doctype/salary_structure_deduction/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json b/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json deleted file mode 100644 index c361163343..0000000000 --- a/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "allow_copy": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2013-02-22 01:27:48", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 1, - "fields": [ - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "deduction_type", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Type", - "length": 0, - "no_copy": 0, - "oldfieldname": "d_type", - "oldfieldtype": "Select", - "options": "Deduction Type", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": "200px", - "read_only": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "200px" - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "d_modified_amt", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Amount", - "length": 0, - "no_copy": 0, - "oldfieldname": "d_modified_amt", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "depend_on_lwp", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Reduce Deduction for Leave Without Pay (LWP)", - "length": 0, - "no_copy": 0, - "oldfieldname": "depend_on_lwp", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 1, - "image_view": 0, - "in_create": 0, - "in_dialog": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2016-07-11 03:28:07.217367", - "modified_by": "Administrator", - "module": "HR", - "name": "Salary Structure Deduction", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.py b/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.py deleted file mode 100644 index 16a67add67..0000000000 --- a/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import frappe - -from frappe.model.document import Document - -class SalaryStructureDeduction(Document): - pass \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_structure_earning/README.md b/erpnext/hr/doctype/salary_structure_earning/README.md deleted file mode 100644 index d495cc4e0e..0000000000 --- a/erpnext/hr/doctype/salary_structure_earning/README.md +++ /dev/null @@ -1 +0,0 @@ -Earning details in parent Salary Structure. \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_structure_earning/__init__.py b/erpnext/hr/doctype/salary_structure_earning/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/erpnext/hr/doctype/salary_structure_earning/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json b/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json deleted file mode 100644 index e7e4cf4334..0000000000 --- a/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "allow_copy": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2013-02-22 01:27:48", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "editable_grid": 1, - "fields": [ - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "earning_type", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Type", - "length": 0, - "no_copy": 0, - "oldfieldname": "e_type", - "oldfieldtype": "Data", - "options": "Earning Type", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": "200px", - "read_only": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0, - "width": "200px" - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "modified_value", - "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "label": "Amount", - "length": 0, - "no_copy": 0, - "oldfieldname": "modified_value", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "depend_on_lwp", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Reduce Earning for Leave Without Pay (LWP)", - "length": 0, - "no_copy": 0, - "oldfieldname": "depend_on_lwp", - "oldfieldtype": "Check", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 1, - "image_view": 0, - "in_create": 0, - "in_dialog": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2016-07-11 03:28:07.283082", - "modified_by": "Administrator", - "module": "HR", - "name": "Salary Structure Earning", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "sort_order": "ASC", - "track_seen": 0 -} \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.py b/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.py deleted file mode 100644 index d80575b2dd..0000000000 --- a/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import frappe - -from frappe.model.document import Document - -class SalaryStructureEarning(Document): - pass \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index d7c156d865..060bec5221 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -303,4 +303,5 @@ erpnext.patches.v7_0.migrate_schools_to_erpnext erpnext.patches.v7_0.remove_administrator_role_in_doctypes erpnext.patches.v7_0.rename_fee_amount_to_fee_component erpnext.patches.v7_0.calculate_total_costing_amount -erpnext.patches.v7_0.fix_nonwarehouse_ledger_gl_entries_for_transactions \ No newline at end of file +erpnext.patches.v7_0.fix_nonwarehouse_ledger_gl_entries_for_transactions +erpnext.patches.v7_0.remove_old_earning_deduction_doctypes \ No newline at end of file diff --git a/erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.py b/erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.py new file mode 100644 index 0000000000..03595a58f8 --- /dev/null +++ b/erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.py @@ -0,0 +1,12 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + if frappe.db.exists("DocType", "Salary Component"): + for dt in ("Salary Structure Earning", "Salary Structure Deduction", "Salary Slip Earning", + "Salary Slip Deduction", "Earning Type", "Deduction Type"): + frappe.delete_doc("DocType", dt) + \ No newline at end of file From 84306ccc4c00ead95dc3290449442d1de8072484 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 30 Jul 2016 20:10:00 +0530 Subject: [PATCH 2/3] Salary component fixtures --- .../setup/doctype/company/fixtures/india/__init__.py | 6 +++--- erpnext/setup/setup_wizard/install_fixtures.py | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/erpnext/setup/doctype/company/fixtures/india/__init__.py b/erpnext/setup/doctype/company/fixtures/india/__init__.py index a97bf94f56..2aeec99d46 100644 --- a/erpnext/setup/doctype/company/fixtures/india/__init__.py +++ b/erpnext/setup/doctype/company/fixtures/india/__init__.py @@ -7,9 +7,9 @@ import frappe def install(company): docs = [ - {'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax', 'salary_component': 'Professional Tax'}, - {'doctype': 'Salary Component', 'salary_component': 'Provident Fund', 'description': 'Provident fund', 'salary_component': 'Provident Fund'}, - {'doctype': 'Salary Component', 'salary_component': 'House Rent Allowance', 'description': 'House Rent Allowance', 'salary_component': 'House Rent Allowance', 'taxable': 'No'}, + {'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax'}, + {'doctype': 'Salary Component', 'salary_component': 'Provident Fund', 'description': 'Provident fund'}, + {'doctype': 'Salary Component', 'salary_component': 'House Rent Allowance', 'description': 'House Rent Allowance'} ] for d in docs: diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py index a0e52dd8e1..23549ff797 100644 --- a/erpnext/setup/setup_wizard/install_fixtures.py +++ b/erpnext/setup/setup_wizard/install_fixtures.py @@ -27,12 +27,10 @@ def install(country=None): {'doctype': 'Item Group', 'item_group_name': _('Consumable'), 'is_group': 0, 'parent_item_group': _('All Item Groups') }, - # deduction type - {'doctype': 'Deduction Type', 'name': _('Income Tax'), 'description': _('Income Tax'), 'deduction_name': _('Income Tax')}, - - # earning type - {'doctype': 'Earning Type', 'name': _('Basic'), 'description': _('Basic'), 'earning_name': _('Basic'), 'taxable': 'Yes'}, - + # salary component + {'doctype': 'Salary Component', 'salary_component': _('Income Tax'), 'description': _('Income Tax')}, + {'doctype': 'Salary Component', 'salary_component': _('Basic'), 'description': _('Basic')}, + # expense claim type {'doctype': 'Expense Claim Type', 'name': _('Calls'), 'expense_type': _('Calls')}, {'doctype': 'Expense Claim Type', 'name': _('Food'), 'expense_type': _('Food')}, From e9674f88660e14ce48239771b76310044fc37090 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 1 Aug 2016 12:13:11 +0530 Subject: [PATCH 3/3] Create columns for custom fields in new table Salary Detail and Component --- .../patches/v7_0/remove_old_earning_deduction_doctypes.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.py b/erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.py index 03595a58f8..05a2c49461 100644 --- a/erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.py +++ b/erpnext/patches/v7_0/remove_old_earning_deduction_doctypes.py @@ -9,4 +9,8 @@ def execute(): for dt in ("Salary Structure Earning", "Salary Structure Deduction", "Salary Slip Earning", "Salary Slip Deduction", "Earning Type", "Deduction Type"): frappe.delete_doc("DocType", dt) - \ No newline at end of file + + + for d in frappe.db.sql("""select name from `tabCustom Field` + where dt in ('Salary Detail', 'Salary Component')"""): + frappe.get_doc("Custom Field", d[0]).save() \ No newline at end of file