Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values ( #31358 )
...
* refactor: DB independent quoting and truthy/falsy values
* style: reformat to black spec
* fix: ifnull -> coalesce
* fix: coalesce -> Coalesce
* fix: revert pypika comparison
* refactor: convert queries to QB
* fix: incorrect value types for query
`=` query makes no sense with list of values
* fix: remove warehouse docstatus condition
* fix: keep using base rate as rate
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-17 17:01:27 +05:30
Conor
2a9105f26f
refactor: DB independent capitalization of test cases ( #31359 )
2022-06-15 11:24:24 +05:30
Marica
2941a8ce73
Merge pull request #31303 from marination/update-employee-compatibility-fix
...
fix: locale Currency and Float setting in update_employee
2022-06-10 11:35:02 +05:30
Ankush Menat
6fc32b83c8
fix: revert show title field on Employee doctype ( #31312 )
2022-06-10 11:03:51 +05:30
RJPvT
17887cde71
fix: locale Currency and Float setting in update_employee
...
In fieldtypes locale settings (example NL) . and , changes whereby the field is inproperly filled
2022-06-09 18:40:51 +05:30
Rucha Mahabal
91f9f37d64
fix: leave balance for earned leaves in backdated Leave Application dashboard ( #31253 )
2022-06-07 09:51:30 +05:30
Rucha Mahabal
cf04683ad3
fix(Leave Application): 'Cancelled' status shown as 'Open' in list view
2022-06-06 14:34:45 +05:30
Rucha Mahabal
59de303b13
refactor: rewrite lwp queries using query builder
2022-06-06 14:34:45 +05:30
Rucha Mahabal
4decb7a02b
fix: Consider only Approved leave applications in LWP, Employee Benefit calculations
...
- do not allow submitting leave applications with 'Cancelled' status
2022-06-06 14:34:45 +05:30
Mohammad Hussain Nagaria
37433aad48
fix: Pluralize year text instead of optional bracket ( #31210 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-06-01 16:29:20 +05:30
Rucha Mahabal
536f1dfc4b
test: fix attendance tests for unmarked days ( #31205 )
...
* test: fix attendance tests for unmarked days
* chore: remove unused import
2022-06-01 13:56:55 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
Rucha Mahabal
34925a3a8c
fix: HRA Exemption calculation in case of multiple salary structure assignments
2022-05-31 11:54:43 +05:30
Rucha Mahabal
2bc6d46070
fix: validation message
2022-05-26 13:00:34 +05:30
Rucha Mahabal
ab0ef60918
test: Job Opening against a Staffing Plan
2022-05-26 11:32:46 +05:30
Rucha Mahabal
29228575fa
fix: Job Opening linked to Staffing Plan cannot be created/updated if there are existing employees
2022-05-25 18:33:37 +05:30
Rucha Mahabal
34e238ce4f
fix: Leave Encashment calculations ( #31062 )
2022-05-23 10:13:49 +05:30
ruthra kumar
59ed7c854d
refactor: ignore linked Payment Ledger Entry in basic transactions
2022-05-20 18:21:47 +05:30
Rucha Mahabal
28fe4f3d54
fix: unlink Attendance from Employee Checkins on cancellation ( #31045 )
2022-05-17 12:07:58 +05:30
Rucha Mahabal
1b7ce9649b
fix: IN time not captured in Attendance through Employee Checkin ( #31029 )
2022-05-16 15:45:00 +05:30
Rucha Mahabal
ead08aa192
Merge pull request #31013 from ruchamahabal/hr-reports-emp-status
...
feat: add Employee Status filter in leave balance reports
2022-05-13 22:07:08 +05:30
Rucha Mahabal
260cfa5d1e
test: employee status filter in leave balance reports
2022-05-13 21:02:09 +05:30
Rucha Mahabal
08fb9a4318
fix: translation for status filter
2022-05-13 20:44:35 +05:30
Rucha Mahabal
ed8a49737a
feat: add Employee Status filter in leave balance reports
2022-05-13 20:23:32 +05:30
Rucha Mahabal
3016ed958e
fix(Employee Advance): Return/Deduction from Salary button visibility ( #31011 )
2022-05-13 20:01:14 +05:30
Rucha Mahabal
51fcbe5826
feat(HR): Leave Type configuration to allow over allocation ( #30940 )
2022-05-09 21:29:58 +05:30
Rucha Mahabal
f92bc4dd33
fix: remove check for already allocated earned leaves ( #30931 )
...
* fix: remove check for already allocated earned leaves
* fix: do not set New Leaves Allocated field as read-only for earned leaves
- removing this until there's a better way to update existing allocations
2022-05-09 12:15:02 +05:30
Rucha Mahabal
7f1024f8aa
feat(minor): fetch default salary structure and base from Employee Grade in Salary Structure Assignment ( #30918 )
2022-05-06 17:44:30 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration
2022-05-02 11:47:37 +05:30
Rucha Mahabal
65742947e7
fix(UX): record reason for skipping attendance or marking absent for auto attendance ( #30844 )
2022-04-29 15:46:00 +05:30
Deepesh Garg
8dcbbf1b9e
chore: Remove course links from training doctypes
2022-04-28 13:49:34 +05:30
Rucha Mahabal
1cc8c79807
test: fix flaky carry forwarded leave expiry test ( #30810 )
2022-04-26 17:43:08 +05:30
Rucha Mahabal
8e5327a0e0
fix: clear property child table on changing employee
2022-04-22 21:33:24 +05:30
Rucha Mahabal
9d158088ee
chore: remove unused Employee Transfer Property doctype
2022-04-22 20:20:12 +05:30
Rucha Mahabal
cfa4dfe7a8
fix: reset old CTC on promotion cancellation
2022-04-22 20:20:04 +05:30
Rucha Mahabal
9b93c63830
fix: tests
2022-04-22 17:54:32 +05:30
Rucha Mahabal
788e0a1c6c
chore: format employee_property_update.js
2022-04-22 17:25:37 +05:30
Rucha Mahabal
ed04241cf4
Merge branch 'develop' into promotion-enhancements
2022-04-22 16:38:01 +05:30
Rucha Mahabal
833a33a94b
test: employee property update via Employee Promotion
2022-04-22 16:28:25 +05:30
Rucha Mahabal
a93867de19
feat: add CTC fields in Employee master and Promotion
2022-04-22 16:28:14 +05:30
Rucha Mahabal
c3dc5d5ce7
fix: property addition not working for select fields
2022-04-21 08:17:00 +05:30
Rucha Mahabal
5411e69553
fix: filters not working in Shift Assignment Calendar view ( #30752 )
2022-04-20 14:56:06 +05:30
Rucha Mahabal
789fa31b82
Merge branch 'develop' into shift-type-null-in-employee-checkin
2022-04-19 13:39:32 +05:30
Rucha Mahabal
3cddc1e97e
test: shift fetching when assignment has an end date
2022-04-19 13:39:03 +05:30
Rucha Mahabal
98cccf221e
fix: shift fetching fails in Employee Checkin if shift assignment has an end date
...
Co-authored-by: Ejaaz Khan <ejaazrkhan@gmail.com>
2022-04-19 13:17:36 +05:30
Rucha Mahabal
cf2e6c6c08
fix: remove hardcoded employee fields that can be updated via Promotion
2022-04-09 13:15:37 +05:30
Suraj Shetty
199419db80
Merge branch 'develop' into exotel-fixes
2022-04-08 21:37:08 +05:30
Rucha Mahabal
7ba66b0320
Merge branch 'develop' into multiple-shifts
2022-04-07 18:07:39 +05:30
Rucha Mahabal
ec65af5f38
fix: show allocation history for earned leaves allocated via scheduler
2022-04-07 12:57:04 +05:30
Rucha Mahabal
6203ffc8fa
fix: make New Leaves Allocated read-only if policy assignment is linked to the allocation and leave type is earned leave
2022-04-07 12:57:04 +05:30
