Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,996 Commits 3 Branches 0 Tags 1 GiB
7d4fd35aa3
Commit Graph

248 Commits

Author SHA1 Message Date
Neil Trini Lasrado
06ed74dc7c Redesign Assessment Module 2017-01-09 18:26:02 +05:30
Neil Trini Lasrado
986927ca98 Added Guardian to school module 2016-12-28 16:15:35 +05:30
Revant Nandgaonkar
0766d3e67e Report : Batch Item Expiry Status 
Select From Date and To Date
Lists Items about to expire or already expired
Expiry Status column shows number of days in which item/batch will expire
 2016-12-21 12:32:12 +05:30
Neil Trini Lasrado
984ee372e8 [new Feature] Added Training Module 2016-12-13 15:42:12 +05:30
Nabin Hait
0fa0af18cc Merge pull request #7175 from neilLasrado/develop 
Student Attendance Tool
 2016-12-12 15:03:59 +05:30
Neil Trini Lasrado
eccbf43235 Renamed Student Batch Attendance Tool to Student Attendance Tool 
Merged code for Student Attendance against Course Schedule and Student Batch
Student Attendance Tool now shows marked student attendance as well.
Fixed validation login in Student Attendance for duplicate Student Attendance Record validation"
 2016-12-09 17:41:09 +05:30
Rushabh Mehta
81af229466 [minor] google analytics id in docs and minor fixes to web forms 2016-12-09 17:29:36 +05:30
Rushabh Mehta
2167ff589c [minor] update font awesome icons 2016-12-07 11:09:02 +05:30
Neil Trini Lasrado
f5c2cf4b5c Updated schools.py in Config 2016-12-05 17:53:41 +05:30
Neil Trini Lasrado
9e7ad6a630 Updated schools.py in Config 2016-12-05 17:28:07 +05:30
Neil Trini Lasrado
e6fb25cce8 Fixes for Student Batch-Wise Attendance report 2016-12-01 16:02:11 +05:30
Neil Trini Lasrado
2607898cde Added Student Batch-Wise Attendance report 2016-12-01 12:53:40 +05:30
Neil Trini Lasrado
331361d03b Added Absent Student Report 2016-11-28 16:57:30 +05:30
Neil Trini Lasrado
14b27c5b42 New Doctype - Student Leave Application 2016-11-28 16:57:30 +05:30
Neil Trini Lasrado
d3a410b0f3 Added Student Monthly Attendence Sheet Report 2016-11-28 16:57:30 +05:30
Nabin Hait
d855167b9b Fixed merge conflict 2016-11-21 19:13:22 +05:30
Nabin Hait
4374ef5adc Merge pull request #6995 from neilLasrado/develop 
Added Student Batch Name & Batch Creation Tool in Schools Module.
 2016-11-21 19:08:15 +05:30
Rushabh Mehta
0d5d4aefe5 [docs] added style 2016-11-21 18:47:00 +05:30
Neil Trini Lasrado
b444d5d81b Rename Scheduling Tool to Course scheduling Tool, Batch Name to Student Batch Name and Batch Creation tool to Student Batch Creation tool 2016-11-21 17:04:23 +05:30
Nabin Hait
fd23fa7c0b Prifitability report link added to accounts module page 2016-11-21 16:59:03 +05:30
Neil Trini Lasrado
defdd784f4 Added Student Batch Name & Batch Creation Tool in Schools Module. 2016-11-21 16:21:25 +05:30
Rushabh Mehta
8042aa4b52 [minor] fixes to docs 2016-11-21 13:53:02 +05:30
Rushabh Mehta
557e7f787b [minor] UX fixes for Daily Work Summary 2016-11-21 12:10:44 +05:30
Neil Trini Lasrado
d9bc5598b6 Added ability to mark attendance against a Student Batch 2016-11-17 15:36:14 +05:30
Kanchan Chauhan
283b8c98f8 [Fix] Customer Addresses and Contacts report fixed for CRM module 2016-11-01 14:38:06 +05:30
Faris Ansari
a0608d463a [gantt] Gantt fixes (#6490) 
* [gantt] fix Gantt Chart link in Modules

* [gantt] added field for Task dependent
 2016-10-10 14:32:35 +05:30
Rushabh Mehta
769dda0874 [translation] [fixes] #5860 2016-09-15 15:17:04 +05:30
Neil Trini Lasrado
83d81203b2 Added Student Admissions (#6359) 
* Added Student Admissions

* Fixes for Student Application
 2016-09-15 14:48:13 +05:30
Neil Trini Lasrado
c20adb532f Added student Category 2016-09-06 13:08:07 +05:30
manqala
b2b238323b Suggested Changes to School (#6223) 
* Linkage of academic term to academic year

* School improvements. Modifications to Academic Term, Assessment, Fees, Student Batch, Student Group. Addition of Grading System.

* Removed Grading System from Assessment and put it on Program

* Removed the field Grading System from Program and added it back to Assessment. Added some validations for dates in controller of Academic Term and Academic Year

* Added validation comparing term start dates with academic year start dates and term end dates with academic year end dates where both are available.

* Renamed Grading System to Grading Structure. Implemented the code in Assessment.js to derive the Grade Code from the result entered for the student. Assumes that result is always a number. Will rename the field result in Results to score.

* Added validation to check if any grade intervals were overlapping when a Grading Structure is being saved.

* Corrections to error in autonaming for Academic Term

* Correction in white_list method get_grade in Assessment. Solves problem with grades not being derived when the score is at the boundaries of a grade interval

* Correction to setup_wizard.py to make sure that creation of academic terms in create_academic_term includes the academic_year which is now mandatory

* Corrections to test_records.json for doctype Academic Term

* Correction of test_records.json in doctype Student Groups

* Correction of test_records.json for doctype Student Group 2

* Correction to test_course_schedule.py in doctype Course Schedule

* More corrections to test_course_schedule.py in doctype Course Schedule

* Corrections to test_course_schedule.py

* Updates to Student DocType. Enrollment date, Nationality

* Linkage of academic term to academic year

* School improvements. Modifications to Academic Term, Assessment, Fees, Student Batch, Student Group. Addition of Grading System.

* Removed Grading System from Assessment and put it on Program

* Removed the field Grading System from Program and added it back to Assessment. Added some validations for dates in controller of Academic Term and Academic Year

* Added validation comparing term start dates with academic year start dates and term end dates with academic year end dates where both are available.

* Renamed Grading System to Grading Structure. Implemented the code in Assessment.js to derive the Grade Code from the result entered for the student. Assumes that result is always a number. Will rename the field result in Results to score.

* Added validation to check if any grade intervals were overlapping when a Grading Structure is being saved.

* Corrections to error in autonaming for Academic Term
 2016-09-03 21:05:06 +05:30
Nabin Hait
595dbd6dea Merge pull request #5963 from neilLasrado/assessment 
Assessment Groups
 2016-08-08 12:50:10 +05:30
Neil Trini Lasrado
50b2278eda Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch 2016-08-05 15:09:49 +05:30
Umair Sayyed
6a3f51bee2 updated docs 2016-08-04 19:01:02 +05:30
Nabin Hait
3bb1a421f0 Change amount calcualtion in POS if there is write off amount and gl entries in this scenario 2016-08-02 16:41:15 +05:30
Neil Trini Lasrado
1e5c251ce2 [new feature] Added Student Log 2016-07-29 17:05:49 +05:30
Neil Trini Lasrado
6cfb60dc98 Minor fixed for Schools 2016-07-22 19:08:18 +05:30
Rushabh Mehta
11900e8fad [fix] make grid editable for schools and fix #5831 2016-07-22 10:59:07 +05:30
Rushabh Mehta
20038ad2c9 [fixes] setup wizard and domainify for schools; 2016-07-21 16:01:59 +05:30
Nabin Hait
6831b9422b payment entry improvements and deletion of payment tool 2016-07-16 11:00:29 +05:30
Kanchan Chauhan
7ff0c4eef4 Employee Attendance report renamed to Employees working on a holiday 2016-07-15 13:42:36 +05:30
Rohit Waghchaure
3e012b7e16 [Fix] Time sheet rename issues 2016-07-11 15:00:38 +05:30
Rohit Waghchaure
e94d18b4cd Rename Time Sheet doctype 2016-07-06 20:38:50 +05:30
Nabin Hait
4647f24865 Merge pull request #5625 from KanchanChauhan/salary-component-cleanup 
Salary component cleanup
 2016-07-06 12:06:05 +05:30
Kanchan Chauhan
d963b76a4b Salary component cleanup 2016-07-06 12:04:38 +05:30
Saurabh
52ec0ed134 [fix] link fixes for tree structures #5651 2016-07-05 18:05:45 +05:30
Saurabh
066ae8e4c4 [fix] make cheque print compatible with payment entry 2016-07-05 12:46:38 +05:30
Nabin Hait
e4bbb696ab Payment Entry minor improvements 2016-07-04 17:26:02 +05:30
Nabin Hait
221fa98b51 Payment Entry: Payment period based on invoice date 2016-07-04 11:42:24 +05:30
Kanchan Chauhan
fb3eb13ca4 New Maintenance Module 2016-06-29 15:51:02 +05:30
Rushabh Mehta
26a76fb2d9 Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe 
Newsletter moved to Frappe
 2016-06-29 12:11:25 +05:30
Kanchan Chauhan
65c8b5a216 Newsletter moved to Frappe 2016-06-28 17:28:40 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Saurabh
ec8babe7ac [minor][fix] 2016-06-25 11:06:14 +05:30
Saurabh
1702273968 [fix] rename account browser and sales browser to tree/doctype for view 2016-06-25 11:06:14 +05:30
Rushabh Mehta
8a065e0028 [rename] Bulk Email to Email Queue 2016-06-22 12:58:39 +05:30
Rushabh Mehta
4cf914d902 [minor] added mins to first response for opportunity 2016-06-22 11:22:12 +05:30
Rushabh Mehta
f7e6ec0654 [report] minutes to first response for issues 2016-06-14 18:08:51 +05:30
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Nabin Hait
b9bc7d6df3 [feature] New document for Budget 2016-05-23 13:04:26 +05:30
Rohit Waghchaure
e0934d118f [Fixes] Some changes and fixes 2016-05-16 12:01:16 +05:30
Rushabh Mehta
d42167e0e5 [cleanup] remove Features Setup 2016-05-11 16:47:14 +05:30
Nabin Hait
70f05df075 Asset Movement 2016-04-28 18:01:32 +05:30
Anand Doshi
e3bd78e912 [css] portal 2016-04-22 18:53:21 +05:30
Rushabh Mehta
202cb7cdf1 Merge pull request #5249 from nabinhait/fixed_asset 
Fixed asset
 2016-04-21 11:41:11 +05:30
Rushabh Mehta
c291ab64a6 Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext 
[WIP] No not merge
 2016-04-21 11:39:45 +05:30
Rushabh Mehta
02772442b6 [cleanup] added dashboard in project 2016-04-20 18:45:56 +05:30
Nabin Hait
cd0e8ce8ad Fixes and modification in fixed asset 2016-04-20 17:57:12 +05:30
Kanchan Chauhan
2dbf5294a9 [WIP] No not merge 2016-04-20 16:24:24 +05:30
Rushabh Mehta
0e2dd859b0 [cleanup] link dashboard for customer, supplier, item, employee and hide form by default 2016-04-13 17:22:09 +05:30
Nabin Hait
9501a1e034 Links for fixed assets added in accounts module page 2016-03-30 15:06:26 +05:30
Rushabh Mehta
c78b3110b5 [enhancement] configurable portal menu; 2016-03-30 12:29:48 +05:30
rohitwaghchaure
44d0449895 [enhancement] request for quotation 2016-03-28 12:13:07 +05:30
Rushabh Mehta
d1e1c52171 [redesign] modules 2016-03-08 18:07:20 +05:30
Neil Trini Lasrado
f5a39d628f Typo Fixes 2016-02-18 19:19:07 +05:30
Anand Doshi
d843ec5fee Merge pull request #4831 from neilLasrado/typos 
Typo fixes in Accounts Module
 2016-02-18 17:24:17 +05:30
Neil Trini Lasrado
8e7240a556 Typo fixes in Accounts Module 2016-02-18 14:38:36 +05:30
Anand Doshi
ed8d9dadfa [fix] Warehouse not mandatory for Purchase Invoice or a Sales Invoice without Update Stock 2016-02-17 17:14:11 +05:30
Valmik Jangla
07364f5ece Feature - Employee Attendance Tool 2016-01-29 16:57:54 +05:30
Valmik Jangla
1890c794d7 Added Employee Report Attendance Report 
Made Holiday details mandatory
 2016-01-29 16:57:54 +05:30
Rushabh Mehta
b46069d44b [cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order 2016-01-15 16:59:26 +05:30
Rushabh Mehta
1bf440b03a [fix] module ordering 2016-01-14 18:19:21 +05:30
Saurabh
6fc408e974 [fixes] conmify account details and validate gateway currency 2016-01-12 14:09:51 +05:30
Saurabh
3ba22676bf [fixes] Create and manage payment request 2016-01-12 14:09:50 +05:30
Rushabh Mehta
eb961370ff [translations] fixes #4532 2016-01-04 15:48:37 +05:30
Anand Doshi
381cec7b87 [fix] added Shopping Cart and Report Builder in Learn module 2015-12-21 18:56:20 +05:30
Anand Doshi
f773f1f539 [videos] added missing videos 2015-12-21 18:32:23 +05:30
Chris Ian Fiel
826e18a29f Cash Flow Report 2015-12-12 10:33:01 +08:00
Rushabh Mehta
2f273674e9 [docs] fixed links 2015-12-04 16:00:38 +05:30
Rushabh Mehta
ab7021ce64 [docs] merged kb and cleanup. warning: don't see the commit 2015-12-03 17:59:34 +05:30
Anand Doshi
f942d97a18 [fix] removed UOM Replace Utility from message 2015-11-26 16:08:09 +05:30
Rushabh Mehta
edc8ab03b5 [minor] fixed description 2015-11-18 16:48:19 +05:30
Anand Doshi
1c1eb7018c [docs] fixed Linked With and title 2015-11-10 18:58:56 +05:30
Nabin Hait
f9ef0e4e15 [docs] Fixed ref docs, image and video links 2015-11-09 15:41:45 +05:30
Nabin Hait
7ba4d02444 [docs] First commit for docs 2015-11-09 14:40:29 +05:30
Rushabh Mehta
7d23e4286e [minor] move item to top in stock module page 2015-11-03 16:25:09 +05:30
Sambhaji Kolate
fd53991dfa [minor] Update Help Video Links in Buying, CRM, Selling #4233 2015-10-27 17:01:27 +05:30
Nabin Hait
1b6c00e2c7 [report] Trial Balance for Party 2015-09-25 09:18:03 +05:30
Neil Trini Lasrado
ef511b160e Added Tax Rule under ERPNext > Accounts > Setup 2015-09-15 15:41:00 +05:30
Anand Doshi
71c33823f6 Merge pull request #3806 from neilLasrado/item-variants 
Improvements in Item Variants
 2015-08-18 16:13:10 +05:30
Anand Doshi
82988be79f Merge pull request #3846 from rmehta/add-to-learn 
Learn module
 2015-08-18 12:10:03 +05:30