Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,180 Commits 3 Branches 0 Tags 1 GiB
76dce2eddc
Commit Graph

432 Commits

Author SHA1 Message Date
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Ankush Menat
457d616966 refactor: remove dead duplicate code 2022-03-22 14:23:56 +05:30
Rushabh Mehta
2dabda03af fix(minor): student_attendance_tool.js fix fetching UX 2022-02-26 11:32:54 +05:30
Rushabh Mehta
1e7df5d0c2 fix(minor): student attendance tool query fix 2022-02-26 11:07:44 +05:30
Rucha Mahabal
da7494c208
fix: Program Enrollment tests (#29592) 2022-02-02 17:30:29 +05:30
Shariq Ansari
bc187c121a fix: updated standard workspace json files 2022-01-13 19:24:11 +05:30
Mohammed Yusuf Shaikh
8b5827ed6d
fix: from time and to time not updated in drag and drop action #29114 
fix: from time and to time not updated in drag and drop action
 2022-01-12 18:49:33 +05:30
Ankush Menat
f5d5281119 chore: drop deprecated qunit tests 2021-12-20 17:03:10 +05:30
Rucha Mahabal
ca8dec0cf2
fix: Use get_all instead of get_list for child doctype (#28538) 
* fix(Student Attendance Tool): Use `get_all` instead of `get_list` for child doctype

* fix(Course Schedule): incorrect fetch from value

* fix: sider

* fix(Gratuity): Use `get_all` instead of `get_list` for child doctype
 2021-11-26 13:24:32 +05:30
Ankush Menat
f8e371af14 fix(ux): ordering fields for better tab order 2021-11-18 15:48:15 +05:30
Bibin
0e8e7e21c3
fix: filter only submitted fees in student fee collection report (#28280) 
* Update student_fee_collection.json

Fix: filter and show only submitted fees documents

* fix: add total row for the student fee collection
 2021-11-09 10:02:05 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612 
fix: Removing unused fields from workspace JSON files
 2021-10-13 16:18:20 +05:30
Chillar Anand
772d4753e7
refactor: Clean up mutable defaults and add CI check (#27828) 
* refactor: Clean up mutable defaults and add CI check
 2021-10-06 16:58:48 +00:00
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
 2021-08-26 20:43:06 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Rucha Mahabal
1a2332a81c
fix: student category mapping from the program enrollment tool (#26716) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
 2021-07-30 18:30:15 +05:30
Jannat Patel
0a15a03522
fix: lms progress issue (#26250) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-02 13:06:56 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Rucha Mahabal
0ed33aa4e8
fix: unable to enter score in Assessment Result details grid (#25945) 2021-06-12 13:40:58 +05:30
Jannat Patel
6b8c123fd9
fix: Quiz timer (#25983) 
* fix: quiz timer

* fix: pass time bound parameter

* fix: sider
 2021-06-08 18:57:49 +05:30
pateljannat
7ace06ac21 fix: sider 2021-06-08 18:26:23 +05:30
pateljannat
bbf07d9214 fix: quiz timer issues 2021-06-08 17:05:44 +05:30
Suraj Shetty
7b74985a54 test: Fix test_dependencies 2021-05-28 09:07:57 +05:30
Marica
477a90e2ac
Merge pull request #25833 from ankush/translation_fixes 
fix(ux): fix unstranslated text in msgprint/throw
 2021-05-26 14:12:36 +05:30
Anupam Kumar
59769c7a86
fix: student invalid password reset link (#25825) 2021-05-26 12:16:04 +05:30
Anupam Kumar
349ef8274b
fix: student invalid password reset link (#25826) 2021-05-26 12:14:02 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Suraj Shetty
80aa8a3149 Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing 2021-05-08 11:28:27 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard (#25606) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard (#25605) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:13:54 +05:30
Suraj Shetty
c5430afe2d test: Fix test_dependencies 2021-05-06 17:44:26 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Jannat Patel
dcdd3bebbe
feat: Timer in LMS Quiz (#24246) 
* feat: new fields in quiz doctypes

* feat: timer in lms quiz

* fix: variable initialisation

* fix: context, exception fix

* fix:sider

* fix:sider

* fix: indentation

* fix: timer

* fix: sider

* fix: return value and format

* fix: show time taken only after all attempts are over

* fix: sider

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-19 10:36:40 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
Syed Mujeer Hashmi
f8b44e05c4
refactor: Add student mobile number to student attendance (#24990) 
To setup SMS alert notification for student attendance we need student mobile
number in this doctype.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2021-03-25 11:48:29 +05:30
Syed Mujeer Hashmi
ec829786e9
fix: Add student category to student applicant (#24779) 
* fix: Add student category to student applicant

Student category will be automatically fetched during program
enrollment while importing students into the system.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Allow student category during program enrollment

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2021-03-09 21:04:55 +05:30
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