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

2011 Commits

Author SHA1 Message Date
Rucha Mahabal
e939da982e
Merge branch 'develop' into profitability-report 2021-04-26 09:17:12 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Rucha Mahabal
184317d5bd
fix(HR): Permission error while adding weekly holidays (#25450) 2021-04-23 20:03:50 +05:30
pateljannat
73896ce94c fix: conflicts 2021-04-19 16:50:39 +05:30
pateljannat
3b54b1e975 fix: report name and columns 2021-04-19 16:49:28 +05:30
Ankush Menat
6c88ab07c7
fix: commit leave_allocation change to db (#25382) 2021-04-19 11:51:46 +05:30
Jannat Patel
b1aad63a99
fix: leave policy in leave allocation (#25334) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-16 16:08:22 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Rucha Mahabal
d77ea7c88b
Merge pull request #25190 from ruchamahabal/approver-perms 
feat(HR): share doc with employee approvers if they don't have access
 2021-04-06 14:32:34 +05:30
Rucha Mahabal
0bcd3c45ed fix: leave approver perms test 2021-04-06 13:46:53 +05:30
Anupam Kumar
7b6c8bb3ab
fix: error message compensatory leave request (#25206) 2021-04-06 10:20:10 +05:30
Rucha Mahabal
084e90e5d3 fix(test): set user as Administrator 2021-04-06 10:07:50 +05:30
Rucha Mahabal
b7436a04c3
fix: Ignore Permission for Leave Ledger Entry (#25172) 2021-04-04 20:09:00 +05:30
Rucha Mahabal
57ab3a5a88
Merge branch 'develop' into approver-perms 2021-04-04 19:57:58 +05:30
Rucha Mahabal
19c3286b06 fix: linter and sider issues 2021-04-04 19:54:00 +05:30
Rucha Mahabal
13c0a350af test: leave, expense, shift request approver permissions 2021-04-04 18:37:46 +05:30
Rucha Mahabal
ba10ef4403 feat(HR): share doc with employee approvers if they don't have access 2021-04-04 17:16:48 +05:30
Sagar Vora
f68f41d7a7
test: fix multiple tests in Leave Application (#25173) 2021-04-03 17:34:57 +05:30
Jannat Patel
0353b0f5f6
Merge branch 'develop' into profitability-report 2021-04-02 10:15:28 +05:30
Prssanna Desai
f3c34aa6ae
fix: don't set "Company:company:default_currency" as default for currency link fields (#25095) 
* fix: don't set Company:company:default_currency as default for currency link fields

* fix: Company:company:default_currency and refactor

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
 2021-03-31 21:52:48 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
shariquerik
82d7986a2f fix: sider fix 2021-03-26 17:02:37 +05:30
shariquerik
1989375be4 fix: Employee profile pic upload access for erpnext user 2021-03-26 16:34:22 +05:30
pateljannat
6597bf7dd7 feat: profitability report default working hours and tests 2021-03-25 13:31:43 +05:30
Sagar Vora
78e576ee6a
fix: default total_estimated_cost to zero (#24939) 
Co-authored-by: walstanb <walstanb@gmail.com>
 2021-03-18 15:23:52 +05:30
Sagar Vora
500f54e515
test: fix shift type not found (#24929) 2021-03-17 23:25:04 +05:30
Sagar Vora
52bbd4e182
test: clear Leave Period before running Leave Allocation tests (#24928) 2021-03-17 22:37:59 +05:30
Sagar Vora
bce904cf97
test: fix Employee Not Found errors (#24906) 2021-03-17 10:03:30 +05:30
Anurag Mishra
6bafbffee0 fix: added also for leave applier as requested 2021-03-16 13:01:39 +05:30
Anurag Mishra
54482fd83f feat: added for disabling leave notification in HR settings 2021-03-16 13:01:39 +05:30
Nabin Hait
6e3668dc30 fix: merge conflict 2021-03-11 16:14:27 +05:30
Jannat Patel
d7ac2394e8
fix: error in bulk attendance (#24806) 
* fix: error in bulk attendance

* fix: no date selected scenario

* fix: translation and sider
 2021-03-09 20:41:58 +05:30
Deepesh Garg
846500e8bc
Merge pull request #24751 from danielchalmers/patch-2 
chore: Add description field & enable quick entry
 2021-03-02 18:53:51 +05:30
Nabin Hait
190106a8b8
fix: rounding of earned leave is optional (#24782) 2021-03-02 13:38:14 +05:30
Daniel Chalmers
aa09628358
Skill fields: enable allow_in_quick_entry 2021-02-26 15:24:34 -06:00
Daniel Chalmers
9803835436
Add "description" field to Skill doctype 
Lets us describe a skill past just the title. Closes #23592
 2021-02-26 00:33:48 -06:00
Ankush Menat
dca307e7cc
feat: track changes to HR settings (#24739) 
related issue: FR-ISS-259927
 2021-02-25 19:05:07 +05:30
Daniel Chalmers
d3e122259d
Update skill.json 2021-02-24 17:13:48 -06:00
Daniel Chalmers
c04ed62863
Allow renaming skills 2021-02-23 22:02:09 -06:00
Michelle Alva
43f126ed13
fix: Typo in Leave Application 
Change "Leaves" to "Leave"
 2021-02-20 10:46:22 +05:30
Kanchan Chauhan
bb05acb60d
fix(Leave Application): List view fix (#24550) 2021-02-11 11:18:59 +05:30
Afshan
8609d31430
fix: amend cancelled job offer (#24589) 2021-02-11 11:05:48 +05:30
Nabin Hait
c4a1bb0e1c
fix: couple of travis fixes (#24554) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-02-05 23:34:18 +05:30
Suraj Shetty
f57efd1150 style: Fix invalid translation syntax usages 2021-02-01 20:09:20 +05:30
prssanna
2aebf99968 fix: add removed get_employee_emails function 2021-01-29 15:55:21 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Anurag Mishra
5756bf50e6
fix: removed all day event from shift assignment calendar (#24397) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-01-28 12:24:39 +05:30
Suraj Shetty
bed55bb7ba fix: Use multisql to support postgres 2021-01-21 18:36:50 +05:30
Suraj Shetty
0c0155e885 fix: Make birthday messages translatable 2021-01-21 14:59:19 +05:30
Suraj Shetty
164fe37fa0 fix: Employee birthday reminder 2021-01-21 14:32:35 +05:30