Rucha Mahabal
e9dbb46a06
fix: incorrect amount based on payment days in timesheet salary slip ( #28884 )
2021-12-14 20:04:37 +05:30
Jannat Patel
9ae3f26dbf
fix: conflicts
2021-10-20 12:34:04 +05:30
Goh Yan Chang
ad736f1789
Update employee_leave_balance.py
...
fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f7848a3
2021-10-20 06:58:37 +00:00
pateljannat
999a3f1305
Revert 'fix: salary component account filter'
2021-09-28 10:32:33 +05:30
Anupam Kumar
09d5ddc42b
fix: bank remittance report issue ( #26398 ) ( #26767 )
2021-08-04 14:03:01 +05:30
pateljannat
2e5a358e96
fix: salary component account filter
2021-07-23 13:06:57 +05:30
Jannat Patel
1b8670b263
fix: Removed company filter for Loan Type ( #26463 )
2021-07-13 15:29:58 +05:30
Jannat Patel
23db6a8e3a
fix: added company filter while fetching loans ( #26296 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2021-07-12 13:17:27 +05:30
Mohammed Yusuf Shaikh
ee7de6b107
fix: half day to be accounted in its leave type ( #26267 )
2021-07-02 12:31:59 +05:30
Jannat Patel
57a68c317e
fix: Staffing plan vacancies data type issue ( #25940 )
...
* fix: staffing plan vacancies data type issue
* fix: translation issue
* fix: removed greater than 0 condition
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2021-06-23 14:38:18 +05:30
Jannat Patel
fc44712976
fix: job applicant link issue ( #25935 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2021-06-23 12:30:30 +05:30
Rucha Mahabal
85dca013ee
fix: update employee field on renaming employee ( #25958 )
2021-06-07 15:02:49 +05:30
Rucha Mahabal
f644f6feba
fix: Employee Separation ( #25504 )
...
* fix: Employee Separation
- add ignore_mandatory flag for project creation
- form clean-up
* fix: Employee Separation test
2021-05-03 18:37:13 +05:30
Nabin Hait
3f459c500f
Merge branch 'version-12-hotfix' into v12-pre-release
2021-04-16 12:42:36 +05:30
Saqib
e787d05f66
fix(e-invoicing): validations & tax calculation fixes ( #25315 )
...
* fix: GST on freight charge in e-invoicing
* fix: cannot fetch e invoice settings
* fix: address validations & cancel eway bill dialog
* fix: except einvoice loading error seperately
* fix: sider
* fix: import format_date
* fix: imports
* fix: test
* fix: test
* fix: test
* fix: validate total condition
* feat: add company link to e-invoice settings
* fix: remove extra condition
* fix: test
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com >
2021-04-15 18:57:08 +05:30
Anupam
ac58e05bbb
fix: error message compensatory leave request
2021-04-06 11:40:21 +05:30
Nabin Hait
238df8b3ec
Merge branch 'version-12-hotfix' into v12-pre-release
2021-03-16 11:03:25 +05:30
Rohan
aa90dc6aa3
fix: do not send emails to disabled users from Employee Onboarding ( #24796 )
2021-03-09 21:02:57 +05:30
Ankush Menat
5feb20d94b
feat: track changes to HR settings ( #24740 )
...
related issue: FR-ISS-259927
2021-02-25 19:05:25 +05:30
Nabin Hait
42675929fa
fix:merge conflict
2021-01-15 17:09:43 +05:30
Afshan
75cfbe132b
fix: calculation of remaining_sub_periods if relieving date before month start date
2021-01-14 13:51:01 +05:30
Nabin Hait
d5abab4208
fix: tax calculation on salary slip for the first month ( #24272 ) ( #24309 )
...
* fix: tax calculation on salary slip for the first month
* fix: net pay precision issue
* fix: net pay precision issue
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com >
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com >
2021-01-06 09:34:44 +05:30
Nabin Hait
2bd620fac8
fix: Fixed merge conflict
2020-12-11 22:34:34 +05:30
Afshan
e39dd079c4
fix: double exception in payroll ( #24080 )
2020-12-08 09:32:08 +05:30
Afshan
482996f8d1
fix: using ORM
2020-12-03 15:14:30 +05:30
Afshan
785579e67b
fix: payroll attendance error
2020-12-03 15:11:34 +05:30
Afshan
2b3a20ed5b
fix: clear error message when approval not availab ( #23972 )
...
le
2020-11-24 08:01:43 +05:30
Marica
9525bffcd9
fix: Hide Ex-Employees from Employee Tree and minor message UX
...
* fix: Hide Ex-Employees from Employee Tree and minor message UX
* fix: translation syntax
2020-11-17 12:58:31 +05:30
Suraj Shetty
fe56015cbf
fix: Handle the "no leave_allocation found" case ( #23920 )
2020-11-17 12:07:53 +05:30
Suraj Shetty
780982dcc7
fix: Handle the "no leave_allocation found" case ( #23921 )
2020-11-17 11:02:15 +05:30
Suraj Shetty
aebeb573e4
Merge branch 'version-12-hotfix' of github.com:frappe/erpnext into v12-pre-release
2020-11-17 10:15:52 +05:30
Anurag Mishra
5f148d3d3a
fix: set_query in leave application ( #22197 )
2020-10-28 16:25:57 +05:30
Abhishek Balam
6c894f8f41
fix(HR) : Filter Leave Type based on allocation for a particular employee ( #22050 )
...
* table was showing empty with just headers when no leaves allocated, fixed template code
* added filters on Leave Type based on leave allocation for a particular employee and to/from dates
2020-10-28 16:12:57 +05:30
Saqib
3ae9bbc0a7
fix: fuel expense amount of vehicle log ( #23634 )
...
* fix: fuel expense amount of vehicle log
* fix: undefined var employee_id in test
* fix: test
2020-10-16 11:54:36 +05:30
Nabin Hait
f145a4ce58
fix: resolved conflict
2020-10-14 09:59:55 +05:30
marination
007069d495
fix: Convert dates to datetime.date before comparing in Holiday List
2020-10-13 02:42:14 +05:30
Anurag Mishra
257927a18b
fix:dash board for pre-release test ( #23428 )
2020-09-24 16:32:39 +05:30
Anurag Mishra
1caab44c29
fix:dash board for pre-release test ( #23426 )
2020-09-24 15:43:18 +05:30
Anupam
f31e358df9
fix: leave application status fix
2020-09-23 19:14:31 +05:30
Anupam
960229793b
fix: conflict resolved
2020-09-23 18:58:38 +05:30
Anupam
ecfc4b3fd4
fix: review changes
2020-09-23 18:53:40 +05:30
Anupam
d5a33f4604
fix: leave application status fix
2020-09-22 11:29:17 +05:30
Nabin Hait
5750f317c5
Merge branch 'version-12-hotfix' into v12-pre-release
2020-09-15 19:42:05 +05:30
rohitwaghchaure
dad5bbdaa2
Merge pull request #23131 from Anurag810/leave_application_form_dashboard_fixes
...
fix: Form dashboard showing wrong balance
2020-09-08 16:58:11 +05:30
Anurag Mishra
e5fbebf946
fix: update filters
2020-09-08 15:55:07 +05:30
Anurag Mishra
053fdd91da
fix: data was not properly maped
2020-09-03 17:11:59 +05:30
Rucha Mahabal
b574353c00
fix(Payroll Entry): Set cost center for payroll payable account ( #23223 )
2020-08-31 20:09:48 +05:30
Anurag Mishra
69bb85d1d0
fix: Form dashboard showing wrong balance
2020-08-25 06:55:02 +05:30
Nabin Hait
3d1df94ad2
fix:Validate Job offer against vacancies ( #23108 )
2020-08-20 19:39:03 +05:30
Nabin Hait
fa36a06188
fix:Validate Job offer against vacancies ( #23107 )
2020-08-20 19:38:55 +05:30
