diff --git a/erpnext/docs/assets/img/collaboration-tools/delete-a-doc.png b/erpnext/docs/assets/img/collaboration-tools/delete-a-doc.png new file mode 100644 index 0000000000..9554a03694 Binary files /dev/null and b/erpnext/docs/assets/img/collaboration-tools/delete-a-doc.png differ diff --git a/erpnext/docs/assets/img/collaboration-tools/deleted-docs-list.gif b/erpnext/docs/assets/img/collaboration-tools/deleted-docs-list.gif new file mode 100644 index 0000000000..1e80da573b Binary files /dev/null and b/erpnext/docs/assets/img/collaboration-tools/deleted-docs-list.gif differ diff --git a/erpnext/docs/assets/img/collaboration-tools/enable-versioning.png b/erpnext/docs/assets/img/collaboration-tools/enable-versioning.png new file mode 100644 index 0000000000..0a399286fc Binary files /dev/null and b/erpnext/docs/assets/img/collaboration-tools/enable-versioning.png differ diff --git a/erpnext/docs/assets/img/collaboration-tools/restore-a-doc.png b/erpnext/docs/assets/img/collaboration-tools/restore-a-doc.png new file mode 100644 index 0000000000..f34c7a4ecf Binary files /dev/null and b/erpnext/docs/assets/img/collaboration-tools/restore-a-doc.png differ diff --git a/erpnext/docs/assets/img/collaboration-tools/restored-doc.png b/erpnext/docs/assets/img/collaboration-tools/restored-doc.png new file mode 100644 index 0000000000..27d70263c7 Binary files /dev/null and b/erpnext/docs/assets/img/collaboration-tools/restored-doc.png differ diff --git a/erpnext/docs/assets/img/collaboration-tools/version-details.png b/erpnext/docs/assets/img/collaboration-tools/version-details.png new file mode 100644 index 0000000000..8feacf34e7 Binary files /dev/null and b/erpnext/docs/assets/img/collaboration-tools/version-details.png differ diff --git a/erpnext/docs/assets/img/collaboration-tools/version-links.png b/erpnext/docs/assets/img/collaboration-tools/version-links.png new file mode 100644 index 0000000000..ecb12d5ff9 Binary files /dev/null and b/erpnext/docs/assets/img/collaboration-tools/version-links.png differ diff --git a/erpnext/docs/assets/img/schools/assessment/__init__.py b/erpnext/docs/assets/img/schools/assessment/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-criteria.png b/erpnext/docs/assets/img/schools/assessment/assessment-criteria.png new file mode 100644 index 0000000000..4fc5fd72ae Binary files /dev/null and b/erpnext/docs/assets/img/schools/assessment/assessment-criteria.png differ diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-group-details.png b/erpnext/docs/assets/img/schools/assessment/assessment-group-details.png new file mode 100644 index 0000000000..0982d99bef Binary files /dev/null and b/erpnext/docs/assets/img/schools/assessment/assessment-group-details.png differ diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-group-term.png b/erpnext/docs/assets/img/schools/assessment/assessment-group-term.png new file mode 100644 index 0000000000..37e90daaa4 Binary files /dev/null and b/erpnext/docs/assets/img/schools/assessment/assessment-group-term.png differ diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png b/erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png new file mode 100644 index 0000000000..3780a0412f Binary files /dev/null and b/erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png differ diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png b/erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png new file mode 100644 index 0000000000..b4ff97978b Binary files /dev/null and b/erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png differ diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png b/erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png new file mode 100644 index 0000000000..b70f0df555 Binary files /dev/null and b/erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png differ diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-result.png b/erpnext/docs/assets/img/schools/assessment/assessment-result.png new file mode 100644 index 0000000000..ae25cd4e21 Binary files /dev/null and b/erpnext/docs/assets/img/schools/assessment/assessment-result.png differ diff --git a/erpnext/docs/assets/img/schools/assessment/grading-scale.png b/erpnext/docs/assets/img/schools/assessment/grading-scale.png new file mode 100644 index 0000000000..f48f617601 Binary files /dev/null and b/erpnext/docs/assets/img/schools/assessment/grading-scale.png differ diff --git a/erpnext/docs/user/manual/en/schools/Assessment/__init__.py b/erpnext/docs/user/manual/en/schools/Assessment/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md new file mode 100644 index 0000000000..1538463b8d --- /dev/null +++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md @@ -0,0 +1,13 @@ +#Assessment Criteria + +Assessment Criteria is the parameter based on which you assess the Student. + +Assessment Criteria + +After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc. + +Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course. + +Assessment Plan Criteria + +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md new file mode 100644 index 0000000000..ae67dba414 --- /dev/null +++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md @@ -0,0 +1,13 @@ +#Assessment Group + +Assessment Group tree is a master where you can define the hierarchy for examination conducted in your education institute. + +For example, if you conduct two assessment in a academic year, then setup Assessment Group as following. + +Assessment Group Term + +On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute. + +Assessment Group Term + +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md new file mode 100644 index 0000000000..85b03bfef0 --- /dev/null +++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md @@ -0,0 +1,19 @@ +#Assessment Plan + +To schedule an assessment/examination for a Student Group, for specific Course, create Assessment Plan. In the Assessment Plan, you can also capture details like: + +1. Grading Scale based on which grades will be assigned to students. + +2. Schedule Date of Assessment + +3. Room where assessment will be conducted + +4. Examiner and Supervisor + +Assessment Plan Details + +5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned. + +Assessment Plan Criteria + +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md new file mode 100644 index 0000000000..68d17e1d32 --- /dev/null +++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md @@ -0,0 +1,7 @@ +#Assessment Result + +Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool]({{docs_base_url}}/user/manual/en/schools/assessment/assessment_result_tool.html). + +Assessment Result + +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md new file mode 100644 index 0000000000..a1111ebf5a --- /dev/null +++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md @@ -0,0 +1,9 @@ +#Assessment Result Tool + +Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student. + +Assessment Result Tool + +As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student. + +{next} diff --git a/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md new file mode 100644 index 0000000000..c0a39cb6a5 --- /dev/null +++ b/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md @@ -0,0 +1,7 @@ +#Grading Scale + +In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned. + +Grading Scale + +{next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.md b/erpnext/docs/user/manual/en/schools/Assessment/index.md new file mode 100644 index 0000000000..3dab62a61e --- /dev/null +++ b/erpnext/docs/user/manual/en/schools/Assessment/index.md @@ -0,0 +1,17 @@ +#Assessment + +Every education institute organizes assessment / examination to evaluates progress of their Students. In ERPNext, you can manage complete assessment processing for your ERPNext account. + +Following is the order in which you should setup masters in the Assessment module. + +1. Assessment Criteria +2. Assessment Group +3. Grading Scale + +Once you have also defined the Student Group and Courses, you can schedule an assessment / examination by creating Assessment Plan. + +Based on the performance of Student in the assessment, you can create Assessment Result for an Student. You can create Assessment Results in bulk using Assessment Result Tool. In this tool, on selection of Assessment Plan, all the students (for Student Group) will be fetched. You can quickly enter marks earned by each Student for each Assessment Criteria in a single row. + +### Topics + +{index} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.txt b/erpnext/docs/user/manual/en/schools/Assessment/index.txt new file mode 100644 index 0000000000..61d744c721 --- /dev/null +++ b/erpnext/docs/user/manual/en/schools/Assessment/index.txt @@ -0,0 +1,6 @@ +assessment_criteria +assessment_group +grading_scale +assessment_plan +assessment_result_tool +assessment_result \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/schools/index.txt b/erpnext/docs/user/manual/en/schools/index.txt index f054827e5e..b485fdcfea 100644 --- a/erpnext/docs/user/manual/en/schools/index.txt +++ b/erpnext/docs/user/manual/en/schools/index.txt @@ -2,4 +2,5 @@ student admission schedule fees -setup \ No newline at end of file +setup +assessment \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md index a47d863785..fb784c4a91 100644 --- a/erpnext/docs/user/manual/en/stock/stock-entry.md +++ b/erpnext/docs/user/manual/en/stock/stock-entry.md @@ -23,7 +23,7 @@ Warehouse” or both (if you are recording a movement). **Additional Costs:** -If the stock entry is an incoming entry i.e any item is receiving at a target warehouse, you can add related additional costs (like Shipping Charges, Customs Duty, Operating Costs etc) assotiated with the process. The additional costs will be considered to calculate valuation rate of the items. +If the stock entry is an incoming entry i.e any item is receiving at a target warehouse, you can add related additional costs (like Shipping Charges, Customs Duty, Operating Costs etc) associated with the process. The additional costs will be considered to calculate valuation rate of the items. To add additional costs, enter the description and amount of the cost in the Additional Costs table. diff --git a/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md new file mode 100644 index 0000000000..bbcdc55dab --- /dev/null +++ b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md @@ -0,0 +1,21 @@ +#Document Versioning + +The document versioning feature allows you to track all the changes made in the form over the period. It will be very helpful in audit trial to check which user edited what value, and when exactly. + +####Enable Document Versioning + +Document Versioning can be enabled for one Document Type as a time. Let's assume that we need to enable it from Purchase Order. Then, we will check Customize Form tool for Purchase Order and check field `Track Changes`. With this, document versioning will be enabled for all the Purchase Orders create and edited hence forth. + +Enable Versioning + +####Version Log + +Following is link of version in a Purchase Order form. Each time a document is edited, a version's link will be added in that document. To check more details on specific version, click on it's link. + +Version Links + +####Version Details + +In the Version document, you will find log of all the fields and values changes in it. + +Version Details \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.txt b/erpnext/docs/user/manual/en/using-erpnext/index.txt index c3a6aa45ee..66bfc1eefe 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/index.txt +++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt @@ -1,4 +1,6 @@ to-do +restore-deleted-docs +document-versioning collaborating-around-forms chat notes diff --git a/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md new file mode 100644 index 0000000000..2c60d3505a --- /dev/null +++ b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md @@ -0,0 +1,31 @@ +#Restore Deleted Documents + +In ERPNext, you can delete a records if not needed. They can be masters like Items, Customer or transactions like Sales Order, Payment Entries etc. + +Delete a Docuemnt + +If you have deleted an entry by mistake and wish to restore it back into your ERPNext account. + +> Only User having System Manager role assigned can restore deleted documents. + +Steps below to restore a deleted document. + +####Step 1: Go to Deleted Documents + +For the list of deleted document, just type Deleted Document in the Search Bar and go to list. + +Deleted Docs List + +####Step 2: Open Doc and Restore + +Open the document to be restored from the list. Click on Restore button. + +Restored Doc + +####Step 3: Restored + +Once a document is restored, you will be able to use it for creating entries in your ERPNext account. + +Restored Doc + +> If canceled document is deleted, then it will not be restored.