Nabin Hait
58ee6c1e08
feat: Income tax slab ( #21399 )
...
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Saqib
7e73473a65
fix: (ux) set jv voucher type depending on mode of payment ( #21411 )
2020-04-26 09:40:57 +05:30
Anurag Mishra
92b933f4ac
feat: Upload Attendance ( #20947 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 16:15:18 +05:30
Deepesh Garg
bf78ed6947
fix: Loan Repayment code clean up and other fixes
2020-04-16 22:53:47 +05:30
Mangesh-Khairnar
2e3548eb83
fix: consider revereted expired leaves entry ( #21257 )
2020-04-14 09:34:39 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor
...
refactor: Healthcare Module
2020-04-13 17:16:02 +05:30
Deepesh Garg
03166fab56
Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes
2020-04-13 13:20:02 +05:30
Deepesh Garg
af27d61bee
fix: Employee loan test case and other fixes
2020-04-13 12:29:00 +05:30
Deepesh Garg
f7e216e285
fix: Employee loan fixes
2020-04-10 20:03:11 +05:30
Rucha Mahabal
1ff0cfd4f9
fix: merge conflicts
2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor
2020-04-09 19:16:31 +05:30
gavin
74dd0e12e7
fix: enable validations for email and phone data fields ( #21199 )
2020-04-08 12:59:15 +05:30
Nabin Hait
04870ae23a
fix: Replace newlines with spaces before evaluation of condition and formula ( #21165 )
2020-04-08 09:34:46 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces ( #21192 )
2020-04-08 09:32:41 +05:30
Rucha Mahabal
21f5680914
fix: merge conflicts
2020-04-07 16:42:50 +05:30
Himanshu Warekar
c207c457a5
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-04-06 11:34:27 +05:30
Nabin Hait
75ef458b34
fix: update attendace from leave application ( #21155 )
2020-04-06 10:15:38 +05:30
Nabin Hait
a0018eed63
Merge branch 'develop' into refactor-addiional-salary
2020-03-31 20:30:52 +05:30
Rucha Mahabal
1900a62c54
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes ( #20981 )
2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop ( #20987 )
...
* fix: Multiple fixes during pre-release testing
* fix: Merge conflict
2020-03-19 10:59:32 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection ( #20818 )
2020-03-16 22:36:44 +05:30
Anurag Mishra
c0b1c372a4
fix: local variable 'benefit_amount' referenced before assignment ( #20949 )
2020-03-16 16:53:03 +05:30
Prssanna Desai
e71153cbee
fix: fix options of currency fieldtype in Expense Taxes and Charges ( #20901 )
2020-03-16 15:52:25 +05:30
Himanshu Warekar
841be6713b
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-03-13 19:40:00 +05:30
Anurag Mishra
3ced42f302
feat: reverse linking and multiple additonal salaries in salary slip
2020-03-13 19:14:56 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor
2020-03-12 19:44:27 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor
2020-03-12 12:52:38 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Anurag Mishra
d319feee9e
fix: reverse linking
2020-03-06 15:01:10 +05:30
Anurag Mishra
1663f66e6d
test: Recurring Additional salary
2020-03-06 15:00:41 +05:30
Anurag Mishra
885ab5dc66
fix: requested changes
2020-03-06 15:00:40 +05:30
Anurag Mishra
2d7fcab2c9
feat: Recurring Addtional Salary
2020-03-06 14:59:56 +05:30
Anurag Mishra
943457abd3
fix: reverse linking for employee advance
2020-03-06 13:37:24 +05:30
Anurag Mishra
59a0bce3a9
feat: Repay advance from salary
2020-03-05 16:13:52 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Rucha Mahabal
5eb42409c7
Merge branch 'develop' into healthcare_refactor
2020-03-03 09:22:11 +05:30
Anurag Mishra
cf04b3c680
fix: added standard filters ( #20807 )
2020-03-02 19:25:01 +05:30
Shivam Mishra
8a8e8d6c5c
feat: added base pages for desk
2020-03-02 16:56:31 +05:30
Karthikeyan S
0db423ed5f
fix(auto attendance): bug in marking absent ( #20759 )
...
This bug was introduces in the commit bd6e8b9cec
i.e. The mark_absent function was renamed to mark_attendance, but there is a miss match in the order of the parameters.
2020-02-28 12:27:21 +05:30
Anurag Mishra
d42a4a6234
fix: deductions calculation based on gross pay ( #20727 )
...
* fix: deductions calculation based on gross pay
* test: salary structure deduction based on gross pay
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:31:18 +05:30
Rucha Mahabal
99321cd538
fix: conflicts
2020-02-27 13:16:53 +05:30
Anurag Mishra
773e7debb9
fix: validated leave allocation ( #20636 )
...
* fix: validated leave allocation
* fix: changes requested
* Update erpnext/hr/doctype/leave_encashment/leave_encashment.py
Co-Authored-By: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-26 14:50:57 +05:30
Mangesh-Khairnar
99d89d6cb8
fix(HR): show correct closing leave balance ( #20723 )
2020-02-26 11:26:07 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting ( #19035 )
...
* fix: Create Loan Management module
* fix: Move loan doctype for hr module to loan management
* fix: Add loan dashboard
* fix: Move loan application form hr module to loan management
* fix: Move Loan Type from hr to loan management
* fix: Move salary slip loan from hr to loan management
* fix: Create loan security pledge doctype
* fix: Create loan security type doctype
* fix: Create Loan security doctype
* fix: Add customer in loan_common.js
* fix: Import patch for loan
* fix: Add security pledging in loan doctype
* fix: Add loan application pledge doctype
* fix: Add logic for security pledgeing in loan
* fix: Add logic for security pledging in loan application
* fix: Rename Loan security doctype to Loan Security Pledge
* fix: Add doctype for loan security
* fix: Fixes in loan and loan application
* fix: Add doctypes for loan repayment
* fix: Fixes in loan and loan application
* fix: Move loan repayment report from HR module to loan management
* fix: Create doctype for loan security price
* fix: Create doctype for loan security shortfall
* fix: Make fields in Loan shortfall readonly
* fix: Make loan type submittable
* fix: Add daily job for loan security revaluation in hooks.py
* fix: Add loan management module
* fix: Doctype for loan disbursement Entry
* fix: GL entry fix for loan disbursement
* fix: Add company currency options in Loan related doctypes
* fix: Changes in Loan Doctypes
* fix: Allow miltiple loan securities in Loan Security Pledge
* fix: Add proposed pledges in Loan Application
* fix: Add test cases for loan
* fix: Interest Accrual Entry for loans
* fix: Remove loan from journal entry
* fix: Update triggers in loan_common.js
* fix: Accrual Entries for loan Interest
* fix: Proposed Pledges for loan application
* fix: Update items in loan management module
* fix: Allow multiple disbursements against a loan
* fix: Add loan security code in loan security master
* fix: Allow multiple securities in a single pledge
* fix: Spelling and label fixes
* fix: Replace date in loan security price with datetime
* fix: Add dashboard to loan master
* fix: Move Repayment Schedule from HR to Loan Management
* fix: Add back jobs for loan accrual entries
* fix: Multiple fixes in loan
* fix: Multiple fixes in loan application
* fix: Loan Reapayment for term loans
* fix: Interest Accural Entries for term loans
* fix: Changes in Loan Doctypes
* fix: Add test case for term loan repayment
* fix: Add custom button to update loan security price and trigger shortfall
* fix: Usability fixes in Loan management
* fix: Multiple usablity and doctype fixes
* fix: Muliple bug and usability fixes in loan
* fix: Test case fixes for loan repayment from Salary
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Minor fix in validate_repayment_method
* fix: Test case and codacy fixes
* fix: Provide consistent naming series to loan doctypes
* fix: Loan Application fix
* fix: Loan Application Dashboard
* fix: Add doctypes to process loan interest accural and loan security price
* fix: Provision to make loan topup
* fix: Pledge and unpledge statuses and doctype for loan securit unpledge
* fix: Multiple fixes in Loan Cycle
* fix: Add missing dashboards to loan doctypes
* fix: Add Loan Manager role to loan doctypes
* fix: Loan Process fixes
* fix: Loan Security Unpledge fixes
* fix: UX, List and dashboards fixes
* fix: Minor fixes
* fix: Minor fixes
* fix: Status on additional loan security
* fix: Codacy fixes
* fix: Multiple fixes in loan
* fix: Rename Process Loan Security Price to Process Loan Security Shortfall
* fix: Loan Repayment and Closure report
* fix: Loan Security Status report and minor fixes
* fix: Multiple UX fixes
* fix: Test Case fixes and UX fixes
* fix: Currency symbol fixes in Salary Slip Loan
* fix: Make loan account details read only
* fix: Changes in loan security price updation
* fix: Sanctioned Loan Amount doctype
* fix: Updates in process loan interest accrual
* fix: Pass loan doc instead of loan name
* fix: Fixes in process loan interest accrual
* fix: Add missing semicolon
* fix: Test case
* fix: Test case
* fix: Sandbox method to get proposed pledges
* fix: Sandbox method
* fix: Nonetype fix in loan sanction limit
* fix: GL entry fixes
* fix: Update maximum loan amount on loan security pledging
* fix: Round off loan amounts
* fix: Loan Security unpledging
* fix: Interest amount for loan closure
* fix: Due date for loan repayments
* fix: API fixes for loan disbursement method
* fix: Disable quick entry for sanctioned loan amount
* fix: Add misssing translations for validations and codecleanup
* fix: Translation fixes and code cleanup
* fix: Test Cases
* fix: Loan Interest Accrual test case
2020-02-26 10:44:24 +05:30
Mangesh-Khairnar
1db8ea317d
Merge pull request #20687 from Anurag810/additional_salary_fixes_v13
...
fix: Additional salary can be created only for active employee
2020-02-20 16:07:35 +05:30
Anurag Mishra
3f0c01199d
fix: Additional salary can be created only for active employee
2020-02-20 15:40:37 +05:30
Mangesh-Khairnar
5d5f5b4f8e
fix(HR): skip earned leaves check for max leaves set to zero or less ( #20535 )
...
* fix: skip earned leaves check for max leaves set to zero or less
* test: earned leaves creation
2020-02-20 13:25:55 +05:30
Deepesh Garg
2c1da897c5
Merge pull request #20450 from Anurag810/fleet-management
...
fix: odometer value was not syncing properly
2020-02-20 13:19:54 +05:30
Anurag Mishra
51cf0eb159
fix: changed field type which was affecting filters ( #20671 )
2020-02-20 12:52:56 +05:30
Anurag Mishra
1a11cb5a07
test: syncing of odometer value
2020-02-19 16:46:00 +05:30
anil pise
7c474130ea
fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed.
2020-02-15 15:58:57 +05:30
anil pise
21b1a00f61
Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599
2020-02-15 15:23:15 +05:30
Rohan Bansal
d64f92cf99
fix: show WFH in monthly attendance sheet report
2020-02-06 17:30:57 +05:30
Parth J. Kharwar
830b316543
fix: full day leaves not tagged as half day in attendance ( #20487 )
...
* fix: full day leaves not tagged as half day in attendance
* chore: code cleanup for half day date value set
2020-02-05 15:01:13 +05:30
Anurag Mishra
eacc1bc2dc
fix: requested changes
2020-02-05 12:45:43 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter ( #20104 )
...
* feat: appointment Letter
* fix: requested changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-03 17:52:42 +05:30
Rucha Mahabal
0a35b2207e
refactor: Healthcare masters
2020-02-02 23:21:18 +05:30
Deepesh Garg
c3f28db5b7
Merge pull request #20475 from ParthKharwar/dev-work-from-home-application
...
feat: request for work from home marked in attendance
2020-02-01 19:06:40 +05:30
Parth Kharwar
823964f3a6
fix: test added to check work from home application
2020-01-31 14:30:38 +05:30
Parth Kharwar
5342c846d2
feat: request for work from home marked in attendance
2020-01-30 13:12:56 +05:30
Suraj Shetty
082020184a
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-30 10:46:11 +05:30
Diksha
480d52c6f3
feat(attendance): add work from home option in status
2020-01-29 17:46:27 +05:30
Suraj Shetty
da2c69e836
fix(translations): Incorrect syntax
2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Anurag Mishra
3496104ebe
fix: odometer value was not syncing properly
2020-01-28 13:11:49 +05:30
Deepesh Garg
cd8d667861
fix: Parent company defaulting on creation of new company ( #20422 )
...
* fix: Parent company defaulting on creation of new company
* fix: Test Cases
* fix: Test Cases
* fix: Test Cases for staffing plan
2020-01-28 12:54:45 +05:30
Parth J. Kharwar
011c13b3cc
fix: employee checkin doctype time permissions ( #20403 )
2020-01-27 16:03:24 +05:30
Anurag Mishra
ce00f6cf70
fix: Duplicate Attendance Due Wrong Date format ( #20390 )
2020-01-24 16:14:50 +05:30
Anurag Mishra
85e5ba9698
Merge branch 'develop' into fix-remaining-leave-balance-calculation
2020-01-20 19:41:33 +05:30
Mangesh-Khairnar
2892a3b067
fix: nonetype issue in the total leaves calculation
2020-01-20 18:02:23 +05:30
Himanshu Warekar
303f085499
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-01-19 11:45:24 +05:30
Mangesh-Khairnar
2ac8473abf
fix: calculate remaining leave balance
2020-01-17 22:46:26 +05:30
Parth Kharwar
0a581c096b
chore: changed employee contact field name
2020-01-17 11:50:35 +05:30
Vishal Dhayagude
2ae87876b6
fix: salary structure assignment filter employee based on company ( #20318 )
...
* fix: pick company from employee salary structure
* fix: Salary structure assignment fetch company from enmployee
* Revert "fix: Salary structure assignment fetch company from enmployee"
This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f.
* fix: Salary structure assignment fetch company from enmployee
* fix: filter on company for salary structure assignment
* fix: minor changes
* fix: minor changes
* fix: added company to salary strucutre assignment
2020-01-17 11:44:11 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch ( #20301 )
...
* fix: Multiple fixes based on testing on pre-release branch
* fix: reload hr settings
2020-01-16 13:37:25 +05:30
Himanshu Warekar
c9f497d7c0
feat: move subject and sender fields to json
2020-01-13 16:26:40 +05:30
Himanshu Warekar
e5692e035a
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-01-13 15:17:32 +05:30
Vishal Dhayagude
7ae11005c4
fix: UX improvement. move trigger on fieldname restrict_backdated_leave_application ( #20211 )
2020-01-07 13:02:13 +05:30
Vishal Dhayagude
6b316cd7cb
feat: Backdated leave application ( #20201 )
...
* fix: only HR Managers can make backdated leave applications
* fix (leave application): error message changed and user check modified
* fix: Move hardcoded logic to HR Settings
* fix: added role as mandetory field on check restict field
* fix: minor changes
2020-01-07 11:48:38 +05:30
Anurag Mishra
8554304616
fix: set currency to company default currency ( #20157 )
2019-12-31 17:23:31 +05:30
Nabin Hait
5748cde54b
fix: minor field arrangements
2019-12-31 17:18:15 +05:30
Anurag Mishra
d2eae9fbcf
fix: Atendance Request, Employee Skill Map, Leave Encashment form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
b57ec65812
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
52d280067b
fix: Leave Type form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
cfdbbcff70
fix: Employee incentive form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
39ecd6ee1e
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
ec9000b6b9
fix: Employee form UI
2019-12-31 17:18:14 +05:30
Anurag Mishra
bd6e8b9cec
feat: Mark Unmarked Attendance ( #20062 )
...
* feat: Mark Unmarked Attendance
* Update shift_type.py
* Update attendance_list.js
* Update attendance.py
* Update attendance.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-31 17:09:56 +05:30
Rohan
b73b347697
feat: add job applicant's email in job offer ( #20153 )
2019-12-31 17:09:02 +05:30
thefalconx33
88de158378
feat: added provision to disable rounded total for salary slips
2019-12-31 15:27:30 +05:30
Saqib
8774c869d7
fix: first name not fetched from job offer applicant name ( #20093 )
2019-12-27 12:15:20 +05:30
thefalconx33
61bd6ccc2b
fix: travis failing for leave application test
2019-12-26 18:27:58 +05:30
Parth J. Kharwar
8c4cf12c93
Setting preferred driver email in delivery trip ( #19832 )
...
* fix: add driver's preferred contact email in delivery trip
* fix: modify driver's preferred email patch and blank field checks
* fix: patch file fix
* fix: patch changes to improve speed
* fix: removal of conflicts
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-25 15:14:52 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return
...
feat: Capture return amount against Employee Advance via Journal Entry
2019-12-24 11:52:20 +05:30
Deepesh Garg
cc62aad503
fix: Label for return amount
2019-12-24 11:51:39 +05:30
DeeMysterio
152c6be209
fix(employee onboarding): stop showing irrelevant job offer links for a job applicant ( #20053 )
2019-12-23 19:02:29 +05:30