scmmishra
1fc45c547b
Added Course Enrollment doctype
2019-02-19 13:05:23 +05:30
scmmishra
06d175a2bd
Added Quiz Activity doctype
2019-02-19 13:05:23 +05:30
scmmishra
e7308125b4
Replaced Student Course Activity with Course Activity
2019-02-19 13:05:23 +05:30
scmmishra
17294e703e
Course Activity linked to Student ID
2019-02-19 13:05:23 +05:30
scmmishra
38c1baf719
Templates: modified routing logic, added data attributes in template
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
9335593b56
LMS: JS Script to send quiz and activity data
2019-02-19 13:05:23 +05:30
scmmishra
4ae11f4d74
LMS: added python functions to evaulate quiz and save student activity
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
eab0b833a1
Modified Student Course Activity Doctype
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
6660a675f1
templates: add templates for LMS content
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
de36e13db7
modified doctypes for lms
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
836a4b5e54
lms: add activity child table and create frontend
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
b3b003f518
course_activity: create doctype for tracking student course activity
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
55e7c1a866
api: create user account for student
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-19 13:05:23 +05:30
scmmishra
43da645be0
Added Web Academy Applicant doctype
2019-02-19 13:05:23 +05:30
scmmishra
4e208e99bc
Added Student Course Acitivity doctype
2019-02-19 13:05:23 +05:30
scmmishra
8c41abc2df
Modified education menu items
2019-02-19 13:03:59 +05:30
scmmishra
84a49d5ea7
Modified Content doctype, added question child table for quiz
2019-02-19 13:03:59 +05:30
scmmishra
f05837a895
Updated Content Doctype
2019-02-19 13:03:59 +05:30
scmmishra
abd1d209fb
Added Content Doctype
2019-02-19 13:03:59 +05:30
Rushabh Mehta
20db65ef77
Merge pull request #16694 from rmehta/refactor-comments
...
fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891
2019-02-18 12:05:35 +05:30
Rushabh Mehta
1a6668ef3c
Merge pull request #16633 from pratu16x7/explore-2.0
...
feat(modules): Add getting started and help desk, merge settings
2019-02-18 11:20:14 +05:30
Rushabh Mehta
39c106dd05
fix(test): rename test in test_customer
2019-02-18 11:16:59 +05:30
Rushabh Mehta
7bb9eae685
Merge pull request #16541 from alyf-de/develop
...
feat(regional): Germany module with address template
2019-02-16 10:54:28 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
Frappe Bot
58dda68430
Merge branch 'hotfix'
2019-02-15 10:22:32 +00:00
Frappe Bot
acf26c8569
bumped to version 11.1.6
2019-02-15 10:22:32 +00:00
Nabin Hait
09a4df74f0
Merge pull request #16645 from nabinhait/tds-fix
...
fix: Ignore tds account while creating tax withholding category
2019-02-15 14:53:30 +05:30
Nabin Hait
eb0627356b
Merge pull request #16650 from nabinhait/general-ledger-fix
...
fix: show values in account/party currency based in actual entry, no conversion
2019-02-15 14:53:12 +05:30
Nabin Hait
b5c249583a
Merge pull request #16651 from netchampfaris/fix-barcode-scanning-ux
...
fix: Barcode scanning UX
2019-02-15 14:52:42 +05:30
Nabin Hait
b819f104e6
Merge pull request #16653 from nabinhait/item-variants
...
fix: Enqueued item variants updation if there are more than 30 variants
2019-02-15 14:51:14 +05:30
Nabin Hait
c45962e3ef
Merge pull request #16675 from deepeshgarg007/purchase-fix
...
fix: Purchase order item description fix
2019-02-15 14:50:38 +05:30
Nabin Hait
aa80a223d8
Merge pull request #16674 from deepeshgarg007/address-rep-fix
...
fix: Address and contact report
2019-02-15 14:26:16 +05:30
Nabin Hait
8788a5c712
Merge pull request #16676 from nabinhait/get-item-details
...
fix: get item details
2019-02-15 14:24:46 +05:30
Nabin Hait
b1cbe221b7
Merge pull request #16677 from nabinhait/total-qty-patch-fix
...
fix: Consider parenttype while updating total qty in transactions
2019-02-15 14:24:30 +05:30
Nabin Hait
a0c9c7501b
Update update_total_qty_field.py
2019-02-15 14:24:08 +05:30
Nabin Hait
9d85876086
Merge pull request #16679 from nabinhait/get_oustanding
...
Get outstanding invoices
2019-02-15 14:23:07 +05:30
Tropicalrambler
3a88bc43dc
fix: typo in salary register report field name ( #16670 )
...
When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled. The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.
2019-02-15 13:40:44 +05:30
Sagar Vora
379e6a4635
Merge branch 'hotfix' into address-rep-fix
2019-02-15 13:08:42 +05:30
Nabin Hait
4df7679c65
fix: Get outstanding invoices
2019-02-15 13:08:04 +05:30
Sagar Vora
ebdd8a9710
Merge branch 'hotfix' into purchase-fix
2019-02-15 13:04:32 +05:30
Sagar Vora
921f468950
Merge branch 'hotfix' into get-item-details
2019-02-15 13:03:04 +05:30
Nabin Hait
6f7a4d94ce
fix: Consider parenttype while updating total qty in transactions
2019-02-14 19:34:43 +05:30
Nabin Hait
f66c6874ca
Merge pull request #16652 from nabinhait/work-order-fix
...
fix: Make work order from production plan considering already ordered qty
2019-02-14 18:50:30 +05:30
Nabin Hait
54f8ed1282
Merge branch 'hotfix' into item-variants
2019-02-14 18:50:11 +05:30
Nabin Hait
c3698e458f
Merge pull request #16666 from nabinhait/deferred-revenue-fix
...
fix: errors in deferred revenue booking
2019-02-14 18:49:01 +05:30
Nabin Hait
1c6a1dd5c0
Merge branch 'hotfix' into general-ledger-fix
2019-02-14 18:37:40 +05:30
Nabin Hait
0d1ccc357f
fix: get item details
2019-02-14 18:30:10 +05:30
deepeshgarg007
867ca63750
fix: Purchase order item description fix
2019-02-14 18:10:47 +05:30
Deepesh Garg
20008946a3
Merge branch 'hotfix' into address-rep-fix
2019-02-14 17:37:41 +05:30
Deepesh Garg
4902f7b2a0
fix: Show tasks in timesheet with status as Closed ( #16660 )
2019-02-14 17:32:52 +05:30