Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,431 Commits 3 Branches 0 Tags 1 GiB
7a5b9a7bbe
Commit Graph

1833 Commits

Author SHA1 Message Date
Faris Ansari
7ed5919d5b fix(LoanApplication): Repayment amount check (#18376) 
* fix: Clickable Asset link

* fix(LoanApplication): Repayment amount check
 2019-07-22 11:30:05 +05:30
Anurag Mishra
d1d8d24d0f
fix: filters conditions in loan repayment (#18428) 2019-07-20 06:31:22 +05:30
Karthikeyan S
fcdcfbf302
fix(loan): Loan Tenure Formula (#18424) 2019-07-20 00:18:44 +05:30
Himanshu
0a8816e053 feat(Google Maps): Google Maps Refactor [Unified Google API Settings] (#18110) 2019-07-19 14:38:04 +05:30
Suraj Shetty
f9c650f8e6 fix: Show submit after salary slip creation 2019-07-17 19:38:46 +05:30
sahil28297
39c3cfa25d fix(hr_setting): fix translation method call (#18328) 2019-07-15 11:25:26 +00:00
Anurag Mishra
e37ff39836 fix: Validate loan repayment amount in Loan Application (#18169) 
* fix: validate loan repayment amount

* fix: test for loan application
 2019-07-15 14:16:52 +05:30
karthikeyan5
625ec43fc9 fix(auto attendance): Prevent marking attendance for the ongoing shift 2019-07-12 15:57:37 +05:30
Nabin Hait
bd055a858c
fix: UX fixes in loan (#18220) 
* fix: UX fixes in loan

* Update loan.py
 2019-07-11 17:18:00 +05:30
Rushabh Mehta
8309fcfbbc BREAKING CHANGE: Remove anti-pattern "Project Task" (#18059) 
* BREAKING CHANGE: Remove anti-pattern "Project Task"

* fix(tests): remove `tasks` from project/test_records.json

* fix(tests)

* fix(test): test_employee_onboarding.py

* fix(tests): test_expense_claim.py

* fix(refactor): cleanup project.py validate/update

* fix(refactor): cleanup project.py validate/update

* fix(test): test_expense_claim

* fix(test): test_expense_claim

* fix(test): test_expense_claim, try Test Company 4

* Update project.py
 2019-07-08 10:39:30 +05:30
karthikeyan5
7fc6021ca5 feat(setup): adding selling buying filter in terms and conditions 2019-07-04 22:46:16 +05:30
Mangesh-Khairnar
100af0a635 fix(salary-slip): Nonetype error on amount calculation (#18147) 
* fix: amount calculation

* Update salary_slip.py
 2019-07-04 12:29:26 +05:30
Anurag Mishra
841d852f41 refactor: added missing translation functions (#18143) 
* fix: Translating Error and Messages

* Update erpnext/controllers/item_variant.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>

* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-07-03 15:15:08 +05:30
Mangesh-Khairnar
80fb0bf520 fix: add employee leave balance report to the dashboard 2019-07-03 13:06:46 +05:30
Mangesh-Khairnar
8d19faa598 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-07-03 11:44:00 +05:30
Mangesh-Khairnar
0d4db95d99 fix: skip expired leaves on allocation end date 2019-07-03 11:35:51 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997) 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
 2019-07-03 10:34:31 +05:30
Suraj Shetty
19e4fde737 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-30 15:30:59 +05:30
rohitwaghchaure
9dd7d3ebb3 fix: not able to make salary slip based on timesheet (#18088) 2019-06-28 12:40:52 +05:30
Anurag Mishra
322eca61e6
fix: Wrong Casual Leave Opening in Employee Leave Balance Report 
fix: Wrong Casual Leave Opening in Employee Leave Balance Report
 2019-06-27 17:00:55 +05:30
Anurag Mishra
0181eb0652 fix: removed unused function 2019-06-26 13:26:50 +05:30
Anurag Mishra
8a6255078b fix: wrong Casual Leave opening 2019-06-26 13:22:34 +05:30
Himanshu Warekar
d48b2ac126 fix: attendance gantt fix 2019-06-26 11:37:49 +05:30
Mangesh-Khairnar
07aae76bbf fix: change the department to tree view (#18057) 2019-06-26 11:03:57 +05:30
rohitwaghchaure
2b6cb6160f
Merge pull request #18042 from rohitwaghchaure/closed_job_opening_disaplying_in_job_applicant 
fix: Closed job opening disaplying in job applicant
 2019-06-25 16:51:03 +05:30
Rohit Waghchaure
78d6086739 fix: Closed job opening disaplying in job applicant 2019-06-24 18:05:10 +05:30
karthikeyan5
eadc144477 fix(HR): fixing bug introduced during merge conflict resolution. 
> while merging with https://github.com/frappe/erpnext/pull/17837
 2019-06-24 15:15:38 +05:30
karthikeyan5
82256bc58b fix(hr): Auto Attendance 
> fixing minor bug in shift calculation
> adding 'Mark Auto Attendance' button in shift and related fixes
> changed employee checkin naming series
> added aditional validation for employee checkin
> added/updated dashboard for Attendance, Employee, Shift Type
 2019-06-24 15:15:38 +05:30
karthikeyan5
32197355ad rename(HR): Employee Attendance Log DocType to Employee Checkin 2019-06-24 15:15:38 +05:30
karthikeyan5
e0c5176383 refactor(HR): Auto Attendance 
> moved all auto attendance settings from HR Settings to shift
> added shift in attendance and Employee Attendance Log
> reordered and cleaned up fields in HR Settings and Employee DocType
 2019-06-24 15:15:38 +05:30
karthikeyan5
66e459b35d fix(auto attendance): changes as requested in review 
> removed unused field from shift assignment
> renamed 'biometric_rf_id' to 'attendance_device_id'
> added more test cases
> few other minor changes after demo
 2019-06-24 15:15:38 +05:30
karthikeyan5
23cedfd6c8 feat(HR): Auto Attendance 
>Marking attendance based on Employee Attendance Log
 2019-06-24 15:15:38 +05:30
karthikeyan5
ceea328542 fix(HR): validations and bug fixes for Attendance Log 2019-06-24 15:15:38 +05:30
karthikeyan5
a4d0ba222b fix(HR): changes as per PR review 
> renamed 'Employee Checkin Log' DocType to 'Employee_attendance_log' DocType
> renamed biometric_id to biometric_rf_if
 2019-06-24 15:15:38 +05:30
karthikeyan5
e4bbda6ff5 feat(HR): Added Employee CheckIn Log 
> Employee CheckIn Log can be used to store IN/OUT Logs of employees from biometric/RFID devices.
>added biometric_id in the Employee Doctype
 2019-06-24 15:15:38 +05:30
Mangesh-Khairnar
bd999b0908 fix: minor changes 2019-06-21 00:49:48 +05:30
rohitwaghchaure
8b7267eb60
Merge pull request #17921 from Mangesh-Khairnar/expense-claim 
feat: Tax based expense claim
 2019-06-20 22:02:52 +05:30
rohitwaghchaure
d2061b44dd fix: could not find company all (#17978) 2019-06-20 19:13:54 +05:30
Mangesh-Khairnar
8619fc7413 fix: fetch rate only if field is empty 2019-06-20 12:02:47 +05:30
Mangesh-Khairnar
0ef1df72ad refactor: fetch rate directly from the account head 2019-06-19 17:50:33 +05:30
Mangesh-Khairnar
439313e524 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-06-19 13:10:53 +05:30
Mangesh-Khairnar
12a2b21465 fix: track status for pending leaves 2019-06-19 13:00:52 +05:30
Suraj Shetty
a367a85a78
Merge branch 'develop' into call-summary-dialog 2019-06-18 11:09:29 +05:30
Mangesh-Khairnar
7293a98a10 fix: change formatting 2019-06-17 19:03:46 +05:30
Mangesh-Khairnar
9ee5c8a4c6 fix(employee-benefit-application): remove query from setup 2019-06-17 18:07:10 +05:30
Mangesh-Khairnar
fefdac432c refactor: add json changes 2019-06-14 15:39:50 +05:30
Mangesh-Khairnar
24fbe23c8d fix: add indicators for expire in the leave allocation list 2019-06-14 15:36:26 +05:30
Anurag Mishra
e87ebcaf04 fix: upadated employee dashboard 2019-06-14 14:10:48 +05:30
Anurag Mishra
0ae6cbdd01 fix: requested Changes 2019-06-14 14:10:48 +05:30
Anurag Mishra
e6dd55d9f2 feat: dashboards for HR module 2019-06-14 14:10:47 +05:30
Saurabh
0d50523723
Merge pull request #17941 from nabinhait/salary-slip-amount-dev 
fix: salary slip amount calculation based on formula
 2019-06-14 11:19:31 +05:30
Mangesh-Khairnar
6726dea88b style: change formatting 2019-06-14 11:17:17 +05:30
Mangesh-Khairnar
4e1b60d401 style: change formatting 2019-06-14 11:15:54 +05:30
Nabin Hait
a2caf884fe fix: salary slip amount calculation based on formula 2019-06-13 19:44:21 +05:30
Mangesh-Khairnar
f8bf57c956 fix: remove transaction section head 2019-06-13 18:09:23 +05:30
Mangesh-Khairnar
0a3ed374cd test: validate tax based expense claim gl entries 2019-06-12 20:03:22 +05:30
Mangesh-Khairnar
a1d354e147 feat: add grand total field 2019-06-12 18:18:38 +05:30
Suraj Shetty
a7ac218584
Merge branch 'develop' into call-summary-dialog 2019-06-12 13:28:41 +05:30
Mangesh-Khairnar
444313bdfc feat: change the claim amount in expenses to amount 2019-06-12 12:52:02 +05:30
Kenneth Sequeira
add002bb0f fix: Make Travel Request Document Submittable (#17874) 
* make travel request submittable

* add patch

* remove patch
 2019-06-12 12:25:48 +05:30
Mangesh-Khairnar
283d2c5ca2 fix: only create leave application ledger on intermediate allocation expiry 2019-06-11 16:35:29 +05:30
Mangesh-Khairnar
ac9a4fe03c feat: add tax and charges in expense claim 2019-06-11 14:25:44 +05:30
Suraj Shetty
54bb3e4b9f Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-10 09:25:39 +05:30
rohitwaghchaure
74d45f40a8
Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop 
fix: Not able to save salary slip
 2019-06-07 12:58:25 +05:30
Rohit Waghchaure
72264697be fix: Not able to save salary slip 2019-06-07 11:46:27 +05:30
Mangesh-Khairnar
e4d03bf0d0 fix: consider expiry in leaves 2019-06-07 11:30:27 +05:30
Mangesh-Khairnar
368a974368 style: change formatting 2019-06-06 20:43:32 +05:30
Mangesh-Khairnar
86e0f4c617 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-06-06 20:41:28 +05:30
Mangesh-Khairnar
c7b9ae9c5e fix: get leave balance based on the ledger entries 2019-06-06 20:38:59 +05:30
Mangesh-Khairnar
b840ba4407 feat: show dashboard on submit 2019-06-06 20:38:23 +05:30
Mangesh-Khairnar
00c607116b fix: handle negative leaves without allocation 2019-06-06 20:37:34 +05:30
Mangesh-Khairnar
f13243a92e feat: fetch annual allocation based on leave policy 2019-06-06 20:35:10 +05:30
Mangesh-Khairnar
3863fc5fb2 feat: create ledger entry for each earned leave 2019-06-06 20:34:10 +05:30
Mangesh-Khairnar
050f65beb4 feat: fetch leave allocation from ledger entry 2019-06-06 20:32:01 +05:30
Suraj Shetty
c0a640c462 feat: Add user_id of employee to employee group 2019-06-06 14:47:40 +05:30
Mangesh-Khairnar
351f4d53a0 feat: add employee filter to employee leave balance 2019-06-05 21:22:07 +05:30
Mangesh-Khairnar
62011c9dc4 feat: add link to policy 2019-06-05 21:16:27 +05:30
Mangesh-Khairnar
2bd211cc05 fix(attendance): fetch employee name (#17857) 2019-06-05 20:24:15 +05:30
Nabin Hait
3f97fac8e1
feat: Salary rounding based on settings on salary component (#17852) 2019-06-05 13:20:08 +05:30
Himanshu
4cb1a1e2e3 fix: set task weight from onboarding template (#17840) 2019-06-05 10:26:01 +05:30
Mangesh-Khairnar
afa1dc4ffa feat: expire current allocation 2019-06-03 20:09:22 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
abhijitkumbharIND
39d6cf38fc fix: Vehicle Master - Last carbon check accepting future date.(#17821) 2019-05-31 14:19:04 +05:30
abhijitkumbharIND
302bce355f fix: Vehicle Master - Last carbon check accepting future date.(#17821) 2019-05-31 14:19:04 +05:30
Mangesh-Khairnar
c5385e141b fix: add mandatory reason fields in leave application 2019-05-31 00:53:28 +05:30
Mangesh-Khairnar
95e5d812fe fix: UX changes 2019-05-30 22:22:15 +05:30
Mangesh-Khairnar
91e62f575e fix: department filters in employee leave balance 2019-05-30 13:38:35 +05:30
Mangesh-Khairnar
2124d9884b fix: pass positional arguments on creation of leave application 2019-05-30 13:21:34 +05:30
Mangesh-Khairnar
aafb5cb6f6 fix: ignore expired non-carry forwarded allocation on calculating leaves taken 2019-05-30 13:13:14 +05:30
Mangesh-Khairnar
ded33a7e2e fix: ledger entries creation 2019-05-29 19:12:19 +05:30
Mangesh-Khairnar
7cc6a67c18 add department filter to employee leave balance 2019-05-29 15:59:20 +05:30
deepeshgarg007
acc2422167 Merge branch develop into dimensions 2019-05-28 12:18:32 +05:30
Nabin Hait
5fef786441
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev 
fix: Tax calculation on salary slip
 2019-05-28 11:16:31 +05:30
Mangesh-Khairnar
c6d6adcbf3 fix: ledger entry creation for encashment 2019-05-28 09:44:38 +05:30
Mangesh-Khairnar
61bb236cfa test: delete ledger entry after each test to maintain balance 2019-05-27 19:36:40 +05:30
Nabin Hait
7f375d209c fix: Tax calculation on salary slip 2019-05-27 18:42:53 +05:30
Nabin Hait
1f24a4d44c
Merge pull request #17691 from netchampfaris/upload-attendance-progress 
fix(UX): Upload Attendance
 2019-05-27 17:17:03 +05:30
Mangesh-Khairnar
35786c0067 Merge branch 'leave-management' of https://github.com/Mangesh-Khairnar/erpnext into leave-management 2019-05-27 15:42:11 +05:30
Mangesh-Khairnar
6f69bbe1d7 test: leave ledger balance 2019-05-27 15:40:36 +05:30
Mangesh-Khairnar
7fbaef5de3 fix: expiry ledger creation 2019-05-27 15:39:48 +05:30
Nabin Hait
c9a4111f4d
Merge branch 'develop' into leave-management 2019-05-27 13:59:27 +05:30
Mitchy25
a8f6938556 Fix: Precision in Appraisals (#17673) 
* Update appraisal.js

This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.

* fix: score based on field's precisin
 2019-05-27 13:57:56 +05:30
Nabin Hait
a659e615f3
Merge branch 'develop' into upload-attendance-progress 2019-05-27 13:47:36 +05:30
Anurag Mishra
9d9440277c fix: holidays was showing on same date in calendar view (#17754) 2019-05-27 13:20:42 +05:30
Nabin Hait
331dcc06c9
Merge branch 'develop' into upload-attendance-progress 2019-05-27 11:59:16 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim (#17729) 
* fix: payment reconciliation against expense claim

* feat: Added dashboard for expense claim
 2019-05-27 11:44:06 +05:30
Mangesh-Khairnar
705b7dc9c2 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-05-27 11:21:06 +05:30
Mangesh-Khairnar
71cdcb3593 style: add a more descriptive method name 2019-05-27 11:00:04 +05:30
Mangesh-Khairnar
45197965d7 fix: give cancellation permission to hr manager 2019-05-27 03:26:48 +05:30
Mangesh-Khairnar
d751281fa7 fix: application and leave encashment test cases 2019-05-27 03:23:58 +05:30
Mangesh-Khairnar
e7d307e6bf fix: only expire carry forwarded allocation via scheduler 2019-05-27 03:21:32 +05:30
Mangesh-Khairnar
2417c93d0e feat: create expiry and carry forward calculation on leave allocation creation 2019-05-27 03:20:10 +05:30
Mangesh-Khairnar
c99f644ffe test: carry forward and expiry allocation 2019-05-27 03:13:47 +05:30
Mangesh-Khairnar
7a7f4bd822 fix: leave balance calculation 2019-05-27 03:12:57 +05:30
Mangesh-Khairnar
9e3b688333 test: create leave policy 2019-05-27 03:10:39 +05:30
deepeshgarg007
6f6636abfe fix: Add dimension section in multiple doctypes 2019-05-26 12:31:01 +05:30
Faris Ansari
932a767de4
Merge branch 'develop' into upload-attendance-progress 2019-05-24 14:46:02 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js 
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
 2019-05-24 11:36:16 +05:30
Rushabh Mehta
7e4fb49c61 fix(minor): after manual testing 2019-05-24 11:22:31 +05:30
Mangesh-Khairnar
45cf02308e fix: prevent manual creation of ledger entries 2019-05-23 20:29:18 +05:30
Mangesh-Khairnar
8ef81870bb test: create leave ledger entry for encashment 2019-05-23 20:28:16 +05:30
Faris Ansari
8f784c8555
fix: Remove console statement 2019-05-23 14:39:38 +05:30
Mangesh-Khairnar
5ba17c87e5 feat: remove update allocation after submit 2019-05-22 18:29:22 +05:30
Rushabh Mehta
04e89ce808 refactor: deprecate old API 2019-05-22 16:52:36 +05:30
Faris Ansari
9e5665dc0a
Merge branch 'develop' into upload-attendance-progress 2019-05-21 18:01:30 +05:30
Faris Ansari
81e698d225 fix(UX): Upload Attendance 
Enqueue import if rows more than 200. Show import progress in dashboard.
 2019-05-21 17:58:55 +05:30
Rushabh Mehta
98a80407f8
Merge pull request #17538 from adityahase/fix-training-feedback 
fix(hr): Use event_status instead of status
 2019-05-21 12:19:03 +05:30
Saurabh
1bcdb094ea
Merge pull request #17630 from nabinhait/multi-fixes-dev 
fix: Multiple small fixes
 2019-05-16 15:21:15 +05:30
Nabin Hait
b90fc7fc0d fix: Get bank account on selection of payment mode in Loan 2019-05-16 13:45:54 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation (#17617) 
* refactor: Payroll processing and tax calculation

* fix: payroll test cases

* fix: Codacy fixes

* fix: payroll test cases

* fix: removed unwanted code
 2019-05-16 11:23:04 +05:30
Himanshu
0e31089af6 validate: if additional salary exists (#17529) 2019-05-16 10:35:02 +05:30
Mangesh-Khairnar
afb0c4aa43 fix: delete entry on cancellation of transaction 2019-05-15 21:50:34 +05:30
Mangesh-Khairnar
f8f02c508d feat: create leave ledger entry on leave encashment creation 2019-05-15 21:50:06 +05:30
Mangesh-Khairnar
50037f8609 fix: consider min days remaining as remaining leaves 2019-05-15 21:49:27 +05:30
Mangesh-Khairnar
6ba9a128e7 feat: calculate leave balance using ledger entries 2019-05-15 15:53:54 +05:30
Mangesh-Khairnar
964deaca96 test: creation of ledger entries on application submit 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
201aeeb20d test: creation of ledger entries on allocation submit 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
170b8dded8 fix: expiry logic for carry forwarded allocation 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
9bb4b8e8b2 feat: create expiry ledger entry on allocation period completion 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
cf8f4bda8f fix: skip application fetch for non allocation records 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
783bd89413 feat: handle cancellation workflow for leave application 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5448edff2c feat: delete cancelled allocation from ledger 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
01490f1560 feat: add cancellation workflow for leave allocation ledger entry 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5ad83c06c2 feat: add ledger entries on leave addition 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
679371e397 feat: get carry forwarded leaves via ledger entries 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
2b421c39b5 feat: add transaction details in ledger 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
1de990b2ac feat: create leave ledger entry 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5e2b067107 feat: display carry forwarded allocation days and total leaves allocated 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0abf5d340c fix: carry forwarded allocation period validation 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d01863707c test: pass leave type as params 2019-05-15 15:53:52 +05:30