nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 13:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,048 Commits 606 Branches 1,802 Tags
294de89b9bc9ecaa5b594436d34be41f15037313
Commit Graph

2308 Commits

Author SHA1 Message Date
mergify[bot]
294de89b9b fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497) (#28505) 
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels

(cherry picked from commit e7eef9601d)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-23 08:52:31 +05:30
mergify[bot]
a30cfbce42 fix: change modified timestamp to apply changes on migrate #28095 (#28099) 
fix: change modified timestamp to apply changes on migrate
(cherry picked from commit 2920f2f614)

Co-authored-by: Dany Robert <rtdany10@gmail.com>
 2021-10-27 11:20:13 +05:30
gsi-maruiz
8cad23b8fb fix: add filter to query to avoid send reminder for zero years (#28092) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-27 11:00:56 +05:30
mergify[bot]
e0f2130731 feat: employee initial work history updated when transfer is performed (#27768) (#28045) 
* feat: employee initial work history updated when transfer is performed

* fix: sider

* fix: remove commit statement

* fix: tests and code formatting

* fix: tests

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

Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
 2021-10-21 10:34:31 +05:30
mergify[bot]
a739bf90c4 feat: Tax for recurring additional salary (backport #27459) (#28024) 
* 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>
(cherry picked from commit 2ef4844a3c)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/salary_slip.py
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py

* fix: conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-20 16:20:25 +05:30
Goh Yan Chang
50af32f35c Update employee_leave_balance.py 
fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f7848a3)
 2021-10-20 06:57:51 +00:00
pateljannat
acc5cff7ff fix: exclude inactive employees from auto attendance 
(cherry picked from commit 921b4be348)
 2021-10-18 04:34:53 +00:00
Chillar Anand
29996ee726 fix(hr): Update expense account after company is updated (#27843) (#27919) 
(cherry picked from commit f0c4ea14a9)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-14 11:13:00 +05:30
Ankush Menat
b6dc71679e fix: remove transaction commit from tests 
(cherry picked from commit 8d69ec72a6)
 2021-10-12 16:41:48 +05:30
mergify[bot]
dd0cefbeb9 refactor: Clean up mutable defaults and add CI check (#27828) (#27841) 
* refactor: Clean up mutable defaults and add CI check

(cherry picked from commit 772d4753e7)

Co-authored-by: Chillar Anand <chillar@avilpage.com>
 2021-10-07 09:57:35 +00:00
Dany Robert
a17fed9cd9 fix: return tax rate since fetch is removed 
(cherry picked from commit 2b4959fb3b)
 2021-10-05 08:45:24 +00:00
Dany Robert
d8479a41e5 fix: tax rate being overridden in case of 0.00 
Tax rate could be different for different expenses.
Therefore, rate is kept as 0.00 and tax amount entered manually.
But fetching used to override the rate(upon saving) and mess up the amount.

(cherry picked from commit 5ce6a4c107)
 2021-10-05 08:45:23 +00:00
Anurag Mishra
4837238f3d feat(HR): Some Enhancements and Onboarding (#25741) 
* feat: Hr settings restructure

* feat: remove validation and make As warning

* feat: made leave policy Assignment feild read only

* feat: send leave Notification via 'Notification'

* patch: for field name change

* feat: removed defaults value for removed field

* feat: removed leave Notification fields

* feat: better label and description

* feat: Hr Module onboarding and Onboarding slides

* fix: sider, test, translations

* chore: remove unnecessary code formatting changes

* refactor: HR Onboarding

* refactor: HR Settings

* revert: Notification changes

* chore: remove unnecessary descriptions from leave type

* fix: linter issues

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-02 12:34:21 +05:30
Anurag Mishra
57e66f958c feat: Tracking Multi-round interview (#25482) 
* 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>
 2021-10-01 00:10:47 +05:30
Mohammed Yusuf Shaikh
b478e72cef fix: wrong company selected when marking attendance for all employees (#27685) 
* fix: wrong company selected when marking attendance for all employees

* fix: enable caching for repeated queries of the same employee

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-09-30 12:02:39 +05:30
Frappe PR Bot
5a8d57f2ae fix: remove bad default for anniversary reminders (#27632) (#27633) 
🤦

(cherry picked from commit c302c7ab42)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-21 17:55:05 +05:30
Frappe PR Bot
fec19a9532 Update training_result.js (#27615) (#27620) 
cur_frm is deprecated

(cherry picked from commit 5c400da4e2)

Co-authored-by: François de Ryckel <f.deryckel@gmail.com>
 2021-09-21 09:32:18 +05:30
Frappe PR Bot
c9e7e72a29 fix(HR): Ignore invalid fields when updating employee details (#27456) (#27474) 
(cherry picked from commit 95460d9818)

Co-authored-by: Chillar Anand <chillar@avilpage.com>
 2021-09-14 12:48:31 +05:30
Frappe PR Bot
8fd1aec76c fix: employee advance return through multiple additional salaries (#27470) 
* 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

(cherry picked from commit b98740b44a)

* fix: remove naming rule

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-14 12:01:19 +05:30
Frappe PR Bot
821d55b0e0 fix: employee remider settings (#27365) (#27366) 
(cherry picked from commit 88c9fe35bd)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2021-09-07 00:20:38 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Frappe PR Bot
cf4ff46c1e fix: Org Chart fixes (#27290) (#27305) 
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes

(cherry picked from commit f828d853e3)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-01 23:53:23 +05:30
Ankush Menat
f0bcb753fb chore: whitespace trimming 2021-09-01 20:23:48 +05:30
Ankush Menat
1c63cbb1e4 fix: remove duplicate imports 2021-09-01 20:18:45 +05:30
Ankush Menat
0519b59aa9 fix: undefined variables 2021-09-01 20:16:38 +05:30
Ankush Menat
8746466412 chore: correct indentation 2021-09-01 20:16:24 +05:30
Ankush Menat
76f1ed624a fix: remove bare excepts 2021-09-01 20:15:54 +05:30
Raffael Meyer
366eb86fdf feat: color and leave type in leave application calendar (#27246) 
* feat: color and leave type in leave application calendar

* fix: sider + use cstring
 2021-08-31 17:00:44 +05:30
Frappe PR Bot
a0cf396712 fix: expense claim reimbursed amount update (#27204) (#27229) 
(cherry picked from commit 9cb642238f)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
 2021-08-30 17:54:57 +05:30
Frappe PR Bot
8dae084f23 chore: remove deprecated and empty QUnit tests (#27179) (#27181) 
* 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.

(cherry picked from commit ae55eab599)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-26 21:08:08 +05:30
Mohammad Hussain Nagaria
24b2a31581 feat: Employee reminders (#25735) 
* 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>
 2021-08-24 19:43:43 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Frappe PR Bot
90818d57f1 fix: change print_format_type from Server to Jinja (#26374) (#26985) 
(cherry picked from commit a2966db1e5)

Co-authored-by: Mohammed Redah <mhbu50@gmail.com>
 2021-08-17 13:36:08 +00:00
Ankush Menat
333d962ac2 test: fix tests failing due to doc amend feature (bp #26656) (#26907) 
* test: fix test due to rename change

* test: fix attendance request tests

- Use `frappe.db.get_value` instead of `get_doc` for asserting values
- Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request)
- rollback everything on tearDown

* test: fix Shift Request test

- Use `get_value` instead of `get_doc`
- Remove unnecessary loop, only one shift assignment is made against a shift request
- Get value after cancel again. Get doc is not reliable since primary key changed after cancel

* test: fix POS Closing Entry Test

- Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact
- This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted
- Dont use this partially cancelled doc for any assertions further, end test at exception assertion
- Use `get_value` to check SI docstatus, as its primary key changes after cancel

* test: fixed asset movement tests

- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces

* Revert "test: fix POS Closing Entry Test"

This reverts commit 8f1a3aef2e.

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2021-08-17 18:01:39 +05:30
Frappe PR Bot
3c9b8dce21 feat: Training Event Status Update and Validations (#26698) (#26961) 
* fix: training event employee status not updated on feedback submission

* feat: update attendees status on training event status update

* test: Training Event and Feedback

* chore: remove unused import

(cherry picked from commit bf75ea70fb)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-16 17:57:14 +05:30
Frappe PR Bot
64dfbfaecb feat: enable track changes for leave type (#26917) (#26959) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit a9a24051c9)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2021-08-16 15:17:28 +05:30
Frappe PR Bot
321dd33015 fix: Org Chart fixes (#26952) (#26953) 
* fix: add z-index to filter to avoid svg wrapper overlapping

* fix: expand all nodes not working when there are only 2 levels

- added dom freeze while expanding all nodes and exporting

(cherry picked from commit 67e3971c3b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-16 10:44:35 +05:30
Ankush Menat
6aed9e26ac fix: unknown attribute "string_type" (#26947) 2021-08-14 10:45:43 +05:30
Nabin Hait
f8031d3d79 Merge pull request #26261 from ruchamahabal/org-chart 
feat: Organizational Chart
 2021-08-10 17:12:59 +05:30
Jannat Patel
6c48a2ed79 fix: Removed set_status after cancel from Expense Claim and Employee Advance (#25901) 
* fix: removed set_status after cancel from hr doctypes

* fix: semgrep on_submit issue

* fix: sider

* fix: spaces

* fix: update flag for db_set
 2021-07-27 09:41:55 +05:30
Rucha Mahabal
017ed3f5c1 fix: employee status server-side validation (#26615) 2021-07-24 00:08:02 +05:30
Rucha Mahabal
fc4079587b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into org-chart 2021-07-13 12:38:37 +05:30
Anurag Mishra
afafe406c8 Merge pull request #26388 from Anurag810/training_fix_v13 
fix: Query for Training Event
 2021-07-09 12:21:17 +05:30
Anurag Mishra
a82e9e42e1 fix: query for training Event 2021-07-08 17:27:21 +05:30
Rucha Mahabal
09c24c7949 fix: exclude active node while fetching sibling group 2021-07-08 17:05:40 +05:30
Rucha Mahabal
48018b8d8c fix: do not sort by number of connections 2021-07-08 11:23:50 +05:30
Rucha Mahabal
df3bb9ea8c perf: Optimise Rendering 
- optimise get_children function

- use promises instead of callbacks

- optimise selectors

- use const wherever possible

- use pure js instead of jquery for connectors for faster rendering
 2021-07-08 09:53:31 +05:30
Rucha Mahabal
6eec251273 feat: handle multiple root / orphan nodes 2021-07-07 12:05:50 +05:30
Deepesh Garg
9b6d9a41f4 fix: Test Cases 2021-07-05 17:08:27 +05:30
Deepesh Garg
15b336df28 fix: Test cases 2021-07-05 14:45:33 +05:30