Merge branch 'develop' into payment-terms

.travis.yml

@@ -58,4 +58,5 @@ script:
   - bench reinstall --yes
   - bench execute erpnext.setup.setup_wizard.utils.complete
   - bench execute erpnext.setup.utils.enable_all_roles_and_domains
+  - bench --verbose run-setup-wizard-ui-test
   - bench run-ui-tests --app erpnext

erpnext/__init__.py

@@ -4,7 +4,7 @@ import inspect
 import frappe
 from erpnext.hooks import regional_overrides
 
-__version__ = '8.10.1'
+__version__ = '8.10.2'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/account/test_account.js

@@ -5,7 +5,9 @@ QUnit.test("test account", function(assert) {
 	let done = assert.async();
 	frappe.run_serially([
 		() => frappe.set_route('Tree', 'Account'),
+		() => frappe.timeout(3),
 		() => frappe.click_button('Expand All'),
+		() => frappe.timeout(1),
 		() => frappe.click_link('Debtors'),
 		() => frappe.click_button('Edit'),
 		() => frappe.timeout(1),

erpnext/docs/user/manual/en/accounts/articles/freeze-account.md

@@ -0,0 +1,13 @@
+# Freeze an Account
+
+Once an Account is Frozen, you won't be able to use it any accounting transaction. Since this is a critical action, you need to explicitly define a Role who can set an Account as Frozen. You can define this Role in the Account Settings.  
+
+`Accounts > Account Settings`
+
+To freeze an Account, go to Chart of Accounts, and edit an Account.
+
+<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/freeze-account-1.png">
+
+If User has Role define in the  Account Setting assigned, then he/she will be able to set an Account as Frozen.
+
+<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/freeze-account-2.png">

erpnext/docs/user/manual/en/accounts/articles/index.txt

@@ -13,4 +13,5 @@ what-is-the-differences-of-total-and-valuation-in-tax-and-charges
 withdrawing-salary-from-owners-equity-account
 adjust-withhold-amount-payment-entry
 common-receivable-account.md
-types-in-tax-template
+types-in-tax-template
+freeze-account

erpnext/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md

@@ -0,0 +1,19 @@
+# Fetching Data from one Document to Another
+
+**Question:** We track Customer's PO No and PO Date field in the Sales Order. To have these values fetched into Sales Invoice as well, we have inserted Custom Field in the Sales Invoice. However, when we create Sales Invoice from the Sales Order, Customer's PO details are not being fetched.
+
+**Answer:** When data is fetched from one transaction to the another transaction, then the mapping of data is done based on the field names. If two transactions have fields with the exact same name, then it's values are mapped.
+
+For example, if you want Customer's PO No. and PO Date to be fetched from Sales Order to Sales Invoice, then you should ensure that Custom Fields added in the Sales Invoice has an exact same field name as in the Sales Order.
+
+Sales Order (standard fields)
+
+<img class="screenshot" alt="Standard fields in Sales Order" src="/docs/assets/img/articles/fetching-1.png">
+
+Sales Invoice (custom fields)
+
+<img class="screenshot" alt="Custom Field in Sales Invoice" src="/docs/assets/img/articles/fetching-2.png">
+
+Since names for the Customer's PO related fields are same in the Sales Order and Sales Invoice, when creating Sales Invoice from the Sales Order, values in these fields are auto-fetched.
+
+<img class="screenshot" alt="Values fetching from Sales Order to Sales Invoice" src="/docs/assets/img/articles/fetching-3.gif">

erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt

@@ -15,4 +15,5 @@ set-language
 set-precision
 user-restriction
 maximum-numbers-of-fields-in-a-form
-child-table	
+child-table
+fetching-data-from-a-document

erpnext/docs/user/manual/en/human-resources/training.md

@@ -9,22 +9,23 @@ Schedule seminars, workshops, conferences etc using Training Event. You can also
 ### Inviting Employees for Event
 
 You can invite your employees to attend the event. You can do so by selecting the employees to be invited in the employee table.
+
 By default the status of the employee will be 'Open'.
-The system shall notify the employee with status 'Open' by sending a email to the office email address of the employee as mentioned in the employee master if you have selected 'Send Email' checkbox. 
-The status is changed to 'Invited' when an invitation email is sent to the employee by the system.
-When an Employee confirms his/her presence for the event you can change the status to 'Confirmed'.
 
 <img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_event_employee.png">
 
+When you submit the Training Event, a notifcation will be sent to the employee notifying that the Training has been scheduled. This is sent via Email Alert "Training Scheduled". You can modifiy this Email Alert to customize the message.
+
 ### Training Result
 
-After compleation of the training Employee Wise training results can be stored based on the Feedback received from the Trainer.
+After compleation of the training Employee-wise training results can be stored based on the Feedback received from the Trainer.
 
 <img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_result.png">
 
+When the Training Result is submitted, all the employees will receive an email notifying them that they must share their feedback via "Training Feedback". This is also managed via an Email Alert, so you can customize this alert too.
 
-### Trainig Feedback
+### Training Feedback
 
-Collect feedback regarding the event from your Employees using Training Feedback.
+Employees can then share their feedback via Training Feedback.
 
 <img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_feedback.png">

erpnext/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md

@@ -48,6 +48,8 @@ In the Timesheet, if "Is Billable" is checked, you will find option to create Sa
 
 <img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/project/timesheet/timesheet-invoice-1.png">
 
+<img class="screenshot" alt="Sales Invoice timesheet" src="{{docs_base_url}}/assets/img/project/timesheet/make_invoice_from_timesheet.gif">
+
 ####Sales Invoice
 
 Sales Invoice has dedicated table for the Timesheet table where Timesheet details will be updated. You can select more Timesheets in this table.

erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md

@@ -0,0 +1 @@
+#

erpnext/docs/user/manual/en/schools/Attendance/index.md

@@ -0,0 +1,6 @@
+#Attendance
+
+
+### Topics
+
+{index}

erpnext/docs/user/manual/en/schools/Attendance/index.txt

@@ -0,0 +1,3 @@
+student-attendance
+student-leave-application
+student-attendance-tool

erpnext/docs/user/manual/en/schools/Attendance/student-attendance-tool.md

@@ -0,0 +1,15 @@
+# Student Attendance Tool
+
+The Student Attendance tool allow you to bulk update the attendance for students based on **Student Group and Course Schedule**.
+
+To mark the **Attedance* based on Student Group select the group based on 
+
+**1. Batch
+  2. Course
+  3. Activity **
+
+Student detials will be autofetched and you can mark the attendance of the given date. 
+
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/setup/student-attendance-tool.gif">
+
+{next}

erpnext/docs/user/manual/en/schools/Attendance/student-attendance.md

@@ -0,0 +1,15 @@
+# Student Attendance
+
+Attendance doctype allows you to track and manage attendance of a student in all the days at any time. The Attendance module is designed to help teachers easily mark student attendance during class. 
+
+Attendance Records can be created against Student on daily basis.
+
+To create Attendance record :
+
+Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save. 
+
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-attendance.gif">
+
+**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
+
+{next}

erpnext/docs/user/manual/en/schools/Attendance/student-leave-application.md

@@ -0,0 +1,13 @@
+#Student Leave Application 
+
+ERPNext allows you to record the leave application for a student. 
+
+To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
+
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-leave-application.gif">
+
+Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself. 
+
+Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave. 
+
+{next}

erpnext/docs/user/manual/en/schools/admission/index.md

@@ -1,6 +1,6 @@
 # Admission
 
-This section contains student admission related documents.
+The Admission section allow you to create all records starting from Student application till the program enrollment. Below is the list of documents for Student addmission.
 
 ### Topics
 

erpnext/docs/user/manual/en/schools/admission/index.txt

@@ -1,2 +1,4 @@
+student-admission
 student-applicant
-program-enrollment
+program-enrollment
+program-enrollment-Tool

erpnext/docs/user/manual/en/schools/admission/program-enrollment-tool.md

@@ -0,0 +1,16 @@
+# Program Enrollment Tool
+
+The Program Enrollment tool allows the bulk enrollment of the **Student Applicants** in a Program. 
+
+
+You can create the the Program Enrollment for :
+
+1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment-tool.gif">
+
+2. **Program Enrollment** >> You can bulk update the **Program** for the students from one academic year to another in the same **Program** or a new **Program**.
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment-tool01.gif">
+
+{next}

erpnext/docs/user/manual/en/schools/admission/program-enrollment.md

@@ -1,7 +1,12 @@
 # Program Enrollment
 
-This form allows you to enroll a student to a program. A student can be enrolled to multiple programs.  
+Program Enrollment describes an educational model where students must complete a  defined set of courses towards their academic objective in a specified sequence. Enrollment is a program driven process in which the student select the Program to enrol for in a Academic Year. 
 
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment.png">
+Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student. 
+
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment.gif">
+
+- A student can be enrolled in multiple Course for a program in a given academeic year. 
+- Based on the Fee structure selected at the time of enrollment Fee detials are created of the student.
 
 {next}

erpnext/docs/user/manual/en/schools/admission/student-applicant.md

@@ -18,7 +18,9 @@ You can Approve or Reject a student applicant. By accepting a student applicant
 	and will not allow you to change the application status unless the student record is deleted.
 
 ### Student Enrollment
+Once the form is submitted you can either approve or reject the application form.
 
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-application-actions.png">
 
 Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
 the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html).

erpnext/docs/user/manual/en/schools/admission/student_admission.md

@@ -0,0 +1,13 @@
+# Student Admission
+
+The admission process begins with filling the admission form. The Student Admission record enables to intitate your admission process for a given **Academic year**. ERPNext admission module allow you to create an admission record which can be then published on the ERPNext generate website. 
+
+To create a Student Admission record  go to :
+
+**Schools** >> **Admissions** >> **Student Admission** >>
+
+
+<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/student/student-admission.gif">
+
+
+Once a admission record is created it can be published on the website and the student can apply from the web portal itself. 

erpnext/docs/user/manual/en/schools/index.md

@@ -1,7 +1,7 @@
 # Schools
 
 
-The School Modules is designed to meet requirements of Schools, Colleges & Educational Institutes.
+The School Modules in ERPNext is designed to meet requirements of Schools, Colleges & Educational Institutes. This is a centralized system, which maintains and updates all the activities related to an Institution. This will ease the process of each and every aspect of a School, be it Students, Admission, Examination and Fee.
 
 <img class="screenshot" alt="Fees Section" src="/docs/assets/img/schools/module.png">
 

erpnext/docs/user/manual/en/schools/index.txt

@@ -1,6 +1,7 @@
 student
 admission
+Attendance
 schedule
 fees
 setup
-assessment
+Assessment

erpnext/docs/user/manual/en/schools/schedule/student-attendance.md

@@ -1,7 +0,0 @@
-# Student Attendance
-
-Maintains attendance record of the student. Attendance Records can be created against Course Schedules.
-
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-attendance.png">
-
-{next}

erpnext/docs/user/manual/en/schools/setup/academic-term.md

@@ -1,5 +1,9 @@
 # Academic Term
 
+An academic term (or simply "term") is a portion of an academic year, the time during which an educational institution holds classes. The schedules adopted vary widely. The academic term can be a quater, trimester or a semester.
+
+The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year.
+
 <img class="screenshot" alt="Academic Term" src="/docs/assets/img/schools/setup/academic-term.png">
 
 

erpnext/docs/user/manual/en/schools/setup/academic-year.md

@@ -1,5 +1,11 @@
 # Academic Year
 
+An academic year is a period of time which schools, colleges and universities use to measure a quantity of study.
+
+The **Academic year** form have the Start and End date for the Academic year.
+
 <img class="screenshot" alt="Academic Year" src="/docs/assets/img/schools/setup/academic-year.png">
 
-{next}
+**Student group** link is given to view or add the respective groups to the Academic year.
+
+{next} 

erpnext/docs/user/manual/en/schools/setup/course.md

@@ -1,5 +1,15 @@
 # Course
 
+ A course is a unit of teaching that typically lasts one academic term, is led by one or more instructors (teachers or professors), and has a fixed number of students. Students may receive a grade and academic credit after completion of the course.
+
+To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted.
+
 <img class="screenshot" alt="Course" src="/docs/assets/img/schools/setup/course.png">
 
+Once a **Course** is created, a course schedule can defined for the same.
+
+<img class="screenshot" alt="Course" src="/docs/assets/img/schools/setup/Course.gif">
+
+The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
+
 {next}

erpnext/docs/user/manual/en/schools/setup/index.md

@@ -1,5 +1,7 @@
 # Setup
 
+The Setup section of Schools module provides facility to make some basic configuration. Below are doctypes for basic configuration.
+
 <img class="screenshot" alt="Setup Section" src="/docs/assets/img/schools/setup/setup-section.png">
 
 ### Topics

erpnext/docs/user/manual/en/schools/setup/index.txt

@@ -2,5 +2,8 @@ course
 program
 instructor
 room
+student-category
+student-batch-name
 academic-term
-academic-year
+academic-year
+school-settings

erpnext/docs/user/manual/en/schools/setup/instructor.md

@@ -1,5 +1,18 @@
 # Instructor
 
+An instructoe is a teacher, or professor, of a specialised subject that involves skill. 
+
+You can create an Instructor and link it to the Employee master and a Departmemt.
+
 <img class="screenshot" alt="Instructor" src="/docs/assets/img/schools/setup/instructor.png">
 
+An **Instructor** is further linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**.
+
+<img class="screenshot" alt="Instructor" src="/docs/assets/img/schools/setup/instructor.gif">
+It is also linked to **Student group** where an **Instructor** is assigned to the Student group.
+
+<img class="screenshot" alt="Instructor" src="/docs/assets/img/schools/setup/student-group-instructor.gif">
+
+An **Instructor** is also linked to an **Assesment Plan** for a Student group. The Instructor can be an Examiner or the supervisor for the assesment. 
+
 {next}

erpnext/docs/user/manual/en/schools/setup/program.md

@@ -1,5 +1,19 @@
 # Program
 
+An educational program is a program written by the institutions which determines the learning progress of each subject in all the stages of formal education.
+
+To create a Program go to :
+
+###Schools >> Setup >> Program >> New Program
+
+Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted.
+
 <img class="screenshot" alt="Program" src="/docs/assets/img/schools/setup/program.png">
 
+Add the relevant Course and the Fee details for a program. 
+
+<img class="screenshot" alt="Program" src="/docs/assets/img/schools/setup/course-fee-program.png">
+
+The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program.
+
 {next}

erpnext/docs/user/manual/en/schools/setup/room.md

@@ -1,6 +1,17 @@
 # Room
 
+A classroom is a space (room or lab) where you want to schedule courses or examinations. A room in an educational institute can be a Class room, a laboratory or a Examination hall.
+
+The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom. 
 
 <img class="screenshot" alt="Room" src="/docs/assets/img/schools/setup/room.png">
 
+The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot.
+
+<img class="screenshot" alt="Room" src="/docs/assets/img/schools/setup/Course-schedule-error.png">
+
+The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time.
+
+<img class="screenshot" alt="Room" src="/docs/assets/img/schools/setup/Room-Assesment-plan.png">
+
 {next}

erpnext/docs/user/manual/en/schools/setup/school-settings.md

@@ -0,0 +1,15 @@
+#School Settings
+
+The Schools settings page allow you to setup basic settings like **Academic Year and Term** for the Schools setup. 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/schools.png">
+
+The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group** 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-batch-validation.gif">
+
+You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group**
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-course-validation.gif">
+
+{next}

erpnext/docs/user/manual/en/schools/setup/student-batch-name.md

@@ -0,0 +1,10 @@
+# Student Batch
+
+Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-batch.gif">
+
+You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
+
+
+{next}

erpnext/docs/user/manual/en/schools/setup/student-category.md

@@ -0,0 +1,12 @@
+# Student Category
+
+Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc.
+
+To create Student category go to Setup >> Student Category >> New.
+
+We can create new student category by adding a name and save it
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-category.gif">
+
+
+{next}

erpnext/docs/user/manual/en/schools/student/guardian.md

@@ -0,0 +1,9 @@
+#Guardian
+
+The Guardian doctype allows you to record the guardian details for a **Student**.
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/guardian.png">
+
+The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
+
+{next}

erpnext/docs/user/manual/en/schools/student/index.txt

@@ -1,5 +1,6 @@
 student
+guardian
 student-log
 student-batch
 student-group
-student-group-creation-tool
+student-group-creation-tool

erpnext/docs/user/manual/en/schools/student/student-batch.md

@@ -1,7 +1,10 @@
 # Student Batch
 
-Student batch is a collection of students from Student Groups.
+Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch 
+
+<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-batch.gif">
+
+You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
 
-<img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-batch.png">
 
 {next}

erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md

@@ -1,8 +1,17 @@
 # Student Group Creation Tool
 
-This tool allows you to create student groups in bulk. You can specify multiple parameters to create them.
+The Student group creation tool allows you to create student groups in bulk. 
 
+To create Student group using this tool go to 
 
-<img class="screenshot" alt="Student Group Creation Tool" src="/docs/assets/img/schools/student/student-group-creation-tool.png">
+##Schools >>Student >> Student Group creation tool
+
+Select the **Academic Term** and the **Program** for which a student group is to be created. 
+
+<img class="screenshot" alt="Student Group Creation Tool" src="/docs/assets/img/schools/student/student-group-creation-tool.gif">
+
+By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course.
+
+You can leave it unchecked if you don't want to consider batch while making course based groups.
 
 {next}

erpnext/docs/user/manual/en/schools/student/student-group.md

@@ -1,8 +1,22 @@
 # Student Group
 
-A student group is a collection of students taking a same course. You can create Course Schedules and Examinations against a Student Group.
-A student group needs to be created for every course in a particular academic term and academic year.
+A student group is a collection of students taking same course. You can create Course Schedules and Examinations against a Student Group.
+
+A Student Group needs to be created for every course for **Academic Term** and **Academic Year**. The student group can be create based on **Batch, Course and Activity**. 
+
+To create a Student Group go to:
+
+Schools >> Student >> New Student Group 
+
+<img class="screenshot" alt="Student Group" src="/docs/assets/img/schools/student/Student-group.gif">
+
+To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute. 
+
+Once a student group is created you can mark attendance for the group. 
+
+<img class="screenshot" alt="Student Group" src="/docs/assets/img/schools/student/student-group-attendance.gif">
+
+You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group.
 
-<img class="screenshot" alt="Student Group" src="/docs/assets/img/schools/student/student-group.png">
 
 {next}

erpnext/docs/user/manual/en/schools/student/student-log.md

@@ -1,6 +1,7 @@
 # Student Log
 
-You can make a note of student activities using student log.
+The Student log Doctype enables you to add and edit addtional information for a student.
+You can make a note of student activities using Student log.
 Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
 
 <img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student-log.png">

erpnext/docs/user/manual/en/schools/student/student.md

@@ -1,10 +1,12 @@
 # Student
 
 A Student is a person who has enrolled at your institute and you have accepted their application.
-The student doctype maintains personal details of the student.
-
-You can view everything related to a particular student on this page. Eg : Fees, Student Group, etc
+The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details. 
 
 <img class="screenshot" alt="Student" src="/docs/assets/img/schools/student/student.png">
+The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted.
 
-{next}
+You can view every doctype created for a particular student. Eg : Fees, Student Group, etc
+
+
+{next}

erpnext/docs/user/manual/en/setting-up/articles/email-error.md

@@ -0,0 +1,9 @@
+# Email Error in Sending or Receiving
+
+In ERPNext, you can customize the Incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account is saved successfully. If not, then you might receive an error as below.  
+
+<img class="screenshot" alt="Email Error" src="/docs/assets/img/articles/email-error.png">
+
+This indicates that using login credentials and other email gateway details provided in the Email Account, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine.
+
+Note: Your ERPNext account is connected with an ERPNext email server by default. If you don't want to use your own email server, you can continue sending emails using ERPNext email server, without any configuration required in the Email Account.

erpnext/docs/user/manual/en/setting-up/articles/index.txt

@@ -14,4 +14,5 @@ using-custom-domain-on-erpnext
 setup-two-factor-authentication
 difference-between-system-user-and-website-user
 outgoing-email-gateway
-print-format-sections
+print-format-sections
+email-error

erpnext/docs/user/manual/en/setting-up/data/download-backup.md

@@ -0,0 +1,13 @@
+# Download Backup
+
+In the ERPNext, you can manually download database backup. To get the latest database backup, go to:
+
+`Setup > Data > Download Backup`
+
+Backup available for the download is updated in every eight hours. Click on the link to download the backups at a given time.
+
+<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/download-backup-1.png">
+
+By default three latest backups will be available for the download. If you want to customize no. of backups, then click on "Set Number of Backups". In the System Settings, you can set Number of Backups available for the download at a time.
+
+<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/download-backup-2.gif">

erpnext/docs/user/manual/en/setting-up/data/index.txt

@@ -1,2 +1,3 @@
 data-import-tool
 bulk-rename
+download-backup

erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md

@@ -1,6 +1,6 @@
 # Setup Wizard
 
-The Setup Wizard helps you quickly setup your ERPnext by helping you create your company, Items, Customer, Suppliers and will also setup a basic website with this data.
+The Setup Wizard helps you quickly setup ERPnext as per your locale and sets up your organisation.
 
 Here is a quick overview of the steps:
 

erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt

@@ -1,10 +1,5 @@
 step-1-language
 step-2-currency-and-timezone
 step-3-user-details
+step-4-two-factor-authentication
 step-5-company-details
-step-6-letterhead-and-logo
-step-7-add-users
-step-8-tax-details
-step-9-customer-names
-step-10-suppliers
-step-11-item

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md

@@ -1,12 +0,0 @@
-# Step 10: Suppliers
-
-Enter a few of your Suppliers' names.
-
-<img alt="Suppliers" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-9.png">
-
----
-
-To understand Suppliers in detail visit [Supplier Master](/docs/user/manual/en/buying/supplier.html)
-
-{next}

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-11-item.md

@@ -1,16 +0,0 @@
-# Step 11: Item Names
-
-In this final step, please enter the names of the Items you buy or sell.
-
-<img alt="Add Items" class="screenshot"
-src="/docs/assets/img/setup-wizard/step-10.png">
-
-Please set the group of the item (Product / Service) and unit of measure. Don't worry you will be able to edit all of this later.
-
----
-
-## Thats it!
-
-Once you are done with the setup wizard you will see the familiar desktop page.
-
-{next}

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-letterhead-and-logo.md

@@ -1,23 +0,0 @@
-# Step 6: Letterhead and Logo
-
-Attach Company Letterhead and Company Logo.
-
-<img alt="Company Logo and Letterhead" class="screenshot" src="/docs/assets/img/setup-wizard/step-5.png">
-
----
-
-### Letterhead
-
-A letterhead is the heading at the top of a sheet of letter paper (stationery). That heading usually consists of a name and an address, and a logo or corporate design.
-
-Click on the box ‘Attach Letterhead’ . Select the image file from the place it is stored and click enter.
-
-You may choose to skip this step if your letterhead is not ready.
-
-To select letterhead later through the setup module, read [Letter-head](/docs/user/manual/en/setting-up/print/letter-head.html)
-
-#### To "attach as web-link"
-
-For any attachments in ERPNext, you can also attach as a web-link. If you are using other tools like Dropbox or Google Docs to manage your files, you can set its public link.
-
-{next}

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md

@@ -1,7 +0,0 @@
-# Step 7: Add Users
-
-Add other users and assign them roles based on their job responsibilities.
-
-<img alt="Users" class="screenshot" src="/docs/assets/img/setup-wizard/step-6.png">
-
-{next}

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md

@@ -1,21 +0,0 @@
-# Step 8: Tax Details
-
-Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type.
-
-<img alt="Tax Details" class="screenshot" src="/docs/assets/img/setup-wizard/step-7.png">
-
-Just set the tax name and the standard percentage levied.
-
----
-
-Some examples of tax types are given below.
-
-#### VAT
-
-A value added tax (VAT) is a form of consumption tax. From the perspective of the buyer, it is a tax on the purchase price. From that of the seller, it is a tax only on the value added to a product, material, or a service. From an accounting point of view, by the stage of its manufacture or distribution. The manufacturer remits to the government the difference between these two amounts, and retains the rest for themselves to offset the taxes they had previously paid on the inputs.
-
-The purpose of VAT is to generate tax revenues to the government similar to the corporate income tax or the personal income tax. For Example: When you shop at a departmental store and avail discount on the products, the store charges you 5% extra on the total bill as the VAT.
-
-To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html)
-
-{next}

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md

@@ -1,22 +0,0 @@
-# Step 9: Customers
-
-Enter your Customer names and the contact person from that organisation.
-
-
-<img alt="Customers" class="screenshot" src="/docs/assets/img/setup-wizard/step-8.png">
-
----
-
-#### Difference between a customer name and a contact name
-
-A customer name is the name of the organisation and a contact name is the name of the person from that organisation.
-
-For Example: If American Power Mills is an organisation name and their founder Shiv Agarwal has installed ERPNext on his system. Then,
-
-Customer Name: American Power Mills
-
-Contact Name:  Shiv Agarwal
-
-To understand Customer in detail visit [Customer Details](/docs/user/manual/en/CRM/customer.html)
-
-{next}

erpnext/docs/user/manual/en/stock/articles/delivery-note-stock-error.md

@@ -0,0 +1,7 @@
+# Delivery Note Negative Stock Error
+
+**Question**: When submitting a Delivery Note, receiving a message says that item's stock is insufficient, but we have item's stock available in the Warehouse.
+
+**Answer**: On submission of Delivery Note, stock level is checked as on Posting Date and Posting Time of a Delivery Note. It's possible that you have stock of an Item available in the Warehouse. But if you are creating back-dated Delivery Note, and if item was not available in the warehouse on the Posting Date and Posting Time of Delivery Note, you are likely to receive an error message on the negative stock. You can refer to the Stock Ledger report to confirm the same.
+
+If this is the case, you should edit the Posting Date and Time of a Delivery Note, and ensure that it is after the Posting Date and Time of item's receipt entry.

erpnext/docs/user/manual/en/stock/articles/index.txt

@@ -10,4 +10,8 @@ repack-entry
 serial-no-naming
 stock-entry-purpose
 stock-level-report
-track-items-using-barcode
+track-items-using-barcode
+stock-received-but-not-billed
+return-rejected-item
+item-valuation-transactions
+delivery-note-stock-error

erpnext/docs/user/manual/en/stock/articles/item-valuation-transactions.md

@@ -0,0 +1,17 @@
+# Item Valuation Methods and Transactions
+
+In ERPNext, Item's stock valuation is updated on the creation of one of the following transaction.
+
+1.  Purchase Receipt
+2.  Stock Entry of type Material Receipt
+3.  Stock Reconciliation made for updating stock opening balance
+
+You can select valuation method based on which item's value will be calculated. Valuation Method can be set globally for all the items from the Stock Settings.
+
+<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/item-valuation-1.png">
+
+You can also set Valuation Method in the item master, especially when a valuation method for an item is different from the default Method.
+
+<img class="screenshot" alt="Download Backup" src="/docs/assets/img/articles/item-valuation-2.png">
+
+[Click here to learn about the valuation methods available in the ERPNext, and how it works.](https://frappe.io/blog/erpnext-features/inventory-valuation-method-fifo-vs-moving-average)

erpnext/docs/user/manual/en/stock/articles/return-rejected-item.md

@@ -0,0 +1,13 @@
+# Return Rejected Items
+
+In the Purchase Receipt, you can receive the Items in the Accepted or the Rejected Warehouse.
+
+If you are creating Purchase Return for the items received in the Rejected Warehouse, then create return entry following these steps.
+
+1.  In the Purchase Receipt Item table, for the item to be returned, in the Received Qty field, enter return entry in negative.
+2.  In the Accepted Warehouse field, set value as zero.
+3.  In the Rejected Warehouse field, set the quantity to be returned in negative.
+
+For detailed steps on how to create Purchase Return Entry for the Rejected Item, refer to the below example.
+
+<img class="screenshot" alt="Returning Rejected Items" src="/docs/assets/img/articles/purchase-return.gif">

erpnext/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md

@@ -0,0 +1,9 @@
+# Purpose of Stock Received but not Billed
+
+When purchased items are received, an accounts posting is done based on the value of the purchased items in the Stock-in-hand / fixed-assets account. When you sell and deliver those items, an expense (cost-of-goods-sold) is booked, equal to the buying cost of the items. 
+
+As stock balance increases through Purchase Receipt, Warehouse account is debited and an adjustment account called **Stock Received But Not Billed** account is credited. At the same time, the negative expense is booked in account **Expense included in Valuation** for the amount added for valuation purpose, to avoid double expense booking. 
+
+On receiving Bill from the supplier, you will make Purchase Invoice against a Purchase Receipt. Here **Stock Received But Not Billed** account is debited, hence nullifies the balance in the Stock Received but not Billed Account.
+
+The balance in the Stock Received but not Billed account indicates the value of items for which Purchase Receipt has been made, but billing is pending.

erpnext/docs/user/manual/en/using-erpnext/articles/index.txt

@@ -8,4 +8,5 @@ bulk-rename
 renaming-documents
 search-filter
 tree-master-renaming
-pos-view
+pos-view
+letter-head-in-the-report