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 |
|
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 |
|
sahil28297
|
adf6dcd74a
|
Merge pull request #17603 from netchampfaris/fix-v12-setup
fix: Clear messages during setup fixtures
|
2019-05-14 20:11:38 +05:30 |
|
Mangesh-Khairnar
|
cf71a84976
|
style: formatting changes
|
2019-05-14 18:50:40 +05:30 |
|
Mangesh-Khairnar
|
cd59263736
|
fix: reload doc on generation of text file
|
2019-05-14 18:34:14 +05:30 |
|
Mangesh-Khairnar
|
c68ee1fcc6
|
feat: add account field in payment order
|
2019-05-14 18:31:14 +05:30 |
|
Mangesh-Khairnar
|
557419a745
|
feat: load company bank account
|
2019-05-14 18:30:19 +05:30 |
|
Mangesh-Khairnar
|
d9140dc772
|
feat: add party bank account field
|
2019-05-14 18:28:24 +05:30 |
|
Mangesh-Khairnar
|
6175eb2cf9
|
feat: add validation for fields
|
2019-05-14 18:25:57 +05:30 |
|
Faris Ansari
|
ec7b064528
|
fix: Clear messages during setup fixtures
|
2019-05-14 16:21:09 +05:30 |
|
Anurag Mishra
|
52f31d211d
|
Merge branch 'develop' into bom_items_and_scraps
|
2019-05-14 15:29:43 +05:30 |
|
Shivam Mishra
|
621cdeb36a
|
Merge pull request #17592 from scmmishra/acad-fixes
fix: bug fixes in LMS
|
2019-05-14 15:20:22 +05:30 |
|
Anurag Mishra
|
f1f2a3eed0
|
feat: added report for showinrg complete hierarchy of bom with item details and scraps
|
2019-05-14 15:04:26 +05:30 |
|
Saurabh
|
1d90ebb16a
|
Merge pull request #17579 from rmehta/remove-feedback-trigger
fix: remove link to feedback trigger
|
2019-05-14 14:38:30 +05:30 |
|