Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(SalarySlip): use correct end_date variable for calculation #2617

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
952 commits
Select commit Hold shift + click to select a range
1fc5b9e
fix(Leave Application): Corrected rendering of Leave Application emai…
mergify[bot] Feb 19, 2024
fb47d04
fix(Monthly Attendance Sheet): parsing error for data values (backpor…
mergify[bot] Feb 21, 2024
925af51
fix: leave application status vs max consecutive days calculation (ba…
mergify[bot] Feb 21, 2024
f410123
fix(Staffing Plan): honour company default currency (backport #1461) …
mergify[bot] Feb 26, 2024
c09aaed
fix: enable no copy for Pending Amount & Returned Amount (backport #1…
mergify[bot] Feb 26, 2024
6c2e475
fix(Payroll Entry): consideration of Salary Slip Based on Timesheet a…
mergify[bot] Feb 28, 2024
c8cfc65
refactor: update exchange rate of reference document supplied by reco…
mergify[bot] Mar 2, 2024
66989d7
test: fix `test_consider_marked_attendance_on_holidays_with_unmarked_…
mergify[bot] Mar 4, 2024
518badc
fix: german translations (backport #1463) (#1465)
mergify[bot] Mar 4, 2024
9e1c5bb
fix: german translations for "leave" (backport #1500) (#1501)
mergify[bot] Mar 4, 2024
7c619f0
fix: company fixture setup error handling & flags (backport #1504) (#…
mergify[bot] Mar 5, 2024
936c7f1
refactor: replace `in_list(array, member)` with `array.includes(membe…
mergify[bot] Mar 11, 2024
c23567e
refactor(UX): show leave application links in leave allocation cancel…
mergify[bot] Mar 12, 2024
2e84f95
fix: connections in organizational chart cards to show active employe…
mergify[bot] Mar 12, 2024
be5ef78
fix: Payroll Entry employee_query Error (#1521)
anupamvs Mar 13, 2024
337c201
fix: honour 'Consider Marked Attendance on Holidays' for Half Day (ba…
mergify[bot] Mar 13, 2024
6ce46a8
feat(Bulk Leave Policy Assignment): add Assignment Based on Joining D…
krantheman Mar 13, 2024
bf6c4bd
fix(Shift Assignment): calendar view date filter (backport #1477) (#1…
mergify[bot] Mar 13, 2024
3f16093
fix(Leave Application): calendar view
barredterra Feb 12, 2024
867d838
fix: show blocked dates as "allDay"
barredterra Feb 12, 2024
1e7064c
fix: remove unused whitelisting from get_applicable_block_dates
barredterra Feb 12, 2024
bead61f
fix: get blocked days in the correct order
barredterra Feb 12, 2024
859dd8b
fix: convert datetime to date
barredterra Feb 12, 2024
3332d54
refactor: use `1` instead of `True`
barredterra Mar 12, 2024
764a1ff
fix: set employee before company
barredterra Mar 12, 2024
8ad3a63
fix: half day
barredterra Mar 12, 2024
680358f
refactor: use get_list instead of sql and simplify date range condition
krantheman Mar 14, 2024
ad05477
fix: remove employee_name and leave_type before checking in events
krantheman Mar 14, 2024
c2d8743
fix: use get_single_value instead of get_value
krantheman Mar 14, 2024
ae8760f
chore: add comment
krantheman Mar 14, 2024
898ea17
Merge pull request #1539 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Mar 14, 2024
04f86ab
feat(Gratuity): allow setting work experience manually (#1541) (#1542)
mergify[bot] Mar 15, 2024
f4d97b1
fix: don't update exchange rate for all references
ruthra-kumar Mar 18, 2024
516dcb7
Merge pull request #1557 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Mar 19, 2024
4fd79b4
fix: bold in group by and options mapping (backport #1564) (#1579)
mergify[bot] Mar 26, 2024
92331aa
fix: add filter for employee in vehicle log (backport #1571) (#1581)
mergify[bot] Mar 26, 2024
2c08519
fix: incorrect IFSC codes in bank remittance report (backport #1538) …
mergify[bot] Mar 26, 2024
b0ed010
fix: employee filter in list view of employee checkin (backport #1612…
mergify[bot] Apr 3, 2024
8ef26a6
fix: employee filter in list view of shift assignment (backport #1624…
mergify[bot] Apr 5, 2024
d339d3b
ci: fix flaky test data (backport #1619) (#1632)
mergify[bot] Apr 5, 2024
32abbc2
fix: shift type filter in list view of shift assignment (backport #16…
mergify[bot] Apr 5, 2024
e252e89
fix: use reference name while updating exc rate (backport #1623) (#1634)
mergify[bot] Apr 5, 2024
061840b
feat: show holidays and colour code in attendance calendar
vinyselopal Mar 28, 2024
58340c1
refactor: move import statements up
vinyselopal Mar 28, 2024
447c615
chore: fix formatting
ruchamahabal Apr 5, 2024
549e033
chore: add read perm for Employee on Attendance
ruchamahabal Apr 5, 2024
012912a
chore: fix formatting & imports
ruchamahabal Apr 5, 2024
ddc1183
chore: fix conflicts
ruchamahabal Apr 5, 2024
9365b55
Merge pull request #1637 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal Apr 5, 2024
0d72b65
refactor: update Pending Amount on validation
krantheman Feb 28, 2024
dd4642a
feat: add field descriptions
krantheman Feb 28, 2024
7fd70ba
perf: better querying
krantheman Feb 28, 2024
ca091e6
fix: fetch only unpaid advances
krantheman Apr 8, 2024
13b3808
test: add test_pending_amount
krantheman Apr 8, 2024
e606ead
chore: fix casing in doctype descriptions
ruchamahabal Apr 12, 2024
4f91aa9
fix: merge conflicts
krantheman Apr 12, 2024
749ce70
Merge pull request #1655 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Apr 13, 2024
2bc8f46
fix(Job Applicant): Translate dialog label (backport #1682) (#1687)
mergify[bot] Apr 19, 2024
7bedf5f
fix(Leave Balance): Add context to translation for "Left" (Employee) …
mergify[bot] Apr 19, 2024
2502b9b
fix(Income Tax Computation): eval locals for Income Tax Slab
krantheman Apr 19, 2024
232873b
fix: get salary slip from the correct payroll period for data evaluation
ruchamahabal Apr 26, 2024
0d37489
chore: fix conflicts
ruchamahabal Apr 26, 2024
ca3364d
Merge pull request #1713 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal Apr 26, 2024
e303590
fix(HRA calculation): fetch active salary assignment assigned before …
ruchamahabal Apr 27, 2024
06caf4c
test: single SSA before payroll period for HRA calculation
ruchamahabal Apr 27, 2024
d8807dd
chore: fix conflicts
ruchamahabal Apr 27, 2024
a668653
Merge pull request #1716 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal Apr 27, 2024
68728db
fix(Employee Advance): selection of currency
krantheman Apr 29, 2024
cccda2e
fix: merge conflicts
krantheman Apr 29, 2024
3d1a6bf
Merge pull request #1722 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Apr 30, 2024
af1b2ba
fix(Employee Attendance Tool): 'On Leave' status showing as undefined…
mergify[bot] May 1, 2024
cba9824
fix(Leave Application): half day date picker rendering (backport #164…
mergify[bot] May 1, 2024
fb5294a
fix: autofill skills on entering designation in Interview Round (back…
mergify[bot] May 1, 2024
12ff8c7
feat(Attendance Request): add 'Include Holidays' checkbox (backport …
mergify[bot] May 1, 2024
380f7d1
ci: use prettier for js formatting and ruff for py formatting/linting
krantheman Apr 24, 2024
31ec73d
chore: format all JS, CSS, and SCSS files
krantheman Apr 24, 2024
6409c64
chore: format all Python files
krantheman Apr 24, 2024
070b457
chore: ignore formatting commits
krantheman Apr 24, 2024
8141c89
fix: ruff linting issues
krantheman Apr 24, 2024
7b2685d
fix: ruff linting issues
krantheman Apr 15, 2024
aa1cbce
ci: ignore salary_structure file
krantheman Apr 24, 2024
f268a10
fix: more ruff linting issues
krantheman Apr 24, 2024
9773e85
fix: semgrep errors
krantheman Apr 17, 2024
9f9eb9b
chore: ignore sql and cur_frm semgrep rules for now
krantheman Apr 17, 2024
763cf3f
chore: remove unncessary fetch from statements & scripts
ruchamahabal Apr 17, 2024
4168b19
refactor(Expense Claim): get rid of `cur_frm` usage
ruchamahabal Apr 17, 2024
258fc60
chore: handle semgrep errors
ruchamahabal May 1, 2024
b96075b
Merge pull request #1708 from krantheman/update-formatting-v14
ruchamahabal May 1, 2024
6d5c118
chore: don't pin frappe dependencies for v14
ruchamahabal May 1, 2024
bbc2b7d
fix: set intro message for leave application (backport #1696) (#1741)
mergify[bot] May 2, 2024
4efdb1f
chore: grant Employee role read permission for Payroll Period (backpo…
mergify[bot] May 7, 2024
3dfb7be
refactor: remove 'Create Employee' step
krantheman Jan 5, 2024
bad102f
feat: Preview Salary Slip from Salary Structure Assignment
krantheman Jan 5, 2024
4e34da8
refactor: combine Create & Assign Salary Structure step
krantheman Jan 11, 2024
f863779
feat(Create Payroll Period): set Start & End Date as that of Fiscal Y…
krantheman Jan 12, 2024
3d5d192
chore: fix linter
ruchamahabal May 3, 2024
b086945
fix: set payroll period dates based on last payroll period/current fi…
ruchamahabal May 7, 2024
7875c70
fix: open full forms instead of quick entries in onboarding, update b…
ruchamahabal May 7, 2024
03b0caf
fix(Auto Attendance): incorrect previous shift computation for a time…
ruchamahabal May 6, 2024
15686c0
test: prev & curr shift edge cases
ruchamahabal May 7, 2024
232b889
Merge pull request #1755 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal May 7, 2024
5e475bb
fix: merge conflicts
krantheman May 10, 2024
41a8dfb
chore: match order of methods with develop branch
krantheman May 10, 2024
bd28f7e
chore: remove redundant code for setting payroll period dates
ruchamahabal May 14, 2024
7bfed5f
Merge pull request #1751 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal May 14, 2024
f6abbc4
feat(minor): allow using `rounded` function in salary slip formulae (…
mergify[bot] May 14, 2024
07e76f0
fix: validation of overlapping shift dates
krantheman May 10, 2024
58df5e2
test: test definite shifts before an indefinite one
krantheman May 10, 2024
398e3f1
test: remove redundant code
krantheman May 12, 2024
d3ad5a6
fix: simplify shift request overlapping validation
ruchamahabal May 16, 2024
2f9ff31
Merge pull request #1781 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal May 16, 2024
07ed29d
chore: remove mergify from release notes (backport #1783) (#1785)
mergify[bot] May 16, 2024
9d2611f
fix: added missing args
nabinhait May 16, 2024
8bb057b
Merge pull request #1789 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal May 17, 2024
4ed93bd
fix(Interview Feedback): type cast user input for "rating" field to f…
mergify[bot] May 22, 2024
3ff82d8
fix(Expense Claim): update of Outstanding Amount on Payment Entry sub…
krantheman May 22, 2024
3f17fee
fix: update all past Payment Entries outstanding amount
krantheman May 22, 2024
05e13a1
test: check if Payment Entry Outstaning Amount has been updated
krantheman May 22, 2024
cc4d718
fix: update outstanding amount only in the current payment entry
ruchamahabal May 23, 2024
3396aef
Merge pull request #1804 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal May 23, 2024
1675932
fix: consider payment days = total working days in the last salary sl…
ruchamahabal May 23, 2024
524ba64
refactor: move gratuity calculation functions to the class
ruchamahabal May 23, 2024
51a7f29
refactor: remove unnecessary functions, improve readability
ruchamahabal May 23, 2024
cb1b76a
fix: only fetch required fields from gratuity slabs
ruchamahabal May 23, 2024
4ed9fb6
test: gratuity amount is consistent irrespective of the payment days
ruchamahabal May 24, 2024
6101ac6
Merge pull request #1809 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal May 24, 2024
ca857ab
fix(Travel Request): get currency from Employee Master's Company (bac…
mergify[bot] May 29, 2024
50f490c
fix: avoid rejected leave application on leave check (backport #1848)…
mergify[bot] Jun 6, 2024
fdbeedd
ci: don't report coverage on individual PRs (backport #1674) (#1851)
mergify[bot] Jun 6, 2024
38bed0b
fix: don't overwrite leave approver while renderingleave summary dash…
ruchamahabal Jun 7, 2024
849b7ea
fix(UX): link employee & department doc in the error message for miss…
ruchamahabal Jun 7, 2024
c5dbad7
Merge pull request #1859 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal Jun 7, 2024
1c6fe98
chore: fix ci.yml
ruchamahabal Jun 7, 2024
e9dc0b1
fix(Salary Slip): remove company filter from employee (backport #1873…
mergify[bot] Jun 11, 2024
f735482
fix(Salary Structure Assignment): Preview Salary Slip date (backport …
mergify[bot] Jun 11, 2024
37578e6
fix(Shift Assignment): type error while comparing dates during comput…
mergify[bot] Jun 11, 2024
4b2312d
fix: calculate leaves for months passed even when policy assignment i…
mergify[bot] Jun 12, 2024
137a269
test: type cast date values in onboarding tests (backport #1889) (#1891)
mergify[bot] Jun 12, 2024
81d2ccf
fix: add party and party type in PE (backport #1894) (#1897)
mergify[bot] Jun 14, 2024
0f6d470
fix(Income Tax Computation): computation of total tax exemption (back…
mergify[bot] Jun 19, 2024
e9e3a16
fix(UX): validate missing Income Tax Slab in Salary Structure Assignm…
mergify[bot] Jun 25, 2024
765f6f1
fix: HR Settings permissions (#1924)
krantheman Jun 26, 2024
4dd9fbf
fix: conflicts
krantheman Jun 27, 2024
5e24717
Merge pull request #1925 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Jun 27, 2024
fb7b283
feat(Salary Payment via ECS): add Net Pay column
krantheman Jul 12, 2024
d6938b6
Merge pull request #1971 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Jul 15, 2024
c2266c9
refactor: validate total weightage in all appraisal forms (backport #…
mergify[bot] Jul 15, 2024
ae694dc
fix(Shift Assignment): timings overlap conditions
krantheman Jun 29, 2024
e821d15
fix(Shift Assignment): allow shift to start at end_time of another sh…
krantheman Jul 1, 2024
af7ea73
test: refactor
krantheman Jul 1, 2024
8bef18c
fix(Attendance): overlapping shift attendance
krantheman Jul 1, 2024
dadf61e
Merge pull request #1983 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal Jul 17, 2024
90721c4
fix: Use `frm` instead of `this` (backport #1990) (#1994)
mergify[bot] Jul 21, 2024
b2dbb0a
fix: Sort lists before calling itertools.groupby (backport #1997) (#2…
mergify[bot] Jul 27, 2024
617de87
fix: query in Provident Fund and Professional Tax Deductions reports …
mergify[bot] Aug 5, 2024
c5dd5fd
ci: fix semgrep version in linters (#2040)
ruchamahabal Aug 5, 2024
3411d7a
fix: concurrency issue leading to duplicate attendance insertion (#20…
mergify[bot] Aug 6, 2024
adeb482
fix: filter in reports (backport #1987) (#2044)
mergify[bot] Aug 6, 2024
1e576fc
fix: rendering the email template subject in leave notification (back…
mergify[bot] Aug 6, 2024
0913976
fix: filter and bold issue in Salary Payments Based On Payment Mode (…
mergify[bot] Aug 6, 2024
f8837e4
fix: wrong compute of CTC on salary slip, if employee relieving date …
mergify[bot] Aug 6, 2024
c16113d
fix: "Employee Exits" set as query report in hr workspace (backport #…
mergify[bot] Aug 11, 2024
89b2cfa
fix: set as query report 1 in all workspace (backport #2066) (#2067)
mergify[bot] Aug 11, 2024
cac8610
fix: get_taxes condition
krantheman Aug 13, 2024
04138ff
Merge pull request #2079 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Aug 14, 2024
21276d0
feat: add Fetch Shift buttons from Employee Checkin
krantheman Aug 12, 2024
6bd60ef
test: fix typo in variable name
krantheman Aug 13, 2024
6cea6cb
feat: show alert when shift is updated
krantheman Aug 14, 2024
3cbed12
fix: don't show button when attendance has been marked
krantheman Aug 15, 2024
7b24c22
fix: merge conflicts
krantheman Aug 15, 2024
e79fef6
Merge pull request #2082 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Aug 15, 2024
d94cc71
fix(Employee Grievance): fix perms for Reports To field
krantheman Aug 21, 2024
5ce0292
fix: merge conflicts
krantheman Aug 21, 2024
ae9b86b
Merge pull request #2104 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Aug 21, 2024
9410b46
chore: fix typo in form tour (backport #2114) (#2115)
mergify[bot] Aug 24, 2024
9aa8e5e
fix: translatability of work anniversary reminders (backport #2092) (…
mergify[bot] Aug 28, 2024
cdbce8e
fix(Monthly Attendance Sheet): consideration of None values while gro…
krantheman Sep 13, 2024
9543975
test: consider None values while testing group by filter
krantheman Sep 13, 2024
41adba1
Merge pull request #2175 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Sep 13, 2024
bf0970c
feat(Monthly Attendance Sheet): add Include Company Descendants filter
krantheman Sep 13, 2024
6ac54cd
test: add test for company filter
krantheman Sep 13, 2024
2395ee3
Merge pull request #2178 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Sep 16, 2024
967b4bd
fix: remove default from Employee Leave Balance report (backport #217…
mergify[bot] Sep 16, 2024
51cb889
fix: year_start_date in Employee Advance Summary (backport #2165) (#2…
mergify[bot] Sep 16, 2024
8e8380e
fix: expire_allocation api endpoint by fetching allocation object (ba…
mergify[bot] Sep 16, 2024
1a00af0
fix: show shift for month full of leaves
krantheman Sep 16, 2024
004f9ed
test: update test to check for shift of employees on leave
krantheman Sep 16, 2024
3d12d30
Merge pull request #2201 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Sep 17, 2024
ceb718f
fix(Income Tax Computation): consideration of new employees without p…
krantheman Sep 16, 2024
fa91264
Merge pull request #2206 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Sep 18, 2024
ed4fcc3
feat(Earned Leave): allocate leaves manually
krantheman Jul 5, 2024
3a616f7
refactor: move get_monthly_earned_leave to server side
krantheman Jul 10, 2024
6774f8a
feat: add error message for annual allocation exceeded
krantheman Sep 25, 2024
e19ae2d
test: allocate leaves manually
krantheman Sep 25, 2024
da7c046
refactor: group buttons under Actions tab
krantheman Sep 25, 2024
e56c469
Merge pull request #2232 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Sep 26, 2024
e09e0c0
feat: show In and Out Time in Attendance even if there is only one log
krantheman Sep 30, 2024
66fea41
Merge pull request #2240 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Sep 30, 2024
2c35fe5
feat: allow get_first_day and get_last_day in salary slip eval
krantheman Sep 30, 2024
1842439
Merge pull request #2245 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Oct 1, 2024
c648253
fix(Salary Slip): consider only leaves taken until End Date in Leave …
krantheman Oct 8, 2024
395444e
test(Salary Slip): leave details
krantheman Oct 8, 2024
498373d
Merge pull request #2264 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Oct 8, 2024
77271f0
chore: update site urls from frappehr.com to frappe.io/hr
krantheman Oct 9, 2024
f1d4b44
fix: merge conflicts
krantheman Oct 10, 2024
254e8df
Merge pull request #2269 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Oct 10, 2024
567b1bb
refactor: Employee working on holiday
niraj2477 Oct 17, 2023
6a63b7a
fix: Update condition in query builder
niraj2477 Oct 17, 2023
b08c890
refactor: show only holidays from employee's holidays
krantheman Oct 14, 2024
257b4e4
refactor: column widths
krantheman Oct 14, 2024
8b2021e
Merge pull request #2279 from frappe/mergify/bp/version-14-hotfix/pr-977
krantheman Oct 14, 2024
504ae57
feat: allow creating attendance requests for future dates
iamejaaz Oct 15, 2024
3c7e4ba
Merge pull request #2293 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Oct 16, 2024
6c68493
fix(Leave Policy Assignment): calculation of months passed
krantheman Oct 15, 2024
de730c6
test: add test_get_leaves_for_passed_months
krantheman Oct 15, 2024
8e1c026
test: fix test condition
krantheman Oct 17, 2024
2dd66d4
Merge pull request #2298 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Oct 17, 2024
314153b
test: add test Employees Working on a Holiday report
krantheman Oct 18, 2024
190d18a
chore: use FrappeTestCase
krantheman Oct 23, 2024
a0470d6
Merge pull request #2306 from frappe/mergify/bp/version-14-hotfix/pr-…
krantheman Oct 23, 2024
14fcacd
fix(appraisal_cycle): Value missing for Appraisal: Company while crea…
mergify[bot] Oct 24, 2024
ec0b808
fix: stop leave allocation for left employees (backport #2358) (#2362)
mergify[bot] Oct 30, 2024
5ed555f
fix: submit attendance request for future dates (backport #2352) (#2365)
mergify[bot] Oct 30, 2024
b5e51f4
feat: add Payroll Entry to Bank Account dashboard (backport #2369) (#…
mergify[bot] Oct 31, 2024
d12f9dc
fix: backport german translations from develop (#2406)
barredterra Nov 11, 2024
8058d74
fix: ignore linked ledger entry record on employee advance cancellati…
mergify[bot] Nov 22, 2024
6d35f11
fix: filters on vehicle expenses report (backport #2440) (#2446)
mergify[bot] Nov 25, 2024
51831cb
fix(Salary Structure Assignment): validate cost center company on ser…
mergify[bot] Nov 26, 2024
9ef4001
fix: prompt user to select company for shift & attendance report crea…
mergify[bot] Dec 4, 2024
8d9f676
fix: Apply system precision value while validating leave balance (bac…
mergify[bot] Dec 9, 2024
1964a5d
fix: set correct work experience for gratuity
AyshaHakeem Nov 27, 2024
efab811
fix: set field level precision for work experience field in gratuity
AyshaHakeem Dec 11, 2024
5c58ad7
chore: remove unused import
ruchamahabal Dec 11, 2024
8c84f5a
chore: fix conflicts
ruchamahabal Dec 17, 2024
fd70a60
Merge pull request #2509 from frappe/mergify/copy/version-14-hotfix/p…
ruchamahabal Dec 17, 2024
1038fa7
fix(Expense Claim): allow editing company and department (#2498)
i-am-vimal Dec 17, 2024
de8159e
chore: fix conflicts
ruchamahabal Dec 18, 2024
52bd24b
Merge pull request #2514 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal Dec 18, 2024
1952e50
fix(UX): inform the user on successful manual leave allocation
ruchamahabal Dec 18, 2024
01652fd
feat: allow setting From Date for manual allocation entry
ruchamahabal Dec 18, 2024
9868be0
fix: only allow date selection within the allocation period
ruchamahabal Dec 18, 2024
f3d6100
test: set from date in manual leave allocation
ruchamahabal Dec 18, 2024
4ea04a0
Merge pull request #2522 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal Dec 18, 2024
6f563be
fix(Shift Type): mark Process Attendance After reqd if auto attendanc…
mergify[bot] Dec 18, 2024
738be08
fix(Leave Type): Change label - Applicable After (Working Days) to Al…
ruchamahabal Dec 18, 2024
f07d903
fix: Change label - Maximum Leave Allocation Allowed to Maximum Leave…
ruchamahabal Dec 18, 2024
657da98
chore: fix conflicts
ruchamahabal Dec 20, 2024
937ec3b
Merge pull request #2530 from frappe/mergify/bp/version-14-hotfix/pr-…
ruchamahabal Dec 20, 2024
805b8c6
fix(CTC): `amount_exempted_from_income_tax` only considers last deduc…
mergify[bot] Jan 2, 2025
fcacdcc
fix(SalarySlip): use correct variable
NethminaHiker360 Jan 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Root editor config file
root = true

# Common settings
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8

# js indentation settings
[{*.js,*.vue,*.css,*.scss,*.html}]
indent_style = tab
indent_size = 4
max_line_length = 99
37 changes: 0 additions & 37 deletions .flake8

This file was deleted.

9 changes: 9 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,12 @@

# old black formatting commit (from erpnext)
76c895a6c659356151433715a1efe9337e348c11

# bulk formatting
b55d6e27af6bd274dfa47e66a3012ddec68ce798

# js, scss prettier formatting
4a224b988a254a053e9c49cd101cd67d433aed90

# python ruff formatting
7b0d00220047545d3d18650235dac9cebe0d2bca
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
name: Feature Request
description: Suggest an idea to improve Frappe HR
labels: ["feature-request"]

body:
- type: markdown
attributes:
value: |
Welcome to Frappe HR issue tracker! Before submitting a request, please consider the following:

1. This tracker should only be used to report bugs and request features / enhancements to Frappe HR
- For questions and general support, checkout the [documentation](https://docs.frappe.io/hr) or use the [forum](https://discuss.frappe.io) to get inputs from the open source community.
2. Use the search function before creating a new issue. Duplicates will be closed and directed to
the original discussion.
3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the greater the drive to make it happen.


Please keep in mind that we get many many requests and we can't possibly work on all of them, we prioritize development based on the goals of the product and organization. Feature requests are still welcome as it helps us in research when we do decide to work on the requested feature.

If you're in urgent need to a feature, please try the following channels to get paid developments done quickly:
1. Certified Frappe partners: https://frappe.io/partners
2. Developer community on Frappe forums: https://discuss.frappe.io/c/developers/5
3. Telegram group for Frappe HR development work: https://t.me/frappehr

- type: textarea
id: problem-info
attributes:
label: Is your feature request related to a problem? Please describe.
description: A clear and concise description of what the problem is. Eg. I'm always frustrated when [...]
placeholder: Please provide as much information as possible.

- type: textarea
id: solution-info
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.

- type: textarea
id: alternatives-info
attributes:
label: Describe the alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.

- type: textarea
id: additional-info
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
...
73 changes: 0 additions & 73 deletions .github/helper/.flake8_strict

This file was deleted.

25 changes: 7 additions & 18 deletions .github/helper/documentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,35 @@
from urllib.parse import urlparse


docs_repos = [
"frappe_docs",
"erpnext_documentation",
"erpnext_com",
"frappe_io",
]


def uri_validator(x):
result = urlparse(x)
return all([result.scheme, result.netloc, result.path])


def docs_link_exists(body):
for line in body.splitlines():
for word in line.split():
if word.startswith('http') and uri_validator(word):
if word.startswith("http") and uri_validator(word):
parsed_url = urlparse(word)
if parsed_url.netloc == "github.com":
parts = parsed_url.path.split('/')
if len(parts) == 5 and parts[1] == "frappe" and parts[2] in docs_repos:
parts = parsed_url.path.split("/")
if len(parts) == 5 and parts[1] == "frappe" and parts[2] == "hrms":
return True
elif parsed_url.netloc == "docs.erpnext.com":
elif parsed_url.netloc == "docs.frappe.io":
return True


if __name__ == "__main__":
pr = sys.argv[1]
response = requests.get("https://api.github.com/repos/frappe/erpnext/pulls/{}".format(pr))
response = requests.get("https://api.github.com/repos/frappe/hrms/pulls/{}".format(pr))

if response.ok:
payload = response.json()
title = (payload.get("title") or "").lower().strip()
head_sha = (payload.get("head") or {}).get("sha")
body = (payload.get("body") or "").lower()

if (title.startswith("feat")
and head_sha
and "no-docs" not in body
and "backport" not in body
):
if title.startswith("feat") and head_sha and "no-docs" not in body and "backport" not in body:
if docs_link_exists(body):
print("Documentation Link Found. You're Awesome! 🎉")

Expand Down
15 changes: 7 additions & 8 deletions .github/helper/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ set -e

cd ~ || exit

sudo apt-get -y install redis-server libcups2-dev -qq
sudo apt update && sudo apt install redis-server libcups2-dev

pip install frappe-bench

git clone https://github.com/frappe/frappe --branch develop --depth 1
git clone https://github.com/frappe/frappe --branch "$BRANCH_TO_CLONE" --depth 1
bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench

mkdir ~/frappe-bench/sites/test_site
Expand Down Expand Up @@ -39,14 +39,13 @@ sed -i 's/schedule:/# schedule:/g' Procfile
sed -i 's/socketio:/# socketio:/g' Procfile
sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile

bench get-app payments
bench get-app https://github.com/frappe/erpnext --branch develop
bench get-app payments --branch ${BRANCH_TO_CLONE%"-hotfix"}
bench get-app https://github.com/frappe/erpnext --branch "$BRANCH_TO_CLONE" --resolve-deps
bench get-app hrms "${GITHUB_WORKSPACE}"
bench setup requirements --dev

bench start &> bench_run_logs.txt &
bench start &>> ~/frappe-bench/bench_start.log &
CI=Yes bench build --app frappe &
bench --site test_site reinstall --yes

bench get-app hrms "${GITHUB_WORKSPACE}"
bench --site test_site install-app hrms
bench setup requirements --dev
bench --verbose --site test_site install-app hrms
34 changes: 21 additions & 13 deletions .github/helper/translation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,24 @@
import sys

errors_encounter = 0
pattern = re.compile(r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)")
pattern = re.compile(
r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)"
)
words_pattern = re.compile(r"_{1,2}\([\"'`]{1,3}.*?[a-zA-Z]")
start_pattern = re.compile(r"_{1,2}\([f\"'`]{1,3}")
f_string_pattern = re.compile(r"_\(f[\"']")
starts_with_f_pattern = re.compile(r"_\(f")

# skip first argument
files = sys.argv[1:]
files_to_scan = [_file for _file in files if _file.endswith(('.py', '.js'))]
files_to_scan = [_file for _file in files if _file.endswith((".py", ".js"))]

for _file in files_to_scan:
with open(_file, 'r') as f:
print(f'Checking: {_file}')
with open(_file, "r") as f:
print(f"Checking: {_file}")
file_lines = f.readlines()
for line_number, line in enumerate(file_lines, 1):
if 'frappe-lint: disable-translate' in line:
if "frappe-lint: disable-translate" in line:
continue

start_matches = start_pattern.search(line)
Expand All @@ -28,33 +30,39 @@
has_f_string = f_string_pattern.search(line)
if has_f_string:
errors_encounter += 1
print(f'\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}')
print(
f"\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}"
)
continue
else:
continue

match = pattern.search(line)
error_found = False

if not match and line.endswith((',\n', '[\n')):
if not match and line.endswith((",\n", "[\n")):
# concat remaining text to validate multiline pattern
line = "".join(file_lines[line_number - 1:])
line = line[start_matches.start() + 1:]
line = "".join(file_lines[line_number - 1 :])
line = line[start_matches.start() + 1 :]
match = pattern.match(line)

if not match:
error_found = True
print(f'\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}')
print(f"\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}")

if not error_found and not words_pattern.search(line):
error_found = True
print(f'\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}')
print(
f"\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}"
)

if error_found:
errors_encounter += 1

if errors_encounter > 0:
print('\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.')
print(
'\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.'
)
sys.exit(1)
else:
print('\nGood To Go!')
print("\nGood To Go!")
Loading
Loading