nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21744 from frappe/mergify/bp/version-12-hotfix/pr-21729

Browse Source 
fix: Submit perm for other income and removed caching while getting hra and basic from company (bp #21729)
This commit is contained in:
Deepesh Garg
2020-05-15 17:47:10 +05:30
committed by GitHub
parent dc59831aa9 78f69e448b
commit 73e3ba2c30
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/hr/doctype/employee_other_income/employee_other_income.json
View File

@@ -76,25 +76,15 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2020-03-19 18:06:45.361830", "modified": "2020-05-14 17:17:38.883126",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employee Other Income", "name": "Employee Other Income",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"create": 1, "amend": 1,
"delete": 1, "cancel": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
},
{
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
@@ -104,9 +94,12 @@
"report": 1, "report": 1,
"role": "HR Manager", "role": "HR Manager",
"share": 1, "share": 1,
"submit": 1,
"write": 1 "write": 1
}, },
{ {
"amend": 1,
"cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
@@ -116,9 +109,12 @@
"report": 1, "report": 1,
"role": "HR User", "role": "HR User",
"share": 1, "share": 1,
"submit": 1,
"write": 1 "write": 1
}, },
{ {
"amend": 1,
"cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
@@ -128,6 +124,7 @@
"report": 1, "report": 1,
"role": "Employee", "role": "Employee",
"share": 1, "share": 1,
"submit": 1,
"write": 1 "write": 1
} }
], ],

3
erpnext/regional/india/utils.py
View File

@@ -236,8 +236,7 @@ def get_tax_template_for_sez(party_details, master_doctype, company, party_type)
def calculate_annual_eligible_hra_exemption(doc): def calculate_annual_eligible_hra_exemption(doc):
basic_component = frappe.get_cached_value('Company', doc.company, "basic_component") basic_component, hra_component = frappe.db.get_value('Company', doc.company, ["basic_component", "hra_component"])
hra_component = frappe.get_cached_value('Company', doc.company, "hra_component")
if not (basic_component and hra_component): if not (basic_component and hra_component):
frappe.throw(_("Please mention Basic and HRA component in Company")) frappe.throw(_("Please mention Basic and HRA component in Company"))
annual_exemption, monthly_exemption, hra_amount = 0, 0, 0 annual_exemption, monthly_exemption, hra_amount = 0, 0, 0