[Docs] Updated Documentations

foundation/www/docs/user/manual/en/CRM/index.md

@@ -4,6 +4,6 @@
 ERPNext helps you track business **Opportunities** from **Leads** and
 **Customers**, send them **Quotations** and make confirmed **Sales Orders**.
 
-The CRM Module helps maintain Leads, Opportunities and Customers.
+The CRM Module helps maintain Leads, Oppurtunities and Customers.
 
 {index}

foundation/www/docs/user/manual/en/CRM/lead.md

@@ -44,6 +44,9 @@ A Lead is a potential Customer, someone who can give you business. A Customer is
 organization or individual who has given you business before (and has an Account
 in your system). A Contact is a person who belongs to the Customer.
 
+A Lead can sometimes be an organization you are trying to make a deal with. In this case you can select "Lead is an Organization" and add as many contacts within this organization as you want.
+It is useful if you are establishing a relationship with several people within the same organization.
+
 A Lead can be converted to a Customer by selecting “Customer” from the **Make**
 dropdown. Once the Customer is created, the Lead becomes “Converted” and any
 further Opportunities from the same source can be created against this

foundation/www/docs/user/manual/en/CRM/newsletter.md

@@ -11,9 +11,9 @@ very simple and easy.
 
 Select the list that you want to send the email to. Fill in your content in
 the message box, and send your newsletter.If you wish to test your email, to
-see how it looks to the recipient, you can use the test function. Save the
+see how it looks to the recepient, you can use the test function. Save the
 document before testing. A test email will be sent to your Email Address. You can
-send the email to all the intended recipients by clicking on the send button.
+send the email to all the intended receipients by clicking on the send button.
 
 <img class="screenshot" alt="Newsletter - New" src="/docs/assets/img/crm/newsletter-new.png">
 

foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md

@@ -3,7 +3,7 @@
 
 Chart of Account has hierarchical structure. Each account has a parent it is listed under. 
 
-There are some accounts which are auto-created. For example, Account for Warehouse is auto-created when new Warehouse is added in the system. These accounts are added under pre-defined account ledger. Warehouse Account is always added under Stock Assets, under Current Assets.
+There are some accounts which are auto-created. For example, Account for Warehouse is auto-created when new Wareouse is added in the system. These accounts are added under pre-defined account ledger. Warehouse Account is always added under Stock Assets, under Current Assets.
 
 If you wish to place specific Account into another parent Account, you can achieve the same as below.
 

foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md

@@ -11,6 +11,6 @@ On clicking 'Make Difference Entry' button, new Row will be added under Journal
 
 <img alt="Debit Credit Not Equal" class="screenshot" src="/docs/assets/img/articles/difference-entry-2.gif">
 
-On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entry correctly.
+On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entri correctly.
 
 <!-- markdown -->

foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-creation.md

@@ -1,6 +1,6 @@
 <!-- add-breadcrumbs -->
 # Fiscal Year Creation
 
-New Fiscal Year should be created each year, at the end of the current fiscal year. Creation of new Fiscal Year before its beginning has been automated in ERPNext.
+New Fiscal Year should be created each year, at the end of the current fiscal year. Creation of new Fiscal Year before its begining has been automated in ERPNext.
 
 Three days prior to the end of the current Fiscal Year, system checks if new Fiscal Year for the incoming year is already created. If not, then system auto-creates new Fiscal Year.

foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 # Manage Foreign Exchange Difference
 
-In ERPNext, you can create transactions in the foreign currency as well. When creating transaction in the foreign currency, system updates current exchange rate with respect to customer/supplier's currency and base currency on your Company. Since Exchange Rate is always fluctuating, on might receive payment from the client on exchange rate different from one mentioned in the Sales/Purchase Invoice. Following is the instruction on how to manage different amount avail in payment entry due to exchange rate change.
+In ERPNext, you can create transactions in the foriegn currency as well. When creating transaction in the foreign currency, system updates current exchanage rate with respect to customer/supplier's currency and base currency on your Company. Since Exchange Rate is always flucuating, on might receive payment from the client on exchange rate different from one mentioned in the Sales/Purchase Invoice. Following is the intruction on how to manage different amount avail in payment entry due to exchange rate change.
 
 #### Add Expense Account
 
@@ -15,10 +15,10 @@ In the payment voucher, update invoice amount against Customer or Supplier accou
 
 In the below scenario, Sales Invoice was made EUR, at the exchange rate of 1.090. As per this rate, Sales Invoice amount in USD (base currency) was $1000.
 
-One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenario.
+One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenerio.
 
 <img alt="Accounts Frozen Date" class="screenshot" src="/docs/assets/img/articles/exchange-rate-difference-2.gif">
 
-In case you incur loss due to change foriegn exchange rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc.
+In case you incur loss due to change foriegn exchnage rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc.
 
 <!-- markdown -->

foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
-#Tracking Project Profitability using Cost Center
+#Tracking Project Profibitability using Cost Center
 
-To track expenses and profitability for a project, you can use Cost Centers. You should create separate Cost Center for each Project. This will allow you to.
+To track expenses and profibility for a project, you can use Cost Centers. You should create separate Cost Center for each Project. This will allow you to.
 
 - Allocating budget on expense for Projects.
 - Tracking Profitability of Project.

foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md

@@ -31,4 +31,4 @@ Check [here](/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-
 
 Tax or Charge categorized as for **Total and Valuation** will be added in the valuation of item, as well as in the totals of purchase transactions.
 
-Let's assume that transportation is arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this, INR 100 transportation charge will be added to the actual purchase amount 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.
+Let's assume that transportion is arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this, INR 100 transportation charge will be added to the actual purchase amount 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.

foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md

@@ -109,6 +109,11 @@ Supplier).
 
 <img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-2.png">
 
+### Account Number
+A standard chart of accounts is organized according to a numerical system. Each major category will begin with a certain number, and then the sub-categories within that major category will all begin with the same number. For example, if assets are classified by numbers starting with the digit 1000, then cash accounts might be labeled 1100, bank accounts might be labeled 1200, accounts receivable might be labeled 1300, and so on. A gap between account numbers is generally maintained for adding accounts in the future.
+
+You can assign a number while creating an account from Chart of Accounts page. You can also edit a number from account record, by clicking "Update Account Number" button. On updating account number, system renames the account name automatically to embed the number in the account name.
+
 ### Other Account Types
 
 In ERPNext, you can also specify more information when you create a new
@@ -116,6 +121,19 @@ Account, this is there to help you select that particular account in a
 scenario like Bank Account or a Tax Account and has no effect on the Chart
 itself.
 
+Explanation of account types:
+- **Bank:** The account group under which bank account will be created.
+- **Cash:** The account group under which cash account will be created.
+- **Cost of Goods Sold:** The account to book the accumulated total of all costs used to manufacture / purchase a product or service, sold by a company.
+- **Depreciation:** The expense account to book the depreciation of teh fixed assets.
+- **Expenses Included In Valuation:** The account to book the expenses (apart from direct material costs) included in landed cost of an item/product, used in Perpetual Inventory, .
+- **Fixed Asset:** The account to maintain the costs of fixed assets.
+- **Payable:** The account which represents the amount owed by a company to its creditors.
+- **Receivable:** The account which represents the amount owed by a company by its debtors.
+- **Stock:** The account group under which the warehouse account will be created.
+- **Stock Adjustment:** An expense account to book any adjustment entry of stock/inventory, and generally comes at the same level of Cost of Goods Sold.
+- **Stock Received But Not Billed:** A temporary liability account which holds the value of stock received but not billed yet and used in Perpetual Inventory.
+
 ### Creating / Editing Accounts
 
 To create new Accounts, explore your Chart of Accounts and click on an Account
@@ -125,7 +143,8 @@ will see an option to “Open” or “Add Child” a new Account.
 <img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-3.png">
 
 Option to create will only appear if you click on a Group (folder) type
-Account.
+Account. There you need to enter account name, account number and some more
+optional details.
 
 ERPNext creates a standard structure for you when the Company is created but
 it is up to you to modify or add or remove accounts.

foundation/www/docs/user/manual/en/accounts/credit-limit.md

@@ -17,7 +17,9 @@ To set credit limit go to Customer - Master
 
 <img class="screenshot" alt="Credit Limit" src="/docs/assets/img/accounts/credit-limit-1.png">
 
-Go to the 'More Info section' and enter the amount in the field Credit Limit.
+Go to the 'CREDIT LIMIT' section and enter the amount in the field Credit Limit.
+
+If you leave CREDIT LIMIT as 0.00, it has no effect.
 
 In case a need arises to allow more credit to the customer as a good-will, the
 Credit Controller has access to submit order even if credit limit is crossed.
@@ -27,6 +29,25 @@ has expired, go to accounting settings and make changes.
 
 In the field Credit Controller, select the role who would be authorized to
 accept orders or raise credit limits of customers.
+
+To set credit limit at Customer Group Level go to Selling -> Customers -> Customer Group
+
+Go to the 'CREDIT LIMIT' field and enter the amount.
+If you leave CREDIT LIMIT as 0.00, it has no effect.
+
+
+To set credit limit at Company level go to Account -> Company
+
+Go to the 'ACCOUNT SETTINGS' section and enter the amount in the CREDIT LIMIT field.
+If you leave CREDIT LIMIT as 0.00, it has no effect.
+
+For 'CREDIT LIMIT' check functionality, Priority (High to Low) is as below
+1) Customer
+2) Customer Group
+3) Company
+
+
+
   
 #### Figure 2: Credit Controller
 

foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md

@@ -29,7 +29,7 @@ In Sales Taxes and Other Charges master, select GST 16% account and mention Tax
 
 ####Step 3: Tax Calculation in transaction	
 
-In the Sales Order, we have selected many Items. For the items mentioned in blue, tax rate is applied based on tax rate mentioned in the taxes table. For the items highlighted in red, tax rate has fetched for them from the respective item master.
+In the Sales Order, we have selected many Items. For the items mentioned in blue, tax rate is applied based on tax rate mentioned in the taxes table. For the items highlited in red, tax rate has fetched for them from the respective item master.
 
 <img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/tax-calulation.png">
 

foundation/www/docs/user/manual/en/accounts/opening-accounts.md

@@ -1,5 +1,5 @@
 <!-- add-breadcrumbs -->
-#Updating Opening Balance in Accounts
+# Updating Opening Balance in Accounts
 
 If you are a new company you can start using ERPNext accounting module by going to chart of accounts. However, if you are migrating from a legacy accounting system like Tally or a Fox Pro based software
 
@@ -14,28 +14,28 @@ If you were using another accounting software before, firstly you should close f
 > Opening entry is only for Balance Sheet accounts and not for the Accounts in the Profit and Loss statement.
 
   * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temporary Opening** account.
-  
+
   * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temporary Opening** account.
 
 ###Opening Entry
 
-####Step 1: New Journal Entry
+#### Step 1: New Journal Entry
 
 To open new Journal Entry, go to:
 
 `Explore > Accounts > Journal Entry`
 
-####Step 2: Entry Type
+#### Step 2: Entry Type
 
 If Entry Type is selected as Opening Entry, all the Balance Sheet Accounts will be auto-fetched in the Journal Entry.
 
 <img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-account-1.png">
 
-####Step 3: Posting Date
+#### Step 3: Posting Date
 
 Select Posting Date on which Accounts Opening Balance will be updated.
 
-####Step 4: Enter Debit/Credit Value
+#### Step 4: Enter Debit/Credit Value
 
 For each Account, enter opening value in the Debit or Credit column. As per the double entry valuation system, Total Debit value in a entry must be equal to Total Credit value.
 
@@ -87,9 +87,9 @@ To update stock opening balance, create [Stock Reconciliation entry](/docs/user/
 
 Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master](/docs/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field.
 
-### Outstanding Invoices
+### Outstanding Payables and Receivables
 
-After opening Journal Entries are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid.
+After opening Journal Entries are made, you will need to enter the Sales Invoice and Purchase Invoice that is yet to be paid.
 
 Since you have already booked the income or expense on these invoices in the previous period, select **Temporary Opening** in the “Income” and “Expense” accounts.
 
@@ -97,4 +97,12 @@ Since you have already booked the income or expense on these invoices in the pre
 
 If you don’t care what items are in that invoice, just make a dummy item entry in the Invoice. Item code in the Invoice is not necessary, so it should not be such a problem.
 
+You can also do this quickly using the **Opening Invoice Creation Tool**
+
+To use this tool, just type "Opening Invoice" in the search bar and select the **Opening Invoice Creation Tool**
+
+Here, select the company and type of invoice (sales or purchase) and add a line item for each invoice you want to create.
+
+<img class="screenshot" alt="Opening Invoice Creation Tool" src="/docs/assets/img/accounts/opening-invoice-creation-tool.png">
+
 {next}

foundation/www/docs/user/manual/en/accounts/payment-terms.md

@@ -0,0 +1,71 @@
+<!-- add-breadcrumbs -->
+# Payment Terms
+You can save your business' payment terms on ERPNext and include it in all documents in the sales/purchase cycle and ERPNext will make all the proper general ledger entries accordingly.
+
+The documents you can attach Payment Terms to are:
+- Sales Invoice
+- Purchase Invoice
+- Sales Order
+- Purchase Order
+- Quotation
+
+Note that the introduction of Payment Terms removes "Credit Days" and "Credit Days Based On" fields in Customer/Supplier master. Payment Term contains the same information and makes it more flexible to use.
+
+## Payment Terms
+Navigate to the Payment Term list page and click "New".
+> Accounts > Payment Term > New Payment Term
+
+Payment Term has the following fields:
+**Payment Term Name:** (optional) The name for this Payment Term.
+
+**Due Date Based On:** The basis by which the due date for the Payment Term is to be calculated. There are three options:
+- Day(s) after invoice date: Due date should be calculated in days with reference to the posting date of the invoice
+- Day(s) after the end of the invoice month: Due date should be calculated in days with reference to the last day of the month in which the invoice was created
+- Month(s) after the end of the invoice month: Due date should be calculated in months with reference to the last day of the month in which the invoice was created
+
+**Invoice Portion:** (optional) The portion of the total invoice amount for which this Payment Term should be applied. Value given will be regarded as percentage i.e 100 = 100%
+
+**Credit Days:** (optional) The number of days or month credit is allowed depending on the option chosen in the `Due Date Based On` field. 0 means no credit allowed.
+
+**Description:** (optional) A brief description of the Payment Term.
+
+## Payment Terms In Converted Documents
+When converting or copying documents in the sales/purchase cycle, the attached Payment Term(s) will not be copied. The reason for this is because the copied information might no longer be true. For example, a Quotation is created for a service costing $1000 on January 1 with payment term of "N 30" (Net payable within 30 days) and then sent to a customer. On the quotation, the due date on the invoice will be January 30. Let's say the customer agrees to the quotation of January 20 and you decide to make an invoice from the Quotation. If the Payment Terms from the Quotation is copied, the due date on the invoice will still wrongly read January 30. This issue also applies for recurring documents.
+
+This does not mean you have manually set Payment Terms for every document. If you want the Payment Terms to be copyable, make use of Payment Terms Template.
+
+##  Payment Terms Template
+Payment Terms Template tells ERPNext how to populate the table in the Payment Terms Schedule section of the sales/purchase document.
+ 
+You should use it if you have a set of standard Payment Terms or if you want the Payment Term(s) on a sales/purchase document to be copyable.
+
+To create a new Payment Terms Template, navigate to the Payment Term Template creation form:
+> Accounts > Payment Terms Template > New Payment Terms Template
+
+**Payment Term:** (optional) The name for this Payment Term.
+
+**Due Date Based On:** The basis by which the due date for the Payment Term is to be calculated. There are three options:
+- Day(s) after invoice date: Due date should be calculated in days with reference to the posting date of the invoice
+- Day(s) after the end of the invoice month: Due date should be calculated in days with reference to the last day of the month in which the invoice was created
+- Month(s) after the end of the invoice month: Due date should be calculated in months with reference to the last day of the month in which the invoice was created
+
+**Invoice Portion:** (optional) The portion of the total invoice amount for which this Payment Term should be applied. Value given will be regarded as percentage i.e 100 = 100%
+
+**Credit Days:** (optional) The number of days or month credit is allowed depending on the option chosen in the `Due Date Based On` field. 0 means no credit allowed.
+
+**Description:** (optional) A brief description of the Payment Term.
+
+Add as many rows as needed but make sure that the sum of the values in the `Invoice Portion` fields in all populated rows equals 100.
+
+## How to Add Payment Terms To Documents
+You can add Payments Terms in the "Payment Terms Schedule" section of the Document. Each row in the table represents a portion of the document's grand total. The table collects the following information:
+
+**Payment Term:** (optional) The name of the Payment Term document you require. If this is added, the data from the selected Payment Term will be used to populate the remaining columns in the row.
+
+**Description:** (optional) Description of the Payment Term.
+
+**Due Date:** (optional) The due date for the portion of the invoice. Set this value only if you did not specify anything in the `Payment Term` column.
+
+**Invoice Portion:** The percentage portion of the document represented in each row.
+
+**Payment Amount:** The amount due from the portion of the invoice represented by each row.

foundation/www/docs/user/manual/en/accounts/payments.md

@@ -29,7 +29,7 @@ For more details about payment entry [check here.](/docs/user/manual/en/accounts
 
 ## Journal Entry
 
-To make payment using journal entry, check below steps
+To make paymant using journal entry, check below steps
 
 ####Step 1: Activate Payment via Journal Entry
 
@@ -45,7 +45,7 @@ On submitting a document against which Journal Entry can be made, you will find
 
 ####Step 3: Journal Entry
 
-Save and submit the journal entry to record the payment against the invoice
+Save and submit the journal entry to record the payament against the invoice
 <img class="screenshot" alt="Making Payment" src="/docs/assets/img/accounts/journal-entry.png">
 
 For more details about journal entry [check here.](/docs/user/manual/en/accounts/journal-entry)

foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md

@@ -50,7 +50,7 @@ in Search box.
 
 ### Removing an Item from the Cart
 
-1. Select row in the cart and click on delete button in the numeric keypad
+1. Select row in the cart and clik on delete button in the numeric keypad
   
 <img class="screenshot" alt="POS Item" src="/docs/assets/img/accounts/pos_deleted_item.gif">
 
@@ -90,7 +90,7 @@ POS calculate the extra amount paid by the customer, which user can return from
 <img class="screenshot" alt="POS Payment" src="/docs/assets/img/accounts/change-amount.png">
 
 ### Offline Records
-All the records from the POS stores into the browser's local storage and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records
+All the records from the POS stores into the browser's local storegae and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records
 
 <img class="screenshot" alt="POS Payment" src="/docs/assets/img/accounts/offline-records.png">
 

foundation/www/docs/user/manual/en/accounts/pricing-rule.md

@@ -12,7 +12,7 @@ Following are the few cases which can be addressed using Pricing Rule.
 
 3. Items categorized under specific Item Group has same selling or buying price.
 
-4. Customers belonging to specific Customer Group should get ### selling price, ot % of Discount on Items.
+4. Customers balonging to specific Customer Group should get ### selling price, ot % of Discount on Items.
 
 5. Supplier's categorized under specific Supplier Type should have ### buying rate applied.
 
@@ -88,7 +88,7 @@ For example :  User want to add 10% margin on the supplier price list at the tim
 
 ####1. Make Price List
 
-Create price list for supplier and create item price against the price list.
+Create price list for supllier and create item price against the price list.
 
 <img alt="Disable" class="screenshot" src="/docs/assets/img/articles/price-list.png">
 

foundation/www/docs/user/manual/en/accounts/sales-invoice.md

@@ -57,6 +57,21 @@ bill this Invoice and the period for which the contract is valid.
 ERPNext will automatically create new Invoices and mail it to the Email Addresses
 you set.
 
+#### Automatically Fetching Item Batch Numbers
+
+If you are selling an item from a [Batch](/docs/user/manual/en/stock/batch),
+ERPNext will automatically fetch a batch number for you if "Update Stock" 
+is checked. The batch number will be fetched on a First Expiring First Out 
+(FEFO) basis. This is a variant of First In First Out (FIFO) that gives 
+highest priority to the soonest to expire Items. 
+
+<img class="screenshot" alt="POS Invoice" src="/docs/assets/img/accounts/sales-invoice-fetch-batch.png">
+
+Note that if the first batch in the queue cannot satisfy the order on the invoice, 
+the next batch in the queue that can satisfy the order will be selected. If there is 
+no batch that can satisfy the order, ERPNext will cancel its attempt to automatically 
+fetch a suitable batch number.
+
 #### POS Invoices
 
 Consider a scenario where retail transaction is carried out. For e.g: A retail shop.

foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md

@@ -9,7 +9,7 @@ You can define Tax Rules for Sales or Purchase Taxes.
 While making a Transaction the system will select and apply tax template based on the tax rule defined.
 The system selects Tax Rule with maximum matching Filters.
 
-Let us consider a scenario to understand Tax Rule Better.
+Let us consider a senario to understand Tax Rule Better.
 
 Suppose we define 2 Tax Rules as below.
 

foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md

@@ -11,7 +11,7 @@ The Bank Reconciliation Report provide the difference between the bank balance s
 
 <img class="screenshot" alt="Bank Reconciliation statement" src="/docs/assets/img/accounts/bank-reconciliation-2.png">  
 
-In the report, check whether the field 'Balance as per bank' matches the Bank Account Statement. If it is matching, it means that Clearance Date is correctly updated for all the bank entries. If there is a mismatch, Its because of bank entries for which Clearance Date is not yet updated.
+In the report, check whether the field 'Balance as per bank' matches the Bank Account Statement. If it is matching, it means that Clearance Date is correctly updated for all the bank entries. If there is a mismatch, Its because of bank entries for which Cleanrane Date is not yet updated.
 
 ###Bank Reconciliation Tool
 

foundation/www/docs/user/manual/en/accounts/tools/index.txt

@@ -1,4 +1,3 @@
 bank-reconciliation
 payment-reconciliation
 period-closing-voucher
-payment-tool

foundation/www/docs/user/manual/en/accounts/tools/payment-tool.md

@@ -1,27 +0,0 @@
-<!-- add-breadcrumbs -->
-# Payment Tool
-
-###Payment Tool
-The Payment Tool Feature allows non-accounting personnel to generate Journal Entries by populating relevant fields in the Journal Entry with account and payment details.
-
-To go to Payment Tool, click on Accounts > Tools > Payment Tool.
-
-1. Select the Company Name.
-2. Select the Party Type (Customer or Supplier) and the name of the customer or supplier against whom the payment has been made or received.
-3. Use the Received Or Paid field to specify 'Received' if payment is being received or 'Paid' if User is making the payment.
-4. Select the Mode of Payment and the Payment Account .
-5. Enter the Reference Number and Reference Date of the payment, for instance, the Cheque no. and Cheque date in case the payment is being made by cheque.
-6. Click on Get Outstanding Vouchers to fetch all the valid Vouchers, Invoices and Orders against which a payment can be made/received. These will appear in the Against Voucher section.
-	* __Note:__ In case User is paying a customer or receiving payment from a supplier, add the details regarding the relevant invoices and orders manually.
-
-   <img class="screenshot" alt="Payment Tool" src="/docs/assets/img/accounts/payment-tool-1.png">
-
-7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher
-
-   <img class="screenshot" alt="Payment Tool" src="/docs/assets/img/accounts/payment-tool-2.png">
-
-8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in.
-
-   <img class="screenshot" alt="Payment Tool" src="/docs/assets/img/accounts/payment-tool-3.png">
-	
-{next}

foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md

@@ -24,7 +24,7 @@ In ERPNext after making all the special entries via Journal Entry for the curren
 
 <img class="screenshot" alt="Period Closing Voucher" src="/docs/assets/img/accounts/period-closing-voucher.png">
 
-This voucher will transfer Profit or Loss (availed from P&L statement) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account.
+This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account.
 
 The Period Closing Voucher will make accounting entries (GL Entry) making all your Income and Expense Accounts zero and transferring Profit/Loss balance to the Closing Account.
 

foundation/www/docs/user/manual/en/agriculture/analytics/_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"
+ }
+]

foundation/www/docs/user/manual/en/agriculture/analytics/index.md

@@ -0,0 +1,13 @@
+<!-- add-breadcrumbs -->
+# Analytics
+
+This part of the Agriculture module is used for tracking data and report generation
+
+All the data pertaining to the following doctypes can be tracked by ERPNext
+
+* Plant Analysis
+* Soil Analysis
+* Water Analysis
+* Soil Texture
+* Weather
+* Agriculture Analysis Criteria

foundation/www/docs/user/manual/en/agriculture/crops_and_land/_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"
+ }
+]

foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md

@@ -0,0 +1,51 @@
+<!-- add-breadcrumbs -->
+# Crop 
+
+Now we need to specify what our crop will be. A crop summarizes all that is necessary before creatng our first crop cycle or planting.
+
+> Agriculture > Crop
+
+On the desk, click on the Crop icon. A list will show any existing Crops.
+
+On the top right, click on 'New'  to create the first Crop. A new Crop document will open, and we will enter basic information.
+
+The basic information should be entered as such:
+
+* Title: Carrot from carrot-top
+* Crop Name: Carrot
+* Scientific name: Daucus Carota
+* Type: Biennial
+* Planting UOM: Unit
+* Yield UOM: Grams
+
+Click Save 
+
+We will skip the Materials Required, Byproducts and Produce sections. In the Ideal Agriculture Task List we enter some planned tasks such as planting, watering, and harvesting. (Please note, our activity list will be intentionally abbreviated for illustraion purposes. For this example we will prepare our field, plant the next day, water only once, add a cover after germination on day 12, remove weeds at day 19, and harvest at day 90.
+
+The first row will look like this:
+
+* Task Name: Preparation - Make rows
+* Start Day: 1
+* End Day: 1
+* Holiday Management: Ignore holidays
+
+When done, you can click 'Save' to prevent any work from being lost.
+
+We are not done yet, we simply have saved the minimum required information!
+Continue filling the next rows with Task Name, Start Day, End Day and Holiday Management.
+
+
+* Row 2: Preparation - Add mulch cover, 1, 1, Previous Business Day
+* Row 3: Planting - Sow the seeds, 2, 2, Previous Business Day
+* Row 4: Water - 10ml per plant, 2, 2, Ignore holidays
+* Row 5: Disease - Pest control - Cover with Fine Net, 12, 12, Previous Business Day
+* Row 6: Weed Control - Remove weeds, 19, 19, Previous Business Day
+* Row 7: Harvest - When top is at 5cm, 90, 90, Previous Business Day
+
+Click 'Save'
+
+You form should now look something like this
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/crop.png">
+
+Repeat step 2 for as many crops as you need. You can save some time by duplicating existing crops and modifying only the necessary items

foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md

@@ -0,0 +1,31 @@
+<!-- add-breadcrumbs -->
+# Crop Cycle
+
+Once we have defined our crop, we can create as many crop cycles as we like, using the parameters outlined previously
+
+On the desk, clik on the Crop Cycle icon.  A list will show any existing Crop Cycles.
+
+> Agriculture > Crop Cycle
+
+On the top right, click on New to create the first Crop Cycle. A new Crop Cycle document will open, and right away you see that two of the required items are a Land Unit and a Crop. We shall give it a descriptive name, to differentiate it from Crop Cycles we might create later.
+
+* Title: Carrot Planting 2017
+* Land Unit: Add a row, and select, Carrot Field 1
+* Crop: Carrot from carrot-top
+* Start Date: Today
+* Leave the ISO 8016 Standard (week count) box unchecked
+* Skip the next four fields for Crop Spacing
+
+Save the new Crop Cycle
+
+It should now look something like this
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/crop_cycle.png">
+
+Repeat these for every Crop Cycle you need
+
+As you can see a Project was created, with the same name as the Crop Cycle and linked to the Crop Cycle. If you click on the project, you'll see all the 'Sample Tasks' from the linked Crop, i.e. 'Carrot from carrot-top' in this case, were converted into actual 'Tasks' and linked to the Project, for easy management
+
+> Projects > Project
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/projects.png">

foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.md

@@ -0,0 +1,16 @@
+<!-- add-breadcrumbs -->
+# Crops and Land
+
+The core and most important elements of Agriculture module are:
+
+* Land Unit: Representing the physical space where the crops are planted.
+* Crop: Characteristics of the crop, inputs and expected outputs, expected calendar of activities and harvest, etc.
+* Crop Cycle: Individual representation of a single planting in a specific area. (Links a crop to a Land Unit for a specified period)
+
+Here we will learn to do a quick setup with the essential requirements to manage a simple example crop, Carrots.
+
+ These instructions assume you have already completed the basic ERPNext setup, and you have the ERPNext desk on your browser window.
+
+### Topics
+
+{index}

foundation/www/docs/user/manual/en/agriculture/crops_and_land/index.txt

@@ -0,0 +1,3 @@
+land_unit
+crop
+crop_cycle

foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md

@@ -0,0 +1,32 @@
+<!-- add-breadcrumbs -->
+# Land Unit
+
+Before we do anything, we need to define some details about where our crops will be planted. We will first create our farm as a parent land unit, and then we will add one or more fields as children or nodes, belonging to the parent.
+
+> Agriculture > Land Unit
+
+On the desk, click on the Land Unit icon. assets/img/new-land-unit-icon.png A list will show any existing Land Units.
+
+On the top right, click on New  to create the first Land Unit.
+
+* Land Unit Name: Carrot Farm
+* Parent Land Unit: All Land Units
+* Check the box next to 'Is Group'
+* Location: plot the area as you please
+
+Click Save
+
+It should look something like this
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/crops_and_land/land_unit.png">
+
+With the farm created, we can now create our first Carrot Field! Click on New 
+
+* Land Unit Name: Carrot Field 1
+* Parent Land Unit:select the one we just created in step two, i.e. Carrot Farm
+* Leave the 'Is Group' box unchecked
+* Location: plot the area as you please
+
+Click Save
+
+Repeat step 3 for as many fields as you need

foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_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"
+ }
+]

foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md

@@ -0,0 +1,25 @@
+<!-- add-breadcrumbs -->
+# Disease 
+
+This part of Agriculture module deals with the management of Diseases, which may include various types of bacteria, funcgi, viruses, or pests which affect he Crop
+
+On the desk, click on the Disease icon. A list will show any existing Diseases.
+
+> Agriculture > Disease
+
+The basic information should be entered as such:
+
+* Disease Name: Aphids
+* Scientific name: Aphidoidea
+* Description: you could give a description of the disease here
+* Treatment Task: This may contain a list of all the Tasks which need to to be executed in orfer to get rid of the Disease
+
+Once you fill the form, click Save
+
+Click Save
+
+Now it should look something like this
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/diseases_and_fertilizer/disease.png">
+
+These Tasks will be imported into the Crop Cycle Project if you choose to add this Disease to the list of Detected Diesase in Crop Cycle

foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md

@@ -0,0 +1,6 @@
+<!-- add-breadcrumbs -->
+# Fertilizer
+
+This is used to keep track of available fertilizers, and their chemical composition, which is linked to the Item master
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/diseases_and_fertilizer/fertilizer.png">

foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.md

@@ -0,0 +1,8 @@
+<!-- add-breadcrumbs -->
+# Disease and Fertilizer
+
+This part of Agriculture module deals with the management of Diseases which affect the Crop and Fertilizers which may be used to promote the growth of the Crop
+
+### Topics
+
+{index}

foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/index.txt

@@ -0,0 +1,2 @@
+disease
+fertilizer

foundation/www/docs/user/manual/en/agriculture/index.md

@@ -0,0 +1,23 @@
+<!-- add-breadcrumbs -->
+# Agriculture
+
+Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers, customers and logistics to name a few areas. ERPNext already helps organize these activities.
+
+A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing, etc.), recording environmental and crop data for analysis, and reports to help make effective decisions.
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/agri_desk.png">
+
+The Agriculture module in ERPNext helps you keep track of your farming operations. It allows you keep records for each field where you farm, such as geospatial and soil texture characteristics. It allows you to:
+
+* Manage the physical spaces where you plant your crops
+* Manage your crops
+* Record analysis data
+* Plan activities related to your crops
+* Record sale of the harvest or transfer to warehouse for further processing
+* View reports
+
+<img class="screenshot" alt="Task" src="/docs/assets/img/agriculture/agri_doctypes.png">
+
+### Topics
+
+{index}

foundation/www/docs/user/manual/en/agriculture/index.txt

@@ -0,0 +1,3 @@
+crops_and_land
+diseases_and_fertlizers
+analytics

foundation/www/docs/user/manual/en/asset/_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"
+ }
+]

foundation/www/docs/user/manual/en/asset/asset-maintenance.md

@@ -0,0 +1,32 @@
+<!-- add-breadcrumbs -->
+# Asset Maintenance Management
+ERPNext provides features to track the details of individual maintenance/calibration tasks for an asset by date, the person responsible for the maintenance and future maintenance due date.
+
+To perform Asset Maintenance in ERPNext,
+
+  1. Enable Asset Maintenance.
+  2. Create Asset Maintenance Team.
+  3. Create Asset Maintenance.
+  4. Create Asset Maintenance Log.
+  5. Create Asset Repair Log.
+
+### Enable Asset Maintenance
+Check Maintain Required in Asset to enable Asset Maintenance
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/maintenance_required.png">
+
+### Asset Maintenance Team
+Create Asset Maintenance Team, select team members and their role.
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance_team.png">
+
+
+### Asset Maintenance
+For each asset create a Asset Maintenance record listing all the associated maintenance tasks, maintenance type (Preventive Maintenance or Calibration), periodicity, assign to and start and end date of maintenance. Based on start date and periodicity the next due date is auto-calculated and a ToDo is created for the Assignee.
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance.png">
+
+### Asset Maintenance Log
+For each task in Asset Maintenance, Asset Maintenance Log is auto created to keep track of the upcoming Maintenances. It will have status, completion date and actions performed. Based on completion date here, next due date is calculated automatically and new Asset Maintenance Log is created.
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_maintenance_log.png">
+
+### Asset Repair
+You can also maintain the records of Repair/Failures of your asset which are not listed in Asset Maintenance.
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset_repair.png">

foundation/www/docs/user/manual/en/asset/assets.md

@@ -7,7 +7,7 @@ In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Car
 
 Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
 
-<img class="screenshot" alt="Asset Category" src="/docs/assets/img/accounts/asset-category.png">
+<img class="screenshot" alt="Asset Category" src="/docs/assets/img/asset/asset-category.png">
 
 > **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master.
 
@@ -15,13 +15,13 @@ Based on the type of assets, create Asset Category. For example, all your deskto
 
 Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset.png">
 
 Explanation of the fields:
 
 1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked.
 
-	<img class="screenshot" alt="Asset Item" src="/docs/assets/img/accounts/asset-item.png">
+	<img class="screenshot" alt="Asset Item" src="/docs/assets/img/asset/asset-item.png">
 
 2. Asset Category: The category of assets it belongs to.
 3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
@@ -43,24 +43,24 @@ Explanation of the fields:
 
 The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/depreciation-schedule.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/depreciation-schedule.png">
 
 On the scheduled date, system creates depreciation entry by creating a Journal Entry and the same Journal Entry is updated in the depreciation table for reference. Next Depreciation Date and Current Value are also updated on submission of depreciation entry.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/depreciation-entry.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/depreciation-entry.png">
 
 In the depreciation entry, the "Accumulated Depreciation Account" is credited and "Depreciation Expense Account" is debited. The related accounts can be set in the Asset Category or Company.
 
 For better visibility, net value of the asset on different depreciation dates are shown in a line graph.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-graph.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-graph.png">
 
 
 ## Purchase an Asset
 
 For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-purchase-invoice.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-purchase-invoice.png">
 
 On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
 
@@ -74,23 +74,23 @@ To sell an asset, open the asset record and create a Sales Invoice by clicking o
 - "Accumulated Depreciation Account" will be debited by the total depreciated amount till now.
 - "Gain/Loss Account on Asset Disposal" will be credited/debited based on gain/loss amount. The Gain/Loss account can be set in Company record.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-sales.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-sales.png">
 
 
 ## Scrap an Asset
 
 You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/scrap-journal-entry.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/scrap-journal-entry.png">
 
 ## Asset Movement
 
 The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-movement.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-movement.png">
 
 There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement.
 
-<img class="screenshot" alt="Asset" src="/docs/assets/img/accounts/asset-movement-using-button.png">
+<img class="screenshot" alt="Asset" src="/docs/assets/img/asset/asset-movement-using-button.png">
 
 {next}

foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 #Purchasing in Different Unit (UoM)
 
-Each item has stock unit of measurement (UoM) associated to it. For example UoM of pen could be numbers (Nos) and sand could be stocked kgs. However, when we place an order with Supplier, UoM for an item could change. Like we can order 1 set/box of Pen, or one truck of sand to our Supplier. When creating purchase transaction, you can change Purchase UoM for an item.
+Each item has stock unit of measument (UoM) associated to it. For example UoM of pen could be numbers (Nos) and sand could be stocked kgs. However, when we place an order with Supplier, UoM for an item could change. Like we can order 1 set/box of Pen, or one truck of sand to our Supplier. When creating purchase transacton, you can change Purchase UoM for an item.
 
 ### Scenario:
 

foundation/www/docs/user/manual/en/customer-portal/index.md

@@ -1,10 +1,9 @@
 <!-- add-breadcrumbs -->
 # Customer Portal
 
-Customer Portal is designed to give easy accessibility to customers of a
-company.
+Customer Portal is designed to give easy accessibility to customers of a company.
 
-This portal allows customers to login and find out information relevant to them.They can trace communication history of their mails. They can also check order status by logging into the website.
+This portal allows customers to login and find out information relevant to them. The customers can trace the communication history of their mails. They can also check order status by logging into the website.
 
 ### Topics
 

foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 #Editing Value in Submitted Document
 
-Once document is submitted, fields are frozen, and no editing is allowed. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted.
+Once document is submitted, fields are frozen, and no editing is allowd. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted.
 
 <div class="well"> Standard fields cannot be set as Allow on Submit.</div>
 

foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md

@@ -57,6 +57,17 @@ Integer field holds numeric value, without decimal place.
 
 Link field is connected to another master from where it fetches data. For example, in the Quotation master, Customer is a Link field.
 
+- Geolocation
+
+Use Geolocation field to store GeoJSON <a href="https://tools.ietf.org/html/rfc7946#section-3.3">featurecollection</a>. Stores polygons, lines and points. Internally it uses following custom properties for identifying a circle.
+
+```
+{
+	"point_type": "circle",
+	"radius": 10.00
+}
+```
+
 - Password
 
 Password field will have decode value in it.
@@ -79,10 +90,10 @@ Small Text field carries text content, has more character limit than the Data fi
 
 - Table
 
-Table will be (sort of) Link field which renders another doctype within the current form. For example, Item table in the Sales Order is a Table field, which is linked to Sales Order Item doctype.
+Table will be (sort of) Link field which renders another docytpe within the current form. For example, Item table in the Sales Order is a Table field, which is linked to Sales Order Item doctype.
 
 - Text Editor
 
 Text Editor is text field. It has text-formatting options. In ERPNext, this field is generally used for defining Terms and Conditions.
 
-<!-- markdown -->
+<!-- markdown -->

foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 #Increase Max Attachments
 
-In ERPNext, you can limit how many files can be attached to specific Document. Using Customize Form, you can set **Max(imum) Attachments** which can be added to a particular documents.
+In ERPNext, you can limit how many files can be attached to specific Document. Using Custmize Form, you can set **Max(imum) Attachments** which can be added to a particular documents.
 
 Let's assume we need to update Max Attachment for Quotation to five.
 

foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md

@@ -15,7 +15,7 @@ Every table (regardless of storage engine) has a maximum row size of 65,535 byte
 
 The maximum row size constrains the number (and possibly size) of columns because the total length of all columns cannot exceed this size (65,535 bytes). For example, `utf8mb3` characters require up to 3 bytes per character, so for a `VARCHAR(140)` column, the server must allocate `140 × 3 = 420` bytes per value. Consequently, a table cannot contain more than `65,535 / 420 = 156` such columns.
 
-In Frappé framework, `VARCHAR(140)` type columns are created based on "Data", "Link", "Select", "Dynamic Link", "Password" and "Read Only" fieldtypes. Hence, you can create approximately 156 such columns in the system.
+In Frappé frapework, `VARCHAR(140)` type columns are created based on "Data", "Link", "Select", "Dynamic Link", "Password" and "Read Only" fieldtypes. Hence, you can create approximately 156 such columns in the system.
 
 ### Solutions:
 

foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 #Change the Language
 
-ERPNext is an multi-lingual application. It allows each user to select preferred language. Following is how User can customize language in one's account.
+ERPNext is an multi-lingual application. It allows each user to select preferred lannguage. Following is how User can customize language in one's account.
 
 ### 1. Setting Language in User's Account
 

foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md

@@ -3,7 +3,7 @@
  
 Kanban is a Japanese manufacturing system in which the supply of components is regulated through the use of an instruction card sent along the production line.
 
-In ERPNext Kanban board can be an alternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotation etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team.
+In ERPNext Kanban board can be an alternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotatio etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team.
 
 ###Create new Kanban Board
 

foundation/www/docs/user/manual/en/education/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"
+ }
+]

foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md

@@ -3,12 +3,12 @@
 
 Assessment Criteria is the parameter based on which you assess the Student.
 
-<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/schools/assessment/assessment-criteria.png">
+<img class="screenshot" alt="Assessment Criteria" src="/docs/assets/img/education/assessment/assessment-criteria.png">
 
 After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
 
 Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
 
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png">
+<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
 
 {next}

foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md

@@ -5,10 +5,10 @@ Assessment Group tree is a master where you can define the hierarchy for examina
 
 For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
 
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-term.png">
+<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-term.png">
 
 On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
 
-<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/schools/assessment/assessment-group-details.png">
+<img class="screenshot" alt="Assessment Group Term" src="/docs/assets/img/education/assessment/assessment-group-details.png">
 
 {next}

foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md

@@ -11,10 +11,10 @@ To schedule an assessment/examination for a Student Group, for specific Course,
 
 4. Examiner and Supervisor
 
-<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/schools/assessment/assessment-plan-details.png">
+<img class="screenshot" alt="Assessment Plan Details" src="/docs/assets/img/education/assessment/assessment-plan-details.png">
 
 5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
 
-<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/schools/assessment/assessment-plan-criteria.png">
+<img class="screenshot" alt="Assessment Plan Criteria" src="/docs/assets/img/education/assessment/assessment-plan-criteria.png">
 
 {next}

foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md

@@ -1,8 +1,8 @@
 <!-- add-breadcrumbs -->
 #Assessment Result
 
-Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/schools/assessment/assessment_result_tool.html).
+Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/education/assessment/assessment_result_tool.html).
 
-<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/schools/assessment/assessment-result.png">
+<img class="screenshot" alt="Assessment Result" src="/docs/assets/img/education/assessment/assessment-result.png">
 
 {next}

foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md

@@ -3,7 +3,7 @@
 
 Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student.
 
-<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/schools/assessment/assessment-result-tool.png">
+<img class="screenshot" alt="Assessment Result Tool" src="/docs/assets/img/education/assessment/assessment-result-tool.png">
 
 As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
 

foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md

@@ -3,6 +3,6 @@
 
 In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned.
 
-<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/schools/assessment/grading-scale.png">
+<img class="screenshot" alt="Grading Scale" src="/docs/assets/img/education/assessment/grading-scale.png">
 
 {next}

foundation/www/docs/user/manual/en/education/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"
+ }
+]

foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md

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

foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md

@@ -9,7 +9,7 @@ To create Attendance record :
 
 Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save. 
 
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-attendance.gif">
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-attendance.gif">
 
 **Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**.
 

foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md

@@ -5,9 +5,9 @@ ERPNext allows you to record the leave application for a student.
 
 To create a Student Leave application record, enter the Student and the date for the leave is applied and save.
 
-<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/schools/schedule/student-leave-application.gif">
+<img class="screenshot" alt="Student Attendance" src="/docs/assets/img/education/schedule/student-leave-application.gif">
 
-Incase the student is not attending the school in order to participate or represent school in any event, he/she can be mark as present from the Leave Application itself. 
+Incase the student is not attending the institute in order to participate or represent institute 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. 
 

foundation/www/docs/user/manual/en/education/_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"
+ }
+]

foundation/www/docs/user/manual/en/education/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"
+ }
+]

foundation/www/docs/user/manual/en/education/admission/index.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 # Admission
 
-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 admission.
+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
 

foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md

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

foundation/www/docs/user/manual/en/education/admission/program-enrollment.md

@@ -5,9 +5,9 @@ Program Enrollment describes an educational model where students must complete a
 
 Once a student have applied for the **Program** and the application is approved, the program enrollment is done for that student. 
 
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/program-enrollment.gif">
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/program-enrollment.gif">
 
-- A student can be enrolled in multiple Course for a program in a given academic year. 
-- Based on the Fee structure selected at the time of enrollment Fee details are created of the 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}

foundation/www/docs/user/manual/en/education/admission/student-applicant.md

@@ -4,7 +4,7 @@
 A Student Applicant record needs to be created when a student applies for a program at your institute.
 You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master.
 
-<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-applicant.png">
+<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-applicant.png">
 
 ### Application Status
 
@@ -21,11 +21,11 @@ You can Approve or Reject a student applicant. By accepting a student applicant
 ### Student Enrollment
 Once the form is submitted you can either approve or reject the application form.
 
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-application-actions.png">
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-application-actions.png">
 
-Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' button,
-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).
+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/education/student/program-enrollment.html).
 
-<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/schools/admission/student-applicant-enroll.png">
+<img class="screenshot" alt="Student Applicant Enrollment" src="/docs/assets/img/education/admission/student-applicant-enroll.png">
 
 {next}

foundation/www/docs/user/manual/en/education/admission/student_admission.md

@@ -0,0 +1,15 @@
+<!-- add-breadcrumbs -->
+# Student Admission
+
+The admission process begins with filling the admission form. The Student Admission record enables to initiate your admission process for a given **Academic year**. ERPNext admission module allows you to create an admission record which can be then published on the ERPNext generate website.
+
+To create a Student Admission record  go to :
+
+**education** >> **Admissions** >> **Student Admission** >>
+
+
+<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/education/admission/student-admission.gif">
+
+Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant.
+
+The information provided in the Student Admission records will be used for the validation and creation of the Student Admission records (only if student admission link is filled there)

foundation/www/docs/user/manual/en/education/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"
+ }
+]

foundation/www/docs/user/manual/en/education/fees/fee-category.md

@@ -3,6 +3,6 @@
 
 List of all different type of fees collected.
 
-<img class="screenshot" alt="Fees Category" src="/docs/assets/img/schools/fees/fee-category.png">
+<img class="screenshot" alt="Fees Category" src="/docs/assets/img/education/fees/fee-category.png">
 
 {next}

foundation/www/docs/user/manual/en/education/fees/fee-structure.md

@@ -0,0 +1,24 @@
+<!-- add-breadcrumbs -->
+# Fee Structure
+
+A Fee Structure is a template that can be used while making Fees records or generating them via the Fee Schedule. In the Accounts section, you can set also the different accounts as for the Fees is an accounting transaction.
+
+You can create the Fee Structure directly from 
+
+> Education > Fees > Fee Structure > New Fee Structure
+
+or you can create the Fee Structure from Program also.
+
+<img class="screenshot" alt="Fees Structure" src="/docs/assets/img/education/fees/fee-structure.png">
+
+#### Academic Year Impact
+
+If the Fee amount doesn't change every academic year then Fee Structure can be created without the Acadamic year. In doing so, the same Fee Structure can be used every academic year until the Fees for that particular program doesn't change. Still you can set the academic year and term while creating the Fees or Fee Schedule records.
+
+#### Accounting Impact
+
+You can set the "Income Account" and "Receivable Account" in the Accounts section which refers to an Account of you [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.md). You must also mention the Cost Center in which your income will be booked.
+
+If you are going to use this in the Fee Schedule, you must select the Accounts carefully as Fee Schedule updates the respected Accounts in bulk. 
+
+{next}

foundation/www/docs/user/manual/en/education/fees/fees.md

@@ -0,0 +1,9 @@
+<!-- add-breadcrumbs -->
+# Fees
+
+Maintain a record of fees collected from students.
+The [Fee Structure](/docs/user/manual/en/education/fees/fee-structure.html) is fetched based on the selected Program and Academic Term.
+
+<img class="screenshot" alt="Fees" src="/docs/assets/img/education/fees/fees.png">
+
+{next}

foundation/www/docs/user/manual/en/education/fees/index.md

@@ -3,7 +3,7 @@
 
 This section contains 'Fee' related documents.
 
-<img class="screenshot" alt="Fees Section" src="/docs/assets/img/schools/fees/fees-section.png">
+<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/fees/fees-section.png">
 
 ### Topics
 

foundation/www/docs/user/manual/en/education/index.md

@@ -0,0 +1,9 @@
+<!-- add-breadcrumbs -->
+# Education
+
+
+The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination.
+
+<img class="screenshot" alt="Fees Section" src="/docs/assets/img/education/module.png">
+
+{index}

foundation/www/docs/user/manual/en/education/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"
+ }
+]

foundation/www/docs/user/manual/en/education/schedule/course-schedule.md

@@ -4,13 +4,13 @@
 Course Schedule is the schedule of a session conducted by an Instructor for a particular Course.
 You can see the overall course schedule in the Calendar view.
 
-<img class="screenshot" alt="Course Schedule" src="/docs/assets/img/schools/schedule/course-schedule.png">
+<img class="screenshot" alt="Course Schedule" src="/docs/assets/img/education/schedule/course-schedule.png">
 
 ### Marking Attendance
 
 You can mark attendance for a Student Group against a Course Schedule.
 
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/schools/schedule/course-schedule-att.png">
+<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att.png">
 
 - To make attendance, expand the attendance section.
 - Check the students who were present for that session.
@@ -21,6 +21,6 @@ You can mark attendance for a Student Group against a Course Schedule.
 Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden. 
 A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule.
 
-<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/schools/schedule/course-schedule-att-1.png">
+<img class="screenshot" alt="Course Schedule Attendance" src="/docs/assets/img/education/schedule/course-schedule-att-1.png">
 
 {next}

foundation/www/docs/user/manual/en/education/schedule/examination.md

@@ -3,7 +3,7 @@
 
 The Examination record can be used to track the exam schedule and the results of that exam.
 
-<img class="screenshot" alt="Examination" src="/docs/assets/img/schools/schedule/examination.png">
+<img class="screenshot" alt="Examination" src="/docs/assets/img/education/schedule/examination.png">
 
 
 {next}

foundation/www/docs/user/manual/en/education/schedule/index.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 # Schedule
 
-<img class="screenshot" alt="Schedule Section" src="/docs/assets/img/schools/schedule/schedule-section.png">
+<img class="screenshot" alt="Schedule Section" src="/docs/assets/img/education/schedule/schedule-section.png">
 
 ### Topics
 

foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md

@@ -3,7 +3,7 @@
 
 This tool can be used to create 'Course Schedules'. 
 
-<img class="screenshot" alt="Scheduling Tool" src="/docs/assets/img/schools/schedule/scheduling-tool.png">
+<img class="screenshot" alt="Scheduling Tool" src="/docs/assets/img/education/schedule/scheduling-tool.png">
 
 ### Creating Course Schedules
 

foundation/www/docs/user/manual/en/education/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"
+ }
+]

foundation/www/docs/user/manual/en/education/setup/academic-term.md

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

foundation/www/docs/user/manual/en/education/setup/academic-year.md

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

foundation/www/docs/user/manual/en/education/setup/course.md

@@ -5,11 +5,11 @@
 
 To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted.
 
-<img class="screenshot" alt="Course" src="/docs/assets/img/schools/setup/course.png">
+<img class="screenshot" alt="Course" src="/docs/assets/img/education/setup/course.png">
 
 Once a **Course** is created, a course schedule can defined for the same.
 
-<img class="screenshot" alt="Course" src="/docs/assets/img/schools/setup/Course.gif">
+<img class="screenshot" alt="Course" src="/docs/assets/img/education/setup/Course.gif">
 
 The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**.
 

foundation/www/docs/user/manual/en/education/setup/index.md

@@ -0,0 +1,10 @@
+<!-- add-breadcrumbs -->
+# Setup
+
+The Setup section of education module provides facility to make some basic configuration. Below are doctypes for basic configuration.
+
+<img class="screenshot" alt="Setup Section" src="/docs/assets/img/education/setup/setup-section.png">
+
+### Topics
+
+{index}