Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,870 Commits 3 Branches 0 Tags 1 GiB
ac816f4fed
Commit Graph

308 Commits

Author SHA1 Message Date
Rucha Mahabal
5eeb94db31 fix: map Accounting Dimensions for Bank Entry against Payroll Entry 2022-01-04 19:21:16 +05:30
Nabin Hait
11cfa16158
fix: future recurring period calculation (#29083) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-04 11:38:49 +05:30
Rucha Mahabal
251ed3aa74
Merge branch 'develop' into multiple-cost-centers-against-employee 2021-12-28 17:10:32 +05:30
Rucha Mahabal
88df5ce530
fix: tests (#29051) 
* fix(test): create salary slip as per timesheet dates for Project Profitability

* fix(test): reload salary slip before checking for payment days
 2021-12-28 17:09:46 +05:30
Rucha Mahabal
baa12bcee6 fix: convert raw queries with frappe ORM 2021-12-28 10:04:14 +05:30
Rucha Mahabal
8226ea65c8 fix: linter issues 2021-12-28 08:54:05 +05:30
Nabin Hait
f867f1974a fix: get fallback cost center from Employee/Department 2021-12-24 17:34:34 +05:30
Nabin Hait
f152a40b28 feat: Provision to assign multiple payroll cost centers against a single employee 2021-12-24 16:23:33 +05:30
Ankush Menat
f5d5281119 chore: drop deprecated qunit tests 2021-12-20 17:03:10 +05:30
Rucha Mahabal
b027050f77
Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet 
fix: incorrect amount based on payment days in timesheet salary slip
 2021-12-14 14:57:21 +05:30
Rucha Mahabal
ca8dec0cf2
fix: Use get_all instead of get_list for child doctype (#28538) 
* fix(Student Attendance Tool): Use `get_all` instead of `get_list` for child doctype

* fix(Course Schedule): incorrect fetch from value

* fix: sider

* fix(Gratuity): Use `get_all` instead of `get_list` for child doctype
 2021-11-26 13:24:32 +05:30
Jannat Patel
17acb08545
fix: sum of components in salary register (#28237) 
* fix: sum of components in salary register

* fix: sum of deduction components

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 15:21:51 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
mergify[bot]
1a31d5856f
fix: useless validation message (#28029) (#28046) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 152f9b0a432361f1c801364d1c85c42a16691a8a)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2021-10-21 11:05:50 +05:30
Nabin Hait
2ef4844a3c
feat: Tax for recurring additional salary (#27459) 
* fix: Logic for tax calculation on recurring additional salary

* fix: Get actual amount always in case of overwritten additional salary even if based on payment days

* feat: Test case added for recurring additional salary

* fix: use query builder to get additional salaries instead of raw SQL

* fix: query formatting and remove trailing spaces

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-20 15:50:30 +05:30
Govind S Menokee
4f2cf43db7 YTD and MTD Messed up in Salary Slip 
The filter for YTD, MTD etc are based on employee name. This seems like an amateur mistake. It should be based on employee id.

(cherry picked from commit efc292a5ddc00e433d75b87d6b3378455bac4438)
 2021-10-20 07:11:26 +00:00
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612 
fix: Removing unused fields from workspace JSON files
 2021-10-13 16:18:20 +05:30
yadavyk
d3d4a3da62
fix: Salary Slip Label fixes (#27865) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-08 13:39:33 +05:30
Sagar Vora
d36849e4f8
test: optimise test_component_amount_dependent_on_another_payment_days_based_component (#27836) 2021-10-06 17:13:34 +05:30
mergify[bot]
b9942ad639
feat: Tracking Multi-round interview (#25482) (#27724) 
* feat: Tracking Multi-round interview

* fix: releted to scheduler event and formating

* fix: job applicant UI/UX and conflicts

* test: Interview Round

* fix(test): Employee referral, Employee Onboarding, Job Offer

* fix: sider

* feat: set default value in Hr settings

* feat: added validation for designation

* test: Interview

* test: Added validatiolns for skill

* test: Interview feedback

* fix: sider

* fix: remove unnecessary validations and form label cleanups

* chore: clean-up Interview Round and Interview Type doctype

* fix: remove redundant Rating Value, only keep Rating

* fix: update interview details on feedback submission

- make interview feedback submission dialog minimizable

* fix: show submit feedback button only if feedback doesn't exist

* refactor: Interview and Feedback statuses and workflow

* fix(HR Settings): clean up interview settings

* refactor: Interview

* refactor: Interview Feedback, remove unnecessary validations

* chore: update notification messages

* chore: remove unnecessary formatting changes in attendance list and leave application

* refactor: Job Applicant to Interview mapping

* chore: sorted imports

* chore: sorted imports

* fix: sider issues

* fix: linter issues

* fix: sider issues

* fix: tests

* fix: sorted imports

* fix: tests, sider

* fix: therapy plan test

* fix: sider issues

* feat: Include From Time and To Time fields in Interview for cleaner data

* feat: Interview Calendar

* fix: allow renaming masters

* fix: add more fields to list view and standard filter

* fix: validate overlapping interviews

* fix: update tests

* fix: linter issues

* refactor: replace reminder messages with Email Templates

* fix: sider issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-10-01 13:15:40 +05:30
Rucha Mahabal
b98740b44a
fix: employee advance return through multiple additional salaries (#27438) 
* fix: employee advance return through multiple additional salaries

* test: test repay unclaimed amount from salary

* fix: sorting in imports
 2021-09-14 11:20:15 +05:30
Rucha Mahabal
bab644a249
fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27349) 
* fix(Payroll): incorrect component amount calculation if dependent on another payment days based component

* fix: set component amount precision at the end

* fix: consider default amount during taxt calculations

* test: component amount dependent on another payment days based component

* fix: test
 2021-09-13 13:24:27 +05:30
Ankush Menat
eec40513be
fix: minor linting issues (#27314) 
* fix: syntax error in gratuity

* fix: unpacking None into three variables

* fix: unexpected kwarg for delete_accounting_dimensions
 2021-09-02 17:42:45 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Devin Slauenwhite
43c476ddf7
fix: (Backport-develop) track salary slip ytd gross salary. (#27242) 
* fix: track salary slip ytd gross salary.

* fix: ytd gross salary unique label

* Revert "fix: ytd gross salary unique label"

This reverts commit a68b387ac21e32c250d042caf75ef301b5a49a1a.

* fix: gross ytd salary unique label
 2021-09-02 09:39:35 +05:30
Anurag Mishra
ab47409e91
feat: Full and Final Settlement and Gratuity Fix (#26364) 
* feat: Full and Final Settlement

* removed option to pay via salary slip

* feat: Create JV

* test:fnf

* fix: tracking asset movement

* fix: sider and test

* fix: changes Requested

* fix: changes requested

* fix: valication for Asset

* fix: add filter for reference document only if relevant field is present

* fix: doctype cleanup

- add more fields to the list view and standard filter

- set title field

- incorrect field labels

* feat: add list view settings for FNF

* fix: incorrect reference type set in Journal Entry

* fix: validation message

* chore: add Full and Final Statement link to Workspace

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-31 17:59:26 +05:30
Chillar Anand
88d849320f
fix(payroll): Fixed issue with accessing last salary slip for new employee (#27247) 2021-08-31 14:42:21 +05:30
Rucha Mahabal
71b7c63ec0
feat: Ability to schedule onboarding and separation activities (#26738) 
* refactor: employee onboarding form clean-up

* feat: ability to schedule onboarding / separation tasks

* feat: skip holidays while setting boarding activity dates

* chore: remove unused child table - Employee Onboarding Activity

* fix: tests

* fix: employee separation test
 2021-08-27 11:12:24 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
 2021-08-26 20:43:06 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders (#25735) (#27115) 
* feat: Add reminders section to HR Settings

* refactor: Extract generic function for getting Employees

* feat: Employee Work Anniversary Reminder

* feat: Daily Holiday Reminder

* fix: Unnecessary params and replace [] with .get()

* test: Daily Holiday Reminders

* test: is_holiday basic tests

* refactor: Move employee reminders code to separate module

* feat: Add advance reminder to HR settings

* feat: Advance Holiday Reminders

* refactor: get_holidays_for_employee

* feat: Email holiday reminders in advance + tests

* fix: Remove unused import

* refactor: HR Setting Reminder Section

* refactor: Remove Daily Holiday Reminders feat

* feat: Reminder miss warning

* fix: Failing test and function name change

* chore: Add patch for field rename

* chore: Rename frequency label

* fix: Failing patch test

* fix: sider and removed description of fields

* fix: email alignment

Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)

Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-08-24 20:19:22 +05:30
Rushabh Mehta
49e0a4f287 Revert "fix: Salary component account filter (#26604)" 
This reverts commit ae9d1d9617.
 2021-08-24 08:33:57 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Rucha Mahabal
15df0ad6a0
fix: undefined variable due to inconsistent porting of commits (#26994) 2021-08-18 11:23:44 +05:30
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Nabin Hait
894ed3a9a5
Merge pull request #26765 from frappe/revert-24206-additional_salary_tax_enhancements 
Revert "fix: Tax calculation for Recurring additional salary"
 2021-08-06 10:22:31 +05:30
Anupam Kumar
df477dcae6
fix: bank remittance report issue (#26398) (#26766) 2021-08-04 14:02:43 +05:30
Nabin Hait
74bb55bfd2 Revert "fix: Tax calculation for Recurring additional salary (#24206)" 
This reverts commit adfdc71844.
 2021-08-01 20:03:38 +05:30
Nabin Hait
493029195c fix: Additional salary processing 2021-08-01 19:47:42 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Rucha Mahabal
821db5cce7
fix: employee status server-side validation (#26442) 
* fix: employee status server-side validation

* fix: test

* test: employee inactive status

* fix: test
 2021-07-30 10:21:42 +05:30
Jannat Patel
ae9d1d9617
fix: Salary component account filter (#26604) 
* fix: salary component account filter

* fix: cleanup
 2021-07-27 09:40:12 +05:30
Jannat Patel
aaea5edbdb
fix: Salary component account filter (#26605) 
* fix: salary component account filter

* fix: cleanup
 2021-07-27 09:39:33 +05:30
Rucha Mahabal
017ed3f5c1
fix: employee status server-side validation (#26615) 2021-07-24 00:08:02 +05:30
Anurag Mishra
adfdc71844
fix: Tax calculation for Recurring additional salary (#24206) 
* fix: Tax calculation for Recurring additional salary

* fix: conflicts
 2021-07-14 09:59:41 +05:30
Anupam Kumar
a8b6cf8114
fix: bank remittance report issue (#26398) 2021-07-13 11:45:34 +05:30
Jannat Patel
b4ea185eca
fix: added company filter while fetching loans (#26295) 
* fix: added company filter while fetching loans

* fix: added set_query in refresh

* fix: quotes

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-12 13:15:41 +05:30
Jannat Patel
38994bd494
fix: Added Company filters for Loan (#26294) 
* fix: loan validations

* fix: added company filter while fetching loans

* fix: tests
 2021-07-12 13:01:31 +05:30