scmmishra
29dc744354
fix: healtcare unit type enable toggle
2019-03-29 19:00:45 +05:30
Himanshu
6343a697a2
fix(Salary Slip): Consider Leave without Pay for calculation ( #16926 )
...
while net salary calculation, it was not considering actual days worked but now it will consider it
2019-03-29 18:48:56 +05:30
rohitwaghchaure
13752774ab
Merge pull request #17000 from scmmishra/hotfix-task-status
...
fix: Task overdue status propagates to project
2019-03-29 18:44:36 +05:30
rohitwaghchaure
706cf7d3d2
Merge pull request #17001 from scmmishra/develop-task-status
...
fix: task overdue status propagates to project
2019-03-29 18:44:17 +05:30
Himanshu
6b54649bfe
fix(Salary Slip): Consider Leave without Pay for calculation ( #17023 )
...
Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
2019-03-29 18:32:23 +05:30
Rushabh Mehta
c4599c21c3
fix(test): item variant
2019-03-29 18:30:00 +05:30
rohitwaghchaure
fb8f1b93d6
Merge pull request #17058 from hrwX/bank_reco_fix
...
fix(Bank Reconciliation): get credit and debit in float and not string
2019-03-29 18:18:15 +05:30
Nabin Hait
92797eee87
Merge pull request #17052 from deepeshgarg007/patch-fix
...
fix: Add patch to move item tax to item tax template
2019-03-29 16:37:17 +05:30
Rushabh Mehta
1c68ddc9c0
Merge pull request #17045 from rmehta/fix-sla-auto-update
...
fix(sla): update agreement status on save'
2019-03-29 16:25:40 +05:30
Himanshu Warekar
95003cbbca
fix: get credit and debit as float and not string
2019-03-29 16:21:59 +05:30
Himanshu Warekar
f7f85f7379
fix: get credit and debit in float and not string
2019-03-29 16:19:15 +05:30
deepeshgarg007
4092ead41e
fix: fetch account only if available
2019-03-29 16:19:04 +05:30
Faris Ansari
eec89ba4cb
Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-leave-application-condition
2019-03-29 16:06:38 +05:30
Rushabh Mehta
048e5f44b5
fix(test): item variant
2019-03-29 14:34:14 +05:30
rohitwaghchaure
e38c0e8716
Merge pull request #17053 from rohitwaghchaure/pos_items_not_loading_v12
...
fix: POS items not loading
2019-03-29 13:54:11 +05:30
Rohit Waghchaure
b00c16470d
fix: POS items not loading
2019-03-29 13:47:45 +05:30
Nabin Hait
7b2c52b6f2
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 13:26:46 +05:30
Nabin Hait
862f77cc13
Merge branch 'deferred_revenue' into hotfix
2019-03-29 13:26:16 +05:30
Nabin Hait
66d07c2700
fix(accounts): Indentation
2019-03-29 13:25:11 +05:30
scmmishra
2b7e158e50
feat: Quiz attempt limits is configurable
...
- Added a 'no limit' check to `check_quiz_completion` in utils.py
- Added disabled flag for questions in quiz component
- Refactored `get_quiz_without_answers` to send attempt limit data to client
2019-03-29 12:45:08 +05:30
Nabin Hait
d4e038b6ca
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 12:41:48 +05:30
Nabin Hait
cf7538c17f
Merge pull request #17046 from nabinhait/deferred_revenue
...
Refactor: deferred revenue booking logic
2019-03-29 12:39:36 +05:30
deepeshgarg007
4f1926bcfe
fix: Add patch to move item tax to item tax template
2019-03-29 12:10:44 +05:30
scmmishra
d4ed56af02
fix: navbar login bug
2019-03-29 11:03:34 +05:30
rohitwaghchaure
043cfe99ad
Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue
...
fix: accounts receivable summary
2019-03-29 09:28:21 +05:30
rohitwaghchaure
c268682772
Merge pull request #17048 from rohitwaghchaure/fixed_bank_reconciliation_not_working
...
fix: bank reconciliation not working
2019-03-29 09:27:50 +05:30
Rohit Waghchaure
9da14747aa
fix: accounts receivable summary
2019-03-29 09:26:40 +05:30
rohitwaghchaure
1296599857
Merge pull request #17042 from rohitwaghchaure/indentation_fix_pricing_rule
...
fix: code cleanup
2019-03-28 21:14:03 +05:30
Rohit Waghchaure
573d1dd31f
fix: bank reconciliation not working
2019-03-28 20:39:49 +05:30
Nabin Hait
86fb523ea7
fix(accounts): codacy fixes
2019-03-28 20:06:57 +05:30
Nabin Hait
0a90ce5cf6
Refactored deferred revenue booking logic
2019-03-28 19:43:02 +05:30
Rushabh Mehta
cf33f4fd53
fix(sla): update agreement status on save'
2019-03-28 18:49:23 +05:30
Rohit Waghchaure
d5e45481cd
fix: code cleanup
2019-03-28 17:09:57 +05:30
rohitwaghchaure
a8c9b81d93
Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups
...
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:52:55 +05:30
Rohit Waghchaure
39a41e7427
fix: pricing rule mixed connditions not working for item group
2019-03-28 16:51:57 +05:30
Faris Ansari
f04988a02f
fix: Missing "and" in filter conditions
2019-03-28 15:42:07 +05:30
scmmishra
cea851522f
feat: Added custom navbar
2019-03-28 15:33:08 +05:30
scmmishra
6123ff3251
fix: styled program card
2019-03-28 15:32:54 +05:30
Suraj Shetty
6262c9ed6a
fix: Subquery in get_bom_items method
2019-03-28 14:59:27 +05:30
scmmishra
9b7ac3e7d2
fix: fixed joining date bug on lms profile
2019-03-28 14:47:22 +05:30
scmmishra
281902f530
chore: clean up
2019-03-28 14:35:15 +05:30
scmmishra
394e93c2bf
chore: Minor fixes on profile page
2019-03-28 14:34:23 +05:30
scmmishra
209250ccae
fix: Profile page cards
...
- Only show attempted quizzes
- Show 0 percent complete if program is enrolled but unattempted
2019-03-28 14:27:51 +05:30
scmmishra
c03db190d2
fix: layout for hero image of program card
2019-03-28 14:15:30 +05:30
Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
Saurabh
6cc9831ce9
Merge branch 'hotfix'
2019-03-28 13:51:58 +05:30
Saurabh
f2036dd1d1
bumped to version 11.1.17
2019-03-28 14:21:58 +06:00
scmmishra
29aaee1488
feat: Added youtube video component
2019-03-28 13:44:25 +05:30
scmmishra
92e311d9d7
feat: refactored YoutubePlayer component
2019-03-28 13:44:05 +05:30
scmmishra
15f6faad9b
fix: Video stops on closing modal
2019-03-28 13:11:00 +05:30