diff --git a/foundation/www/docs/assets/img/articles/$SGrab_253.png b/foundation/www/docs/assets/img/articles/$SGrab_253.png deleted file mode 100644 index 69649253..00000000 Binary files a/foundation/www/docs/assets/img/articles/$SGrab_253.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/$SGrab_254.png b/foundation/www/docs/assets/img/articles/$SGrab_254.png deleted file mode 100644 index 7b2ea780..00000000 Binary files a/foundation/www/docs/assets/img/articles/$SGrab_254.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/$SGrab_256.png b/foundation/www/docs/assets/img/articles/$SGrab_256.png deleted file mode 100644 index 1fabda35..00000000 Binary files a/foundation/www/docs/assets/img/articles/$SGrab_256.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/$SGrab_306.png b/foundation/www/docs/assets/img/articles/$SGrab_306.png deleted file mode 100644 index ebbb0076..00000000 Binary files a/foundation/www/docs/assets/img/articles/$SGrab_306.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/$SGrab_307.png b/foundation/www/docs/assets/img/articles/$SGrab_307.png deleted file mode 100644 index f3d1ee1e..00000000 Binary files a/foundation/www/docs/assets/img/articles/$SGrab_307.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/$SGrab_431.png b/foundation/www/docs/assets/img/articles/$SGrab_431.png deleted file mode 100644 index ae79a3ef..00000000 Binary files a/foundation/www/docs/assets/img/articles/$SGrab_431.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/$SGrab_432.png b/foundation/www/docs/assets/img/articles/$SGrab_432.png deleted file mode 100644 index cc49d855..00000000 Binary files a/foundation/www/docs/assets/img/articles/$SGrab_432.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/SGrab_282.png b/foundation/www/docs/assets/img/articles/SGrab_282.png deleted file mode 100644 index 3fb138a3..00000000 Binary files a/foundation/www/docs/assets/img/articles/SGrab_282.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/SGrab_283.png b/foundation/www/docs/assets/img/articles/SGrab_283.png deleted file mode 100644 index d726339d..00000000 Binary files a/foundation/www/docs/assets/img/articles/SGrab_283.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png b/foundation/www/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png deleted file mode 100644 index 8467e6dc..00000000 Binary files a/foundation/www/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png b/foundation/www/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png deleted file mode 100644 index ac32083b..00000000 Binary files a/foundation/www/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png b/foundation/www/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png deleted file mode 100644 index 46c20471..00000000 Binary files a/foundation/www/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/articles/brand-logo.gif b/foundation/www/docs/assets/img/articles/brand-logo.gif new file mode 100644 index 00000000..99a10d3b Binary files /dev/null and b/foundation/www/docs/assets/img/articles/brand-logo.gif differ diff --git a/foundation/www/docs/assets/img/articles/capacity-1.png b/foundation/www/docs/assets/img/articles/capacity-1.png new file mode 100644 index 00000000..b6879959 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/capacity-1.png differ diff --git a/foundation/www/docs/assets/img/articles/capacity-2.png b/foundation/www/docs/assets/img/articles/capacity-2.png new file mode 100644 index 00000000..9995b6c6 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/capacity-2.png differ diff --git a/foundation/www/docs/assets/img/articles/capacity-3.png b/foundation/www/docs/assets/img/articles/capacity-3.png new file mode 100644 index 00000000..d074eb01 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/capacity-3.png differ diff --git a/foundation/www/docs/assets/img/articles/child-1.png b/foundation/www/docs/assets/img/articles/child-1.png new file mode 100644 index 00000000..fb19e268 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/child-1.png differ diff --git a/foundation/www/docs/assets/img/articles/child-2.png b/foundation/www/docs/assets/img/articles/child-2.png new file mode 100644 index 00000000..2141272e Binary files /dev/null and b/foundation/www/docs/assets/img/articles/child-2.png differ diff --git a/foundation/www/docs/assets/img/articles/child-3.png b/foundation/www/docs/assets/img/articles/child-3.png new file mode 100644 index 00000000..a3667aa7 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/child-3.png differ diff --git a/foundation/www/docs/assets/img/articles/child-4.gif b/foundation/www/docs/assets/img/articles/child-4.gif new file mode 100644 index 00000000..fab4ba7e Binary files /dev/null and b/foundation/www/docs/assets/img/articles/child-4.gif differ diff --git a/foundation/www/docs/assets/img/articles/child-5.png b/foundation/www/docs/assets/img/articles/child-5.png new file mode 100644 index 00000000..69900212 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/child-5.png differ diff --git a/foundation/www/docs/assets/img/articles/child-6.png b/foundation/www/docs/assets/img/articles/child-6.png new file mode 100644 index 00000000..d6549869 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/child-6.png differ diff --git a/foundation/www/docs/assets/img/articles/common-receivable.png b/foundation/www/docs/assets/img/articles/common-receivable.png new file mode 100644 index 00000000..33e92c1a Binary files /dev/null and b/foundation/www/docs/assets/img/articles/common-receivable.png differ diff --git a/foundation/www/docs/assets/img/articles/download-backup-1.png b/foundation/www/docs/assets/img/articles/download-backup-1.png new file mode 100644 index 00000000..93597f45 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/download-backup-1.png differ diff --git a/foundation/www/docs/assets/img/articles/download-backup-2.gif b/foundation/www/docs/assets/img/articles/download-backup-2.gif new file mode 100644 index 00000000..4109dff0 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/download-backup-2.gif differ diff --git a/foundation/www/docs/assets/img/articles/email-error.png b/foundation/www/docs/assets/img/articles/email-error.png new file mode 100644 index 00000000..e8c5d73d Binary files /dev/null and b/foundation/www/docs/assets/img/articles/email-error.png differ diff --git a/foundation/www/docs/assets/img/articles/email-setup-error.png b/foundation/www/docs/assets/img/articles/email-setup-error.png new file mode 100644 index 00000000..e8c5d73d Binary files /dev/null and b/foundation/www/docs/assets/img/articles/email-setup-error.png differ diff --git a/foundation/www/docs/assets/img/articles/fetching-1.png b/foundation/www/docs/assets/img/articles/fetching-1.png new file mode 100644 index 00000000..fcf3fcba Binary files /dev/null and b/foundation/www/docs/assets/img/articles/fetching-1.png differ diff --git a/foundation/www/docs/assets/img/articles/fetching-2.png b/foundation/www/docs/assets/img/articles/fetching-2.png new file mode 100644 index 00000000..c5594d56 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/fetching-2.png differ diff --git a/foundation/www/docs/assets/img/articles/fetching-3.gif b/foundation/www/docs/assets/img/articles/fetching-3.gif new file mode 100644 index 00000000..5deea3e5 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/fetching-3.gif differ diff --git a/foundation/www/docs/assets/img/articles/hr-working-days.png b/foundation/www/docs/assets/img/articles/hr-working-days.png new file mode 100644 index 00000000..58571646 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/hr-working-days.png differ diff --git a/foundation/www/docs/assets/img/articles/item-valuation-1.png b/foundation/www/docs/assets/img/articles/item-valuation-1.png new file mode 100644 index 00000000..16bde1d1 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/item-valuation-1.png differ diff --git a/foundation/www/docs/assets/img/articles/item-valuation-2.png b/foundation/www/docs/assets/img/articles/item-valuation-2.png new file mode 100644 index 00000000..cc8b8442 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/item-valuation-2.png differ diff --git a/foundation/www/docs/assets/img/articles/purchase-invoice-account-type.png b/foundation/www/docs/assets/img/articles/purchase-invoice-account-type.png new file mode 100644 index 00000000..f268fd7a Binary files /dev/null and b/foundation/www/docs/assets/img/articles/purchase-invoice-account-type.png differ diff --git a/foundation/www/docs/assets/img/articles/purchase-return.gif b/foundation/www/docs/assets/img/articles/purchase-return.gif new file mode 100644 index 00000000..de5f18cf Binary files /dev/null and b/foundation/www/docs/assets/img/articles/purchase-return.gif differ diff --git a/foundation/www/docs/assets/img/articles/report-header-1.png b/foundation/www/docs/assets/img/articles/report-header-1.png new file mode 100644 index 00000000..848c3018 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/report-header-1.png differ diff --git a/foundation/www/docs/assets/img/articles/report-header-2.png b/foundation/www/docs/assets/img/articles/report-header-2.png new file mode 100644 index 00000000..47d86958 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/report-header-2.png differ diff --git a/foundation/www/docs/assets/img/articles/report-permission-1.png b/foundation/www/docs/assets/img/articles/report-permission-1.png new file mode 100644 index 00000000..08c4f5a5 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/report-permission-1.png differ diff --git a/foundation/www/docs/assets/img/articles/report-permission-2.png b/foundation/www/docs/assets/img/articles/report-permission-2.png new file mode 100644 index 00000000..5e5ef17c Binary files /dev/null and b/foundation/www/docs/assets/img/articles/report-permission-2.png differ diff --git a/foundation/www/docs/assets/img/articles/role-deskperm.png b/foundation/www/docs/assets/img/articles/role-deskperm.png new file mode 100644 index 00000000..ef4a4d87 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/role-deskperm.png differ diff --git a/foundation/www/docs/assets/img/articles/sections-1.png b/foundation/www/docs/assets/img/articles/sections-1.png new file mode 100644 index 00000000..1ac12add Binary files /dev/null and b/foundation/www/docs/assets/img/articles/sections-1.png differ diff --git a/foundation/www/docs/assets/img/articles/sections-2.gif b/foundation/www/docs/assets/img/articles/sections-2.gif new file mode 100644 index 00000000..48edb795 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/sections-2.gif differ diff --git a/foundation/www/docs/assets/img/articles/types-in-tax-masters.png b/foundation/www/docs/assets/img/articles/types-in-tax-masters.png new file mode 100644 index 00000000..221808ea Binary files /dev/null and b/foundation/www/docs/assets/img/articles/types-in-tax-masters.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/bom-replace-tool.png b/foundation/www/docs/assets/img/manufacturing/bom-replace-tool.png deleted file mode 100644 index 51ac9932..00000000 Binary files a/foundation/www/docs/assets/img/manufacturing/bom-replace-tool.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/manufacturing/bom-update-tool.png b/foundation/www/docs/assets/img/manufacturing/bom-update-tool.png new file mode 100644 index 00000000..7dbd47fe Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/bom-update-tool.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/make_invoice_from_timesheet.gif b/foundation/www/docs/assets/img/project/timesheet/make_invoice_from_timesheet.gif new file mode 100644 index 00000000..90cc6d6e Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/make_invoice_from_timesheet.gif differ diff --git a/foundation/www/docs/assets/img/schools/admission/program-enrollment-tool.gif b/foundation/www/docs/assets/img/schools/admission/program-enrollment-tool.gif new file mode 100644 index 00000000..c25b1799 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/admission/program-enrollment-tool.gif differ diff --git a/foundation/www/docs/assets/img/schools/admission/program-enrollment-tool01.gif b/foundation/www/docs/assets/img/schools/admission/program-enrollment-tool01.gif new file mode 100644 index 00000000..8b1f6314 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/admission/program-enrollment-tool01.gif differ diff --git a/foundation/www/docs/assets/img/schools/admission/program-enrollment.gif b/foundation/www/docs/assets/img/schools/admission/program-enrollment.gif new file mode 100644 index 00000000..616ab17d Binary files /dev/null and b/foundation/www/docs/assets/img/schools/admission/program-enrollment.gif differ diff --git a/foundation/www/docs/assets/img/schools/admission/program-enrollment.png b/foundation/www/docs/assets/img/schools/admission/program-enrollment.png deleted file mode 100644 index df96f3c3..00000000 Binary files a/foundation/www/docs/assets/img/schools/admission/program-enrollment.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/schools/admission/student-applicant-enroll.png b/foundation/www/docs/assets/img/schools/admission/student-applicant-enroll.png index fb92a679..7cf5e75b 100644 Binary files a/foundation/www/docs/assets/img/schools/admission/student-applicant-enroll.png and b/foundation/www/docs/assets/img/schools/admission/student-applicant-enroll.png differ diff --git a/foundation/www/docs/assets/img/schools/admission/student-application-actions.png b/foundation/www/docs/assets/img/schools/admission/student-application-actions.png new file mode 100644 index 00000000..e3a4c15e Binary files /dev/null and b/foundation/www/docs/assets/img/schools/admission/student-application-actions.png differ diff --git a/foundation/www/docs/assets/img/schools/schedule/student-attendance.gif b/foundation/www/docs/assets/img/schools/schedule/student-attendance.gif new file mode 100644 index 00000000..82549d46 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/schedule/student-attendance.gif differ diff --git a/foundation/www/docs/assets/img/schools/schedule/student-leave-application.gif b/foundation/www/docs/assets/img/schools/schedule/student-leave-application.gif new file mode 100644 index 00000000..3b09fac2 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/schedule/student-leave-application.gif differ diff --git a/foundation/www/docs/assets/img/schools/setup/Course-schedule-error.png b/foundation/www/docs/assets/img/schools/setup/Course-schedule-error.png new file mode 100644 index 00000000..d9913d85 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/setup/Course-schedule-error.png differ diff --git a/foundation/www/docs/assets/img/schools/setup/Room-Assesment-plan.png b/foundation/www/docs/assets/img/schools/setup/Room-Assesment-plan.png new file mode 100644 index 00000000..4b23cd7e Binary files /dev/null and b/foundation/www/docs/assets/img/schools/setup/Room-Assesment-plan.png differ diff --git a/foundation/www/docs/assets/img/schools/setup/course-fee-program.png b/foundation/www/docs/assets/img/schools/setup/course-fee-program.png new file mode 100644 index 00000000..c8527d04 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/setup/course-fee-program.png differ diff --git a/foundation/www/docs/assets/img/schools/setup/setup-section.png b/foundation/www/docs/assets/img/schools/setup/setup-section.png deleted file mode 100644 index c02bbc47..00000000 Binary files a/foundation/www/docs/assets/img/schools/setup/setup-section.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/schools/setup/student-attendance-tool.gif b/foundation/www/docs/assets/img/schools/setup/student-attendance-tool.gif new file mode 100644 index 00000000..c8c1c05e Binary files /dev/null and b/foundation/www/docs/assets/img/schools/setup/student-attendance-tool.gif differ diff --git a/foundation/www/docs/assets/img/schools/setup/student-group-instructor.png b/foundation/www/docs/assets/img/schools/setup/student-group-instructor.png new file mode 100644 index 00000000..d9457a6d Binary files /dev/null and b/foundation/www/docs/assets/img/schools/setup/student-group-instructor.png differ diff --git a/foundation/www/docs/assets/img/schools/student/guardian.png b/foundation/www/docs/assets/img/schools/student/guardian.png new file mode 100644 index 00000000..01045be4 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/guardian.png differ diff --git a/foundation/www/docs/assets/img/schools/student/schools-settings.png b/foundation/www/docs/assets/img/schools/student/schools-settings.png new file mode 100644 index 00000000..8a71ac92 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/schools-settings.png differ diff --git a/foundation/www/docs/assets/img/schools/student/student group.gif b/foundation/www/docs/assets/img/schools/student/student group.gif new file mode 100644 index 00000000..13b1cf43 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/student group.gif differ diff --git a/foundation/www/docs/assets/img/schools/student/student-admission.gif b/foundation/www/docs/assets/img/schools/student/student-admission.gif new file mode 100644 index 00000000..a9ce8dc9 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/student-admission.gif differ diff --git a/foundation/www/docs/assets/img/schools/student/student-batch-validation.gif b/foundation/www/docs/assets/img/schools/student/student-batch-validation.gif new file mode 100644 index 00000000..dd9f0e82 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/student-batch-validation.gif differ diff --git a/foundation/www/docs/assets/img/schools/student/student-batch.gif b/foundation/www/docs/assets/img/schools/student/student-batch.gif new file mode 100644 index 00000000..43bae773 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/student-batch.gif differ diff --git a/foundation/www/docs/assets/img/schools/student/student-batch.png b/foundation/www/docs/assets/img/schools/student/student-batch.png deleted file mode 100644 index 75a33140..00000000 Binary files a/foundation/www/docs/assets/img/schools/student/student-batch.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/schools/student/student-course-validation.gif b/foundation/www/docs/assets/img/schools/student/student-course-validation.gif new file mode 100644 index 00000000..6ab9d004 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/student-course-validation.gif differ diff --git a/foundation/www/docs/assets/img/schools/student/student-group-attendance.gif b/foundation/www/docs/assets/img/schools/student/student-group-attendance.gif new file mode 100644 index 00000000..da9aa1ac Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/student-group-attendance.gif differ diff --git a/foundation/www/docs/assets/img/schools/student/student-group-creation-tool.gif b/foundation/www/docs/assets/img/schools/student/student-group-creation-tool.gif new file mode 100644 index 00000000..1fe1a6f0 Binary files /dev/null and b/foundation/www/docs/assets/img/schools/student/student-group-creation-tool.gif differ diff --git a/foundation/www/docs/assets/img/schools/student/student-group-creation-tool.png b/foundation/www/docs/assets/img/schools/student/student-group-creation-tool.png deleted file mode 100644 index 32e6498f..00000000 Binary files a/foundation/www/docs/assets/img/schools/student/student-group-creation-tool.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/schools/student/student-group.png b/foundation/www/docs/assets/img/schools/student/student-group.png deleted file mode 100644 index c562b001..00000000 Binary files a/foundation/www/docs/assets/img/schools/student/student-group.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/setup/integrations/razorpay-api.gif b/foundation/www/docs/assets/img/setup/integrations/razorpay-api.gif new file mode 100644 index 00000000..1e79664e Binary files /dev/null and b/foundation/www/docs/assets/img/setup/integrations/razorpay-api.gif differ diff --git a/foundation/www/docs/assets/img/setup/print/print-style.png b/foundation/www/docs/assets/img/setup/print/print-style.png new file mode 100644 index 00000000..db93ceb0 Binary files /dev/null and b/foundation/www/docs/assets/img/setup/print/print-style.png differ diff --git a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html index ea00cf22..e3ece185 100644 --- a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html +++ b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html @@ -3,7 +3,7 @@
No docs
++ + + erpnext.hr.email_alert.training_feedback.training_feedback.get_context + (context) +
+No docs
++ + + erpnext.hr.email_alert.training_scheduled.training_scheduled.get_context + (context) +
+No docs
+Create a few opportunities, quotes, material requests, issues, todos, projects to help the user get started
diff --git a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html index bdfc96a6..0807fcad 100644 --- a/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html +++ b/foundation/www/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html @@ -3,7 +3,7 @@Create contact based on given contact name
-- - - erpnext.setup.setup_wizard.setup_wizard.create_course - (args) -
-No docs
-- - - erpnext.setup.setup_wizard.setup_wizard.create_customers - (args) -
-No docs
-+ + + erpnext.setup.setup_wizard.setup_wizard.create_employee_for_self + (args) +
+No docs
+- - - erpnext.setup.setup_wizard.setup_wizard.create_instructor - (args) -
-No docs
-- - - erpnext.setup.setup_wizard.setup_wizard.create_items - (args) -
-No docs
-- - - erpnext.setup.setup_wizard.setup_wizard.create_program - (args) -
-No docs
-- - - erpnext.setup.setup_wizard.setup_wizard.create_room - (args) -
-No docs
-- - - erpnext.setup.setup_wizard.setup_wizard.create_suppliers - (args) -
-No docs
-- - - erpnext.setup.setup_wizard.setup_wizard.create_taxes - (args) -
-No docs
-- - - erpnext.setup.setup_wizard.setup_wizard.create_users - (args) -
-No docs
-- - - erpnext.setup.setup_wizard.setup_wizard.make_item_price - (item, price_list_name, item_price) -
-No docs
-@@ -527,6 +367,22 @@ + + + + +
+ + + erpnext.setup.setup_wizard.setup_wizard.setup_success + (args=None) +
+No docs
++ + + erpnext.setup.setup_wizard.test_setup_wizard.run_setup_wizard_test + () +
+No docs
++ + + erpnext.utilities.user_progress.get_slide_settings + () +
+No docs
++ + + erpnext.utilities.user_progress.get_user_progress_slides + () +
+No docs
++ + + erpnext.utilities.user_progress_utils.create_contact + (contact, party_type, party) +
+Create contact based on given contact name
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.create_course
+
+ + + erpnext.utilities.user_progress_utils.create_course + (args_data) +
+No docs
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.create_customers
+
+ + + erpnext.utilities.user_progress_utils.create_customers + (args_data) +
+No docs
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.create_instructor
+
+ + + erpnext.utilities.user_progress_utils.create_instructor + (args_data) +
+No docs
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.create_items
+
+ + + erpnext.utilities.user_progress_utils.create_items + (args_data) +
+No docs
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.create_program
+
+ + + erpnext.utilities.user_progress_utils.create_program + (args_data) +
+No docs
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.create_room
+
+ + + erpnext.utilities.user_progress_utils.create_room + (args_data) +
+No docs
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.create_suppliers
+
+ + + erpnext.utilities.user_progress_utils.create_suppliers + (args_data) +
+No docs
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.create_users
+
+ + + erpnext.utilities.user_progress_utils.create_users + (args_data) +
+No docs
++ + + erpnext.utilities.user_progress_utils.make_item_price + (item, price_list_name, item_price) +
+No docs
+Public API
+ /api/method/erpnext.utilities.user_progress_utils.update_default_domain_actions_and_get_state
+
+ + + erpnext.utilities.user_progress_utils.update_default_domain_actions_and_get_state + () +
+No docs
+8.8.2
+ 8.10.2
price+ + + update_current_month_sales + (self) +
+No docs
+diff --git a/foundation/www/docs/current/models/accounts/sales_invoice_advance.html b/foundation/www/docs/current/models/accounts/sales_invoice_advance.html index b8ff6046..97967e77 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_advance.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_advance.html @@ -9,7 +9,7 @@
+ + + erpnext.accounts.doctype.tax_rule.tax_rule.get_customer_group_condition + (customer_group) +
+No docs
+Public API
/api/method/erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details
+ + + update_rfq_supplier_status + (self, sup_name=None) +
+No docs
+diff --git a/foundation/www/docs/current/models/buying/request_for_quotation_item.html b/foundation/www/docs/current/models/buying/request_for_quotation_item.html index ec03672e..4a943225 100644 --- a/foundation/www/docs/current/models/buying/request_for_quotation_item.html +++ b/foundation/www/docs/current/models/buying/request_for_quotation_item.html @@ -9,7 +9,7 @@
no_quotequote_statusPending +Received +No Quote+
column_break_3supplier_nameemail_iddownload_pdf+ + + update_rfq_supplier_status + (self, include_me) +
+No docs
+diff --git a/foundation/www/docs/current/models/buying/supplier_quotation_item.html b/foundation/www/docs/current/models/buying/supplier_quotation_item.html index 45fafa62..9836a95e 100644 --- a/foundation/www/docs/current/models/buying/supplier_quotation_item.html +++ b/foundation/www/docs/current/models/buying/supplier_quotation_item.html @@ -9,7 +9,7 @@
salutationlead_namegendercompany_nameemail_idcol_break123statusgendersourcecompany_namecustomercampaign_nameimagesection_break_12lead_ownercolumn_break_14contact_datecontact_bycontact_date- Add to calendar on this date
-contact_infoaddress_descaddress_htmlcolumn_break2phonesalutationmobile_nonext_contactcontact_bycontact_datecolumn_break2to_discussitems_sectionitemscontact_infocustomer_addressaddress_displayterritorycustomer_groupcolumn_break3contact_personcontact_displaycontact_emailcontact_mobilemore_infosourcecampaigncolumn_break1companytransaction_datenext_contactcontact_by- Your sales person who will contact the customer in future
-contact_date- Your sales person will get a reminder on this date to contact the customer
-column_break2to_discussamended_from+ + + erpnext.hr.doctype.employee.employee.get_employee_emails + (employee_list) +
+Returns list of employee emails either based on userid or companyemail
+diff --git a/foundation/www/docs/current/models/hr/employee_attendance_tool.html b/foundation/www/docs/current/models/hr/employee_attendance_tool.html index cc759bb2..17517e72 100644 --- a/foundation/www/docs/current/models/hr/employee_attendance_tool.html +++ b/foundation/www/docs/current/models/hr/employee_attendance_tool.html @@ -9,7 +9,7 @@
send_email- Will send an email about the event to employees with status 'Open'
-employeesamended_fromemployee_emails- + - invite_employee - (self) -
-No docs
-- - - on_update - (self) -
-No docs
-- - - on_update_after_submit + validate (self)
No docs
diff --git a/foundation/www/docs/current/models/hr/training_event_employee.html b/foundation/www/docs/current/models/hr/training_event_employee.html index b5a09d32..e858ad8c 100644 --- a/foundation/www/docs/current/models/hr/training_event_employee.html +++ b/foundation/www/docs/current/models/hr/training_event_employee.html @@ -9,7 +9,7 @@attendanceMandatory +Optional
+ + + on_submit + (self) +
+No docs
++ + + validate + (self) +
+No docs
+employee_emails- + - send_result + validate (self)
No docs
diff --git a/foundation/www/docs/current/models/hr/training_result_employee.html b/foundation/www/docs/current/models/hr/training_result_employee.html index c18cf40f..ce2d8ad0 100644 --- a/foundation/www/docs/current/models/hr/training_result_employee.html +++ b/foundation/www/docs/current/models/hr/training_result_employee.html @@ -9,7 +9,7 @@set_rate_of_sub_assembly_item_based_on_bomcurrency_detailcurrencycolumn_break_12conversion_rateoperations_sectionoperationsmaterials_sectionitemsscrap_sectionscrap_itemscostingoperating_costraw_material_costscrap_material_costcb1base_operating_costbase_raw_material_costbase_scrap_material_costtotal_cost_of_bomtotal_costcolumn_break_26base_total_costmore_info_sectionprojectcompanyamended_fromcol_break23uomsection_break_25descriptioncolumn_break_27imageimage_viewsection_break0exploded_itemswebsite_sectionshow_in_websiteroutewebsite_imagethumbnailsb_web_specweb_long_descriptionshow_itemsshow_operationsNo docs
+ + + erpnext.manufacturing.doctype.bom.bom.get_boms_in_bottom_up_order + (bom_no=None) +
+No docs
+Public API
/api/method/erpnext.manufacturing.doctype.bom.bom.get_children
replace_bom_sectioncurrent_bomnew_bomreplaceupdate_cost_sectionupdate_latest_price_in_all_bomsInherits from frappe.model.document.Document @@ -179,6 +216,56 @@ Replace a particular BOM in all other BOMs where it is used. It will replace the + + + +
Public API
+ /api/method/erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.enqueue_update_cost
+
+ + + erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.enqueue_update_cost + () +
+No docs
++ + + erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.update_cost + () +
+No docs
++ + + erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.update_latest_price_in_all_boms + () +
+No docs
+update_bom_costs_automatically+ Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.
+column_break_11default_wip_warehousedefault_fg_warehouseNo docs
section_break_7instructor_created_byFull Name +Naming Series +Employee Number+
+ + + validate + (self) +
+No docs
++ + + erpnext.selling.doctype.sales_order.sales_order.get_default_bom_item + (item_code) +
+No docs
+Public API
/api/method/erpnext.selling.doctype.sales_order.sales_order.get_events
sales_settingssales_monthly_historymonthly_sales_targetdefault_currency+
column_break_goalstotal_monthly_salesdefault_currency+
charts_sectiondefault_letter_headdefault_holiday_listdefault_termsdefault_currencycolumn_break_10countrycreate_chart_of_accounts_based_onchart_of_accountsexisting_companysales_settingssales_monthly_historysales_targetdefault_currency-
column_break_goalstotal_monthly_salesdefault_currency-
default_settings- - - install_country_fixtures - (self) -
-No docs
-@@ -1414,6 +1400,22 @@ Last Day of the Next Month + +
+ + + erpnext.setup.doctype.company.company.install_country_fixtures + (company) +
+No docs
+Public API
/api/method/erpnext.setup.doctype.company.company.replace_abbr
+ + + erpnext.setup.doctype.customer_group.customer_group.get_parent_customer_groups + (customer_group) +
+No docs
+| Sr | +Fieldname | +Type | +Label | +Options | +
|---|---|---|---|---|
| 1 | +actions_sb |
+ + Section Break | ++ Actions + + | ++ |
| 2 | +actions |
+ + Table | ++ Actions + + | ++ + + + +Setup Progress Action + + + + | +
Inherits from frappe.model.document.Document + +
+ + + erpnext.setup.doctype.setup_progress.setup_progress.get_action_completed_state + (action_name) +
+No docs
++ + + erpnext.setup.doctype.setup_progress.setup_progress.get_domain_actions_state + (domain) +
+No docs
++ + + erpnext.setup.doctype.setup_progress.setup_progress.get_setup_progress + () +
+No docs
+Public API
+ /api/method/erpnext.setup.doctype.setup_progress.setup_progress.set_action_completed_state
+
+ + + erpnext.setup.doctype.setup_progress.setup_progress.set_action_completed_state + (action_name) +
+No docs
++ + + erpnext.setup.doctype.setup_progress.setup_progress.update_action + (action_table_doc) +
+No docs
++ + + erpnext.setup.doctype.setup_progress.setup_progress.update_action_completed_state + (action_name) +
+No docs
++ + + erpnext.setup.doctype.setup_progress.setup_progress.update_domain_actions + (domain) +
+No docs
+Table Name: tabSetup Progress Action
| Sr | +Fieldname | +Type | +Label | +Options | +
|---|---|---|---|---|
| 1 | +action_name |
+ + Data | ++ Action Name + + | ++ |
| 2 | +action_doctype |
+ + Link | ++ Action Doctype + + | ++ + + + +DocType + + + + | +
| 3 | +min_doc_count |
+ + Int | ++ Min Doc Count + + | ++ |
| 4 | +domains |
+ + Code | ++ Domains + + | ++ |
| 5 | +is_completed |
+ + Check | ++ Is Completed + + | ++ |
customer_groupcompany_addressterritorycompany_address_displaycustomer_groupterritoryprinting_detailsletter_headselect_print_headinglanguagecolumn_break_88print_without_amountsection_break_83statusper_installedinstallation_statuscolumn_break_89to_warehouseexcise_pageinstructionssales_team_section_breaksales_partnercolumn_break7commission_ratetotal_commissionsection_break1sales_team+ + + erpnext.stock.doctype.serial_no.serial_no.has_duplicate_serial_no + (sn, sle) +
+No docs
+diff --git a/foundation/www/docs/current/models/stock/stock_entry.html b/foundation/www/docs/current/models/stock/stock_entry.html index 1dd2eab1..cc969312 100644 --- a/foundation/www/docs/current/models/stock/stock_entry.html +++ b/foundation/www/docs/current/models/stock/stock_entry.html @@ -9,7 +9,7 @@
+
+If needed, you can also create a new receivable account and update in the Customer master.
+
+**Question:** Should I create separate Receivable Account Account for each Customer?
+
+**Answer:** You can, but it's not a recommend approach. If you want to create separate Receivable Account for each Customer for tracking receivable, then it not needed. You still view Account Receivable & General Ledger report for each Customer.
+
+Just like Debtors, for tracking payables, default account called Creditors is created under Account Payables.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md b/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md
new file mode 100644
index 00000000..9d41e676
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md
@@ -0,0 +1,14 @@
+
+# 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.
+
+
+
+If User has Role define in the Account Setting assigned, then he/she will be able to set an Account as Frozen.
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/index.txt b/foundation/www/docs/user/manual/en/accounts/articles/index.txt
index 77474bd1..af8572c2 100644
--- a/foundation/www/docs/user/manual/en/accounts/articles/index.txt
+++ b/foundation/www/docs/user/manual/en/accounts/articles/index.txt
@@ -6,10 +6,12 @@ freeze-accounting-entries
how-to-freeze-accouting-ledger
manage-foreign-exchange-difference
managing-transactions-in-multiple-currency
-fiscal-year-creation
+fiscal-year-creation
post-dated-cheque-entry
update-stock-option-in-sales-invoice
what-is-the-differences-of-total-and-valuation-in-tax-and-charges
withdrawing-salary-from-owners-equity-account
adjust-withhold-amount-payment-entry
-c-form
\ No newline at end of file
+common-receivable-account.md
+types-in-tax-template
+freeze-account
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md b/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
new file mode 100644
index 00000000..1a64643b
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
@@ -0,0 +1,10 @@
+
+# Purchase Invoice - Account Type Error
+
+**Question:** On saving the Purchase Invoice, I am getting a validation message that Credit To Account must be a Balance Sheet account.
+
+
+
+**Answer: **On submission of a Purchase Invoice, payable is updated towards the Supplier. As per the accounting standards, Payable Account is aligned under Current Liability (credit side of Balance Sheet).
+
+The error message indicates that Account selected in the Credit To field doesn't belong to the Liability Group. Please ensure that Payable Account selected in the Purchase Invoice is located under Liability group.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md b/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md
new file mode 100644
index 00000000..3be3b1ca
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md
@@ -0,0 +1,18 @@
+
+# Types in Sales and Purchase Tax Template
+
+In the Sales Taxes and Purchase Taxes master, you will find a column called Type. Following a brief on a meaning of each Type and how you can use it.
+
+
+
+**Actual:** This allows you to enter expense amount directly. For example, Rs. 500 incurred for Shipping.
+
+**On Net Total:** If you want to apply any tax or charges on Net Total, select this option. For example, 18% GST applied to all the item in the Sales Order.
+
+**On Previous Row Amount:** This option helps you want to calculate tax amount calculated based on another tax amount.
+
+Example: Education Cess is calculated based on the amount of GST tax.
+
+**On Previous Row Total:** For each Tax row, a cumulative tax is calculated in the Total column. For the first row, total tax is calculated as Net Total + Tax amount at first row. If you want to apply a tax on the Total Amount of another tax row, then use this option.
+
+If you select Type as Previous Row Amount or Previous Row Total, then you must also specify a Row No. whose Amount or Total should be considered for the calculation.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md b/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md
index 38f960d2..d630da20 100644
--- a/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md
+++ b/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -24,6 +24,15 @@ You can change accounting currency in Party / Account record, until making any t
In case of multi-company setup, accounting currency of Party must be same for all the companies.
+### Exchange Rates
+When dealing with multiple currencies, ERPNext has the Currency Exchange module for managing exchange rates. It allows you to save the exchange rate quotes you require.
+
+For foreign currency transactions, ERPNext checks Currency Exchange for any matching record. If this fails, ERPNext will attempt to get the exchange rate quote from [fixer.io](http://fixer.io). If this still fails, then the exchange rate will have to be entered manually.
+
+#### Exchange Rate Selection
+ERPNext automatically fetches the latest exchange rate available.
+
+
## Transactions
### Sales Invoice
@@ -51,61 +60,6 @@ In Accounts table, on selection of foreign currency account, system will show Cu
-#### Example 1: Payment Entry Against Customer With Alternate Currency
-
-Suppose, default currency of the company is INR and customer's accounting currency is USD. Customer made full payment against an outstanding invoice of USD 100. Exchange Rate (USD -> INR) in Sales Invoice was 60.
-
-Exchange Rate in the payment entry should always be same as invoice (60), even if exchange rate on the payment date is 62. The bank account will be credited by the amount considering exchange rate as 62. Hence, Exchnage Gain / Loss will be booked based on exchange rate difference.
-
-
-
-#### Example 2: Inter-bank Transfer (USD -> INR)
-
-Suppose the default currency of the company is INR. You have a Paypal account for which Currency is USD. You receive payments in the paypal account and lets say, paypal transfers amount once in a week to your other bank account which is managed in INR.
-
-Paypal account gets debited on different date with different exchange rate, but on transfer date the exchange rate can be different. Hence, there is generally Exchange Loss / Gain on the transfer entry.
-In the bank transfer entry, system sets exchange rate of the credit account (Paypal) based on the average incoming exchange rate. This is to maintain Paypal balance properly in company currency. In case you modify the average exchange rate, you need to adjust the exchange rate manually in the future entries, so that balance in account currency and company currency are in sync.
-Then you should calculate and enter Exchange Loss / Gain based on the Paypal exchange rate and the exchange rate on the transfer date.
-
-Lets say, Paypal account debited by following amounts over the week, which has not been transferred to your other bank account.
-
-| Date | -Account | -Debit (USD) | -Exchange Rate | -
| 2015-09-02 | -Paypal | -100 | -60 | -
| 2015-09-02 | -Paypal | -100 | -61 | -
| 2015-09-02 | -Paypal | -100 | -64 | -
-
-
## Reports
### General Ledger
diff --git a/foundation/www/docs/user/manual/en/buying/request-for-quotation.md b/foundation/www/docs/user/manual/en/buying/request-for-quotation.md
index 05245df1..0c4bd087 100644
--- a/foundation/www/docs/user/manual/en/buying/request-for-quotation.md
+++ b/foundation/www/docs/user/manual/en/buying/request-for-quotation.md
@@ -3,43 +3,40 @@
A Request for Quotation is a document that an organization submits to one or more suppliers eliciting quotation for items.
-In ERPNext, You can create request for quotation directly by going to:
+In ERPNext, You can create Request for Quotation directly by going to:
> Buying > Documents > Request for Quotation > New Request for Quotation
-
+After creation of Request for Quotation, there are two ways to generate Supplier Quotation from Request for Quotation.
-After creation of request for quotation, there are two ways to generate supplier quotation from request for quotation.
#### For User
-__Step 1:__ Open request for quotation and click on make supplier quotation.
+__Step 1:__ Open Request for Quotation and click on make Supplier Quotation.

-__Step 2:__ Select supplier and click on make supplier quotation.
+__Step 2:__ Select supplier and click on make Supplier Quotation.

-__Step 3:__ System will open the supplier quotation, user has to enter the rate and submit it.
+__Step 3:__ System will open the Supplier Quotation, user has to enter the rate and submit it.

#### For Supplier
-__Step 1:__ User has to create contact or enter Email Address against the supplier on request for quotation.
+__Step 1:__ User has to create contact or enter Email Address against the supplier on Request for Quotation.

__Step 2:__ User has to click on send supplier emails button.
-
-
-* If supplier's user not available: system will create supplier's user and send details to the supplier, supplier will need to click on the link(Password Update) present in the email. After password update supplier can access his portal with the request for quotation form.
+* If supplier's user not available: system will create supplier's user and send details to the supplier, supplier will need to click on the link(Password Update) present in the email. After password update supplier can access his portal with the Request for Quotation form.

-* If supplier's user available: system will send request for quotation link to supplier, supplier has to login using his credentials to view request for quotation form on portal.
+* If supplier's user available: system will send Request for Quotation link to supplier, supplier has to login using his credentials to view Request for Quotation form on portal.

@@ -47,9 +44,12 @@ __Step 3:__ Supplier has to enter amount and notes(payment terms) on the form an

-__Step 4:__ On submission, system will create supplier quotation(draft mode) against the supplier. User has to review the supplier quotation
- and submit it.
-
-More details:-
+__Step 4:__ On submission, system will create Supplier Quotation (draft mode) against the supplier. The user has to review the Supplier Quotation
+ and submit it. When all items from the Request for Quotation have been quoted by a supplier, the status is updated in the Supplier
+ table of the Request for Quotation.
-
\ No newline at end of file
+#### More details
+
+If a supplier indicates that they will not provide a quotation for the item, this can be indicated in the RFQ document by checking the 'No Quote' box after the Request for Quotation has been submitted.
+
+
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md
new file mode 100644
index 00000000..ee28f288
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md
@@ -0,0 +1,34 @@
+
+# Customizing visibility of data in the child table
+
+**Question:** Currently, in the child table (like Item table in Quotation), we can view value in the four columns only. How can we have more values previewed in the child table?
+
+**Answer:** In the version 7, we introduced a feature, editable grid. This allowed the user to add values in the child table without opening dialog box/form for each row.
+
+This is how Quotation Item table renders value when Editable Grid is enabled. It will maximum list four columns in the table.
+
+
+
+As per the default setting, only four columns are listed in the child table. Following is how you can add more columns in the editable itself.
+
+For the field to be added as a column in the table, enter a value in the Column field. Also, ensure that "Is List View" property is checked for that field.
+
+
+
+Based on the value in the Column field, columns will be added in the child table. Ensure that sum total of value added in the Column field doesn't exceed 10. Based on the Column value, width for that column will be set.
+
+
+
+**Switch to Un-editable Grid**
+
+To have more values shown in the preview of Quotation Item table, you can disable Editable Grid for the Quotation Item Doctype. Steps below.
+
+
+
+Once Editable Grid is disabled for the Quotation Item, the following is how values will be rendered in a preview of the Quotation Item table.
+
+
+
+To have specific field's value shown in the preview, ensure that for that field, in the Customize Form tool, "In List View" property is checked.
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
new file mode 100644
index 00000000..85409f44
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md
@@ -0,0 +1,20 @@
+
+# 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)
+
+
+
+Sales Invoice (custom fields)
+
+
+
+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.
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/index.txt b/foundation/www/docs/user/manual/en/customize-erpnext/articles/index.txt
index f8a81a4e..56e7040b 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/index.txt
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/index.txt
@@ -14,4 +14,6 @@ search-record-by-specific-field
set-language
set-precision
user-restriction
-maximum-numbers-of-fields-in-a-form
\ No newline at end of file
+maximum-numbers-of-fields-in-a-form
+child-table
+fetching-data-from-a-document
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/human-resources/articles/index.txt b/foundation/www/docs/user/manual/en/human-resources/articles/index.txt
index 3fbdc5bb..3019af5d 100644
--- a/foundation/www/docs/user/manual/en/human-resources/articles/index.txt
+++ b/foundation/www/docs/user/manual/en/human-resources/articles/index.txt
@@ -1,2 +1,3 @@
employees-loan-management
-leave-calculation-in-salary-slip
\ No newline at end of file
+leave-calculation-in-salary-slip
+working-days-in-salary-slip
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md b/foundation/www/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md
new file mode 100644
index 00000000..debbe1c1
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md
@@ -0,0 +1,12 @@
+
+# Working Days Calculation in the Salary Slip
+
+Working Days are shown in the In the Salary Slip. Based on your preference, it may include holidays of the month or it may not. You can define your preference for the Working Days calculation in HR Settings.
+
+`HR > Setup > HR Settings`
+
+If you want to include holidays in the count of Total Working days, then ensure that in the HR Settings, field **Include holidays in Total no. of Working Days** is checked and vice versa.
+
+
+
+To learn how to define holidays for your company, check [Holiday List](/user/manual/en/human-resources/holiday-list) feature in the HR module.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/human-resources/training.md b/foundation/www/docs/user/manual/en/human-resources/training.md
index b9016966..e2255d7d 100644
--- a/foundation/www/docs/user/manual/en/human-resources/training.md
+++ b/foundation/www/docs/user/manual/en/human-resources/training.md
@@ -10,22 +10,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'.
+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.
+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.
diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md b/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md
new file mode 100644
index 00000000..876c96f0
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md
@@ -0,0 +1,52 @@
+
+# Capacity Planning based on Production Order
+
+Capacity Planning functionality helps you in tracking production jobs allocated on each Workstation.
+
+
+
+Follow are the steps to use Capacity Planning Feature in your ERPNext account.
+
+1. Operations
+
+ To add operations, go to:
+
+ `Manufacturing > Bill of Materials > Operations`
+
+2. Workstation
+
+ Add each Workstation in your ERPNext account from:
+
+ `Manufacturing > Bill of Materials > Workstation`
+
+ In the Workstation master, you can define which operations will be performed on it, what are the cost associated with it, and what are the working hours of that Workstation.
+
+3. Bill of Materials (BOM):
+
+ In a BOM, with the list of raw material needed, for manufacturing, you can also list operation and workstations through which those raw materials will be processed.
+
+4. Production Order:
+
+ On submission of Production Order, Timesheet for Operations. This helps you allocate production jobs on each Workstation, as well as you can update actual time taken for each Operation.
+
+### Error due to Capacity Planning
+
+**Question:** On Submission of Production Order, we are getting following error message.
+
+
+
+**Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Production Order.
+
+On submission of Production Order, Operations (as added in the BOM) are allocated on the workstation. Each operation should start and end on the same day. If a system is not able to schedule that operation in a day, then system request you to divide that Project, so that system can allocate smaller operations in a day.
+
+If you have update working hours in the Workstation, but still getting this issue, that because one of your operation is taking too long, and cannot be completed in a day. Please divide that operation into smaller operations, so that it can be allocated on Workstation and completed on the same day.
+
+### Avoid Working Hours of Workstation
+
+If you want to ignore above validation and allow scheduling of production job beyond the working hours of the Workstation, enable
+Overtime in the Manufacturing Settings.
+
+
+
+If you want to complete disable Capacity Planning feature, in the Manufacturing Settings, check field "Disable Capacity Planning and Time Tracking".
+
diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/index.txt b/foundation/www/docs/user/manual/en/manufacturing/articles/index.txt
index bb78d397..d0e429e9 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/articles/index.txt
+++ b/foundation/www/docs/user/manual/en/manufacturing/articles/index.txt
@@ -1,3 +1,4 @@
nested-bom-structure
production-planning-subassembly
-valuation-based-on-field-in-bom
\ No newline at end of file
+valuation-based-on-field-in-bom
+capacity-planning
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md b/foundation/www/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
deleted file mode 100644
index 19010634..00000000
--- a/foundation/www/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# BOM Replace Tool
-
-Replace BOM is the utility to replace BOM of sub-assembly item, which is already updated in the BOM of Finished Good item.
-
-To use the Production Planning Tool, go to:
-
-> Manufacturing > Tools > BOM Replace Tool
-
-Let's consider a scenario to understand this better.
-
-If company manufactures computers, Bill of Material of its finished item will constitute of:
-
-1. Monitor
-1. Key Board
-1. Mouse
-1. CPU
-
-Out of all the items above, CPU is asembled separately. Hence separate BOM will be created for the CPU. Following are the items from the BOM of CPU.
-
-1. 250 GB Hard Disk
-1. Mother Board
-1. Processor
-1. SMTP
-1. DVD player
-
-If we have more items to be added , or existing items to be edited in the BOM of CPU, then we should create new BOM for it.
-
-1. _350 GB Hard Disk_
-1. Mother Board
-1. Processor
-1. SMTP
-1. DVD player
-
-To update new BOM updated in the BOM of finished item, where CPU is selected as raw-material, you can use BOM Replace tool.
-
-
-
-In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer).
-
-**Will BOM Replace Tool work for replacing finsihed item in BOM?**
-
-No. You should Cancel and Amend current BOM, or create a new BOM for finished item.
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/bom-update-tool.md b/foundation/www/docs/user/manual/en/manufacturing/tools/bom-update-tool.md
new file mode 100644
index 00000000..dd8b9fe1
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/manufacturing/tools/bom-update-tool.md
@@ -0,0 +1,55 @@
+
+# BOM Update Tool
+
+From BOM Update Tool, you can replace a sub-assembly BOM and update costs of all BOMs.
+
+### Replace BOM
+Using this utility, you can replace an existing BOM of sub-assembly item, with a new one. The system will update the new BOM in all the parent BOMs where it was used.
+
+To use the BOM Update Tool, go to:
+
+> Manufacturing > Tools > BOM Update Tool
+
+Let's consider a scenario to understand this better.
+
+Suppose a company manufactures computers, Bill of Material of of the computer will look like this:
+
+1. Monitor
+1. Key Board
+1. Mouse
+1. CPU
+
+Out of all the items above, CPU is asembled separately. Hence separate BOM will be created for the CPU. Following are the items from the BOM of CPU.
+
+1. 250 GB Hard Disk
+1. Mother Board
+1. Processor
+1. SMTP
+1. DVD player
+
+If we have more items to be added , or existing items to be edited in the BOM of CPU, then we should create new BOM for it.
+
+1. _350 GB Hard Disk_
+1. Mother Board
+1. Processor
+1. SMTP
+1. DVD player
+
+To update new BOM in all the parent BOMs, where CPU is selected as raw-material, you can use Replace utility.
+
+
+
+In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer).
+
+**Will BOM Replace Tool work for replacing finsihed item in BOM?**
+
+No. You should Cancel and Amend current BOM, or create a new BOM for finished item.
+
+### Update BOM Cost
+Using the button **Update latest price in all BOMs**, you can update cost of all Bill of Materials, based on latest purchase price / price list rate / valuation rate of raw materials.
+
+On clicking of this buttom, system will create a background process to update all the BOM's cost. It is processed via background jobs because this process can take a few minutes (depending on the number of BOMs) to update all the BOMs.
+
+This functionality can also be executed automatically on daily basis. For that, you need to enable "Update BOM Cost Automatically" from Manufacturing Settings.
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/index.txt b/foundation/www/docs/user/manual/en/manufacturing/tools/index.txt
index aaf7cecc..a3851545 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/tools/index.txt
+++ b/foundation/www/docs/user/manual/en/manufacturing/tools/index.txt
@@ -1,2 +1,2 @@
production-planning-tool
-bom-replace-tool
\ No newline at end of file
+bom-update-tool
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/projects/articles/project-costing.md b/foundation/www/docs/user/manual/en/projects/articles/project-costing.md
index 454fc714..55784ca2 100644
--- a/foundation/www/docs/user/manual/en/projects/articles/project-costing.md
+++ b/foundation/www/docs/user/manual/en/projects/articles/project-costing.md
@@ -1,5 +1,5 @@
-
#### Time Log
Based on Actual Time spent on the Project-Task, Employee will create a time log.
-
+
On selection of Activity Type in the Time Log, Billing and Costing Rate will fetched for that Employee from respective Activity Cost master.
-
+
Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log.
@@ -31,10 +31,10 @@ Multiplying these rates with total no. of Hours in the Time Log gives Costing Am
Based on total Time Logs created for a specific Task, its costing will be updated in the respective Task master.
-
+
Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project.
-
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md b/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
index 2a54d20f..af4e6088 100644
--- a/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
+++ b/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md
@@ -49,6 +49,8 @@ In the Timesheet, if "Is Billable" is checked, you will find option to create Sa
+
+
####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.
diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md
new file mode 100644
index 00000000..d5d6b2cb
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria_group.md
@@ -0,0 +1,2 @@
+
+#
\ No newline at end of file
diff --git a/foundation/www/docs/assets/old_images/__init__.py b/foundation/www/docs/user/manual/en/schools/Attendance/__init__.py
similarity index 100%
rename from foundation/www/docs/assets/old_images/__init__.py
rename to foundation/www/docs/user/manual/en/schools/Attendance/__init__.py
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/_sidebar.json b/foundation/www/docs/user/manual/en/schools/Attendance/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/Attendance/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/index.md b/foundation/www/docs/user/manual/en/schools/Attendance/index.md
new file mode 100644
index 00000000..cc661226
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/Attendance/index.md
@@ -0,0 +1,7 @@
+
+#Attendance
+
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/index.txt b/foundation/www/docs/user/manual/en/schools/Attendance/index.txt
new file mode 100644
index 00000000..8cd02627
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/Attendance/index.txt
@@ -0,0 +1,3 @@
+student-attendance
+student-leave-application
+student-attendance-tool
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md b/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
new file mode 100644
index 00000000..987b407e
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance-tool.md
@@ -0,0 +1,16 @@
+
+# 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.
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance.md b/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance.md
new file mode 100644
index 00000000..d2f25f8c
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/Attendance/student-attendance.md
@@ -0,0 +1,16 @@
+
+# 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.
+
+
+
+**Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md b/foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md
new file mode 100644
index 00000000..a32f75fb
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/Attendance/student-leave-application.md
@@ -0,0 +1,14 @@
+
+#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.
+
+
+
+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}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/admission/index.md b/foundation/www/docs/user/manual/en/schools/admission/index.md
index 3f01a6b2..f9d0f14c 100644
--- a/foundation/www/docs/user/manual/en/schools/admission/index.md
+++ b/foundation/www/docs/user/manual/en/schools/admission/index.md
@@ -1,7 +1,7 @@
# 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
diff --git a/foundation/www/docs/user/manual/en/schools/admission/index.txt b/foundation/www/docs/user/manual/en/schools/admission/index.txt
index ec9e7681..680d7790 100644
--- a/foundation/www/docs/user/manual/en/schools/admission/index.txt
+++ b/foundation/www/docs/user/manual/en/schools/admission/index.txt
@@ -1,2 +1,4 @@
+student-admission
student-applicant
-program-enrollment
\ No newline at end of file
+program-enrollment
+program-enrollment-Tool
diff --git a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md b/foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md
new file mode 100644
index 00000000..bf729b5a
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/admission/program-enrollment-tool.md
@@ -0,0 +1,17 @@
+
+# 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**.
+
+
+
+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**.
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md b/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md
index 78ea65cf..e003ab9c 100644
--- a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md
+++ b/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md
@@ -1,8 +1,13 @@
# 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.
-
+Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student.
+
+
+
+- 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}
diff --git a/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md b/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md
index 8b941f88..46f6a294 100644
--- a/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md
+++ b/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md
@@ -19,7 +19,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.
+
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).
diff --git a/foundation/www/docs/user/manual/en/schools/admission/student_admission.md b/foundation/www/docs/user/manual/en/schools/admission/student_admission.md
new file mode 100644
index 00000000..da5e4603
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/admission/student_admission.md
@@ -0,0 +1,14 @@
+
+# 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** >>
+
+
+
+
+
+Once a admission record is created it can be published on the website and the student can apply from the web portal itself.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/index.md b/foundation/www/docs/user/manual/en/schools/index.md
index 43672a26..4e17d224 100644
--- a/foundation/www/docs/user/manual/en/schools/index.md
+++ b/foundation/www/docs/user/manual/en/schools/index.md
@@ -2,7 +2,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.
diff --git a/foundation/www/docs/user/manual/en/schools/index.txt b/foundation/www/docs/user/manual/en/schools/index.txt
index b485fdcf..159089c6 100644
--- a/foundation/www/docs/user/manual/en/schools/index.txt
+++ b/foundation/www/docs/user/manual/en/schools/index.txt
@@ -1,6 +1,7 @@
student
admission
+Attendance
schedule
fees
setup
-assessment
\ No newline at end of file
+Assessment
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/schedule/student-attendance.md b/foundation/www/docs/user/manual/en/schools/schedule/student-attendance.md
deleted file mode 100644
index 57aeb6e2..00000000
--- a/foundation/www/docs/user/manual/en/schools/schedule/student-attendance.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Student Attendance
-
-Maintains attendance record of the student. Attendance Records can be created against Course Schedules.
-
-
-
-{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/academic-term.md b/foundation/www/docs/user/manual/en/schools/setup/academic-term.md
index 12d4a860..d1c25775 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/academic-term.md
+++ b/foundation/www/docs/user/manual/en/schools/setup/academic-term.md
@@ -1,6 +1,10 @@
# 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.
+
diff --git a/foundation/www/docs/user/manual/en/schools/setup/academic-year.md b/foundation/www/docs/user/manual/en/schools/setup/academic-year.md
index 217afe96..5025dd46 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/academic-year.md
+++ b/foundation/www/docs/user/manual/en/schools/setup/academic-year.md
@@ -1,6 +1,12 @@
# 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.
+
-{next}
\ No newline at end of file
+**Student group** link is given to view or add the respective groups to the Academic year.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/course.md b/foundation/www/docs/user/manual/en/schools/setup/course.md
index c2ed9799..596051e0 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/course.md
+++ b/foundation/www/docs/user/manual/en/schools/setup/course.md
@@ -1,6 +1,16 @@
# 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.
+
+Once a **Course** is created, a course schedule can defined for the same.
+
+
+
+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}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/index.md b/foundation/www/docs/user/manual/en/schools/setup/index.md
index 7eba1e0f..bc6a4cf2 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/index.md
+++ b/foundation/www/docs/user/manual/en/schools/setup/index.md
@@ -1,6 +1,8 @@
# Setup
+The Setup section of Schools module provides facility to make some basic configuration. Below are doctypes for basic configuration.
+
### Topics
diff --git a/foundation/www/docs/user/manual/en/schools/setup/index.txt b/foundation/www/docs/user/manual/en/schools/setup/index.txt
index fb9ba05d..8fb9bb2d 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/index.txt
+++ b/foundation/www/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
\ No newline at end of file
+academic-year
+school-settings
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/instructor.md b/foundation/www/docs/user/manual/en/schools/setup/instructor.md
index b05be687..969c5c8f 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/instructor.md
+++ b/foundation/www/docs/user/manual/en/schools/setup/instructor.md
@@ -1,6 +1,19 @@
# 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.
+
+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**.
+
+
+It is also linked to **Student group** where an **Instructor** is assigned to the Student group.
+
+
+
+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}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/program.md b/foundation/www/docs/user/manual/en/schools/setup/program.md
index 40d99b4e..b319d431 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/program.md
+++ b/foundation/www/docs/user/manual/en/schools/setup/program.md
@@ -1,6 +1,20 @@
# 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.
+
+Add the relevant Course and the Fee details for a program.
+
+
+
+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}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/room.md b/foundation/www/docs/user/manual/en/schools/setup/room.md
index 44df465c..bfdb3edd 100644
--- a/foundation/www/docs/user/manual/en/schools/setup/room.md
+++ b/foundation/www/docs/user/manual/en/schools/setup/room.md
@@ -1,7 +1,18 @@
# 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.
+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.
+
+
+
+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.
+
+
+
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/school-settings.md b/foundation/www/docs/user/manual/en/schools/setup/school-settings.md
new file mode 100644
index 00000000..08b5b60b
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/setup/school-settings.md
@@ -0,0 +1,16 @@
+
+#School Settings
+
+The Schools settings page allow you to setup basic settings like **Academic Year and Term** for the Schools setup.
+
+
+
+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**
+
+
+
+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**
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md b/foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md
new file mode 100644
index 00000000..33768684
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/setup/student-batch-name.md
@@ -0,0 +1,11 @@
+
+# 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
+
+
+
+You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/schools/setup/student-category.md b/foundation/www/docs/user/manual/en/schools/setup/student-category.md
new file mode 100644
index 00000000..53423fae
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/setup/student-category.md
@@ -0,0 +1,13 @@
+
+# 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
+
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/student/guardian.md b/foundation/www/docs/user/manual/en/schools/student/guardian.md
new file mode 100644
index 00000000..be92e1cd
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/schools/student/guardian.md
@@ -0,0 +1,10 @@
+
+#Guardian
+
+The Guardian doctype allows you to record the guardian details for a **Student**.
+
+
+
+The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/student/index.txt b/foundation/www/docs/user/manual/en/schools/student/index.txt
index 9b31be4d..89704b1f 100644
--- a/foundation/www/docs/user/manual/en/schools/student/index.txt
+++ b/foundation/www/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
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/student/student-batch.md b/foundation/www/docs/user/manual/en/schools/student/student-batch.md
index 2c0e20b8..33768684 100644
--- a/foundation/www/docs/user/manual/en/schools/student/student-batch.md
+++ b/foundation/www/docs/user/manual/en/schools/student/student-batch.md
@@ -1,8 +1,11 @@
# 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
+
+
+
+You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch.
-
{next}
diff --git a/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md
index ef23ce58..7bb259b6 100644
--- a/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md
+++ b/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md
@@ -1,9 +1,18 @@
# 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
-
+##Schools >>Student >> Student Group creation tool
+
+Select the **Academic Term** and the **Program** for which a student group is to be created.
+
+
+
+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}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/student/student-group.md b/foundation/www/docs/user/manual/en/schools/student/student-group.md
index f32ee105..bc305bc6 100644
--- a/foundation/www/docs/user/manual/en/schools/student/student-group.md
+++ b/foundation/www/docs/user/manual/en/schools/student/student-group.md
@@ -1,9 +1,23 @@
# 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
+
+
+
+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.
+
+
+
+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.
-
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/schools/student/student-log.md b/foundation/www/docs/user/manual/en/schools/student/student-log.md
index a8f4668b..f2b0e89a 100644
--- a/foundation/www/docs/user/manual/en/schools/student/student-log.md
+++ b/foundation/www/docs/user/manual/en/schools/student/student-log.md
@@ -1,7 +1,8 @@
# 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'
diff --git a/foundation/www/docs/user/manual/en/schools/student/student.md b/foundation/www/docs/user/manual/en/schools/student/student.md
index 86aa055c..3f49bc43 100644
--- a/foundation/www/docs/user/manual/en/schools/student/student.md
+++ b/foundation/www/docs/user/manual/en/schools/student/student.md
@@ -2,10 +2,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.
+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}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md b/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md
new file mode 100644
index 00000000..d42a8de4
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md
@@ -0,0 +1,20 @@
+
+# Difference Between System User and Website User
+
+**Question:** I have added my Employee as a User and have assigned them Roles as well. Still, they are not able to view Dashboard on the login.
+
+**Answer:**
+
+There are two type of Users in ERPNext.
+
+* **System User**: They are Employees of your company. Example of Roles assigned to System Users are Account User, Sales Manager, Purchase User, Support Team etc.
+
+* **Website User**: They are to parties (like Customer and Suppliers) of your Company.
+
+Example Website User Roles are Customer and Suppliers.
+
+How to check if Role is for System User or Website User?
+
+In the Role master, if field "Desk Access" is checked, that Role is for System User. If Desk Access field is unchecked, then that Role is for Website User.
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/email-error.md b/foundation/www/docs/user/manual/en/setting-up/articles/email-error.md
new file mode 100644
index 00000000..965a90af
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/email-error.md
@@ -0,0 +1,10 @@
+
+# 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.
+
+
+
+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.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/index.txt b/foundation/www/docs/user/manual/en/setting-up/articles/index.txt
index acf15318..259229ec 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/index.txt
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/index.txt
@@ -11,4 +11,8 @@ naming-series-current-value
overwriting-data-from-data-import-tool
rename-user
using-custom-domain-on-erpnext
-setup-two-factor-authentication
\ No newline at end of file
+setup-two-factor-authentication
+difference-between-system-user-and-website-user
+outgoing-email-gateway
+print-format-sections
+email-error
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
index 7e8b05db..b84e449d 100644
--- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
@@ -37,5 +37,4 @@ A separate Chart of Account master will be set for each company in the ERPNext.
-
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md b/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md
new file mode 100644
index 00000000..56b3e4b4
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md
@@ -0,0 +1,10 @@
+
+#Outgoing Email Gateway
+
+In the ERPNext, you can customize 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 master is saved. If not, then you might receive an error as indicated below.
+
+
+
+This indicates that using login credentials and other email gateway details provided, 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 ERPNext email server by default. If you don't want to use your own email server, you can continue sending emails using an ERPNext email server.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md b/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md
new file mode 100644
index 00000000..e9a78833
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md
@@ -0,0 +1,12 @@
+
+#Print Format Sections
+
+**Question:** In the Print Format, I am getting link breaks for each section. How can I disable it?
+
+
+
+**Answer:** To disable line breaks for the section breaks, you should uncheck field "Show Line Breaks after Sections" in its Print Format.
+
+Print Format Builder > Select Print Format > Edit Settings > Uncheck field "Show Line Breaks after Sections"
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md b/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md
new file mode 100644
index 00000000..7a9dbe00
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md
@@ -0,0 +1,18 @@
+
+**Question:** User has roles like Account User and Account Manager assigned. Still, when accessing Account Receivable report, User is getting an error message of no permission the territory master.
+
+
+
+**Answer:**
+
+As per the permission system in ERPNext, for the User to be able to access a form or a report, s(he) should have at-least read permission on all the link field in that form/report. Since Territory is a link field in Account Receivable report, please add a permission rule to let Account User/Manager have at-least Read permission on the Territory master. Please follow below-given steps to resolve this issue.
+
+1. Roles assigned to User are Account User and Account Manager.
+
+2. As indicates in the Error message, the user didn't have permission on the territory master. As per the default permission, none of the above role assigned to that User has any permission on the Territory master.
+
+3. To resolve this issue, I have assigned Account User permission to Read Territory master.
+
+
+
+As per this permission update, User should be able to access Account Receivable report fine.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md b/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md
new file mode 100644
index 00000000..b87cf274
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md
@@ -0,0 +1,14 @@
+
+# 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.
+
+
+
+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.
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/data/index.txt b/foundation/www/docs/user/manual/en/setting-up/data/index.txt
index 998b5a21..d15f9175 100644
--- a/foundation/www/docs/user/manual/en/setting-up/data/index.txt
+++ b/foundation/www/docs/user/manual/en/setting-up/data/index.txt
@@ -1,2 +1,3 @@
data-import-tool
bulk-rename
+download-backup
diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
index 07838c5c..564410ae 100644
--- a/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
+++ b/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
@@ -1,27 +1,32 @@
-#Setting up Razorpay
+#RazorPay Integration
-A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+A payment gateway is an e-commerce application service provider service that authorises credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank.
-To setup Razorpay,
-`Explore > Integrations > Razorpay Settings`
+To setup RazorPay,
-#### Setup Razorpay
+`Explore > Integrations > RazorPay Settings`
+
+
+
+#### Setup RazorPay
+
+To enable RazorPay payment service, you need to configure parameters like API Key, API Secret
-To enable Razorpay payment service, you need to configure parameters like API Key, API Secret
-On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
+On enabling service, the system will create Payment Gateway record and Account head in the Chart of Account with account type as Bank.
-Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
+Also, it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
####Supporting transaction currencies
-INR
+
+RazorPay will only work for the company having `INR (Indian Rupee)` as a Currency.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/print/index.txt b/foundation/www/docs/user/manual/en/setting-up/print/index.txt
index fa236525..9597cc06 100644
--- a/foundation/www/docs/user/manual/en/setting-up/print/index.txt
+++ b/foundation/www/docs/user/manual/en/setting-up/print/index.txt
@@ -1,5 +1,6 @@
print-settings
print-format-builder
+print-style
print-headings
letter-head
address-template
diff --git a/foundation/www/docs/user/manual/en/setting-up/print/print-style.md b/foundation/www/docs/user/manual/en/setting-up/print/print-style.md
new file mode 100644
index 00000000..6798cb30
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/print/print-style.md
@@ -0,0 +1,16 @@
+
+# Print Style
+
+Frappe/ERPNext comes with pre-set styles for your printed documents. You can also create new styles using CSS that can be applied to all your print formats.
+
+To create a new **Print Style** go to **Setup > Printing and Branding > Print Style**, or just type "print style" in the search bar.
+
+Here you can define the CSS rules for your print formats. These apply to both standard and custom print formats. To find out the various classes available, you can make a standard print format, open in a new page and see the source.
+
+To set a default style, you can go to [Print Settings](/docs/setup/print/print-settings)
+
+All Print Format styles are based on Bootstrap (Version 3) CSS Framework.
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.md
index 3827b312..7e08678a 100644
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.md
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.md
@@ -1,7 +1,7 @@
# 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:
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt
index eb765582..b2f680a3 100644
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt
+++ b/foundation/www/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
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md
deleted file mode 100644
index ad1bbf11..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Step 10: Suppliers
-
-Enter a few of your Suppliers' names.
-
-
-
----
-
-### 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}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md
deleted file mode 100644
index 74bb492f..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Step 7: Add Users
-
-Add other users and assign them roles based on their job responsibilities.
-
-
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md
deleted file mode 100644
index b6dbe0df..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md
+++ /dev/null
@@ -1,22 +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.
-
-
-
-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}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md
deleted file mode 100644
index 08eb4c29..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Step 9: Customers
-
-Enter your Customer names and the contact person from that organisation.
-
-
-
-
----
-
-#### 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}
diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/admin-user.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/admin-user.md
new file mode 100644
index 00000000..425714fd
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/admin-user.md
@@ -0,0 +1,8 @@
+
+# Administrator User
+
+If your ERPNext account is hosted with us (Frappe Technologies Pvt. Ltd.), then you won't be able to access your ERPNext account as an Administrator. For the hosted account, access via Administrator User us reserved with us.
+
+1. For the hosted account, upgrades are managed from the backend. We reserve admin login credential with us so that we can upgrade all the hosted customer's ERPNext accounts from the backend.
+
+2. Since on a single server, we host have many customer's ERPNext accounts, as a security measure, we cannot share the credentials for administrator account with any hosted user.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/index.txt b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/index.txt
index 74243df5..2477fca4 100644
--- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/index.txt
+++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/index.txt
@@ -3,3 +3,4 @@ role-based-permissions
user-permissions
role-permisison-for-page-and-report
sharing
+admin-user
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/delivery-note-stock-error.md b/foundation/www/docs/user/manual/en/stock/articles/delivery-note-stock-error.md
new file mode 100644
index 00000000..7db41e9c
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/stock/articles/delivery-note-stock-error.md
@@ -0,0 +1,8 @@
+
+# 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.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/index.txt b/foundation/www/docs/user/manual/en/stock/articles/index.txt
index df779de6..acf13752 100644
--- a/foundation/www/docs/user/manual/en/stock/articles/index.txt
+++ b/foundation/www/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
\ No newline at end of file
+track-items-using-barcode
+stock-received-but-not-billed
+return-rejected-item
+item-valuation-transactions
+delivery-note-stock-error
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md b/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md
new file mode 100644
index 00000000..7c1703e7
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md
@@ -0,0 +1,18 @@
+
+# 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.
+
+
+
+You can also set Valuation Method in the item master, especially when a valuation method for an item is different from the default Method.
+
+
+
+[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)
diff --git a/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md b/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md
new file mode 100644
index 00000000..54bbedf7
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md
@@ -0,0 +1,14 @@
+
+# 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.
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md b/foundation/www/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md
new file mode 100644
index 00000000..c9f2634f
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/stock/articles/stock-received-but-not-billed.md
@@ -0,0 +1,10 @@
+
+# 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.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/index.txt b/foundation/www/docs/user/manual/en/using-erpnext/articles/index.txt
index 4ca21aa9..9dc7df3f 100644
--- a/foundation/www/docs/user/manual/en/using-erpnext/articles/index.txt
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/index.txt
@@ -8,4 +8,5 @@ bulk-rename
renaming-documents
search-filter
tree-master-renaming
-pos-view
\ No newline at end of file
+pos-view
+letter-head-in-the-report
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
new file mode 100644
index 00000000..be9197e3
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md
@@ -0,0 +1,16 @@
+
+# Letter Head in the Report's Print Format
+
+In the reports, Letter Head is fetched from the Company master. To have company's Letter Head fetched correctly in the report, please ensure that you have updated default Letter Head in the Company master.
+
+`Explore > Accounts > Company`
+
+
+
+In a Company master, if no Letter Head is set as default, then in the reports, Letter Head having Default field checked will be fetched.
+
+
+
+If you are managing multiple companies in a single ERPNext account, then ensure that for each Company, default Letter Head is set in the Company master.
+
+After updating Letter Head in the Company master, refresh your ERPNext account, and then check the print format of a report.
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/website/articles/website-banner.md b/foundation/www/docs/user/manual/en/website/articles/website-banner.md
new file mode 100644
index 00000000..db24efa9
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/website/articles/website-banner.md
@@ -0,0 +1,10 @@
+
+# Website Banner Resizing
+
+Each ERPNext account website automatically generated from it. On a website, logo is set based on logo image selected in the Setup Wizard. You can change or edit property for your company's logo from the Website Settings.
+
+`Explore > Website > Website Settings`
+
+For the exact steps on how to upload a Website Banner and resize it, please refer to the help given below.
+
+
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/index.txt b/foundation/www/docs/user/manual/es/index.txt
index d19ef975..feb68a2f 100644
--- a/foundation/www/docs/user/manual/es/index.txt
+++ b/foundation/www/docs/user/manual/es/index.txt
@@ -1,2 +1,3 @@
introduction
accounts
+schools
diff --git a/foundation/www/docs/assets/old_images/erpnext/__init__.py b/foundation/www/docs/user/manual/es/schools/Assessment/__init__.py
similarity index 100%
rename from foundation/www/docs/assets/old_images/erpnext/__init__.py
rename to foundation/www/docs/user/manual/es/schools/Assessment/__init__.py
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/_sidebar.json b/foundation/www/docs/user/manual/es/schools/Assessment/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/Assessment/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_criteria.md
new file mode 100644
index 00000000..1c3d8431
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_criteria.md
@@ -0,0 +1,14 @@
+
+#Criterios de Evaluación
+
+Criterios de evaluación es el parámetro basado en el que se evalúa el estudiante.
+
+
+
+Después de la evaluación para un curso, las calificaciones obtenidas se ingresan en base a los criterios de evaluación. Por ejemplo, si la evaluación se llevó a cabo para el tema de la ciencia, entonces usted puede evaluar al estudiante en ciencia en varios criterios como la escritura, prácticas, presentación, etc
+
+Los Criterios de Evaluación se usan al programar el Plan de Evaluación para el Grupo de Estudiantes y el Curso.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_group.md b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_group.md
new file mode 100644
index 00000000..e9185453
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_group.md
@@ -0,0 +1,14 @@
+
+#Grupo de Evaluación
+
+La estructura del grupo de evaluación es un maestro donde se puede definir la jerarquía para el examen realizado en su instituto de educación.
+
+Por ejemplo, si realiza dos evaluaciones en un año académico, configure el Grupo de evaluación de la siguiente manera.
+
+
+
+En la misma línea, también puede definir varios Grupo de Evaluación basado sobre la evaluación llevada a cabo en su instituto.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_plan.md
new file mode 100644
index 00000000..44f5646a
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_plan.md
@@ -0,0 +1,20 @@
+
+#Plan de Evaluación
+
+Para programar una evaluación/examinación para un Grupo de Estudiantes, para un curso específico, crea un Plan de Evaluación. En el plan de evaluación, puedes capturar detalles como:
+
+1. Escala de Calificaciones basada en qué calificaciones serán asignadas a los estudiantes.
+
+2. Fecha de planificación de la Evaluación
+
+3. Aula donde se va a llevar a cabo la evaluación
+
+4. Examinador y Supervisor
+
+
+
+5. Los Criterios de Evaluación son la lista de criterios basados en que cada estudiante en será evaluado y los grados serán asignados.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result.md b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result.md
new file mode 100644
index 00000000..c640f395
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result.md
@@ -0,0 +1,8 @@
+
+#Resultados de Evaluación
+
+El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/schools/assessment/assessment_result_tool.html).
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result_tool.md
new file mode 100644
index 00000000..c9523703
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/Assessment/assessment_result_tool.md
@@ -0,0 +1,11 @@
+
+#Herramienta de resultados de la evaluación
+
+
+Herramienta de resultados de evaluación le ayuda a ingresar las calificaciones obtenidas por los estudiantes para un curso específico. En esta herramienta, basada en el plan de evaluación, todos los estudiantes van a ser filtrados dentro de la herramienta de resultados de la evaluación. También, Columnas para los Criterios de Evaluación serán donde las calificaciones ganadas pueden ser ingresadas para cada Estudiante.
+
+
+
+A medida que vaya introduciendo las notas para un Estudiante y cambie al siguiente alumno, en el backend, el registro de Resultados del Estudiante se creará automáticamente para ese Estudiante.
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/grading_scale.md b/foundation/www/docs/user/manual/es/schools/Assessment/grading_scale.md
new file mode 100644
index 00000000..792b6f21
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/Assessment/grading_scale.md
@@ -0,0 +1,8 @@
+
+#Escala de calificación
+
+En la escala de calificación, puedes definir varios grados y límites para los estudiantes. Basado en la calificación obtenida por el estudiante en la evaluación, el grado (Grade) será asignado.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/index.md b/foundation/www/docs/user/manual/es/schools/Assessment/index.md
new file mode 100644
index 00000000..468c6822
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/Assessment/index.md
@@ -0,0 +1,20 @@
+
+#Evaluación
+
+Cada instituto de educación organiza evaluaciones / examenes para evaluar el progreso de sus estudiantes. En ERPNext, puedes gestionar completamente el proceso de evaluación para sus cuentas en ERPNext.
+
+
+
+A continuación se muestra el orden en el que debe configurar los masters en el módulo de evaluación.
+
+1. Criterio de Evaluación
+2. Grupo de Evaluación
+3. Escala de Evaluación
+
+Una vez tengas definido los Grupos de Estudiantes y Cursos, puedes programar una evaluación / examinación creando un Plan de Evaluación.
+
+Basado en el rendimiento del estudiante en la evaluación, puedes ingresar los resultados de la evaluación por un estudiante. Puedes ingresar todos los registros de los estudiantes usando la herramienta de resultados de evaluación. En esta herramienta, en la selecció del Plan de Evaluación, todos los estudiantes (De un grupo de estudiantes) van a ser buscados y mostrados. Puedes rápidamente ingresar los puntos obtenidos por cada estudiante en cada uno de los Criterios de Evaluación en una sola linea.
+
+### Temas
+
+{index}
diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/index.txt b/foundation/www/docs/user/manual/es/schools/Assessment/index.txt
new file mode 100644
index 00000000..61d744c7
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/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/foundation/www/docs/user/manual/en/setting-up/setup-wizard/__init__.py b/foundation/www/docs/user/manual/es/schools/__init__.py
similarity index 100%
rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/__init__.py
rename to foundation/www/docs/user/manual/es/schools/__init__.py
diff --git a/foundation/www/docs/user/manual/es/schools/_sidebar.json b/foundation/www/docs/user/manual/es/schools/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/admission/__init__.py b/foundation/www/docs/user/manual/es/schools/admission/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/es/schools/admission/_sidebar.json b/foundation/www/docs/user/manual/es/schools/admission/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/admission/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/admission/index.md b/foundation/www/docs/user/manual/es/schools/admission/index.md
new file mode 100644
index 00000000..ec4a7e7f
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/admission/index.md
@@ -0,0 +1,8 @@
+
+# Admisiones
+
+Esta sección contiene los documentos relacionados a adminisiones de estudiantes.
+
+### Temas
+
+{index}
diff --git a/foundation/www/docs/user/manual/es/schools/admission/index.txt b/foundation/www/docs/user/manual/es/schools/admission/index.txt
new file mode 100644
index 00000000..ec9e7681
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/admission/index.txt
@@ -0,0 +1,2 @@
+student-applicant
+program-enrollment
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/admission/program-enrollment.md b/foundation/www/docs/user/manual/es/schools/admission/program-enrollment.md
new file mode 100644
index 00000000..4ca2f457
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/admission/program-enrollment.md
@@ -0,0 +1,8 @@
+
+# Inscripción al Programa
+
+Este formulario te permite inscribir un estudiante a un programa. Un estudiante puede ser inscrito en multiples programas.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/admission/student-applicant.md b/foundation/www/docs/user/manual/es/schools/admission/student-applicant.md
new file mode 100644
index 00000000..a14feb20
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/admission/student-applicant.md
@@ -0,0 +1,29 @@
+
+# Aplicación de Estudiante
+
+Un registro de Aplicación de Estudiante necesita ser creado cuando un estudiante aplica para un programa en su institución.
+Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicación de un estudiante puedes agregarlos al master de estudiantes.
+
+
+
+### Estados de la Aplicación
+
+- Por defecto cuando una aplicación de estudiante es creada en el sistema, el estado de la aplicación es seteado a 'Applied'
+
+- Puedes actualizar el estado a 'Approved' una vez apruebas la aplicación de estudiante para unirse a su institución
+
+- Cuando el estado de la aplicación es actualizada a 'Approved', el botón de 'Inscribir' debería aparecer.
+ Puedes crear un registro de estudiante usando la aplicación de estudiante e inscribirlos a un programa al presionar el botón de Inscribir
+
+- Una vez el estudiante es creado usando la aplicación de estudiante, el sistema va a setear el estado del documento de aplicación a 'Admitted'
+ y no te va a permiter cambiar el estado de la aplicación a menos que el estudiante sea eliminado
+
+### Registro de Estudiante
+
+
+Una vez aprobada una Aplicación de Estudiante, puedes inscribirlo a un programa. Cuando le das click al butón 'Inscribir',
+el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/schools/student/program-enrollment.html).
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/fees/__init__.py b/foundation/www/docs/user/manual/es/schools/fees/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/es/schools/fees/_sidebar.json b/foundation/www/docs/user/manual/es/schools/fees/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/fees/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/fees/fee-category.md b/foundation/www/docs/user/manual/es/schools/fees/fee-category.md
new file mode 100644
index 00000000..6cc4f400
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/fees/fee-category.md
@@ -0,0 +1,8 @@
+
+# Categoría de Cuota
+
+Todos los tipos diferentes de cuotas que se cobran
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/fees/fee-structure.md b/foundation/www/docs/user/manual/es/schools/fees/fee-structure.md
new file mode 100644
index 00000000..cfc7659d
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/fees/fee-structure.md
@@ -0,0 +1,8 @@
+
+# Estructura de Cuota
+
+Una Estructura de Cuota es una plantilla que puede ser usada cuando se hacen registros de cuotas.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/fees/fees.md b/foundation/www/docs/user/manual/es/schools/fees/fees.md
new file mode 100644
index 00000000..c91e9231
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/fees/fees.md
@@ -0,0 +1,9 @@
+
+# Cuotas
+
+Mantiene un registro de todas las cuotas recolectadas de los estudiantes.
+La [Estructura de Cuota](/docs/user/manual/es/schools/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/fees/index.md b/foundation/www/docs/user/manual/es/schools/fees/index.md
new file mode 100644
index 00000000..0b4f4cb8
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/fees/index.md
@@ -0,0 +1,10 @@
+
+# Cuota
+
+Esta sección contiene todos los documentos relacionado a las 'Cuota'
+
+
+
+### Temas
+
+{index}
diff --git a/foundation/www/docs/user/manual/es/schools/fees/index.txt b/foundation/www/docs/user/manual/es/schools/fees/index.txt
new file mode 100644
index 00000000..265ac6a5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/fees/index.txt
@@ -0,0 +1,3 @@
+fees
+fee-structure
+fee-category
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/index.md b/foundation/www/docs/user/manual/es/schools/index.md
new file mode 100644
index 00000000..3ea18e40
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/index.md
@@ -0,0 +1,9 @@
+
+# Schools
+
+
+Los módulos de School estan diseñados para satisfacer los requerimientos de Escuelas, Colegios e Institutos Educacionales.
+
+
+
+{index}
diff --git a/foundation/www/docs/user/manual/es/schools/index.txt b/foundation/www/docs/user/manual/es/schools/index.txt
new file mode 100644
index 00000000..b485fdcf
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/index.txt
@@ -0,0 +1,6 @@
+student
+admission
+schedule
+fees
+setup
+assessment
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/schedule/__init__.py b/foundation/www/docs/user/manual/es/schools/schedule/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/es/schools/schedule/_sidebar.json b/foundation/www/docs/user/manual/es/schools/schedule/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/schedule/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/schedule/course-schedule.md b/foundation/www/docs/user/manual/es/schools/schedule/course-schedule.md
new file mode 100644
index 00000000..ea517e1b
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/schedule/course-schedule.md
@@ -0,0 +1,26 @@
+
+# Horario de un Curso
+
+El Horario de Curso es el horario de una sesión de un profesor para un Curso en particular.
+Puedes ver un resumen del horario del curso en la vista de Calendario.
+
+
+
+### Marcando asistencia
+
+Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Curso.
+
+
+
+- Para hacer la asistencia, expandir la sección de asistencia.
+- Selecciona los estudiantes que estaban presentes para esa sesión.
+- Click en el botón de 'Mark Attendance'. El sistema va a crear los registros de asistencia automáticamente.
+
+### Ver Asistencia
+
+Una vez hayas marcado la asistencia usando la sección de asistencia en el Horario de un Curso, esta sección debería estar oculta.
+Un botón de Ver Asistencia debería aparecer. Click en el botón para ver todos los registros de asistencia creados para ese Horario de Curso.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/schedule/examination.md b/foundation/www/docs/user/manual/es/schools/schedule/examination.md
new file mode 100644
index 00000000..86c5b0f3
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/schedule/examination.md
@@ -0,0 +1,9 @@
+
+# Examinación
+
+El registro de examinación puede ser usado para hacer el seguimiento del horario de los examenes y los resultados de los mismos.
+
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/schedule/index.md b/foundation/www/docs/user/manual/es/schools/schedule/index.md
new file mode 100644
index 00000000..5d37fa13
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/schedule/index.md
@@ -0,0 +1,8 @@
+
+# Horario
+
+
+
+### Temas
+
+{index}
diff --git a/foundation/www/docs/user/manual/es/schools/schedule/index.txt b/foundation/www/docs/user/manual/es/schools/schedule/index.txt
new file mode 100644
index 00000000..704ad84b
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/schedule/index.txt
@@ -0,0 +1,4 @@
+course-schedule
+student-attendance
+scheduling-tool
+examination
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/schedule/scheduling-tool.md b/foundation/www/docs/user/manual/es/schools/schedule/scheduling-tool.md
new file mode 100644
index 00000000..089f771f
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/schedule/scheduling-tool.md
@@ -0,0 +1,24 @@
+
+# Herramienta para Horarios
+
+Esta herramienta puede ser usada para crear los Horarios de los Cursos.
+
+
+
+### Creando Horarios de Cursos
+
+- Selecciona el Grupo de Estudiante para el cual vas a establecer el Horario.
+- Seleccione el curso, Aula y un Instructor para el Horario.
+- Específica los rangos de fecha desde-hasta para el horario de los cursos.
+- Especifíca Fecha Inicio y Fecha Final de un curso(Los Horarios de los cursos van a ser creados dentro de este rango de fechas)
+- Espeficíca el dia de la semana en el cual deseas establecer el horario.
+- Presiona el botón de 'Schedule Course'
+- El sistema va a crear la planificación si el Aula y el Instructor estan disponibles y no hay ningún conflicto con el grupo de estudiantes seleccionados con otros horarios para el mismo grupo.
+
+###Reprogramar Horario
+
+- Si deseas reprogramar el horario de un curso, sigue las instrucciones para crear horarios de cursos.
+- Selecciona el checkbox 'Reschedule' y luego da click en el botón 'Schedule Course'.
+- El sistema va a eliminar la progración de horario especifícada para ese curso dentro del rango de fecha seleccionado y crearia la nueva planificación de horario para el curso.
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/schedule/student-attendance.md b/foundation/www/docs/user/manual/es/schools/schedule/student-attendance.md
new file mode 100644
index 00000000..59b125b2
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/schedule/student-attendance.md
@@ -0,0 +1,8 @@
+
+# Asistencia de Estudiante
+
+Mantiene los registros de la asistencia del estudiante. Los registros de asistencia pueden ser creados sobre los horarios de los cursos (Course Schedules).
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/setup/__init__.py b/foundation/www/docs/user/manual/es/schools/setup/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/es/schools/setup/_sidebar.json b/foundation/www/docs/user/manual/es/schools/setup/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/setup/academic-term.md b/foundation/www/docs/user/manual/es/schools/setup/academic-term.md
new file mode 100644
index 00000000..043aa21d
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/academic-term.md
@@ -0,0 +1,7 @@
+
+# Término Académico
+
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/setup/academic-year.md b/foundation/www/docs/user/manual/es/schools/setup/academic-year.md
new file mode 100644
index 00000000..fff8a7d2
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/academic-year.md
@@ -0,0 +1,6 @@
+
+# Año Académico
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/setup/course.md b/foundation/www/docs/user/manual/es/schools/setup/course.md
new file mode 100644
index 00000000..f8d90b56
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/course.md
@@ -0,0 +1,6 @@
+
+# Curso
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/setup/index.md b/foundation/www/docs/user/manual/es/schools/setup/index.md
new file mode 100644
index 00000000..cf23d3a5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/index.md
@@ -0,0 +1,8 @@
+
+# Configuración
+
+
+
+### Temas
+
+{index}
diff --git a/foundation/www/docs/user/manual/es/schools/setup/index.txt b/foundation/www/docs/user/manual/es/schools/setup/index.txt
new file mode 100644
index 00000000..fb9ba05d
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/index.txt
@@ -0,0 +1,6 @@
+course
+program
+instructor
+room
+academic-term
+academic-year
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/setup/instructor.md b/foundation/www/docs/user/manual/es/schools/setup/instructor.md
new file mode 100644
index 00000000..b05be687
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/instructor.md
@@ -0,0 +1,6 @@
+
+# Instructor
+
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/setup/program.md b/foundation/www/docs/user/manual/es/schools/setup/program.md
new file mode 100644
index 00000000..954269b1
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/program.md
@@ -0,0 +1,6 @@
+
+# Programa
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/setup/room.md b/foundation/www/docs/user/manual/es/schools/setup/room.md
new file mode 100644
index 00000000..aa3fbce8
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/setup/room.md
@@ -0,0 +1,7 @@
+
+# Aula
+
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/student/__init__.py b/foundation/www/docs/user/manual/es/schools/student/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/docs/user/manual/es/schools/student/_sidebar.json b/foundation/www/docs/user/manual/es/schools/student/_sidebar.json
new file mode 100644
index 00000000..88f5aab5
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/student/_sidebar.json
@@ -0,0 +1,22 @@
+[
+ {
+ "route": "/docs",
+ "title": "Docs Home"
+ },
+ {
+ "route": "/docs/user",
+ "title": "User Guide"
+ },
+ {
+ "route": "/docs/current/api",
+ "title": "Server API"
+ },
+ {
+ "route": "/docs/current/models",
+ "title": "Models (Reference)"
+ },
+ {
+ "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
+ "title": "Improve Docs"
+ }
+]
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/es/schools/student/index.md b/foundation/www/docs/user/manual/es/schools/student/index.md
new file mode 100644
index 00000000..dd0bce36
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/student/index.md
@@ -0,0 +1,8 @@
+
+# Student
+
+Esta sección contiene los documentos relacionados a los estudiantes.
+
+### Temas
+
+{index}
diff --git a/foundation/www/docs/user/manual/es/schools/student/index.txt b/foundation/www/docs/user/manual/es/schools/student/index.txt
new file mode 100644
index 00000000..9b31be4d
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/student/index.txt
@@ -0,0 +1,5 @@
+student
+student-log
+student-batch
+student-group
+student-group-creation-tool
diff --git a/foundation/www/docs/user/manual/es/schools/student/student-batch.md b/foundation/www/docs/user/manual/es/schools/student/student-batch.md
new file mode 100644
index 00000000..692462c0
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/student/student-batch.md
@@ -0,0 +1,9 @@
+
+# Lote de Estudiantes
+
+
+Un lote de estudiantes es una colección de estudiantes desde los Grupos de Estudiantes.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md
new file mode 100644
index 00000000..c188640f
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/student/student-group-creation-tool.md
@@ -0,0 +1,9 @@
+
+# Herramienta para creación de Grupo de Estudiantes
+
+Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos.
+
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/student/student-group.md b/foundation/www/docs/user/manual/es/schools/student/student-group.md
new file mode 100644
index 00000000..058a60b0
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/student/student-group.md
@@ -0,0 +1,9 @@
+
+# Grupo de Estudiante
+
+Un Grupo de Estudiante es una colección de estudiantes tomando el mismo curso. Puedes crear calendarios para los cursos y examinaciones para un Grupo de Estudiante.
+Un Grupo de Estudiante necesita ser creado para cada curso en un año o término académico en particular.
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/student/student-log.md b/foundation/www/docs/user/manual/es/schools/student/student-log.md
new file mode 100644
index 00000000..69a41942
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/student/student-log.md
@@ -0,0 +1,9 @@
+
+# Bitácora de Estudiante (Log)
+
+Puedes crear una nota de una actividad de un estudiante usando la bitácora de estudiante (log)
+Los registros de bitágora pueden ser categorizadas como 'General', 'Academic', 'Medical' or 'Achievement'
+
+
+
+{next}
diff --git a/foundation/www/docs/user/manual/es/schools/student/student.md b/foundation/www/docs/user/manual/es/schools/student/student.md
new file mode 100644
index 00000000..e0e7ac98
--- /dev/null
+++ b/foundation/www/docs/user/manual/es/schools/student/student.md
@@ -0,0 +1,11 @@
+
+# Estudiante
+
+Un estudiante es una persona que se ha registrado en su institución y has aceptado se solicitud de aplicación.
+El doctype de Estudiante mantiene los detalles personales de los estudiantes.
+
+Puedes ver todo lo relacionado a un estudiante en particular en esta página. Ejemplo: Pagos, Grupo de Estudiante, etc.
+
+
+
+{next}