Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,021 Commits 3 Branches 0 Tags 1 GiB
814fd19424
Commit Graph

2235 Commits

Author SHA1 Message Date
Anurag Mishra
8f2cb0beb6 fix: set half day date None if half day is unchecked 2020-06-30 12:11:03 +05:30
Anurag Mishra
343651fc39
fix: job offer validation fix (#22504) 2020-06-29 18:23:22 +05:30
Anurag Mishra
ba5f571b0d
fix: take parent cost center for child if no cost center at child (#22496) 2020-06-29 17:35:27 +05:30
rohitwaghchaure
81af2235f4
Merge branch 'develop' into dev-job-offer-list-view 2020-06-28 15:25:32 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs (#22432) 
* fix: Add view ledger button for cancelled docs

* fix: Add moddified to date in Stock Ledger
 2020-06-25 15:34:01 +05:30
Rohan Bansal
e7c91917aa fix: setup status indicators for Job Offer and Job Applicant 2020-06-25 13:40:18 +05:30
Anurag Mishra
36560c8406
fix: staffing Plan validation (#22379) 2020-06-23 10:44:33 +05:30
Deepesh Garg
62897d3878 fix: Unable to cancel employee advance 2020-06-22 14:54:01 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module (#21990) 
* feat: Moved Document to Payroll Module

* feat: Moved Reports to Payroll Module

* feat: Moved Print fromat With Patch

* feat: Moved Notifiction to Payroll Module and patches

* feat: added dashboard and desk page to Payroll

* feat: Payroll Dashboard

* feat: Module onboarding

* feat: Income tax Deductions Report

* feat: Ecs Checklist Report

* feat: Provident Fund Report

* feat: Professional Fund report and commonified Code

* feat: Total Payments Based On Payment Mode Report

* fix: refactor and added chart Total Payments Based On Payment Mode

* feat: Payroll Settings

* fix: Bank remittance Report

* feat(Payroll based on): Considered unmarked days

* feat: Added Help for condition an formula in Salary structure

* fix: requested changes

* fix: rename report Ecs checklist to salary_payments_via_ecs

* fix: renamed report report/total_payments_based_on_payment_mode

* fix: added role via setup.py for regional report

* feat: added All reports to desk page

* fix: frappe.reload doc in all patches

* fix: codacy

* fix: frappe.reload_doctype for patches

* patch: is_income_tax_component and component_type for salary component

* fix: uncommented code

* test: fixture

* fix: test

* test: test_payment_days_based_on_attendance
 2020-06-19 19:17:57 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
Anurag Mishra
d9b2d635d8
feat: added Expense approver for employee and validation (#22244) 
* feat: added Expense approver for employee nad validation

* fix: requested changes
 2020-06-18 19:13:01 +05:30
Anurag Mishra
58831ecc7d
fix(HR): wrong shortcut in desk page (#22269) 2020-06-16 19:23:52 +05:30
rohitwaghchaure
75366ebaec
Merge pull request #22243 from Anurag810/expense-claim-standard-filter-fix 
fix: added some standard filters in expense claim
 2020-06-15 15:36:37 +05:30
Anurag Mishra
45b6fed029 fix: added some standard filters in expense cliam 2020-06-15 12:44:55 +05:30
Anurag Mishra
a2cf79da0f fix: allow to enter Releaving date if status = Left 2020-06-15 12:28:31 +05:30
Anurag Mishra
7558e64d6d
fix: set_query in leave application (#22197) 2020-06-12 17:37:59 +05:30
Abhishek Balam
86ea75e49e
fix(HR): Change Due Advance Amount to Pending Amount (#22123) 
* rename 'Due Advance Amount' field to 'Pending Amount'

* changed fieldname and references for easier debugging

* added patch for moving data

* added newline added

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-12 13:13:14 +05:30
Vignesh S
90957b7f74
feat(Attendance): Add In and Out time to attendance (#21547) 
* feat(Attendance): Add In and Out time to attendance

Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>

* fix:add depends in attendance IN time and OUT time

Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
 2020-06-12 12:32:55 +05:30
rohitwaghchaure
63e8f2c430
Merge pull request #22175 from Anurag810/expense_claim_cost_center_fix 
fix: set cost center in child table
 2020-06-10 13:40:51 +05:30
Anurag Mishra
452b7760df fix: dependency for leave Period in Desk page 2020-06-10 12:48:21 +05:30
rohitwaghchaure
904e0f4eda
Merge pull request #22106 from Anurag810/employee_onboarding_fix 
fix: problem during assigning
 2020-06-10 12:30:15 +05:30
Anurag Mishra
402c347f83 fix: set cost center in child table 2020-06-10 12:27:59 +05:30
rohitwaghchaure
c6d4c2afb6
Merge pull request #22113 from Anurag810/leave_application-fixes 
fix: Wrong filters
 2020-06-08 10:43:22 +05:30
Abhishek Balam
328a55749d
fix(HR): Fix half day error when only 1 day is selected (#22122) 
* fix half day error when only 1 day is selected

* adding validation fix for half day on serverside
 2020-06-05 16:46:57 +05:30
Anurag Mishra
94582a89c7 fix: Wrong filters 2020-06-04 17:50:47 +05:30
Anurag Mishra
225802e3a0 fix: problem during assigning 2020-06-04 14:15:55 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
8a4dc521cd Revert 'fix: tests depending on global default company' 2020-05-30 11:40:16 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecf.
 2020-05-30 11:38:04 +05:30
Abhishek Balam
40694c98aa
fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050) 
* table was showing empty with just headers when no leaves allocated, fixed template code

* added filters on Leave Type based on leave allocation for a particular employee and to/from dates
 2020-05-30 01:02:06 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Anurag Mishra
cf0168668f
fix: Correct filters (#22022) 2020-05-29 10:19:33 +05:30
Shivam Mishra
6621e22c02
refactor: clean up desk pages (#22004) 
* refactor: clean up desk pages

* refactor: update label for CRM
 2020-05-28 14:48:50 +05:30
Anurag Mishra
d6d84a3c15
fix: Module Onboarding for HR (#21963) 2020-05-27 20:21:15 +05:30
Anurag Mishra
ef0026c06f fix: addtional salary date validation (#21952) 2020-05-27 12:28:11 +05:30
Anurag Mishra
01bced8c67
fix Report not working on parameter Grade (#21951) 2020-05-27 12:26:54 +05:30
Anurag Mishra
56357fafeb
fix: Added column Expired Leave (#21857) 2020-05-26 18:08:22 +05:30
Anurag Mishra
752ca63fea
fix: Was showing opening on date not remaimning leave (#21899) 2020-05-26 18:01:03 +05:30
Anurag Mishra
93e15c5f5c
fix: showing Wrong balance on allocation boundary dates (#21904) 2020-05-26 18:00:37 +05:30
Anurag Mishra
a7f42f7256
fix: showing wrong record (#21884) 2020-05-25 19:23:17 +05:30
Anurag Mishra
8a1cf45473
fix: Validation for dates (#21886) 2020-05-25 18:39:19 +05:30
Anurag Mishra
c07265ea3f
fix: convert goals point to flt (#21844) 2020-05-21 18:47:39 +05:30
Marica
82f639da59
fix: Employee Advance Return not working (#21812) 2020-05-21 11:35:00 +05:30
Anurag Mishra
2346353a22
fix: missing parameter (#21802) 2020-05-20 16:14:09 +05:30
Nabin Hait
9d04c06c62 fix: HR dashboard and onboarding 2020-05-20 12:05:03 +05:30
Anurag Mishra
57bfee8ea9 fix: dashboard changes 2020-05-18 13:27:15 +05:30
Nabin Hait
1862f5f29a
feat: Payroll based on employee cost center (#21609) 2020-05-18 07:37:04 +05:30
Anurag Mishra
779fc898b1
fix: Future date half day validation (#21718) 
* fix: Future date half day validation

* fix: Allow half day attendance only via leave application

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-17 20:18:30 +05:30
Deepesh Garg
5ee8327415
Merge pull request #21729 from nabinhait/basic-hra-comp 
fix: Submit perm for other income and removed caching while getting hra and basic from company
 2020-05-15 14:44:37 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries (#21689) 
* fix: Add misssing dimensions in GL entries

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
 2020-05-15 12:58:48 +05:30
Mangesh-Khairnar
f984bee5f9
fix: duplicate leave expiry creation (#21505) 
* fix: validate existing ledger entries to avoid duplicates

* patch: remove duplicate ledger entries created

* fix: consider only submitted ledger entries

* fix: delete duplicate leaves from the ledger

* fix: check if duplicate ledger entry exists

* chore: formatting changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-15 11:55:42 +05:30
Nabin Hait
200f80c3d3 fix: Added submit permission in employee other income 2020-05-14 17:18:29 +05:30
Anurag Mishra
36aea71fd7 fix: new dashboard and report 2020-05-13 10:47:36 +05:30
Nabin Hait
6e5952fa69 fix: Changed label for payroll working days based on field 2020-05-11 16:11:43 +05:30
Prssanna Desai
d50502ca40
fix: fix get_employee_details query (#21623) 2020-05-06 17:36:48 +05:30
Anurag Mishra
2596c8bbe7
fix: upload attendance (#21620) 2020-05-06 17:06:53 +05:30
Nabin Hait
a4567a446f fix: Test for payroll entry 2020-05-05 18:36:12 +05:30
Anurag Mishra
ddcc4fa9b9
Feat: Monthly attendance sheet Enhancements and UI/UX Improvements (#21331) 
* refactor: Employee attendance sheet redesign

* feat: Added weekly off status in monthly Attendance sheet

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 16:08:05 +05:30
Nabin Hait
672b74d89c fix: Patch and tests 2020-05-05 15:58:52 +05:30
Nabin Hait
5a1a765ebf
Update test_leave_encashment.py 2020-05-05 15:37:17 +05:30
Anurag Mishra
94719e7e81 fix: tests 2020-05-04 18:54:06 +05:30
Anurag Mishra
09572d9892 patch: to link additional salary with salary slip and leave encashment, incentive with additional salary 2020-05-04 17:07:15 +05:30
Anurag Mishra
e15f0da011 fix: conflicts 2020-05-04 13:56:07 +05:30
Anurag Mishra
f453a1c13f Fix: requested Changes 2020-05-04 12:36:01 +05:30
Nabin Hait
ddf90b29f2
Update salary_slip.py 2020-05-01 22:34:28 +05:30
Nabin Hait
a67fb31f67
Merge branch 'develop' into refactor-addiional-salary 2020-05-01 19:04:20 +05:30
Nabin Hait
fdacc50e78
Update salary_detail.json 2020-05-01 19:04:00 +05:30
Nabin Hait
a1ffc44f0c fix: removed unwanted comma from json 2020-05-01 18:55:57 +05:30
Vishal Dhayagude
2e082affc7
fix(HR): Leave application company field made read-only and filter in Monthly attendance sheet (#20912) 
* fix(HR): Leave application company field made Readonly

* fix: in monthly report attandance employee filter based on company

* fix: minor typo

* fix: Fetch company from employee

* Update monthly_attendance_sheet.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-01 18:11:43 +05:30
Michelle Alva
95b186268c
fix: only check for payment_account on bank entry (#21445) 
* fix: only check for payment_account on bank entry

Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission.

* fix: cur_frm to frm

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-30 16:24:51 +05:30
Nabin Hait
b8d633cb4a
fix: Desk links for Income Tax Slab and Employee Other Income (#21510) 2020-04-30 11:03:49 +05:30
Nabin Hait
62394d7762
fix: Tax calcualtion based on slab (#21496) 
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-04-30 11:02:53 +05:30
Nabin Hait
691f69c731
fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21474) 2020-04-30 11:02:28 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740) 
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-30 10:38:58 +05:30
Deepesh Garg
0a6450115f fix: get_period_list API change fixes 2020-04-29 22:14:45 +05:30
Anurag Mishra
33793d4e0d
fix: Permission issue Employee Tax exemption (#21490) 2020-04-29 11:48:41 +05:30
Raffael Meyer
49bb8ccd2e feat: add Bank Account to dashboards 2020-04-28 18:56:47 +02:00
Nabin Hait
1bd6de41e6
Merge branch 'develop' into refactor-addiional-salary 2020-04-28 13:15:18 +05:30
rohitwaghchaure
daf37e7570
fix: better validation message for the expense claim and set default cost center in the expenses table (#21454) 2020-04-28 12:48:22 +05:30
Ahmad
f34faa9181
Module Import Fix (#21433) 2020-04-27 10:57:02 +05:30
Nabin Hait
2305d00e0b
fix: Procurement tracker report (#21421) 
* fix: procurement report data was not coming

* fix: leave allocation minor issue
 2020-04-26 23:29:13 +05:30
Anurag Mishra
ded418e31d
feat: employee leave balance reports (#20754) 
* feat: Employee leave balance summary report new design

* feat: Employee leave balance report new design

* fix: leave based on multiple holiday list

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-26 21:04:58 +05:30
Nabin Hait
ba70e7e8bc
Payroll based on attendance (#21258) 
* feat: Payroll based on attendance and leave

* test: salary slip based 0n attendance

* feat: Payroll based on attendance

* fix: Codacy issues

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-04-26 20:17:48 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab (#21399) 
* Feat: Multiple tax as per new taxation rule

* patch:for multiple tax slab, fix: payroll and exemption validation

* Test: Fixture

* feat: income tax slab with other charges and tax exempted deduction components

* fix: added missing init file

* fix: Patch fixed

* fix: Patch fixed

* fix: test fixes

* fix: validate duplicate exemption declaration

* fix: payment entry test case

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-04-26 17:45:57 +05:30
Saqib
7e73473a65
fix: (ux) set jv voucher type depending on mode of payment (#21411) 2020-04-26 09:40:57 +05:30
Anurag Mishra
92b933f4ac
feat: Upload Attendance (#20947) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-23 16:15:18 +05:30
Deepesh Garg
bf78ed6947 fix: Loan Repayment code clean up and other fixes 2020-04-16 22:53:47 +05:30
Saqib Ansari
55410e03e4 fix: tests depending on global default company 2020-04-15 12:57:55 +05:30
Saqib Ansari
1f20c99ecf fix: tests depending on global default company 2020-04-14 19:40:25 +05:30
Mangesh-Khairnar
2e3548eb83
fix: consider revereted expired leaves entry (#21257) 2020-04-14 09:34:39 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor 
refactor: Healthcare Module
 2020-04-13 17:16:02 +05:30
Deepesh Garg
03166fab56 Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes 2020-04-13 13:20:02 +05:30
Deepesh Garg
af27d61bee fix: Employee loan test case and other fixes 2020-04-13 12:29:00 +05:30
Deepesh Garg
f7e216e285 fix: Employee loan fixes 2020-04-10 20:03:11 +05:30
Rucha Mahabal
1ff0cfd4f9 fix: merge conflicts 2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor 2020-04-09 19:16:31 +05:30
gavin
74dd0e12e7
fix: enable validations for email and phone data fields (#21199) 2020-04-08 12:59:15 +05:30
Nabin Hait
04870ae23a
fix: Replace newlines with spaces before evaluation of condition and formula (#21165) 2020-04-08 09:34:46 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces (#21192) 2020-04-08 09:32:41 +05:30
Rucha Mahabal
21f5680914 fix: merge conflicts 2020-04-07 16:42:50 +05:30
Himanshu Warekar
c207c457a5 Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-04-06 11:34:27 +05:30
Nabin Hait
75ef458b34
fix: update attendace from leave application (#21155) 2020-04-06 10:15:38 +05:30
Nabin Hait
a0018eed63
Merge branch 'develop' into refactor-addiional-salary 2020-03-31 20:30:52 +05:30
Rucha Mahabal
1900a62c54 fix: Merge branch 'develop' into healthcare_refactor 2020-03-25 02:08:42 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop (#20987) 
* fix: Multiple fixes during pre-release testing

* fix: Merge conflict
 2020-03-19 10:59:32 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection (#20818) 2020-03-16 22:36:44 +05:30
Anurag Mishra
c0b1c372a4
fix: local variable 'benefit_amount' referenced before assignment (#20949) 2020-03-16 16:53:03 +05:30
Prssanna Desai
e71153cbee
fix: fix options of currency fieldtype in Expense Taxes and Charges (#20901) 2020-03-16 15:52:25 +05:30
Himanshu Warekar
841be6713b Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-03-13 19:40:00 +05:30
Anurag Mishra
3ced42f302 feat: reverse linking and multiple additonal salaries in salary slip 2020-03-13 19:14:56 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor 2020-03-12 19:44:27 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor 2020-03-12 12:52:38 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Anurag Mishra
d319feee9e fix: reverse linking 2020-03-06 15:01:10 +05:30
Anurag Mishra
1663f66e6d test: Recurring Additional salary 2020-03-06 15:00:41 +05:30
Anurag Mishra
885ab5dc66 fix: requested changes 2020-03-06 15:00:40 +05:30
Anurag Mishra
2d7fcab2c9 feat: Recurring Addtional Salary 2020-03-06 14:59:56 +05:30
Anurag Mishra
943457abd3 fix: reverse linking for employee advance 2020-03-06 13:37:24 +05:30
Anurag Mishra
59a0bce3a9 feat: Repay advance from salary 2020-03-05 16:13:52 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Rucha Mahabal
5eb42409c7
Merge branch 'develop' into healthcare_refactor 2020-03-03 09:22:11 +05:30
Anurag Mishra
cf04b3c680
fix: added standard filters (#20807) 2020-03-02 19:25:01 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Karthikeyan S
0db423ed5f
fix(auto attendance): bug in marking absent (#20759) 
This bug was introduces in the commit bd6e8b9cec

i.e. The mark_absent function was renamed to mark_attendance, but there is a miss match in the order of the parameters.
 2020-02-28 12:27:21 +05:30
Anurag Mishra
d42a4a6234
fix: deductions calculation based on gross pay (#20727) 
* fix: deductions calculation based on gross pay

* test: salary structure deduction based on gross pay

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-27 18:31:18 +05:30
Rucha Mahabal
99321cd538 fix: conflicts 2020-02-27 13:16:53 +05:30
Anurag Mishra
773e7debb9
fix: validated leave allocation (#20636) 
* fix: validated leave allocation

* fix: changes requested

* Update erpnext/hr/doctype/leave_encashment/leave_encashment.py

Co-Authored-By: Nabin Hait <nabinhait@gmail.com>

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-26 14:50:57 +05:30
Mangesh-Khairnar
99d89d6cb8
fix(HR): show correct closing leave balance (#20723) 2020-02-26 11:26:07 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting (#19035) 
* fix: Create Loan Management module

* fix: Move loan doctype for hr module to loan management

* fix: Add loan dashboard

* fix: Move loan application form hr module to loan management

* fix: Move Loan Type from hr to loan management

* fix: Move salary slip loan from hr to loan management

* fix: Create loan security pledge doctype

* fix: Create loan security type doctype

* fix: Create Loan security doctype

* fix: Add customer in loan_common.js

* fix: Import patch for loan

* fix: Add security pledging in loan doctype

* fix: Add loan application pledge doctype

* fix: Add logic for security pledgeing in loan

* fix: Add logic for security pledging in loan application

* fix: Rename Loan security doctype to Loan Security Pledge

* fix: Add doctype for loan security

* fix: Fixes in loan and loan application

* fix: Add doctypes for loan repayment

* fix: Fixes in loan and loan application

* fix: Move loan repayment report from HR module to loan management

* fix: Create doctype for loan security price

* fix: Create doctype for loan security shortfall

* fix: Make fields in Loan shortfall readonly

* fix: Make loan type submittable

* fix: Add daily job for loan security revaluation in hooks.py

* fix: Add loan management module

* fix: Doctype for loan disbursement Entry

* fix: GL entry fix for loan disbursement

* fix: Add company currency options in Loan related doctypes

* fix: Changes in Loan Doctypes

* fix: Allow miltiple loan securities in Loan Security Pledge

* fix: Add proposed pledges in Loan Application

* fix: Add test cases for loan

* fix: Interest Accrual Entry for loans

* fix: Remove loan from journal entry

* fix: Update triggers in loan_common.js

* fix: Accrual Entries for loan Interest

* fix: Proposed Pledges for loan application

* fix: Update items in loan management module

* fix: Allow multiple disbursements against a loan

* fix: Add loan security code in loan security master

* fix: Allow multiple securities in a single pledge

* fix: Spelling and label fixes

* fix: Replace date in loan security price with datetime

* fix: Add dashboard to loan master

* fix: Move Repayment Schedule from HR to Loan Management

* fix: Add back jobs for loan accrual entries

* fix: Multiple fixes in loan

* fix: Multiple fixes in loan application

* fix: Loan Reapayment for term loans

* fix: Interest Accural Entries for term loans

* fix: Changes in Loan Doctypes

* fix: Add test case for term loan repayment

* fix: Add custom button to update loan security price and trigger shortfall

* fix: Usability fixes in Loan management

* fix: Multiple usablity and doctype fixes

* fix: Muliple bug and usability fixes in loan

* fix: Test case fixes for loan repayment from Salary

* fix: Codacy fixes

* fix: Test Case fixes

* fix: Minor fix in validate_repayment_method

* fix: Test case and codacy fixes

* fix: Provide consistent naming series to loan doctypes

* fix: Loan Application fix

* fix: Loan Application Dashboard

* fix: Add doctypes to process loan interest accural and loan security price

* fix: Provision to make loan topup

* fix: Pledge and unpledge statuses and doctype for loan securit unpledge

* fix: Multiple fixes in Loan Cycle

* fix: Add missing dashboards to loan doctypes

* fix: Add Loan Manager role to loan doctypes

* fix: Loan Process fixes

* fix: Loan Security Unpledge fixes

* fix: UX, List and dashboards fixes

* fix: Minor fixes

* fix: Minor fixes

* fix: Status on additional loan security

* fix: Codacy fixes

* fix: Multiple fixes in loan

* fix: Rename Process Loan Security Price to Process Loan Security Shortfall

* fix: Loan Repayment and Closure report

* fix: Loan Security Status report and minor fixes

* fix: Multiple UX fixes

* fix: Test Case fixes and UX fixes

* fix: Currency symbol fixes in Salary Slip Loan

* fix: Make loan account details read only

* fix: Changes in loan security price updation

* fix: Sanctioned Loan Amount doctype

* fix: Updates in process loan interest accrual

* fix: Pass loan doc instead of loan name

* fix: Fixes in process loan interest accrual

* fix: Add missing semicolon

* fix: Test case

* fix: Test case

* fix: Sandbox method to get proposed pledges

* fix: Sandbox method

* fix: Nonetype fix in loan sanction limit

* fix: GL entry fixes

* fix: Update maximum loan amount on loan security pledging

* fix: Round  off loan amounts

* fix: Loan Security unpledging

* fix: Interest amount for loan closure

* fix: Due date for loan repayments

* fix: API fixes for loan disbursement method

* fix: Disable quick entry for sanctioned loan amount

* fix: Add misssing translations for validations and codecleanup

* fix: Translation fixes and code cleanup

* fix: Test Cases

* fix: Loan Interest Accrual test case
 2020-02-26 10:44:24 +05:30
Mangesh-Khairnar
1db8ea317d
Merge pull request #20687 from Anurag810/additional_salary_fixes_v13 
fix: Additional salary can be created only for active employee
 2020-02-20 16:07:35 +05:30
Anurag Mishra
3f0c01199d fix: Additional salary can be created only for active employee 2020-02-20 15:40:37 +05:30
Mangesh-Khairnar
5d5f5b4f8e
fix(HR): skip earned leaves check for max leaves set to zero or less (#20535) 
* fix: skip earned leaves check for max leaves set to zero or less

* test: earned leaves creation
 2020-02-20 13:25:55 +05:30
Deepesh Garg
2c1da897c5
Merge pull request #20450 from Anurag810/fleet-management 
fix: odometer value was not syncing properly
 2020-02-20 13:19:54 +05:30
Anurag Mishra
51cf0eb159
fix: changed field type which was affecting filters (#20671) 2020-02-20 12:52:56 +05:30
Anurag Mishra
1a11cb5a07 test: syncing of odometer value 2020-02-19 16:46:00 +05:30
anil pise
7c474130ea fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed. 2020-02-15 15:58:57 +05:30
anil pise
21b1a00f61 Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599 2020-02-15 15:23:15 +05:30
Rohan Bansal
d64f92cf99 fix: show WFH in monthly attendance sheet report 2020-02-06 17:30:57 +05:30
Parth J. Kharwar
830b316543
fix: full day leaves not tagged as half day in attendance (#20487) 
* fix: full day leaves not tagged as half day in attendance

* chore: code cleanup for half day date value set
 2020-02-05 15:01:13 +05:30
Anurag Mishra
eacc1bc2dc fix: requested changes 2020-02-05 12:45:43 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter (#20104) 
* feat: appointment Letter

* fix: requested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-03 17:52:42 +05:30
Rucha Mahabal
0a35b2207e refactor: Healthcare masters 2020-02-02 23:21:18 +05:30
Deepesh Garg
c3f28db5b7
Merge pull request #20475 from ParthKharwar/dev-work-from-home-application 
feat: request for work from home marked in attendance
 2020-02-01 19:06:40 +05:30
Parth Kharwar
823964f3a6 fix: test added to check work from home application 2020-01-31 14:30:38 +05:30
Parth Kharwar
5342c846d2 feat: request for work from home marked in attendance 2020-01-30 13:12:56 +05:30
Suraj Shetty
082020184a Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-30 10:46:11 +05:30
Diksha
480d52c6f3 feat(attendance): add work from home option in status 2020-01-29 17:46:27 +05:30
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Anurag Mishra
3496104ebe fix: odometer value was not syncing properly 2020-01-28 13:11:49 +05:30
Deepesh Garg
cd8d667861 fix: Parent company defaulting on creation of new company (#20422) 
* fix: Parent company defaulting on creation of new company

* fix: Test Cases

* fix: Test Cases

* fix: Test Cases for staffing plan
 2020-01-28 12:54:45 +05:30
Parth J. Kharwar
011c13b3cc fix: employee checkin doctype time permissions (#20403) 2020-01-27 16:03:24 +05:30
Anurag Mishra
ce00f6cf70 fix: Duplicate Attendance Due Wrong Date format (#20390) 2020-01-24 16:14:50 +05:30
Anurag Mishra
85e5ba9698
Merge branch 'develop' into fix-remaining-leave-balance-calculation 2020-01-20 19:41:33 +05:30
Mangesh-Khairnar
2892a3b067 fix: nonetype issue in the total leaves calculation 2020-01-20 18:02:23 +05:30
Himanshu Warekar
303f085499 Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-01-19 11:45:24 +05:30
Mangesh-Khairnar
2ac8473abf fix: calculate remaining leave balance 2020-01-17 22:46:26 +05:30
Parth Kharwar
0a581c096b chore: changed employee contact field name 2020-01-17 11:50:35 +05:30
Vishal Dhayagude
2ae87876b6 fix: salary structure assignment filter employee based on company (#20318) 
* fix: pick company from employee salary structure

* fix: Salary structure assignment fetch company from enmployee

* Revert "fix: Salary structure assignment fetch company from enmployee"

This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f.

* fix: Salary structure assignment fetch company from enmployee

* fix: filter on company for salary structure assignment

* fix: minor changes

* fix: minor changes

* fix: added company to salary strucutre assignment
 2020-01-17 11:44:11 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch (#20301) 
* fix: Multiple fixes based on testing on pre-release branch

* fix: reload hr settings
 2020-01-16 13:37:25 +05:30
Himanshu Warekar
c9f497d7c0 feat: move subject and sender fields to json 2020-01-13 16:26:40 +05:30
Himanshu Warekar
e5692e035a Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-01-13 15:17:32 +05:30
Vishal Dhayagude
7ae11005c4 fix: UX improvement. move trigger on fieldname restrict_backdated_leave_application (#20211) 2020-01-07 13:02:13 +05:30
Vishal Dhayagude
6b316cd7cb feat: Backdated leave application (#20201) 
* fix: only HR Managers can make backdated leave applications

* fix (leave application): error message changed and user check modified

* fix: Move hardcoded logic to HR Settings

* fix: added role as mandetory field on check restict field

* fix: minor changes
 2020-01-07 11:48:38 +05:30
Anurag Mishra
8554304616 fix: set currency to company default currency (#20157) 2019-12-31 17:23:31 +05:30
Nabin Hait
5748cde54b fix: minor field arrangements 2019-12-31 17:18:15 +05:30
Anurag Mishra
d2eae9fbcf fix: Atendance Request, Employee Skill Map, Leave Encashment form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
b57ec65812 fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
52d280067b fix: Leave Type form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
cfdbbcff70 fix: Employee incentive form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
39ecd6ee1e fix: Expense calim form UI 2019-12-31 17:18:15 +05:30
Anurag Mishra
ec9000b6b9 fix: Employee form UI 2019-12-31 17:18:14 +05:30
Anurag Mishra
bd6e8b9cec feat: Mark Unmarked Attendance (#20062) 
* feat: Mark Unmarked Attendance

* Update shift_type.py

* Update attendance_list.js

* Update attendance.py

* Update attendance.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-31 17:09:56 +05:30
Rohan
b73b347697 feat: add job applicant's email in job offer (#20153) 2019-12-31 17:09:02 +05:30
thefalconx33
88de158378 feat: added provision to disable rounded total for salary slips 2019-12-31 15:27:30 +05:30
Saqib
8774c869d7 fix: first name not fetched from job offer applicant name (#20093) 2019-12-27 12:15:20 +05:30
thefalconx33
61bd6ccc2b fix: travis failing for leave application test 2019-12-26 18:27:58 +05:30
Parth J. Kharwar
8c4cf12c93 Setting preferred driver email in delivery trip (#19832) 
* fix: add driver's preferred contact email in delivery trip

* fix: modify driver's preferred email patch and blank field checks

* fix: patch file fix

* fix: patch changes to improve speed

* fix: removal of conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-25 15:14:52 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return 
feat: Capture return amount against Employee Advance via Journal Entry
 2019-12-24 11:52:20 +05:30
Deepesh Garg
cc62aad503
fix: Label for return amount 2019-12-24 11:51:39 +05:30
DeeMysterio
152c6be209 fix(employee onboarding): stop showing irrelevant job offer links for a job applicant (#20053) 2019-12-23 19:02:29 +05:30
Wolfram Schmidt
964cbc03ba Update employee.json (#20057) 
unnecessary description. Should be added by customer manually if needed individually.
 2019-12-23 18:50:40 +05:30
Parth J. Kharwar
da5d5c4941 fix(hr): update leave application status on cancel (#19883) 2019-12-23 18:41:17 +05:30
Anurag Mishra
bd5f5dabbd fix: Salary Structure Fixes (#19923) 2019-12-23 18:01:40 +05:30
Anurag Mishra
e6b3da0f59 feat: fixed party and party type in Accrual journal entry (#20021) 2019-12-23 15:50:29 +05:30
Mangesh-Khairnar
6edd3580d1 fix(expense-claim): update status (#20030) 
* fix(expense-claim): update status

* fix(expense-claim): compare using grandtotal precision
 2019-12-23 15:48:34 +05:30
Anurag Mishra
1202e64403
fix: Training Event Email Tenplate (#19652) 2019-12-18 11:43:16 +05:30
deepeshgarg007
b695fd31d6 fix: Remove trailing whitespace and add semicolon 2019-12-17 18:14:33 +05:30
deepeshgarg007
83ecaefd4c feat: Custom button to create return entry from Employee Advance 2019-12-17 11:03:22 +05:30
deepeshgarg007
c05bd1964f feat: Capture return amount against Employee advance via Journal Entry 2019-12-15 21:22:28 +05:30
deepeshgarg007
b223dd95e2 fix: Dashboard for employee advance doctype 2019-12-15 21:21:31 +05:30
deepeshgarg007
40b7ac4987 fix: Minor filter fix in expense claim type 2019-12-15 21:20:55 +05:30
Himanshu Warekar
c7feea830f feat: Email Append To 2019-12-12 21:12:17 +05:30
Anurag Mishra
9046c13858 fix: added extra condition (#19884) 2019-12-10 21:37:27 +05:30
Anurag Mishra
9cc5c18f36 fix: removed only custom dashboard 2019-12-10 15:20:47 +05:30
Nabin Hait
6f68f2d020
feat: Cost center for each expenses in expense claim and allowed deferred expense (#19807) 
* refactor: Expense Claim Cost Center

* refactor: Expense Claim Cost Center

* refactor: Expense Claim Cost Center

* fix: copy cost center from other row

* patch: set cost center in children based on parent

* fix: test cases for expense claim
 2019-12-10 08:40:10 +05:30
Mangesh-Khairnar
4350846f1e fix(compensatory leave request): Create leave ledger entry on submit/cancel (#19476) 
* fix: allow creation of leave ledger entry

* feat(compensatory-leave-request): create leave ledger entry on submit

* style: add descriptive comments

* test: allow creation of leave period based on company

* fix(leave-allocation): check name of leave allocation for determining overlap

* fix: validate new leaves allocated before updating leave allocation

* test: compensatory leave request creation

* fix: skip leave entries for non expired leave allocation

* test: creation of leave ledger entry on creation of compensatory leave request

* fix: minor changes

* fix: fetch leave approver defined in employee in leave application

* fix: attendance creation and leave balance calculation

* test: create leave period for the compensatory off

* style: add descriptive method name

* test: updation of leave allocation on submit

* fix: remove db_set from compensatory off
 2019-12-09 14:27:38 +05:30
Khushal Trivedi
51f2131a41 fix: joining and relieving Date can be on same date as valid use case on emoloyee form (#19798) 
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix: joining and relieving Date can be on same date as valid use case

* Update employee.py
 2019-12-04 11:56:44 +05:30
Nabin Hait
a0f9db4b83
Update employee.py 2019-12-03 12:51:27 +05:30
Anurag Mishra
957a6f5bd5 fix: UX/UI (#19753) 2019-12-02 14:44:17 +05:30
Sammish Thundiyil
54694dd816 modified: erpnext/hr/doctype/repayment_schedule/repayment_schedule.json (#19470) 2019-11-29 18:00:30 +05:30
Anurag Mishra
707bb2052c fix: Employee dashboard disappear after switching from leave application form (#19690) 2019-11-27 16:27:50 +05:30
Nabin Hait
a7d168c05f fix: merge conflict 2019-11-25 18:12:56 +05:30
Anurag Mishra
763660b2e4 fix: set allocated amount in employee advance as per total amount (#19626) 2019-11-22 13:32:25 +05:30
Mangesh-Khairnar
1a92eb14ed fix: Mark attendance from employee attendance tool (#19627) 2019-11-21 17:58:18 +05:30
Nabin Hait
9db9edca2c fix(expense claim): fetch outstanding documents based on party account type 2019-11-19 18:44:54 +05:30
Mangesh-Khairnar
3f854fce2e feat: fetch leave approver from both employee and department approvers (#19613) 
* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers
 2019-11-19 15:07:30 +05:30
Mangesh-Khairnar
f3ecfd8e58 fix: fetch leave approvers from both department and employee master (#19611) 
* fix: fetch leave approvers from both department and employee master

* fix: creaate a set of approvers
 2019-11-19 14:50:05 +05:30
Saqib
d995609ffa Fixed asset refactor (#19369) 
* refactor: Asset Movement with multiple assets using table

* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset

* feat: Auto create asset on Purchase checkbox

* refactor: LCV for asset created via PR/PI

* refactor: get asset category accounts from item master

* refactor: Purchase Receipt for asset purchasing

* refactor: Purchase Invoice for asset purchasing

* fix: post-refactor delete fixes

* refactor: moved asset validation from pr/pi on asset submission

* fix: Asset Category should be defined for auto purchasing assets

* fix: undo serial_no_update removal (for non asset item) from LCV

* fix: remove duplicate calls from item.js

* fix: args position of all occurrence of get_asset_category_account()

* fix: test cases

* fix: landed cost voucher validations

* refactor: test case for auto creation of asset

* fix: removed invalid assertions

* fix: patch errors on travis

* fix: codacy fixes

* fix: PI Items not fetching details from item

* fix: asset movement from list view having default purpose 'Receipt'

* chore: msgprint for selecting item code first while creating asset manually

* fix: alert messages

* minor: asset movement fixes

* fix: lcv was made against submitted assets

* minor: ux fixes

* refac: move specific asset validation to SINV

* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code

* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests

* fix: code review changes

* chore: remove unecessary asset movement updation

* refac: setting latest location while making asset movements
* Added extra validations

* fix: form dashboard make lcv button

* fix: auto asset movement creation validation

* fix: allow lcv against other items after removing submitted assets

* chore: remove unwanted condition

* fix: mismatch debit credit on  purchase of asset with valuation tax

* chore: toggle required field based on movement type

* chore: fix lcv error message

* fix: travis failing

* fix: travis failing test

* fix: wrong conditions after merge

* fix: cannot cancel assets

* fix: travis failing* fix change in deletion of assets

* fix: codacy

* fix: process cancellation of assets

* refac: cancellation of pr only deletes auto created assets

* fix: incorrect query
 2019-11-18 11:46:55 +05:30
Mangesh-Khairnar
d545f6fb6b
fix: fetch approver from employee 2019-11-14 19:26:49 +05:30
Mangesh-Khairnar
fc3b924d4d fix: skip leave ledger entry creation for denied leaves (#19556) 
* fix: skip leave ledger entry creation for denied leave application

* patch: remove incorrect leave ledger entries

* fix: create reverse ledger entry before setting status to cancel
 2019-11-14 12:02:10 +05:30
Mangesh-Khairnar
af7fe1937e fix: fetch leave approver defined in employee in leave application (#19559) 
* fix: fetch leave approver defined in employee in leave application

* Update department_approver.py
 2019-11-13 19:00:56 +05:30
Deepesh Garg
3cc3b57926 fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry (#19427) 
* fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry

* fix: Codacy

* fix: Minor UX fixes

* fix: Also credit payable amount in case of advance payment

* fix: Against voucher in GL enrty
 2019-11-12 14:32:50 +05:30
Diksha
39152f935c fix(employee): show only active employees in the error display while marking a reporting to employee as left 2019-11-11 19:22:51 +05:30
Mangesh-Khairnar
2f44480d69 enhancement: Item-wise sales history report (#19500) 
* refactor(item-wise-sales-history): convert query report to script report

* refactor: add columns, fetch data

* refactor: shift company set func to utils

* fix: add filters

* fix: minor changes

* fix: fetch all the descendants
 2019-11-11 10:54:12 +05:30
Saqib
01c19d3b93 internal issues (#19496) 
* fix: user remark mandatory in quick entry but not in form

* fix: preview salary slip btn showing in draft and unsaved states

* minor: removed unecessay comma

* fix: department analytics report showing departments of all companies
 2019-11-06 14:41:16 +05:30
Deepesh Garg
2ec7acb592
Merge pull request #19294 from vijaywm/duplicate-attendance 
fix: Typo in attendance date filter
 2019-10-31 16:46:52 +05:30
Mangesh-Khairnar
45c18b3184 fix: fetch employee department (#19433) 2019-10-31 16:00:52 +05:30
deepeshgarg007
4a1d000c33 fix: Test Case 2019-10-31 15:57:15 +05:30
Mangesh-Khairnar
7638788c2f fix: calculate pending leaves (#19411) 2019-10-30 14:23:41 +05:30
Faris Ansari
e127d937f7 fix(ExpenseClaim): List filter config for Rejected and Unpaid (#19434) 2019-10-30 13:31:05 +05:30
ahmadRagheb
2a72d1fee4
Update salary_slip.py 
getdate imported twice
 2019-10-29 19:49:08 +02:00
Mangesh-Khairnar
cdf15222e1 fix: half day leave (#19323) 2019-10-21 13:33:46 +05:30
Vijaya Raghavan
adc1529567
fixed typo 
fixes type in filter parameter
 2019-10-13 21:41:02 +05:30
Saqib
66762380ed fixes: internal issues (#19201) 
* fix: Delivery Trip now has editable start address.

* fix: default party type not set in Journal Entry

* fix: maintainence visit purpose table not fetching item name

* fix: maintainence visit purpose table not fetching item name
 2019-10-11 11:09:10 +05:30
Mangesh-Khairnar
d5e9cd72df
Merge branch 'develop' into lwp_half_day_fix 2019-10-07 16:08:30 +05:30
Mangesh-Khairnar
75397b441f
style(salary-slip): fixed formatting 2019-10-07 16:08:15 +05:30
Nabin Hait
25e043766a
fix: Get leave approvers in Employee leave balance report (#19211) 2019-09-30 16:36:23 +05:30
Mangesh-Khairnar
f82ea857a0 feat(job-applicant): allow rename/merge with existing 2019-09-26 12:29:41 +05:30
Vijaya Raghavan
e9affd97ac
LWP for half day in multi day leave 2019-09-24 17:04:32 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +05:30
Mangesh-Khairnar
a44e8afe71 feat: add bank account in payroll entry (#19021) 
* fix(journal-entry): change fieldname from bank account no to bank account

* fix: add payroll entry in bank dashboard

* fix: fetch account from bank account

* fix: minor changes

* patch: check for bank account no column before updating

* fix: use rename field function
 2019-09-20 18:19:47 +05:30
Rucha Mahabal
aeaf416d6d fix: upload attendance template not marking attendance 2019-09-18 13:11:30 +05:30
Chinmay Pai
7e8e4783a1 fix: remove function call from kwarg (#19072) 
this commit fixes mail not being sent for leave applications

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-16 19:14:42 +05:30
Suraj Shetty
6996c2d17d fix: Fetch image from user if available (#19030) 2019-09-13 12:25:06 +05:30
Mangesh-Khairnar
755020843b fix: leave balance reports (#18984) 
* fix: process allocation expiry

* fix: leave balance summary filter

* fix: opening and closing balance

* fix: check for department leave approvers

* fix: minor changes

* fix: consider leave approver in employee

* Update employee_leave_balance_summary.py
 2019-09-13 11:07:09 +05:30
Mangesh-Khairnar
cbcede79b1
Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves 
feat: Added input field for max carry forwarded leaves
 2019-09-09 14:38:06 +05:30
Nabin Hait
632fc6af79 feat: Added input field for max carry forwarded leaves 2019-09-09 13:33:00 +05:30
Nabin Hait
fb7c7b53ba feat: Added input field for max carry forwarded leaves 2019-09-09 12:08:58 +05:30
Suraj Shetty
5ae40a9500
fix: Use absolute import instead of relative import 
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2019-09-08 15:16:35 +05:30
Suraj Shetty
a14ee7f1fe Merge branch 'develop' of github.com:frappe/erpnext into employee-leave-balance-summary 2019-09-07 22:02:02 +05:30
Suraj Shetty
c5588a9b93 fix: Column value and data indentation 2019-09-07 21:26:43 +05:30
Suraj Shetty
21a4f82f69 fix: Re-arrange filters 2019-09-07 20:21:56 +05:30
Nabin Hait
3b366c30a8
feat: Added default Leave Approver in Employee (#18953) 2019-09-07 12:31:07 +05:30
Karthikeyan S
1d1427de60 fix(auto attendance): handling None case for IN/OUT Logs (#18867) 2019-09-05 15:02:33 +05:30