Suraj Shetty
|
03c3bd5f4a
|
feat: Open modal in realtime for incoming call
|
2019-05-16 13:39:50 +05:30 |
|
Anurag Mishra
|
6f619e2bbf
|
Merge branch 'develop' into subs
|
2019-05-16 12:52:26 +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 |
|
Anurag Mishra
|
b6a4a02dc2
|
Merge branch 'develop' into subs
|
2019-05-16 10:48:21 +05:30 |
|
Himanshu
|
0e31089af6
|
validate: if additional salary exists (#17529)
|
2019-05-16 10:35:02 +05:30 |
|
Rushabh Mehta
|
fd6ae67b16
|
fix: link preview for item and task
|
2019-05-16 10:25:27 +05:30 |
|
Prasad Ramesh
|
067d3c0c09
|
fix: made Sales Partner Comission report visible in Selling module (#17602)
|
2019-05-16 10:18:02 +05:30 |
|
Suraj Shetty
|
d382f1d470
|
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
|
2019-05-16 09:47:17 +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 |
|
Anurag Mishra
|
1a98cce3a4
|
Merge branch 'develop' into subs
|
2019-05-15 16:40:03 +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 |
|
Mangesh-Khairnar
|
70cf4a6796
|
feat: validate leave allocation period to be within expiry limits
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
99c9cfaaed
|
feat: generate leave allocation for carry forwarded leaves
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
4badca54af
|
feat: validate leave expiry days
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
0c0bfb1ef0
|
feat: calculate carry forward leaves allocation
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
d6c5b6320f
|
feat: add a field for conditionally displaying carry forwarded leave
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
e46d3a87ea
|
feat: set carry forwarded leave allocation
|
2019-05-15 15:53:52 +05:30 |
|
Mangesh-Khairnar
|
c28d2e4b2a
|
test: create leave allocation check
|
2019-05-15 15:53:51 +05:30 |
|
Mangesh-Khairnar
|
bd3b3ea12c
|
test: create leave type
|
2019-05-15 15:53:51 +05:30 |
|
Mangesh-Khairnar
|
7c6b6eae5b
|
feat: set leave allocation on carry forward check
|
2019-05-15 15:53:51 +05:30 |
|
Mangesh-Khairnar
|
1208ca6a36
|
feat: add old leaves to track carry forward leave allocation
|
2019-05-15 15:53:51 +05:30 |
|
Mangesh-Khairnar
|
c182a5687e
|
feat: add validation for carry forward leave expiry
|
2019-05-15 15:53:51 +05:30 |
|
Mangesh-Khairnar
|
fd53c64d5d
|
feat: create carried forward leave expiry option
|
2019-05-15 15:53:51 +05:30 |
|
Mangesh-Khairnar
|
6e3586423f
|
fix: multiple changes
|
2019-05-15 15:50:50 +05:30 |
|
Deepesh Garg
|
0ae1c293d3
|
fix: Status updater fixes in PO and SO and test coverage for return (#17491)
* fix: Status updator fixes in sales and purchase cycle
* fix: Test cases for return in so and po
* fix: Resolve conflicts
|
2019-05-15 12:23:24 +05:30 |
|
deepeshgarg007
|
073f36b766
|
fix: Create property setter for budget if dimension is created
|
2019-05-15 12:20:37 +05:30 |
|
Saurabh
|
9da57d79b5
|
fix: reload docs before creating custom fields (#17586)
|
2019-05-15 11:39:41 +05:30 |
|
Mohamed Al Zubaidi
|
4c0f754a96
|
Fix typos (#17601)
|
2019-05-15 11:38:56 +05:30 |
|
Karthikeyan S
|
c3779851e4
|
fix(HR Settings): Unable to save HR Settings (#17608)
|
2019-05-15 11:38:20 +05:30 |
|
rohitwaghchaure
|
d07a3e1de2
|
fix: limit offset was missing in the get_delivery_notes_to_be_billed method (#17611)
|
2019-05-15 07:46:28 +05:30 |
|
rohitwaghchaure
|
32d91b2c00
|
fix: not able to create the sales invoice without item code (#17612)
|
2019-05-15 07:41:44 +05:30 |
|
Himanshu
|
abcb6aea00
|
fix: do not remove assignment when closed (#17613)
|
2019-05-14 20:07:53 +00:00 |
|
Himanshu
|
8b2a76a03a
|
Merge branch 'develop' into sla_fix
|
2019-05-15 00:08:45 +05:30 |
|