Nabin Hait 11eb30d082 fix: merge conflict

2021-04-01 15:03:11 +05:30

..

additional_salary

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

employee_benefit_application

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

employee_benefit_application_detail

feat: multi-currency payroll (#23519)

2020-12-01 09:11:05 +05:30

employee_benefit_claim

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

employee_incentive

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

employee_other_income

fix: patch check_is_income_tax_component (#22371)

2020-06-22 12:17:29 +05:30

employee_tax_exemption_category

fix: patch check_is_income_tax_component (#22371)

2020-06-22 12:17:29 +05:30

employee_tax_exemption_declaration

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

employee_tax_exemption_declaration_category

feat: multi-currency payroll (#23519)

2020-12-01 09:11:05 +05:30

employee_tax_exemption_proof_submission

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

employee_tax_exemption_proof_submission_detail

feat: multi-currency payroll (#23519)

2020-12-01 09:11:05 +05:30

employee_tax_exemption_sub_category

fix: patch check_is_income_tax_component (#22371)

2020-06-22 12:17:29 +05:30

gratuity

fix: sider

2020-12-23 18:07:54 +05:30

gratuity_applicable_component

Feat: gratuity

2020-12-23 18:07:05 +05:30

gratuity_rule

feat: Added Form dashboard

2020-12-23 18:07:54 +05:30

gratuity_rule_slab

fix: Some enhancements and better validation

2020-12-23 18:07:06 +05:30

income_tax_slab

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

income_tax_slab_other_charges

feat: multi-currency payroll (#23519)

2020-12-01 09:11:05 +05:30

payroll_employee_detail

fix: allow addition and removal of employee in payroll Entry

2020-12-23 12:59:48 +05:30

payroll_entry

fix: optimize reposting of gle and sle (#24702)

2021-02-23 16:38:52 +05:30

payroll_period

Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui

2021-01-19 09:34:06 +05:30

payroll_period_date

fix: patch check_is_income_tax_component (#22371)

2020-06-22 12:17:29 +05:30

payroll_settings

Merge branch 'develop' into track_settings

2021-03-03 12:40:37 +01:00

retention_bonus

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

salary_component

feat: multi-currency payroll (#23519)

2020-12-01 09:11:05 +05:30

salary_detail

feat: add descriptions for YTD and MTD fields

2021-01-14 13:42:40 +05:30

salary_slip

fix: merge conflict

2021-04-01 15:03:11 +05:30

salary_slip_leave

feat: Additon of leave details in Salary Slip (#24674)

2021-03-02 18:38:31 +05:30

salary_slip_timesheet

fix: patch check_is_income_tax_component (#22371)

2020-06-22 12:17:29 +05:30

salary_structure

fix: salary structure assign to employee (#24798)

2021-03-09 20:27:29 +05:30

salary_structure_assignment

fix: don't set Company:company:default_currency as default for currency link fields (#25111)

2021-03-31 21:57:04 +05:30

taxable_salary_slab

feat: multi-currency payroll (#23519)

2020-12-01 09:11:05 +05:30

__init__.py

feat: New Payroll module (#21990)

2020-06-19 19:17:57 +05:30