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
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
Faris Ansari
ec7b064528
fix: Clear messages during setup fixtures
2019-05-14 16:21:09 +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
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
Deepesh Garg
1f02fcdf89
Merge pull request #17597 from deepeshgarg007/territory_group_fixes_develop
...
fix: Make territory filter mandatory
2019-05-14 14:37:39 +05:30
deepeshgarg007
d9a22726f1
fix: Make territory filter mandatory
2019-05-14 14:36:40 +05:30
Shivam Mishra
776d891b19
fix: test for course
2019-05-14 14:16:50 +05:30
Shivam Mishra
f82d0a6074
fix: show video duration and publish date only if data exists
2019-05-14 12:02:51 +05:30
Deepesh Garg
bbdd737b5c
Merge pull request #17590 from deepeshgarg007/inactive_items_row_develop
...
fix: Do not append row if item is sold within days since last ordered
2019-05-14 11:56:59 +05:30
Deepesh Garg
571c5c8bf1
Merge branch 'develop' into inactive_items_row_develop
2019-05-14 11:54:08 +05:30
Shivam Mishra
2430fd3a4c
chore: show description on course card
2019-05-14 11:24:51 +05:30
Shivam Mishra
f2d62195b0
chore: Minor code improvements
2019-05-14 11:24:45 +05:30
Shivam Mishra
d2c4af154b
fix: Video not found bug
2019-05-14 11:24:40 +05:30
rohitwaghchaure
39be1d43bc
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
...
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-14 11:15:14 +05:30
Shivam Mishra
51b6fe2b8d
feat: Allow disbaling LMS ( #17587 )
2019-05-14 10:22:15 +05:30
deepeshgarg007
4dcba49b5f
fix: Do not append row if item is sold within days since last order
2019-05-14 08:53:24 +05:30
Anurag Mishra
73706f85aa
feat: Bank remittance report for tracking payroll-entry transactions ( #17013 )
...
* feat: Bank remittance report for tracking payroll-entry transactions
* feat: show Company bank account and bank name
* feat: Added Permissions to view report
* feat: Validated report only if debit account is present
* fix: query optimisation
* feat: Added From date and To date filters
* fix: code optimisation
* fix: requested changes
* fix: requested changes and refactor
* style: indentation
* style: Formatting
* fix: added parameter filters
2019-05-13 19:03:21 +05:30
Deepesh Garg
3866e132f7
Merge pull request #17582 from asbasawaraj/blanket_order_in_selling_module_page
...
feat: Added Link to Blanket Order in Selling Module Page
2019-05-13 16:52:23 +05:30
Deepesh Garg
dbf9251324
Merge branch 'develop' into blanket_order_in_selling_module_page
2019-05-13 16:49:47 +05:30
Basawaraj Savalagi
09bafc6d10
feat: Added Link to Blanket Orded in Selling Module Page
2019-05-13 14:59:19 +05:30
