diff --git a/foundation/www/docs/assets/img/education/setup/instructor.png b/foundation/www/docs/assets/img/education/setup/instructor.png index 8ea86bb3..d69f194b 100644 Binary files a/foundation/www/docs/assets/img/education/setup/instructor.png and b/foundation/www/docs/assets/img/education/setup/instructor.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/subcontract3-reserved-material.png b/foundation/www/docs/assets/img/manufacturing/subcontract3-reserved-material.png new file mode 100644 index 00000000..55a4291a Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/subcontract3-reserved-material.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/subcontract3.png b/foundation/www/docs/assets/img/manufacturing/subcontract3.png index 9a74824e..d91975b6 100644 Binary files a/foundation/www/docs/assets/img/manufacturing/subcontract3.png and b/foundation/www/docs/assets/img/manufacturing/subcontract3.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-1.png b/foundation/www/docs/assets/img/setup-wizard/step-1.png index 0a3c230a..79d4e1ff 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-1.png and b/foundation/www/docs/assets/img/setup-wizard/step-1.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-10.png b/foundation/www/docs/assets/img/setup-wizard/step-10.png index 46879992..f16ab625 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-10.png and b/foundation/www/docs/assets/img/setup-wizard/step-10.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-10a.png b/foundation/www/docs/assets/img/setup-wizard/step-10a.png new file mode 100644 index 00000000..5f405557 Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/step-10a.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-11.png b/foundation/www/docs/assets/img/setup-wizard/step-11.png new file mode 100644 index 00000000..229c3608 Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/step-11.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-11a.png b/foundation/www/docs/assets/img/setup-wizard/step-11a.png new file mode 100644 index 00000000..2804bc9d Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/step-11a.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-12.png b/foundation/www/docs/assets/img/setup-wizard/step-12.png new file mode 100644 index 00000000..ea6cb8e3 Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/step-12.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-12a.png b/foundation/www/docs/assets/img/setup-wizard/step-12a.png new file mode 100644 index 00000000..3b156ee3 Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/step-12a.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-2.png b/foundation/www/docs/assets/img/setup-wizard/step-2.png index 73300041..abd9deb1 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-2.png and b/foundation/www/docs/assets/img/setup-wizard/step-2.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-3.png b/foundation/www/docs/assets/img/setup-wizard/step-3.png index 7aac64a2..182d153a 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-3.png and b/foundation/www/docs/assets/img/setup-wizard/step-3.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-4.png b/foundation/www/docs/assets/img/setup-wizard/step-4.png index cee29fc1..d799f4b7 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-4.png and b/foundation/www/docs/assets/img/setup-wizard/step-4.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-5.png b/foundation/www/docs/assets/img/setup-wizard/step-5.png index a770f3eb..fbe8bf6c 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-5.png and b/foundation/www/docs/assets/img/setup-wizard/step-5.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-6.png b/foundation/www/docs/assets/img/setup-wizard/step-6.png index db2bf389..a1675ddc 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-6.png and b/foundation/www/docs/assets/img/setup-wizard/step-6.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-6a.png b/foundation/www/docs/assets/img/setup-wizard/step-6a.png new file mode 100644 index 00000000..f9388b5a Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/step-6a.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-7.png b/foundation/www/docs/assets/img/setup-wizard/step-7.png index 02c6da60..9e5f8fc7 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-7.png and b/foundation/www/docs/assets/img/setup-wizard/step-7.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-8.png b/foundation/www/docs/assets/img/setup-wizard/step-8.png index 18f8d88a..2e12519b 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-8.png and b/foundation/www/docs/assets/img/setup-wizard/step-8.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-8a.png b/foundation/www/docs/assets/img/setup-wizard/step-8a.png new file mode 100644 index 00000000..764e64f8 Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/step-8a.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-9.png b/foundation/www/docs/assets/img/setup-wizard/step-9.png index dced6e07..b417cf80 100644 Binary files a/foundation/www/docs/assets/img/setup-wizard/step-9.png and b/foundation/www/docs/assets/img/setup-wizard/step-9.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/step-9a.png b/foundation/www/docs/assets/img/setup-wizard/step-9a.png new file mode 100644 index 00000000..f409785b Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/step-9a.png differ diff --git a/foundation/www/docs/assets/img/setup-wizard/twofactor.png b/foundation/www/docs/assets/img/setup-wizard/twofactor.png deleted file mode 100644 index ada4f5b9..00000000 Binary files a/foundation/www/docs/assets/img/setup-wizard/twofactor.png and /dev/null 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 9fdc9a33..bda24ac4 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
+diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html index 287f5ce3..acbb2d38 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html @@ -3,7 +3,7 @@
No docs
++ + + on_submit + (self) +
+No docs
+- + - update_ordered_qty + update_ordered_and_reserved_qty (self)
No docs
diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.html index e62d4ff8..591e96fe 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.html @@ -3,7 +3,7 @@+ + + erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data + (doc) +
+No docs
+10.0.2
+ 10.0.7
print_settingsshow_inclusive_tax_in_printcolumn_break_12show_payment_schedule_in_printcurrency_exchange_sectionallow_stalestale_daysNo docs
+diff --git a/foundation/www/docs/current/models/accounts/salary_component_account.html b/foundation/www/docs/current/models/accounts/salary_component_account.html index 19eea44a..f8d290ce 100644 --- a/foundation/www/docs/current/models/accounts/salary_component_account.html +++ b/foundation/www/docs/current/models/accounts/salary_component_account.html @@ -9,7 +9,7 @@
No docs
+diff --git a/foundation/www/docs/current/models/accounts/shipping_rule.html b/foundation/www/docs/current/models/accounts/shipping_rule.html index 8e5f4f42..dfffb81c 100644 --- a/foundation/www/docs/current/models/accounts/shipping_rule.html +++ b/foundation/www/docs/current/models/accounts/shipping_rule.html @@ -9,7 +9,7 @@
disable_fetch_last_purchase_rate+ If enabled, last purchase details of items will not be fetched from previous purchase order or purchase receipt
+get_last_purchase_ratelink_to_mrssb_last_purchasebase_totalbase_net_totalcolumn_break_26totalnet_totaltotal_net_weighttaxes_sectiontaxes_and_chargescolumn_break_50shipping_rulesection_break_52taxessec_tax_breakupother_charges_calculationtotalsbase_taxes_and_charges_addedbase_taxes_and_charges_deductedbase_total_taxes_and_chargescolumn_break_39taxes_and_charges_addedtaxes_and_charges_deductedtotal_taxes_and_chargesdiscount_sectionapply_discount_onbase_discount_amountcolumn_break_45additional_discount_percentagediscount_amounttotals_sectionbase_grand_totalbase_rounding_adjustmentbase_in_wordsbase_rounded_totalcolumn_break4grand_totalrounding_adjustmentin_wordsadvance_paidpayment_schedule_sectionpayment_terms_templatepayment_scheduleterms_section_breaktc_nametermsmore_infostatusref_sqparty_account_currencycolumn_break_74per_receivedper_billedcolumn_break5letter_headselect_print_headingcolumn_break_86group_same_itemslanguagesupplied_items_sectionsupplied_itemssubscription_sectionfrom_dateto_datecolumn_break_97subscription+ + + update_reserved_qty_for_subcontract + (self) +
+No docs
+@@ -1921,6 +1959,22 @@ Delivered + +
+ + + erpnext.buying.doctype.purchase_order.purchase_order.item_last_purchase_rate + (name, conversion_rate, item_code, conversion_factor=1.0) +
+get last purchase rate for an item
+Public API
/api/method/erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice
column_break_6bom_detail_noreference_nameconversion_factorstock_uomreserve_warehouselog_detailsinstructor_logTable Name: tabInstructor Log
| Sr | +Fieldname | +Type | +Label | +Options | +
|---|---|---|---|---|
| 1 | +academic_year |
+ + Link | ++ Academic Year + + | ++ + + + +Academic Year + + + + | +
| 2 | +academic_term |
+ + Link | ++ Academic Term + + | ++ + + + +Academic Term + + + + | +
| 3 | +department |
+ + Link | ++ Department + + | ++ + + + +Department + + + + | +
| 4 | +column_break_3 |
+ + Column Break | ++ + + | ++ |
| 5 | +program |
+ + Link | ++ Program + + | ++ + + + +Program + + + + | +
| 6 | +course |
+ + Link | ++ Course + + | ++ + + + +Course + + + + | +
| 7 | +student_group |
+ + Link | ++ Student Group + + | ++ + + + +Student Group + + + + | +
| 8 | +section_break_8 |
+ + Section Break | ++ + + | ++ |
| 9 | +other_details |
+ + Small Text | ++ Other details + + | ++ |
student_batch_nameschool_houseboarding_student- Check this if the Student is residing at the Institute's Hostel.
-column_break_4student_batch_nameacademic_yearacademic_termenrollment_dateboarding_student+ Check this if the Student is residing at the Institute's Hostel.
+transportation-Student Applicants -Program Enrollments+Student Applicant +Program Enrollment
student_batchcolumn_break_3academic_yearget_studentsacademic_termsection_break_5get_studentsstudentssection_break_7new_programnew_student_batchenroll_studentscolumn_break_12new_academic_yearenroll_studentsnew_academic_termstudent_batch_nameacademic_termstudent_admissionimagesection_break_4date_of_birthgenderblood_groupcolumn_break_12student_email_idstudent_mobile_numbernationalityhome_addressaddress_line_1address_line_2pincodecolumn_break_23citystatesection_break_20guardianssection_break_21siblingssection_break_23titleamended_frompatient_detailspatient_details_htmlsb_symptomssymptoms_selectsymptomssymptoms_in_printphysical_examinationdiagnosis_selectdiagnosisdiagnosis_in_printcodificationcodification_tablesb_drug_prescriptiondrug_prescriptionsb_test_prescriptiontest_prescriptionconsultation_commentamended_fromsubjectsubjectNo docs
titlechapter_headcolumn_break_3regionsection_break_5introductionmeetup_embed_htmlpublishedrouteregionaddressroute+ chapters/chapter_name +leave blank automatically set after saving chapter.
+publishedchapter_membersmembers- + - foundation.erpnext_foundation.doctype.chapter.chapter.get_list_context + erpnext.non_profit.doctype.chapter.chapter.get_list_context (context)
No docs
diff --git a/foundation/www/docs/current/models/non_profit/chapter_member.html b/foundation/www/docs/current/models/non_profit/chapter_member.html index 3ac829eb..cc093271 100644 --- a/foundation/www/docs/current/models/non_profit/chapter_member.html +++ b/foundation/www/docs/current/models/non_profit/chapter_member.html @@ -9,10 +9,10 @@membership_expiry_datecolumn_break_5membership_typeGold -Silver -Individual+ + + + +Membership Type + + +
emailimageaddress_contactsfa fa-map-marker+
addressaddress_htmlexpires_oncolumn_break_9contact_html+ + + onload + (self) +
+Load address and contacts in __onload
+ + + validate + (self) +
+No docs
++ + + validate_email_type + (self, email) +
+No docs
+membership_typeGold -Silver -Individual+ + + + +Membership Type + + +
column_break_3membership_statusNew +Current +Expired +Pending +Cancelled+
membership_validaty_sectionfrom_dateto_datecolumn_break_8member_since_datepayment_detailspaidcurrencyamount- - - link_member_with_service_provider - (self) -
-No docs
-
@@ -204,20 +273,6 @@ INR
-
-
-
-
- - - validate_payment - (self) -
-No docs
-+ + + create_default_tax_template + (self) +
+No docs
+diff --git a/foundation/www/docs/current/models/setup/currency_exchange.html b/foundation/www/docs/current/models/setup/currency_exchange.html index 84c0f548..36750c38 100644 --- a/foundation/www/docs/current/models/setup/currency_exchange.html +++ b/foundation/www/docs/current/models/setup/currency_exchange.html @@ -9,7 +9,7 @@
reserved_qty_for_sub_contractma_ratestock_uomfcfs_ratevaluation_ratestock_value+ + + update_reserved_qty_for_sub_contracting + (self) +
+No docs
+diff --git a/foundation/www/docs/current/models/stock/customs_tariff_number.html b/foundation/www/docs/current/models/stock/customs_tariff_number.html index 318d34e0..ff0c8933 100644 --- a/foundation/www/docs/current/models/stock/customs_tariff_number.html +++ b/foundation/www/docs/current/models/stock/customs_tariff_number.html @@ -9,7 +9,7 @@
payment_terms_template_sectionpayment_terms_templateterms_sectiontc_nametermstransporter_infotransporter_namecol_break34lr_nolr_datemore_infoprojectcampaignsourcecolumn_break5per_billedcustomer_groupterritoryprinting_detailsletter_headselect_print_headinglanguagecolumn_break_88print_without_amountsection_break_83statusper_installedinstallation_statuscolumn_break_89to_warehouseexcise_pageinstructionssubscription_sectionsubscriptionsales_team_section_breaksales_partnercolumn_break7commission_ratetotal_commissionsection_break1sales_team+ + + update_purchase_order_supplied_items + (self) +
+No docs
+diff --git a/foundation/www/docs/current/models/stock/stock_entry_detail.html b/foundation/www/docs/current/models/stock/stock_entry_detail.html index 9f976bef..0f41e379 100644 --- a/foundation/www/docs/current/models/stock/stock_entry_detail.html +++ b/foundation/www/docs/current/models/stock/stock_entry_detail.html @@ -9,7 +9,7 @@
+
+### Schulungstermin
+
+Erstelle Termine für Seminare, Workshops, Konferenzen etc über den Link im Schulungsprogramm. Hier können die Teilnehmer die die Schulung benötigen eingetragen werden.
+
+
+
+### Teilnehmer zum Schulungstermin einladen
+
+Die Teilnehmer können aus der Liste der Mitarbeiter ausgewählt werden.
+
+Standardmäßig ist der Status des Mitarbeiters „Offen“.
+
+
+
+Wenn der Schulungstermin gebucht wird, dann wird eine Benachrichtigung an den Mitarbeiter gesendet, dass er zum Schulungstermin eigeladen ist. Dies wird über die automatische Email „Schulungstermin“ gesendet. Der Inhalt der Email kann entsprechend angepasst werden.
+
+### Schulungsergebnis
+
+Nach der Schulung können die Ergebnisse gespeichert werden basierend auf dem Feedback des Trainers.
+
+
+
+Wenn das Schulungsergebnis gebucht wird, bekommen die Mitarbeiter eine Benachrichtigung, dass sie eine Schulungsbeurteilung abgeben sollen. Dies wird ebenfalls über die automatische Email verwaltet, der Inhalt kann auch hier angepasst werden.
+
+### Schulungsbeurteilung
+
+Die Mitarbeiter können ihre Rückmeldung durch die Schulungsbeurteilung geben.
+
+
+
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
index e309341c..e278b5c2 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
@@ -7,7 +7,7 @@ There are three kind of reports in ERPNext.
Report Builder is an in-built report customization tool in ERPNext. This allows you to define specific fields of the form which shall be added in the report. Also you can set required filters, sorting and give preferred name to report.
-
+
### 2. Query Report
diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md
index 47e17b3d..42adef23 100644
--- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md
+++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md
@@ -37,7 +37,7 @@ Fields are much more than database columns, they can be:
1. Actions (button)
1. Attachments or Images
-
+
When you add fields, you need to enter the **Type**. **Label** is optional for Section Break and Column Break. **Name** (`fieldname`) is the name of the database table column.
@@ -53,13 +53,13 @@ In this section, you can define criteria based on which document for this doctyp
In this table, you should select roles and define permission roles for them for this Doctype.
-
+
#### Save DocType
On saving doctype, you will get pop-up to provide name for this Doctype.
-
+
#### DocType in System
@@ -68,12 +68,12 @@ Human Resource module, to access this doctype, go to:
`Human Resource > Document > Book`
-
+
#### Book master
Using the fields entered, following is the master one book.
-
+
{next}
diff --git a/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md b/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md
index e5719a3a..89ae7032 100644
--- a/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md
+++ b/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md
@@ -1,17 +1,22 @@
# Program Enrollment Tool
-The Program Enrollment tool allows the bulk enrollment of the **Student Applicants** in a Program.
+The Program Enrollment tool allows the bulk enrollment of the new and old students in a Program. If you are enrolling a new student, you can fetch the students from the **Student Applicant** or if you are promoting the older students you can fetch them from the **Program Enrollment** itself
+> Note: Academic Term is optional in the Program Enrollment Tool
-You can create the the Program Enrollment for :
+You can create the Program Enrollment for :
-1. **Student Applicants** >> List of Student Applicants will be fetched for the selected **Program** and **Academic year**.
+1. **Student Applicants**: List of Student Applicants will be fetched for the selected **Program**, **Academic year** and **Academic Term** (if provided).
-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**.
+2. **Program Enrollment**: List of students already enrolled in selected **Program** for the given **Academic Year**, **Academic Term** (if provided) and **Student Batch** will be fetched and can be used to enroll students from one academic year/term to another in the same **Program** or a new **Program**.
+**New Student Batch**: This can be selected for the entire students fetched in the table. Priority will be given to the Batch selected in the table (for individual students).
+
+For promoting the students, the new academic year, academic term and program can also be selected for the enrollment of the fetched students list.
+
{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md b/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md
index 2b80c11c..21778ed8 100644
--- a/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md
+++ b/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md
@@ -1,13 +1,22 @@
# Program Enrollment
-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.
+**Program Enrollment** is the record of enrollment of a student in a given program and choose courses for a particular Academic Year and Academic Term (optional). If a student is enrolled in a program then his/her Program Enrollment must be created. The mandatory course in that program is automatically filled in Enrolled Courses table while the elective/optional courses can be selected manually.
-Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student.
+If the student has applied online for the admission in a particular **Program** and the application is approved, then the Program Enrollment can be created from within the Student Applicant record via clicking on the **Enroll** button.
+
+Else, to create the new Program Enrollment manually, go to:
+> Education > Program Enrollment > New
-- 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.
+If any institution has skipped the online admission process then Program Enrollment can also be considered as the confirmation of the admission in a particular Program.
-{next}
+> TIP: Academic Term is optional in the Program Enrollment. If your institution has only annual curriculum, you can skip the Academic Term
+
+Student Batch: To categorize student into different sections/batches, you can assign the batch to the student. On the basis of this field, later student groups can be created.
+
+Student Category: For the Institutions having multiple Fees Structure, this field can be used to differentiate the student enrollment in a given fee category.
+
+
+{next}
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/education/setup/instructor.md b/foundation/www/docs/user/manual/en/education/setup/instructor.md
index c719aa04..9e5434aa 100644
--- a/foundation/www/docs/user/manual/en/education/setup/instructor.md
+++ b/foundation/www/docs/user/manual/en/education/setup/instructor.md
@@ -1,19 +1,21 @@
# Instructor
-An instructoe is a teacher, or professor, of a specialised subject that involves skill.
+An Instructor can be a teacher, tutor, coach, or professor, of a specialised subject that involves any skill.
-You can create an Instructor and link it to the Employee master and a Departmemt.
+To create new Instructor go to:
+
+> Education > Instructor > New
-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**.
+An **Instructor** can also be 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.
+It is also linked to **Student group** where an **Instructor** is assigned to the Student Group.
-
+While creating the **Assessment Plan** for a Student Group, **Instructor** can be linked as the Examiner or the Supervisor for that assessment.
+
+Further, the log for the Instructor can be entered in the Instructor Log table which can be used for keeping the records of subjects taught by that Instructor.
-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/manufacturing/subcontracting.md b/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md
index a40c97a3..7f18912a 100644
--- a/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md
+++ b/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md
@@ -28,10 +28,14 @@ other items which go into the making of pen, will be categorized as sub-items.
-__Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials.
+__Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials. You can also select the warehouse from which the material would be reserved for sub contracting.
+Once the PO is submitted, you can view the reserved quantity of the item from the item dashboard as well.
+
+
+
__Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier.
@@ -47,6 +51,10 @@ correct stock is maintained at the Supplier’s end.
> Note 2: ERPNext will automatically add the raw material rate for your
valuation purpose when you receive the finished Item in your stock.
+> Note 3: ERPNext will automatically default the Reserve Warehouse in the PO
+from the BOM. If not found in the BOM, it would default it from the default
+warehouse setup in the Item.
+
### Video Help
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 7e08678a..fcd35b95 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 ERPnext as per your locale and sets up your organisation.
+The Setup Wizard helps you quickly setup ERPnext as per your locale and sets up your organization.
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 b2f680a3..91c3afc6 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,5 +1,12 @@
-step-1-language
-step-2-currency-and-timezone
-step-3-user-details
-step-4-two-factor-authentication
-step-5-company-details
+step-01-language
+step-02-currency-and-timezone
+step-03-user-details
+step-04-select-domain
+step-05-the-brand
+step-06-your-organization
+step-07-setup-company-complete
+step-08-set-sales-target
+step-09-customers
+step-10-letterhead
+step-11-suppliers
+step-12-users
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
similarity index 100%
rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md
new file mode 100644
index 00000000..a9c24ffc
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md
@@ -0,0 +1,16 @@
+
+# Step 2: Country, Currency and Time Zone
+
+Set your Country Name, Time Zone and Currency.
+
+
+
+### Default Currency
+
+For most countries, your currency and time zone will be automatically set.
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md
new file mode 100644
index 00000000..94e63952
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md
@@ -0,0 +1,12 @@
+
+# Step 3: User Details
+
+Enter the First User. Give the Full Name, Email Address (as User ID) and Password. This first user will be setup as a System Manager with privileges similar to the Administrator account.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
new file mode 100644
index 00000000..7b920922
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md
@@ -0,0 +1,12 @@
+
+# Step 4: Select Domain
+
+Select the domain(s) that will be enabled after setup.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
new file mode 100644
index 00000000..1a4109f5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md
@@ -0,0 +1,18 @@
+
+# Step 5: The Brand
+
+Enter Company Name, Abbreviation and add a logo.
+
+
+
+### Company Abbreviation
+
+These will be appended to your **Account** Heads, for example if your abbreviation is **WPL**, then your Sales account will be **Sales - WPL**
+
+For Example: East Wind will be abbreviated as EW. Shades of Green will be abbreviated as SOG. In case you wish to give your own abbreviation, you can do so. The text field allows any type of text.
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
new file mode 100644
index 00000000..4291e05a
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md
@@ -0,0 +1,24 @@
+
+# Step 6: Your Organization
+
+Enter in a short sentence of what your company does. This is often a mission statement or vision statement.
+
+Add the name of the organization's primary financial institution. This information will populate **Accounts**.
+
+
+
+### Chart of Accounts
+
+Select whether the organization will use a standard chart of accounts without number or a standard chart of accounts with numbers. The out of box chart of accounts is the same either way.
+
+### Financial Year
+
+Any annual period at the end of which a firm's accounts are made up is called a Financial Year. Some countries have their account year starting from 1st January and some 1st April.
+
+The end date will be set automatically
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
new file mode 100644
index 00000000..23ab78c5
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md
@@ -0,0 +1,16 @@
+
+# Step 7: Initial Setup Complete
+
+The initial setup wizard will create all the settings needed including the first system manager user.
+
+
+
+When complete, the Setup Wizard will go to the Desk and begin a secondary set of steps. This screen shows that the initial setup wizard is complete and begins the secondary setup wizard.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
new file mode 100644
index 00000000..ad093138
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md
@@ -0,0 +1,16 @@
+
+# Step 8: Set Sales Target
+
+Set a monthly sales target for the organization in the currency selected during Step 2.
+
+
+
+If a sales target is not known, then clicking **Mark as Done** will complete the step.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
new file mode 100644
index 00000000..6bf07c49
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md
@@ -0,0 +1,16 @@
+
+# Step 9: Add Customers
+
+Add known customers to the system.
+
+
+
+If customers are not known, then clicking **Mark as Done** will complete the step.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
new file mode 100644
index 00000000..27ae3fcd
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md
@@ -0,0 +1,16 @@
+
+# Step 10: Company Letter Head
+
+Add a company logo to be used as a standard letter head on all printed invoices and other document types. Ideally the logo is 900px by 100px.
+
+
+
+If a letter head logo file is not available, the clicking **Mark as Done** will complete the step.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
new file mode 100644
index 00000000..311b17bf
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md
@@ -0,0 +1,21 @@
+
+# Step 11: Add Suppliers
+
+Add known suppliers to the system.
+
+
+
+If suppliers are not known, then clicking **Mark as Done** will complete the step.
+
+
+
+
+## Step 11a: Other Domain Specific Steps
+
+Depending on the domain(s) selected in Step 4, there will be more screens to fill in for the secondary setup wizard.
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
new file mode 100644
index 00000000..72c00a7d
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md
@@ -0,0 +1,16 @@
+
+# Step 12: Add Users
+
+The last step in the secondary setup wizard will prompt to add more users to the system. These users will be regular non-privileged users.
+
+
+
+If users are not known, then clicking **Mark as Done** will complete the step.
+
+
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
deleted file mode 100644
index 40906e38..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Step 2: Currency and Timezone
-
-Set your country name, currency and timezone.
-
-
-
----
-
-### Default Currency
-
-For most countries, your currency and timezone will be automatically set
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
deleted file mode 100644
index ee660298..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# Step 3: User Details
-
-Enter Users Profile Details like Name, User ID and preferred password.
-
-
-
----
-
-Note: Add your own photograph, not your company's
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md
deleted file mode 100644
index f6e758c0..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Step 4: Two Factor Authentication
-
-Enable Two Factor Athentication
-
-
-
----
-###Authentication Method
-Whenevever each user logs in, based on the role set for that user,
-they will be asked for a **One Time Password** after they input
-their login details.
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md
deleted file mode 100644
index 63246bff..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-# Step 5: Company Details
-
-Enter Company Details like Name, Abbreviation and Financial Year Details.
-
-
-
----
-
-### Company Abbreviation
-
-These will be appened to your **Account** Heads, for example if your abbreviation is **WP**, then your Sales account will be **Sales - WPL**
-
-For Example: East Wind will be abbreviated as EW. Shades of Green will be abbreviated as SOG. In case you wish to give your own abbreviation, you can do so. The text field allows any type of text.
-
-### Financial Year
-
-Any annual period at the end of which a firm's accounts are made up is called a Financial Year. Some countries have their account year starting from 1st January and some 1st April.
-
-The end date will be set automatically
-
-{next}