Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,423 Commits 3 Branches 0 Tags 1 GiB
aa00eb9898
Commit Graph

319 Commits

Author SHA1 Message Date
Suraj Shetty
723bd9676d style: Fix formatting issues 2021-02-01 20:34:21 +05:30
prssanna
526ea46ae2 fix: formatting issues 2021-02-01 20:12:47 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Deepesh Garg
e30b33a3b8 fix: Linting issues 2021-01-15 15:47:15 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Jannat Patel
8aeadc743e
fix: assessment plan error handling for course field (#23961) 
* fix: assessment plan error handling for course field

* fix: message rectification

* fix(travis): clean-up tests

* fix: travis

* fix: tests

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-13 12:56:04 +05:30
Deepesh Garg
23ab5c5cc0 fix: Multiplle sider issues 2020-12-31 11:29:06 +05:30
Rushabh Mehta
2cd41bca06 fix(routes): desk to app 2020-12-18 13:17:58 +05:30
Suraj Shetty
c9209237da fix: Progress bar style 2020-12-10 22:45:27 +05:30
Deepesh Garg
1a4390de44 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e fix: Move filter setup to doctype controllers 2020-11-25 14:49:10 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Rucha Mahabal
30d58cc3d7
feat: Consider Holiday List in Student Leave Application and Attendance (#23388) 
* feat: Consider holiday list in Student Attendance and Leave Application

* feat: Show Holidays as 'H' in Student Monthly Attendance Sheet

* fix: check if date is a holiday in attendance reports

* test: skip attendance record creation for holidays

* fix: holiday list validation

* fix: clean up after test

* fix: codacy

* fix: show date in user format

* fix: remove ununsed imports

* fix: sider

* fix: test

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-09 18:41:03 +05:30
François de Ryckel
ca5f5cb367
Update student_attendance.py (#23761) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-10-29 23:04:13 +05:30
Rucha Mahabal
1c4d732873 fix: sider and translation issues 2020-10-24 00:21:05 +05:30
Rucha Mahabal
b3f81ad5b0 fix: allow future attendance marking for leave applications 2020-10-23 21:21:58 +05:30
Rucha Mahabal
b01334d2e1 fix: attendance cannot be marked outside of Academic Year validation 2020-10-23 18:32:33 +05:30
Rucha Mahabal
8b4d33474e fix: validation for attendance marked on future dates 2020-10-23 16:23:30 +05:30
Rucha Mahabal
6c3efbdb48 fix: filters for course and academic term fields 2020-10-23 16:11:40 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Rucha Mahabal
174019a838
fix: Student Admission and Student Applicant fixes (#23515) 
* fix: student admission list portal styling

* fix: added basic validations to Student Admission DocType

* fix: show program description and apply button for every program

* fix: don't show apply now button if admissions have not started

* fix: fetch admission details in student applicant web form

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 17:00:56 +05:30
Rucha Mahabal
96bd65e203
fix: duplicate validation for Course Enrollment (#23659) 
* fix: duplicate validation for Course Enrollment

* fix: clean-up failing tests
 2020-10-19 10:41:25 +05:30
Rucha Mahabal
ff0917358c fix: test 2020-10-13 22:39:05 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Rucha Mahabal
fc8ced9958
Merge branch 'develop' into enrollment-fixes 2020-10-13 17:28:39 +05:30
madar2020
ce39323a0a
feat: Allow rich text edit for questions (#23402) 
* rich text

* Update question.json

As to make sense for rich text

* Update quiz_question.json

* Update question.json

* Update quiz_question.json

* Update macros.html

fix: cards in second row of homepage section overlapps the row before.

* Revert "Update macros.html"

This reverts commit b649b507e5d546b5b4a78fbf68053493a71c7af2.

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-28 17:36:25 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Rucha Mahabal
8193582645 fix: codacy issue 2020-09-15 18:53:38 +05:30
Rucha Mahabal
253936c8df fix: create Course Enrollment only for courses added in Program Enrollment 2020-09-15 18:16:42 +05:30
Rucha Mahabal
42d7acf522 fix: academic term and year date validations 2020-09-15 17:52:47 +05:30
Rucha Mahabal
f5eb45bf23 fix: validate academic term while checking for enrollment duplication 2020-09-15 17:01:00 +05:30
Rucha Mahabal
68a07eda72 fix: program enrollment date not considered during course enrollment 2020-09-15 16:55:35 +05:30
Rucha Mahabal
1915a60834 fix: education settings check 2020-09-10 12:13:58 +05:30
Rucha Mahabal
4673bed67e fix: codacy issues 2020-09-07 20:12:29 +05:30
Rucha Mahabal
06f89a1b94 fix: Set student email id mandatory only if skip user creation is disabled 2020-09-07 19:46:53 +05:30
Suraj Shetty
b6ebcd7559 refactor: Replace darkgray indicator with gray indicator 2020-08-27 18:57:18 +05:30
prssanna
744169833c fix: replace indicator color darkgrey with darkgray 2020-08-27 17:06:10 +05:30
Rucha Mahabal
97ecf52d6f fix: failing Fees test 2020-08-10 12:13:35 +05:30
Marica
1afe177a4f
Merge branch 'develop' into education-dashboard 2020-08-06 14:12:00 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* 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-05 19:42:25 +05:30
Rucha Mahabal
f9143e9bb0
Merge branch 'develop' into education-dashboard 2020-08-05 16:28:14 +05:30
Rucha Mahabal
d67c2ea0d4 fix: make program field mandatory in Fees 2020-08-05 14:13:14 +05:30
Rucha Mahabal
101fe2b769
fix: Assessment Result child table not visible when accessed via dashboard (#22880) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-03 19:42:24 +05:30
Rucha Mahabal
fdcaecb58c
Merge branch 'develop' into education-dashboard 2020-07-27 22:23:08 +05:30
Rucha Mahabal
6c11f26a11 feat: Education dashboard charts and number cards 2020-07-27 18:50:04 +05:30
bhavesh95863
bcb49e59e7
fix: Add missing translation function (#22813) 
* fix: Add missing translation function

Add missing translation function

* fix: Add missing function for translation

* fix: Add missing translation function

* fix: Add missing translation function
 2020-07-26 14:02:16 +05:30
Rucha Mahabal
89f9346185
fix(Education): descriptions not copied while creating fees from fee structure (#22792) 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-07-23 20:59:56 +05:30
Abhishek Balam
d05a98517d
Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732) 
* new parent updating logic, made requested changes

* fix: Increase Length of In Words fields

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-23 19:01:31 +05:30