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

419 Commits

Author SHA1 Message Date
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
Kenneth Sequeira
0b84a6399b fix: remove default nationality as Indian 2020-10-07 23:14:27 +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
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +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
8edace1a58 fix: covert Program wise Fee Collection to a Script Report 2020-08-05 16:24:21 +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
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30
Rucha Mahabal
9087689d90
fix: subtitle for onboarding 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-30 16:10:05 +05:30
Rucha Mahabal
fdcaecb58c
Merge branch 'develop' into education-dashboard 2020-07-27 22:23:08 +05:30
Rucha Mahabal
9a2cc74414 feat: onboarding for Education module 2020-07-27 21:33:00 +05:30
Rucha Mahabal
6c11f26a11 feat: Education dashboard charts and number cards 2020-07-27 18:50:04 +05:30
Rucha Mahabal
49140ccbfd feat: Program wise Fee Collection Query Report 2020-07-27 18:48:15 +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
860a824a7c fix: change label for final grade 2020-07-24 14:32:36 +05:30
Rucha Mahabal
27835b7789 fix: add labels to chart datasets in course wise assessment 2020-07-24 14:07:00 +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
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Rucha Mahabal
833682b03d
feat(Education): Student Attendance and Leave Enhancements (#22623) 
* feat: make Student Attendance doctype submittable

* feat: add attendance related fields in Student Leave Application

* feat: update Attendance records on Leave Application submission

* refactor: better error messages and ORM queries

* fix: show present only for leave applications with mark_as_present enabled in attendance reports

* test: Student Leave Application

* fix: filter for attendance records

* fix: codacy issues
 2020-07-23 16:40:07 +05:30
Rucha Mahabal
5142fc9365
feat(Education): added form dashboards and refactored custom buttons for better linking (#22727) 
* feat: add form dashboards to all forms in Education Module

* feat: Add Course to Programs button in Course DocType

* refactor: custom buttons in Education module forms

* feat: buttons to add topic, article, quiz to their respective parent doctypes

* feat: add charts to form dashboards

* fix: code cleanup
 2020-07-23 15:57:27 +05:30
Rucha Mahabal
f4a7adbf2e refactor: Education Desk Page 2020-07-22 18:59:04 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs (#22432) 
* fix: Add view ledger button for cancelled docs

* fix: Add moddified to date in Stock Ledger
 2020-06-25 15:34:01 +05:30
Anupam Kumar
10c7faf090
updating education report modified time (#22418) 
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-24 17:34:52 +05:30
Deepesh Garg
179365683f
Merge pull request #22265 from frappe/edu-academic-term-validation 
fix: Adding filter in academic term
 2020-06-17 15:34:47 +05:30
Anupam Kumar
c6592c880a
fix: Student Admission (#22255) 
* Student Admission fix

* adding check for application

* adding check for application

* updating error message

* added date_diff for date comparision
 2020-06-17 12:38:31 +05:30
Anupam K
8d4ba6c7ec Adding filter in academic term 2020-06-17 11:48:15 +05:30
Anupam Kumar
934e30ecac
update program course (#22166) 2020-06-10 11:07:43 +05:30
rohitwaghchaure
bf561f9387
Merge pull request #21738 from theopen-institute/fee-schedule-date 
fix(Education): Added a posting_date field to Fee Schedule
 2020-05-28 12:01:30 +05:30
Anupam Kumar
0a147d5c76
fix: adding dashboard in course and assessment plan (#21889) 
* Adding dashboards

* adding dashboard in course and assessment plan
 2020-05-25 19:21:48 +05:30
Deepesh Garg
d1d54ebe41
Merge pull request #21853 from anupamvs/edu-card-report 
feat: Added card for reports on education desk
 2020-05-22 11:52:39 +05:30
Anupam K
d7d4bed0b1 adding report card in education desk 2020-05-22 01:10:55 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries (#21689) 
* fix: Add misssing dimensions in GL entries

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
 2020-05-15 12:58:48 +05:30
theopen-institute
3373dad708 Added a posting_date field to Fee Schedule, which carries forward to created Fees 2020-05-15 08:51:39 +05:45
rohitwaghchaure
6a61636c58
Merge pull request #21665 from anupamvs/assessment-issue 
fix: Assessment Plan not getting created
 2020-05-11 07:17:46 +05:30
Anupam K
aadf264b49 Assessment Plan not getting created 2020-05-09 16:15:51 +05:30
Anupam K
ebf3b78b42 renaming LMS to Learning Management System 2020-05-07 19:20:16 +05:30
Deepesh Garg
cea4eeaa53 fix: Reverse GL Entry on cancel fix 2020-05-02 18:05:33 +05:30
Rucha Mahabal
f65fb1fcf8
fix: Move Video Doctype from Education module to Core (#21234) 
* fix: move Video Doctype from Education module to Core

* fix: patch to retain Permissions

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-04-30 19:47:18 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger (#18740) 
* fix: Reverse GL entry on cancellation of document

* fix: Removed set posting time field for multiple docs

* fix: Stop future reposting and reverse entry for purchase receipt and delivery note

* fix: Change is_cancelled field from select to check

* Revert "fix: Removed set posting time field for multiple docs"

This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.

* fix: Multiple fixes in GL Entry

* fix: Remove future reporting from doctypes

* fix: Canceled entry filters in Stock Ledger and General Ledger Report

* fix: Remove print statement

* fix: Validation for back dated entries

* fix: Codacy fixes

* fix: Add ignore links to multiple doctypes

* fix: Codacy Fixes

* fix: Ignore GL Entry and Stock Ledger entry while cancel

* fix: Test case fixes

* fix: Patch

* fix: Codacy

* fix: Budget Test Cases

* fix: Patch

* fix: Patch

* fix: Multiple test cases

* fix: changes in make_reverse_entry function

* fix: Update patch

* fix: Test Cases

* fix: Test Case fixes

* fix: Move patch upward in patches.txt

* fix: Budget Test Cases

* fix: Test Case and codacy

* fix: Patch

* fix: Minor label and UX fixes

* fix: Move freezing date check

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Test Case

* fix: Remove update_gl_entries_after function

* fix: Remove update_gl_entries_after function

* fix: Test Cases

* fix: Fiscal Year wise backdated entry

* fix: Update entries only for current SLE

* fix: Remove is_cancelled

* fix: Test Cases

* fix: Test cases

* fix: Test Cases

* fix: Uncomment account and stock balance sync logic

* fix: Stock balance and Account balance out of sync fixes

* fix: Test Cases

* fix: Test cases for POS, Stock Reco and Purchase Receipt

* fix: Stock Reco tests

* fix: Test stock reco precision

* fix: Test stock reco for fifo precision

* fix: Test stock reco for fifo precision

* fix: Stock Entry test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-30 10:38:58 +05:30
Deepesh Garg
e006a76f8d
Merge pull request #21486 from rohitwaghchaure/not-able-to-make-payment-request-against-fees 
fix: payment request not able to make against fees
 2020-04-29 09:36:37 +05:30
Rohit Waghchaure
50b4106d1d fix: payment request not able to make against fees 2020-04-29 02:27:47 +05:30
Raffael Meyer
49bb8ccd2e feat: add Bank Account to dashboards 2020-04-28 18:56:47 +02:00
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces (#21192) 2020-04-08 09:32:41 +05:30
Saqib Ansari
0f6d372182 fix: cannot view report for course doctype - permission problem 2020-03-29 12:52:16 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
radhikag
86ecaa59ca fix : Student Admission accepting end date less than start date. #20625 2020-02-29 12:47:03 +05:30
abhijitkumbharInd
12bc43e495
fix: Education | Quiz accepting duplicate question #20622 (#20708) 2020-02-26 12:04:41 +05:30
sharmatripti
08fa7590ef
fix: Employee field should be filtered based on department on doctype Instructor (#20705) 
* Fix: Filtered Employee based on Department on Instructor doctype (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* fix :  Filtered Employee based on Department on Instructor doctype (#20704)
 2020-02-26 12:02:37 +05:30
Deepesh Garg
735ec98b61
Merge pull request #20623 from jprashant09/develop 
fix: Future date of birth accepted at Sibling Detail section in Studen…
 2020-02-24 18:30:27 +05:30
Deepesh Garg
aaea4e60b6
fix: Validation condition 2020-02-23 20:59:05 +05:30
Deepesh Garg
dee42de0fd
Merge pull request #20596 from PratikM34/develop 
fix: restricted duplicate topics on Course doctype (#20594)
 2020-02-23 20:56:43 +05:30
Deepesh Garg
cd416bbaa6
Merge pull request #20617 from jsukrut/develop 
fix: restricted duplicate courses on Program Enrollment doctype (#20611)
 2020-02-23 20:51:08 +05:30
Deepesh Garg
6e53afd947
fix: Travis (#20688) 
* fix: Travis

* fix: Update test records

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-02-20 23:33:35 +05:30
Deepesh Garg
a0021969ad
fix: Validation message 2020-02-20 13:22:28 +05:30
Khushal Trivedi
8773dc3ffe fix: student max gropu cannot be zero or less than zero 2020-02-18 19:37:21 +05:30
Khushal Trivedi
3a196b09ee Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-18 17:48:18 +05:30
Anuradha Kalaskar
93e8fc1833 fix: date of birth cannot be greater than today on student application form 2020-02-18 11:32:35 +05:30
Khushal Trivedi
1153de1965 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-18 11:16:53 +05:30
indictrans
68fa65edd1 fix: Throw message 2020-02-17 14:55:56 +05:30
indictrans
a840889dd7 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-17 14:46:40 +05:30
Deepesh Garg
5894c2d005
Merge pull request #20595 from anuradha-8/develop 
fix: to date cannot be less than from date validation on student leave application form
 2020-02-17 10:57:29 +05:30
Deepesh Garg
fd182b80ac
Merge pull request #20616 from Darpan245/develop 
fix: Mandatory field property failed to work based on the selection of…
 2020-02-17 10:35:56 +05:30
indictrans
ad5da823e1 fix:Future date of birth accepted at Sibling Detail section in Student form #20619 2020-02-16 22:59:41 +05:30
shrikant dixit
e329d417d6 fix: Added validation for student DOB can not be greater than Joining Date 2020-02-15 18:20:05 +05:30
indictrans
1118ee07a8 fix:Future date of birth accepted at Sibling Detail section in Student form #20619 2020-02-15 17:37:39 +05:30