Dany Robert
68c592377b
chore: pre-commit
2022-09-30 23:41:01 -07:00
Dany Robert
f24f71f387
Merge branch 'version-13-hotfix' into cst-ux-improvement
2022-10-01 12:03:05 +05:30
Dany Robert
552c5951bd
feat: cst ux improvement
2022-09-30 23:25:55 -07:00
Syed Mujeer Hashmi
0602848caa
fix: The Fee details are not fetched in Program Enrollment ( #31153 )
2022-07-28 12:30:39 +05:30
Alberto826
63dacaa03d
fix: Remove trailing slashes "/" from route ( #30531 )
...
Trailing slashes "/" in the routes causes redirect to port 8080 in docker implementation with reverse proxy.
The "student_admission_row.html" template has an href attribute with a trailing slash.
2022-04-01 14:48:15 +05:30
Ankush Menat
c07713b860
style: bulk format code with black
...
v13 port because otherwise backports will result in conflicts always
2022-03-29 17:29:34 +05:30
mergify[bot]
0608f61b80
fix: Program Enrollment tests (backport #29592 ) ( #29594 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2022-02-02 17:51:46 +05:30
mergify[bot]
f75d36dcb4
fix: from time and to time not updated in drag and drop action #29114 ( #29361 )
...
fix: from time and to time not updated in drag and drop action
(cherry picked from commit 8b5827ed6d49878143+mohammedyusufshaikh@users.noreply.github.com >
2022-01-19 19:30:21 +05:30
mergify[bot]
cf5cb70f35
fix: Use get_all instead of get_list for child doctype ( #28538 ) ( #28577 )
...
* 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
(cherry picked from commit ca8dec0cf2ruchamahabal2@gmail.com >
2021-11-26 14:01:04 +05:30
Ankush Menat
fbfaf75b66
chore: remove __future__ py2 compatibility imports
2021-11-25 17:42:24 +05:30
mergify[bot]
58ece37d8f
fix: filter only submitted fees in student fee collection report ( #28280 ) ( #28282 )
...
* Update student_fee_collection.json
Fix: filter and show only submitted fees documents
* fix: add total row for the student fee collection
(cherry picked from commit 0e8e7e21c317405044+bibinqcs@users.noreply.github.com >
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2021-11-09 15:45:11 +05:30
mergify[bot]
dd0cefbeb9
refactor: Clean up mutable defaults and add CI check ( #27828 ) ( #27841 )
...
* refactor: Clean up mutable defaults and add CI check
(cherry picked from commit 772d4753e7chillar@avilpage.com >
2021-10-07 09:57:35 +00:00
Chillar Anand
4b2be2999f
chore: Cleanup imports ( #27320 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Remove imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Fix sider issues
* chore: linting
* chore: linting / sorting import
from ecommerce refactor merge
* ci: dont allow unused imports
* chore: sort / clean ecommerce imports
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
2021-09-03 18:57:43 +05:30
Ankush Menat
76f1ed624a
fix: remove bare excepts
2021-09-01 20:15:54 +05:30
Frappe PR Bot
8dae084f23
chore: remove deprecated and empty QUnit tests ( #27179 ) ( #27181 )
...
* 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.
(cherry picked from commit ae55eab599ankush@iwebnotes.com >
2021-08-26 21:08:08 +05:30
Ankush Menat
9bb69e711a
chore: whitespace cleanup from codebase
2021-08-19 14:33:03 +05:30
Frappe PR Bot
b5c7fce689
fix: student category mapping from the program enrollment tool ( #26716 ) ( #26739 )
...
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com >
(cherry picked from commit 1a2332a81cruchamahabal2@gmail.com >
2021-07-30 18:54:35 +05:30
Jannat Patel
18533e381a
fix: lms progress issue ( #26253 )
2021-07-02 12:57:06 +05:30
Rucha Mahabal
cf349aadf9
fix: unable to enter score in Assessment Result details grid ( #25945 ) ( #26031 )
2021-06-12 14:05:12 +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
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
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
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
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
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +05:30
Suraj Shetty
c9209237da
fix: Progress bar style
2020-12-10 22:45:27 +05:30
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +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
