nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 05:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,052 Commits 469 Branches 1,756 Tags
aa358b021e79030ba9b3e7aa0c6b8c7cbb00ce20
Commit Graph

277 Commits

Author SHA1 Message Date
Jannat Patel
dfc68950c1 fix: lms progress issue (#26254) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-02 13:08:38 +05:30
Anupam Kumar
fa3ca02557 fix: student invalid password reset link (#25827) 2021-05-26 12:16:25 +05:30
Wolfram Schmidt
85f1561e5e Update question.json (#24487) 
according to: https://github.com/frappe/erpnext/pull/23402
 2021-02-11 13:39:23 +05:30
Suraj Shetty
bf7adb8b38 refactor: Format and sanitise user inputs to search queries. (#23064) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-20 11:17:30 +05:30
aakvatech
2cdc0c3f2d fix: AttributeError: 'ProgramFee' object has no attribute 'course' 
Error occurs while program enrollment on new student.

This happens on version 12 and not on version 13.

Version 12 uses
course_list = [course.course for course in program.get_all_children()]

where as version 13 uses
course_list = [course.course for course in program.courses]

erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py
 2020-08-14 10:26:54 +03:00
Rucha Mahabal
3d2fa59e6d fix(Education): course wise assessment report labels (#22805) 
* fix: add labels to chart datasets in course wise assessment

* fix: change label for final grade

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-30 13:27:47 +05:30
bhavesh95863
ca6ec72ade fix: Add missing translation function for freeze message (#22812) 
* fix[missing translation function]

missing translation function

* fix[missing translation function for message]

missing translation function for message

* fix[add missing translation function]

add missing translation function

* Update payroll_entry.js

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-07-26 14:03:03 +05:30
Rucha Mahabal
9abb8e309e fix(Education): descriptions not copied while creating fees from fee structure (#22793) 2020-07-24 08:52:53 +05:30
mergify[bot]
5acc06dfe6 fix: Student Admission (#22280) 
* Student Admission fix

* adding check for application

* adding check for application

* updating error message

* added date_diff for date comparision

(cherry picked from commit c6592c880a)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-19 11:58:51 +05:30
mergify[bot]
703cee6abf fix: update program course (#22166) (#22173) 
(cherry picked from commit 934e30ecac)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2020-06-10 12:51:29 +05:30
mergify[bot]
7177514b0d fix: adding dashboard in course and assessment plan (#21889) (#21919) 
* Adding dashboards

* adding dashboard in course and assessment plan

(cherry picked from commit 0a147d5c76)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2020-05-26 17:59:24 +05:30
Deepesh Garg
8ed066ba1f fix: Add misssing dimensions in GL entries (#21691) 
* fix: Add misssing dimensions in GL entries

* fix: expnese_taxes_and_charges.json

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
 2020-05-15 12:58:19 +05:30
rohitwaghchaure
65d6efdaee Merge pull request #21666 from anupamvs/assessment-issue-hotfix 
fix: Assessment Plan not getting created
 2020-05-11 07:17:28 +05:30
Anupam K
27b2988938 Assessment Plan not getting created 2020-05-09 16:44:36 +05:30
Anupam K
0b6ef55e78 renaming LMS to Learning Management System 2020-05-07 19:51:46 +05:30
Rohit Waghchaure
3d2dcd8c59 fix: payment request not able to make against fees 2020-04-29 02:29:43 +05:30
Saqib Ansari
dc04cbf9a9 fix: cannot view report for course doctype - permission problem 2020-03-29 12:52:43 +05:30
Deepesh Garg
71e9f23d77 fix: Update is_tree field in Tree doctypes (#20982) 2020-03-19 11:00:55 +05:30
Govind S Menokee
57d33f9ce6 fix: get_students not respecting the program 
The get_students function is not taking into account the program for which the fee needs to be created. If a student is enrolled for multiple programs then the fee schedule pull up the wrong count of students.
 2020-02-11 11:23:16 +05:30
gavin
35effe9be0 fix: AttributeError on new Student creation (#19787) 2019-12-03 12:54:18 +05:30
Rohit Waghchaure
39eeac265b fix: not able to select department in instructor form 2019-11-18 15:20:15 +05:30
theopen-institute
36520ef951 fix: Add a setting to make creation of new Student User optional (#19122) 
* New setting to skip Student User creation

* Allow skip of new User creation via settings
 2019-11-06 19:09:15 +05:30
Sagar Gharge
f935e37925 [Fix] restricted duplicate guardians on student doctype (#19194) 2019-10-15 14:38:04 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +05:30
Fisher Yu
cd38ba4833 fix: several bugs and improvement ideas for education module #18599 (#18600) 
* Update student_report_generation_tool.py

bug fix

* Update student_applicant.json

* Update program_course.json

* Update course_activity.json
 2019-09-11 19:10:39 +05:30
Govind S Menokee
c901d6322c fix(18837): Student creation error (#18838) 
Academic user not able to create student
 2019-09-05 14:50:23 +05:30
Anurag Mishra
841d852f41 refactor: added missing translation functions (#18143) 
* fix: Translating Error and Messages

* Update erpnext/controllers/item_variant.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>

* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-07-03 15:15:08 +05:30
Shivam Mishra
3264822c1c test: fixed unknown column course_name 2019-06-12 15:43:36 +05:30
Shivam Mishra
a99d3a844f test: fix fixtures for program and course 2019-06-12 14:32:27 +05:30
Shivam Mishra
147cd1035e Merge branch 'develop' into lms-patch-3 2019-06-12 12:44:12 +05:30
Shivam Mishra
d9e68c9f69 refactor: remove course name field from ProgramCourse 2019-06-12 12:43:22 +05:30
Shivam Mishra
a9508862b2 refactor: doctype settings for lms 2019-06-12 12:39:12 +05:30
Shivam Mishra
d49b5e4736 fix: sql query case fix 2019-06-06 17:19:53 +05:30
Shivam Mishra
76fe1b1e9f Merge pull request #17674 from scmmishra/lms-refactor 
refactor: lms
 2019-06-06 16:32:17 +05:30
Shivam Mishra
09cd46fa0b fix: minor bugs 2019-06-06 14:02:49 +05:30
Shivam Mishra
624b4fd5b8 refactor: better sql 2019-06-06 11:30:56 +05:30
Shivam Mishra
d69892abfa feat: added topic page 2019-06-05 19:42:30 +05:30
Shivam Mishra
9cad9439a1 fix: travis fixes for education setup 2019-06-05 17:52:21 +05:30
Shivam Mishra
7597baab95 refactor: minor fixes 2019-06-05 17:49:42 +05:30
Shivam Mishra
16b4129ede feat: added student profile page 2019-06-05 17:29:48 +05:30
Shivam Mishra
6593263df8 feat: added navigation 2019-06-05 13:34:44 +05:30
Shivam Mishra
570161b978 feat: added course progress apis 2019-06-05 13:08:53 +05:30
Shivam Mishra
6d4c666476 feat: added topic progress api 2019-06-03 14:41:05 +05:30
Shivam Mishra
8ddb63adae feat: added auto course enrollment for enrolled programs 2019-06-03 14:40:52 +05:30
Shivam Mishra
d1a252190b refactor: refactored quiz api and added quiz.js 2019-06-03 12:57:38 +05:30
Shivam Mishra
46b3446da0 refactor: add check for max passing score 2019-05-30 18:55:16 +05:30
Shivam Mishra
7c7053fcf5 refactor: added question type field 2019-05-30 18:54:58 +05:30
Shivam Mishra
e94e9d2b06 feat: content navigation and activity tracking working 2019-05-30 18:23:03 +05:30
Shivam Mishra
12579617f3 refactor: added enrolled status to program card 2019-05-30 17:20:31 +05:30
Shivam Mishra
dfdb92f4b1 refactor: added enrollment api 2019-05-30 16:36:01 +05:30