From 84306ccc4c00ead95dc3290449442d1de8072484 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 30 Jul 2016 20:10:00 +0530 Subject: [PATCH] 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 a97bf94f56d..2aeec99d460 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 a0e52dd8e18..23549ff7970 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')},