Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
Frappe Bot
ee5d7e6d0f
Merge branch 'master' into staging-fixes
2018-12-06 09:26:42 +00:00
Zlash65
db43c3af68
display message if details to fetch grade isnt filled up
2018-12-03 12:15:10 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop
2018-11-28 08:28:37 +00:00
deepeshgarg007
bc513a8828
Removed paid amount form Fees doctype
2018-11-26 20:43:39 +05:30
deepeshgarg007
a9525de0da
paid amount fix in fees
2018-11-26 20:34:32 +05:30
Ameya Shenoy
8075a576f9
Merge branch 'staging' into develop
2018-11-05 06:53:27 +00:00
Tyler Matteson
d14e46ef02
Doctypes in domains that are in beta are now restricted to that domain
...
non-profit, agriculture, healthcare, hospitality, education
Please enter the commit message for your changes. Lines starting
2018-11-04 08:39:52 -05:00
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
rohitwaghchaure
4cfff7829b
Added validation to check duplicate student leave application ( #15636 )
2018-10-10 14:47:48 +05:30
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Rushabh Mehta
a2288ff8e7
fix(assessment_result): student must be in group ( #15255 )
...
* fix(assessment_result): student must be in group
* fix(test_student_group): raise correct exception
* fix(unused-import): assessment-plan.py
* fix(tests)
* fix(tests)
* fix(test)
* fix(tests)
2018-08-31 16:12:49 +05:30
Nabin Hait
28f9b0a9ab
(fix)test case: loyalty program, course schedule and more
2018-08-29 17:05:11 +05:30
Nabin Hait
a804d6d487
Fixed merge conflict
2018-08-29 13:34:58 +05:30
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
rohitwaghchaure
e689a903d8
Allowed data import for Assessment Result ( #15168 )
2018-08-20 17:50:04 +05:30
Saurabh
824b388631
Resolved merge conflicts
2018-08-07 13:01:11 +05:30
rohitwaghchaure
fc682c86c6
[Fix] Inactive student validation issue while disabling the student group ( #15095 )
2018-08-06 14:29:46 +05:30
Nabin Hait
eed3d4c1b3
Fixed Merge Conflict
2018-07-31 12:36:16 +05:30
rohitwaghchaure
086da451ca
Removed academic term from validation to check duplicate program enrollement ( #15046 )
2018-07-30 19:11:14 +05:30
Nabin Hait
fa06ee80e9
Fixed merge conflict
2018-07-27 12:54:00 +05:30
Shreya Shah
1f4c263a63
[minor] Program Enrollment Tool ( #15013 )
...
* Make academic term field mandatory
* Add disabled field to Student Group
* Mandatory check in Education Settings for Academic Term
* Fix as per review
2018-07-27 10:59:14 +05:30
Nabin Hait
d0a2b1619b
Optimization for marking student attendance
2018-07-27 10:51:55 +05:30
Shreya Shah
b75e77a2cc
Fix syntax ( #14342 )
2018-06-05 10:33:29 +05:30
Zarrar
c141eb00ee
[Enhance] Department added wherever applicable ( #14121 )
...
* set All Department as default parent_department
* add department field in employee_transfer
* copied data from options to fetch_from
* add department field wherever employee's link field present
* empty options field where fetch_from is added
2018-05-23 11:11:36 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Zlash65
03ad0f2f4a
set query for department based on company
2018-05-14 16:07:28 +05:30
Nabin Hait
9036b9ee85
Merge branch 'master' into develop
2018-05-08 16:31:42 +05:30
Manas Solanki
cf26b2ca1c
[minor] fix for the student report card
2018-05-08 12:39:02 +05:30
bghayad
1184a7300a
Adding Payments View for Fees ( #13939 )
...
* Adding View Payments For Fees
* Adding View Payments For Fees
* Adding Payments View For Fees
2018-05-07 18:20:37 +05:30
Shreya
fd47b92138
renamed color field
2018-05-01 18:55:17 +05:30
Shreya
4c8a08effb
color field for calendar in course schedule
2018-05-01 18:54:20 +05:30
bghayad
1c3830c53f
Student Account Ledger Button ( #13591 )
...
* Student Account Ledger Button
* Student Account Ledger Button
* Student Account Ledger Button
* Student Account Ledger Button
2018-04-24 12:12:11 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Zarrar
68a7ee22f2
order_by for gantt error fix ( #13752 )
2018-04-23 13:22:03 +05:30
Saurabh
492aff2a8b
[fix] check if academic_year exists ( #13665 )
2018-04-17 14:21:40 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
Manas Solanki
ccf2b7b08b
minor fix for the program enrollment tool
2018-03-29 16:36:59 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Manas Solanki
398eac3f4c
message in the program enrollment tool ( #13393 )
2018-03-27 11:21:47 +05:30
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30
Manas Solanki
e010ddf65f
Student Report Card ( #13346 )
...
* finalise the assessment report
* minor fixes for button
* fix the travis and codacy
2018-03-21 17:50:42 +05:30
Zarrar
9a01baac1d
explicitely provide order_by ( #13338 )
2018-03-20 14:08:44 +05:30
Manas Solanki
633a39144d
addition of student report card generation tool
2018-03-16 01:57:45 +05:30
Suraj Shetty
f2d28ebd6a
Data import Tool bug fix ( #13165 )
...
* fixes #13064
* commonified naming series checks
* test fixes
replaced test employee names according to naming series
2018-03-09 12:33:13 +05:30
Nabin Hait
c50d7446b5
Merge branch 'master' into develop
2018-03-07 13:09:07 +05:30
Manas Solanki
12d7bfb658
allow renaming of the guardian
2018-03-07 12:52:31 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Manas Solanki
51dfba749b
filter students on basis of category and button to show fees
2018-02-26 19:32:26 +05:30
