[docs] merged kb and cleanup. warning: don't see the commit
diff --git a/erpnext/docs/user/manual/en/CRM/contact.md b/erpnext/docs/user/manual/en/CRM/contact.md
new file mode 100644
index 0000000..83757e0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/contact.md
@@ -0,0 +1,47 @@
+# Contact and Address
+
+Contacts are not necessarily linked to another document. They can be stand alone, just a Contact with a First Name not linked to any other document or
+Contacts can be linked to a Party, that is either a Customer or a Supplier.
+
+The Contact_ID is automatically created:
+
+1. If only a First Name is entered that First Name defines the ID , thus First name (only)
+2. If a First Name and a Party is linked the ID becomes “FirstName-Party”
+
+Contacts can, but do not have to be linked, to: User, Customer, Supplier, and Sales Partner. Since Customers and Addresses are not directly linked to a User, all links go via Contacts.
+
+A Contact can be linked to the (web) user. If that user is also a Customer, it is linked to the Customer by the Customer ID
+
+Contacts and Addresses in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Customers and Suppliers.
+
+To create a new Contact go to,
+
+> CRM > Contact > New
+
+<img class="screenshot" alt="Contact" src="{{docs_base_url}}/assets/img/crm/contact.png">
+
+Or you can add a Contact or Address directly from the Customer record, click on “New
+Contact” or “New Address”.
+
+<img class="screenshot" alt="Contact" src="{{docs_base_url}}/assets/img/crm/contact-from-cust.png">
+
+> Tip: When you select a Customer in any transaction, one Contact and Address
+gets pre-selected. This is the “Default Contact or Address”.
+
+To Import multiple Contacts and Addresses from a spreadsheet, use the Data
+Import Tool.
+
+---
+
+### Address Titles
+
+The Address Title (Name of person or organization that this address belongs to) is a free format unlinked field. The ID is automatically created from the Address Title upper score Address Type. (AdressTitle-AddressType).
+
+### Address Linking
+
+Addresses can be entered individually (unlinked) or linked to customers, leads, suppliers or Sales Partners.
+
+Linking is done in the reference section where the links can be established.
+
+(Contributed by Robert Becht)
diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
new file mode 100644
index 0000000..b317336
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -0,0 +1,72 @@
+A customer, who is sometimes known as a client, buyer, or purchaser is the one
+who receives goods, services, products, or ideas, from a seller for a monetary
+consideration. A customer can also receive goods or services from a vendor or
+a supplier for other valuable considerations.
+
+A customer is uniquely identified by the Customer ID. Normally this ID is identical to the customer Full Name, but in case of duplicate Full Name, a Name-1 is created as ID.
+
+You can either directly create your Customers via
+
+> Selling > Customer
+
+or upload it via the Data Import Tool.
+
+<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer.png">
+
+> Note: Customers are separate from Contacts and Addresses. A Customer can
+have multiple Contacts and Addresses.
+
+### Contacts and Addresses
+
+Contacts and Addresses in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Customers and Suppliers.
+
+Read [Contact]({{docs_base_url}}/user/guides/crm/contact.html) to know more.
+
+Thus we may have identical Customer Names that are uniquely identified by the ID. Since the email address is not part of the customer information the linking of customer and User is through [Contacts]({{docs_base_url}}/user/guides/crm/contact.html)
+
+### Integration with Accounts
+
+In ERPNext, there is a separate Account record for each Customer, for each
+Company.
+
+When you create a new Customer, ERPNext will automatically create an Account
+Ledger for the Customer under “Accounts Receivable” in the Company set in the
+Customer record.
+
+> Advanced Tip: If you want to change the Account Group under which the
+Customer Account is created, you can set it in the Company master.
+
+If you want to create an Account in another Company, just change the Company
+value and “Save” the Customer again.
+
+### Customer Settings
+
+You can link a Price List to a Customer (select “Default Price List”), so that
+when you select that Customer, the Price List will be automatically selected.
+
+You can set “Credit Days”, so that it is automatically set due date in the Sales
+Invoices made against this Customer. Credit Days can be defined as fixed days or last day of the next month based on invoice date.
+
+You can set how much credit you want to allow for a Customer by adding the
+“Credit Limit”. You can also set a global “Credit Limit” in the Company
+master. Classifying Customers
+
+ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/guides/crm/setup/customer-group.html)
+and also divide them into [Territories]({{docs_base_url}}/user/guides/crm/setup/territory.html)
+Grouping will help you get better analysis of your data and
+identify which Customers are profitable and which are not. Territories will
+help you set sales targets for the respective territories.
+You can also mention [Sales Person]({{docs_base_url}}/user/guides/crm/setup/sales-person.html) against a customer.
+
+### Sales Partner
+
+A Sales Partner is a third party distributor / dealer / commission agent /
+affiliate / reseller who sells the companies products, for a commission. This
+is useful if you make the end sale to the Customer, involving your Sales
+Partner.
+
+If you sell to your Sales Partner who in-turn sells it to the Customer, then
+you must make a Customer instead.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/CRM/index.md b/erpnext/docs/user/manual/en/CRM/index.md
new file mode 100644
index 0000000..20639a9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/index.md
@@ -0,0 +1,8 @@
+#CRM
+
+ERPNext helps you track business **Opportunities** from **Leads** and
+**Customers**, send them **Quotations** and make confirmed **Sales Orders**.
+
+The CRM Module helps maintain Leads, Oppurtunities and Customers.
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/index.txt b/erpnext/docs/user/manual/en/CRM/index.txt
new file mode 100644
index 0000000..204123a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/index.txt
@@ -0,0 +1,6 @@
+lead
+customer
+opportunity
+contact
+newsletter
+setup
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md
new file mode 100644
index 0000000..8bcbc05
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/lead.md
@@ -0,0 +1,60 @@
+To get the customer through the door, you may be doing all or any of the
+following:
+
+ * Listing your product on directories.
+ * Maintaining an updated and searchable website.
+ * Meeting people at trade events.
+ * Advertising your product or services.
+
+When you send out the word that you are around and have something valuable to
+offer, people will come in to check out your product. These are your Leads.
+
+They are called Leads because they may lead you to a sale. Sales people
+usually work on leads by calling them, building a relationship and sending
+information about their products or services. It is important to track all
+this conversation to enable another person who may have to follow-up on that
+contact. The new person is then able to know the history of that particular
+Lead.
+
+---
+
+Leads are the entities constituting a first contact. Leads can be created by a system users or by a web-user. When a lead is created minimal info (name,email) is entered and the lead is (default) linked to the active system user, the owner of the lead A user configurable drop list is used to classify Status of the lead (Open, Replied etc)
+
+To create a Lead, go to:
+
+> Selling > Lead > New Lead
+
+<img class="screenshot" alt="Lead" src="{{docs_base_url}}/assets/img/crm/lead.png">
+
+ERPNext gives you a lot of options you may want to store about your Leads. For
+example what is the source, how likely are they to give you business etc. If
+you have a healthy number of leads, this information will help you prioritize
+who you want to work with.
+
+> **Tip:** ERPNext makes it easy to follow-up on leads by updating the “Next
+Contact” details. This will add a new event in the Calendar for the User who
+has to contact the lead next.
+
+### Difference between Lead, Contact and Customer
+
+The difference is that a Lead is a potential Customer, someone who can give
+you business. A Customer is an 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 be converted to a Customer by clicking on the “Create Customer”
+button. Once the Customer is created, the Lead becomes “Converted” and any
+further Opportunities from the same source can be created against the
+Customer.
+
+---
+
+### Creation via Portal
+
+If a someone creates an account through the website interface is Lead is automatically created, status is Open and the Owner is the webuser.
+
+After registration the webform Addresses is called, where the web user can enter address information.The address is linked to the lead using the **Lead Name-Address Type** as ID.
+
+If using the Cart functionality, items are ordered the Lead is Converted and a Customer is created using the Web-User Name. Because a Customer can only be linked to a webuser using the (foreign) ID in Contact, such contact has to be created as well.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/CRM/newsletter.md b/erpnext/docs/user/manual/en/CRM/newsletter.md
new file mode 100644
index 0000000..c4d9c9d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/newsletter.md
@@ -0,0 +1,19 @@
+A newsletter is a short written report that tells about the recent activities
+of an organization. It is generally sent to members of the organization,
+potential clients customers or potential leads.
+
+In ERPNext, you can use this UI to send any type of communication to a large
+number of audience. The process of sending bulk email to a target audience is
+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 recepient, you can use the test function. Save the
+document before testing. A test email will be sent to your email id. You can
+send the email to all the intended receipients by clicking on the send button.
+
+<img class="screenshot" alt="Newsletter - New" src="{{docs_base_url}}/assets/img/crm/newsletter-new.png">
+
+<img class="screenshot" alt="Newsletter - Test" src="{{docs_base_url}}/assets/img/crm/newsletter-test.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
new file mode 100644
index 0000000..9f44fdf
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -0,0 +1,30 @@
+When you know a Lead is looking for some products or services to buy, you can
+track that as an Opportunity.
+
+You can create an Opportunity from:
+
+> Selling > Opportunity > New Opportunity
+
+or open a “Open” Lead and click on “Create Opportunity” button.
+
+#### Figure 1: Create Opportunity
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/opportunity.png">
+
+You can also open a “Open” Lead and click on “Create Opportunity” button.
+
+#### Figure 2: Create Opportunity from an open Lead
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/lead-to-opportunity.png">
+
+An Opportunity can also come from an existing Customer. You can create
+multiple Opportunities against the same Lead. In Opportunity, apart from the
+Communication, you can also add the Items for which the Lead or Contact is
+looking for.
+
+> Best Practice: Leads and Opportunities are often referred as your “Sales
+Pipeline” this is what you need to track if you want to be able to predict how
+much business you are going to get in the future. Its always a good idea to be
+able to track what is coming in order to adjust your resources.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/CRM/setup/campaign.md b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
new file mode 100644
index 0000000..9f2f070
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
@@ -0,0 +1,20 @@
+A Campaign is a full-scale implementation of a sales strategy to promote a
+product or a service. This is done in a market segment of a particular
+geographical area, to achieve specified objectives.
+
+<img class="screenshot" alt="Campaign" src="{{docs_base_url}}/assets/img/crm/campaign.png">
+
+You can track [Lead]({{docs_base_url}}/user/guides/crm/lead.html), [Opportunity]({{docs_base_url}}/user/guides/crm/opportunity.html), [Quotation]({{docs_base_url}}/user/guides/selling/quotation.html) against a campaign.
+
+###Track Leads against Campaign
+
+* To track a 'Lead' against a campaign select 'View Leads'.
+
+<img class="screenshot" alt="Campaign - View Leads" src="{{docs_base_url}}/assets/img/crm/campaign-view-leads.png">
+
+* You shall get a filtered list of all leads made against that campaign.
+* You can also create new leads by clicking 'New'
+
+<img class="screenshot" alt="Campaign - New Lead" src="{{docs_base_url}}/assets/img/crm/campaign-new-lead.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
new file mode 100644
index 0000000..007f445
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
@@ -0,0 +1,14 @@
+Customer groups allow you to organize your customers. You can also have discounts based on customer groups.
+You can also get trend analysis for each
+group. Typically Customers are grouped by market segment (that is usually
+based on your domain).
+
+<img class="screenshot" alt="Customer Group Tree" src="{{docs_base_url}}/assets/img/crm/customer-group-tree.png">
+
+> Tip: If you think all this is too much effort, you can leave it at “Default
+Customer Group”. But all this effort, will pay off when you start getting
+reports. An example of a sample report is given below:
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/setup/index.md b/erpnext/docs/user/manual/en/CRM/setup/index.md
new file mode 100644
index 0000000..259b5eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/index.md
@@ -0,0 +1,4 @@
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/setup/index.txt b/erpnext/docs/user/manual/en/CRM/setup/index.txt
new file mode 100644
index 0000000..3d960aa
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/index.txt
@@ -0,0 +1,3 @@
+campaign
+customer-group
+sales-person
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
new file mode 100644
index 0000000..114003b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
@@ -0,0 +1,14 @@
+Sales Persons behave exactly like Territories. You can create an organization
+chart of Sales Persons where each Sales Person’s target can be set
+individually. Again as in Territory, the target has to be set against Item
+Group.
+
+<img class="screenshot" alt="Sales Person Tree" src="{{docs_base_url}}/assets/img/crm/sales-person-tree.png">
+
+####Sales Person in Transactions
+
+You can use this Sales Person in Customer and sales transactions like Sales Order, Delivery Note and Sales Invoice.
+Click [here](https://erpnext.com/kb/selling/managing-sales-persons-in-sales-transactions) to learn more
+about how Sales Persons are used in the transactions of Sales Cycle.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/accounting-entries.md b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
new file mode 100644
index 0000000..7aeff24
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
@@ -0,0 +1,58 @@
+The concept of accounting is explained with an example given below: We will
+take a "Tea Stall" as a company and see how to book accounting entries for the
+business.
+
+ * Mama (The Tea-stall owner) invests Rs 25000 to start the business.
+
+
+
+__Analysis:__ Mama invested 25000 in company, hoping to get some profit. In other
+words, company is liable to pay 25000 to Mama in the future. So, account
+"Mama" is a liability account and it is credited. Company's cash balance will
+be increased due to the investment, "Cash" is an asset to the company and it
+will debited.
+
+ * The company needs equipments (Stove, teapot, cups etc) and raw materials (tea, sugar, milk etc) immediately. He decides to buy from the nearest general store "Super Bazaar" who is a friend so that he gets some credit. Equipments cost him 2800 and raw materials worth of 2200. He pays 2000 out of total cost 5000.
+
+
+
+__Analysis:__ Equipments are "Fixed Assets" (because they have a long life) of the
+company and raw materials "Current Assets" (since they are used for day-to-day
+business), of the company. So, "Equipments" and "Stock in Hand" accounts have
+been debited to increase the value. He pays 2000, so "Cash" account will be
+reduced by that amount, hence credited and he is liable to pay 3000 to "Super
+Bazaar" later, so Super Bazaar will be credited by 3000.
+
+ * Mama (who takes care of all entries) decides to book sales at the end of the every day, so that he can analyze daily sales. At the end of the very first day, the tea stall sells 325 cups of tea, which gives net sales of Rs. 1575. The owner happily books his first day sales.
+
+
+
+__Analysis:__ Income has been booked in "Sales of Tea" account which has been
+credited to increase the value and the same amount will be debited to "Cash"
+account. Lets say, to make 325 cups of tea, it costs Rs. 800, so "Stock in
+Hand" will be reduced (Cr) by 800 and expense will be booked in "Cost of goods
+sold" account by same amount.
+
+At the end of the month, the company paid the rent amount of stall (5000) and
+salary of one employee (8000), who joined from the very first day.
+
+
+
+### Booking Profit
+
+As month progress, company purchased more raw materials for the business.
+After a month he books profit to balance the "Balance Sheet" and "Profit and
+Loss Statements" statements. Profit belongs to Mama and not the company hence
+its a liability for the company (it has to pay it to Mama). When the Balance
+Sheet is not balanced i.e. Debit is not equal to Credit, the profit has not
+yet been booked. To book profit, the following entry has to be made:
+
+
+
+Explanation: Company's net sales and expenses are 40000 and 20000
+respectively. So, company made a profit of 20000. To make the profit booking
+entry, "Profit or Loss" account has been debited and "Capital Account" has
+been credited. Company's net cash balance is 44000 and there is some raw
+materials available worth 1000 rupees.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/accounting-reports.md b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
new file mode 100644
index 0000000..61470b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
@@ -0,0 +1,43 @@
+Some of the major accounting reports are:
+
+### General Ledger
+
+General Ledger is based on the table GL Entry and can be filtered by Account
+and between a period. This will help you to get a full update for all entries
+done in that period for that Account.
+
+<img alt="General Ledger" class="screenshot"
+ src="{{docs_base_url}}/assets/img/accounts/general-ledger.png">
+
+### Trial Balance
+
+Trial Balance is the list of Account balances for all your Accounts
+(“Ledger” and “Group”) on a particular date. For each Account it will give you
+the:
+
+ * Opening
+ * Debits
+ * Credits
+ * Closing
+
+<img alt="Trial Balance" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/trial-balance.png">
+
+The sum of all closing balances in a Trial Balance must be zero.
+
+### Accounts Payable and Accounts Receivable (AP / AR)
+
+These reports help you to track the outstanding invoices sent to Customer and
+Suppliers. In this report, you will get your outstanding amounts period wise.
+i.e. between 0-30 days, 30-60 days and so on.
+
+<img alt="Accounts Receivable" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
+
+### Sales and Purchase Register
+
+In this report, each tax Account is transposed in columns. For each Invoice and
+invoice Item, you will get the amount of individual tax that has been paid,
+based on the Taxes and Charges table.
+
+<img alt="Sales Register" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/sales-register.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
new file mode 100644
index 0000000..042e800
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
@@ -0,0 +1,62 @@
+Payment done by the customer before accepting delivery of the product is an
+Advance Payment. For Orders of high value, the business houses expect to
+receive advance.
+
+
+__For Example:__ Consider a customer- Jane D'souza placing an order for a double
+bed costing $10000 She is asked to give some advance before the furniture
+house begins work on her order. She gives them $5000 in cash.
+
+
+Go to Accounts and open a new Journal Entry to make the advance entry.
+
+> Accounts > Documents > Journal Entry > New Journal Entry
+
+Mention the voucher type as cash voucher. This differs for different
+customers. If somebody pays by cheque the voucher type will be Bank Voucher.
+Then select the customer account and make the respective debit and credit
+entries.
+
+Since the customer has given $5000 as cash advance,it will be recorded as a
+credit entry against the customer. To balance it with the debit entry [Double
+accounting Entry] enter $5000 as debit against the company's cash account. In
+the row "Is Advance" click 'Yes'.
+
+#### Figure 1 : Journal Entry -Advance Entry
+
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-1.png">
+
+### Double Entry Accounting
+
+Double entry bookkeeping is a system of accounting in which every transaction
+has a corresponding positive and negative entry : debits and credits. Every
+transaction involves a [debit entry
+](http://www.e-conomic.co.uk/accountingsystem/glossary/debit)in one account
+and a [credit
+entry](http://www.e-conomic.co.uk/accountingsystem/glossary/credit) in another
+account. This means that every transaction must be recorded in two accounts;
+one account will be debited because it receives value and the other account
+will be credited because it has given value.
+
+
+#### Figure 2: Transaction and Difference Entry
+
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-2.png">
+
+Save and submit the JV. If this document is not saved it will not be pulled in
+other accounting documents.
+
+When you make a new Sales Invoice for the same customer, mention the advance
+in the Sales Invoice Form.
+
+To link the Sales Invoice to the Journal Entry which mentions the advance
+payment entry, click on ‘Get Advances Received’. Allocate the amount of
+advance in the advances table. The accounting will be adjusted accordingly.
+
+#### Figure 3: Receive Advance
+
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-3.png">
+
+Save and submit the Sales Invoice.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/articles/.md b/erpnext/docs/user/manual/en/accounts/articles/.md
new file mode 100644
index 0000000..39dc1a8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/.md
@@ -0,0 +1,228 @@
+Write a post about distributing same expense among various cost centers.
+
+<div><span style="color: rgb(0, 100, 0); font-family: Verdana, sans-serif; font-size: 9pt; line-height: 1.42857143;"> </span>
+ <br>
+</div>
+<div><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif">How do i differentiate salaries of 2 departments in <span class="il">cost</span> <span class="il">centers</span>?</span>
+ <br>
+</div>
+<div><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"><br></span>
+</div>9:18:38 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> hi Dhaval..</span>
+<br>
+<br>9:18:42 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> this is Umair..</span>
+<br>
+<br>9:18:44 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> how are you?</span>
+<br>
+<br>9:18:46 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> hey umair</span>
+<br>
+<br>9:18:49 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> m good</span>
+<br>
+<br>9:19:16 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> have you created department wise <span class="il">cost</span> <span class="il">center</span>?</span>
+<br>
+<br>9:19:27 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> no we have not yet created <span class="il">cost</span> <span class="il">center</span></span>
+<br>
+<br>9:19:36 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> if so, this is how you should post journal voucher for salary..</span>
+<br>
+<br>9:19:49 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> can you help us in an ideal way to setup up <span class="il">cost</span> <span class="il">centers</span>?</span>
+<br>
+<br>9:19:50 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> I will just give you an example first..</span>
+<br>
+<br>9:19:53 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> ok</span>
+<br>
+<br>9:20:09 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> if you give 2,00,000 in a monthly salary..</span>
+<br>
+<br>9:20:37 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> and divide salary expense in multiple <span class="il">cost</span> <span class="il">center</span>:</span>
+<br>
+<br>9:20:52 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> then this how journal voucher will be posted.</span>
+<br>
+<br>9:23:06 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> Dr. Salary (Expense a/c) ........... Sales (<span class="il">cost</span> <span class="il">center</span>) ........... 80000
+<br> Dr. Salary ..............................
+<wbr>. Manufacturing .................. 70000
+<br> Dr. Salary ..............................
+<wbr>. Admin.........................
+<wbr>..... 30000
+<br> Dr. Salary ..............................
+<wbr>. Seniors ............................ 20000
+<br> Cr. Bank/Cash account.......................
+<wbr>..............................
+<wbr>. 200000</span>
+<br>
+<br>9:23:15 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> Debit = Credit - 2,00,000</span>
+<br>
+<br>9:23:25 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> ok</span>
+<br>
+<br>9:23:32 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> so, expense account selected will be same..</span>
+<br>
+<br>9:23:45 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> but you will divide rows based on <span class="il">cost</span> <span class="il">center</span>.</span>
+<br>
+<br>9:24:00 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> but we have 3 levels of hierarchy</span>
+<br>
+<br>9:24:30 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> like Production Unit -1 > Departments > sections</span>
+<br>
+<br>9:24:49 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> its like a tree,</span>
+<br>
+<br>9:24:57 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> <span class="il">cost</span> <span class="il">center</span> within a <span class="il">cost</span> <span class="il">center</span></span>
+<br>
+<br>9:25:48 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> you can define child - parent relationship in <span class="il">Cost</span> <span class="il">Center</span> master.</span>
+<br>
+<br>9:26:01 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> because it is a tree structure master..</span>
+<br>
+<br>9:26:20 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> ya, but here is my problem</span>
+<br>
+<br>9:26:20 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> but only child <span class="il">cost</span> <span class="il">centers</span> will be selectable in the transactions..</span>
+<br>
+<br>9:26:28 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> exactly</span>
+<br>
+<br>9:26:52 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> <a href="https://erpnext.com/user-guide/selling/selling-setup/customer-group" target="_blank">https://erpnext.com/user-<wbr>guide/selling/selling-setup/<wbr>customer-group</a></span>
+<br>
+<br>9:27:08 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> check this for example on how to manage tree masters</span>
+<br>
+<br>9:28:03 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> so how can i have a <span class="il">cost</span> <span class="il">center</span> of production unit as a ledger as well as parent</span>
+<br>
+<br>9:29:45 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> Production (parent)<br> - Cutting<br> - Stitching<br> - packing</span>
+<br>
+<br>9:30:09 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> so how do i track salaries of each of there depts</span>
+<br>
+<br>9:30:15 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> these*</span>
+<br>
+<br>9:30:25 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> check attached link for example on how to create group and child <span class="il">Cost</span> <span class="il">Centers</span>.</span>
+<br>
+<br>9:31:00 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> in JV, you will select Cutting, Packing department for <span class="il">Cost</span> <span class="il">Center</span>.</span>
+<br>
+<br>9:31:06 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> i have to create each individual ledgers - cutting salary, stitching salary, packing salary</span>
+<br>
+<br>9:32:15 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> OH! so in JV, when i select Cutting, Packing department for <span class="il">Cost</span> <span class="il">Center</span>. will it show salary as a head in
+the <span class="il">cost</span> <span class="il">center</span>?</span>
+<br>
+<br>9:32:22 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> as it is a salary JV?</span>
+<br>
+<br>9:32:32 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> or will only the value of the amount show?</span>
+<br>
+<br>9:33:50 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> it will show balance for the individual <span class="il">cost</span> <span class="il">center</span>..</span>
+<br>
+<br>9:34:19 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> and consolidated <span class="il">cost</span> <span class="il">center</span> for Production <span class="il">Cost</span> <span class="il">Center</span>, which
+is parent for these <span class="il">cost</span> <span class="il">centers</span></span>
+<br>
+<br>9:34:38 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> so only amount and not against the type expense</span>
+<br>
+<br>9:38:00 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> yes.. it will show again Salary Account as well..</span>
+<br>
+<br>9:38:17 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> basically, we tag <span class="il">cost</span> <span class="il">center</span> with Profit and Loss account..</span>
+<br>
+<br>9:38:34 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> ok</span>
+<br>
+<br>9:38:35 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> so actual ledger posting happens in the Account/Ledger..</span>
+<br>
+<br>9:38:54 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> <span class="il">Cost</span> <span class="il">Center</span> shows balance based on amount mentioned with it..</span>
+<br>
+<br>9:39:17 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> so in <span class="il">cost</span> <span class="il">centers</span> i should just keep all my depts as ledgers and all <span class="il">costs</span> will be
+tracked for all types of expenses</span>
+<br>
+<br>9:39:23 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> so, we need to identify the correct combination of <span class="il">Cost</span> <span class="il">Center</span> and Expense account when making entry</span>
+<br>
+<br>9:39:45 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> thats one approach.</span>
+<br>
+<br>9:39:54 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> you can try and check if it works for you.</span>
+<br>
+<br>9:40:12 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> what is the other approach?</span>
+<br>
+<br>9:41:53 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> as per your scenario, this seems to be better.</span>
+<br>
+<br>9:42:08 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> we can comeup with other solution as scenario changes.</span>
+<br>
+<br>9:42:57 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> ok so, just for my knowledge, what was the default according to you?</span>
+<br>
+<br>9:43:11 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> where do i track <span class="il">cost</span> <span class="il">center</span> transactions?</span>
+<br>
+<br>9:43:43 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> there is no default as such <img class="CToWUd" src="https://mail.google.com/mail/u/0/?ui=2&ik=5ded98c3b2&view=fimg&th=14997f6e6fc0690c&attid=0.2&disp=emb&attbid=ANGjdJ8-s7s_w-HjfYCzquJ_jtWcYmi_jio2e21FfwAQMuN0Ojva3jv5ASXx__dGcNPLBGFnkLIhVx7IEYFiJRpimtb3Baen5vbSkns_O1ZHy63fuzSb1DKi0IilcQE&sz=w1600-h1000&ats=1415597192468&rm=14997f6e6fc0690c&zw&atsh=1" alt="Smiley: Smile" title="Smile" height="24" width="24"></span>
+<br>
+<br>9:43:56 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> you can define masters you per your requirement..</span>
+<br>
+<br>9:44:06 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> we suggest setting up <span class="il">cost</span> <span class="il">center</span> based on Project..</span>
+<br>
+<br>9:44:19 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> because it will help you track profitability as well.</span>
+<br>
+<br>9:44:29 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> but thats another scenario.</span>
+<br>
+<br>9:44:41 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> ok</span>
+<br>
+<br>9:44:44 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> cool</span>
+<br>
+<br>9:46:36 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> where to tract <span class="il">cost</span> <span class="il">center</span> reports?</span>
+<br>
+<br>9:47:24 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> track*</span>
+<br>
+<br>9:48:32 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Dhaval Shah:</span>
+<br><span style="color:#006400;font-size:9.0pt;font-family:Verdana,sans-serif"> ?</span>
+<br>
+<br>9:48:51 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> Accounts >> Main Reports >> Financial Analytics</span>
+<br>
+<br>9:49:12 AM: <span style="color:#696969;font-size:9.0pt;font-family:Verdana,sans-serif">Web Notes Support:</span>
+<br><span style="color:#b22222;font-size:9.0pt;font-family:Verdana,sans-serif"> below P&L and Balance Sheet, you will find <span class="il">cost</span> <span class="il">centers</span> for selection.</span>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
new file mode 100644
index 0000000..6eba288
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
@@ -0,0 +1,72 @@
+<h1>Accounting for Projects</h1>
+
+Accounting for the projects is tracked via Cost Center in ERPNext. This will require you creating separate Cost Center for each Project. Separate Cost Center for each Project all allow:<
+
+- Allocating budget against specific Cost Center.
+- Getting Profitability Report for each Project.
+
+Let's check steps on how Project and Cost Center should be linked, and used in the sales and purchase transactions.
+
+### 1. Linking Project and Cost Center
+
+#### 1.1 Create Project
+
+You should first create new Project from:
+
+`Projects > Project > New`
+
+In the Project, you will find field to set default Cost Center for this Project.
+
+#### 1.2 Create Cost Center
+
+Since budgeting and costing for each Project will be managed separately, you should create separate Cost Center for each Project.
+
+To create new Cost Center, go to:
+
+`Accounts > Setup > Cost Center`
+
+[Click here to learn on how to add new Cost Center](https://erpnext.com/user-guide/accounts/cost-centers-and-budgeting).
+
+#### 1.3 Update Cost Center in the Project
+
+After creating Cost Center, come back to Project master, and select Cost Center creating for this Project under Default Cost Center field.
+
+
+
+With this, you will have Cost Center being fetched automatically in the Sales and Purchase transactions based on selection of Cost Center.
+
+Let's check how this setting will affect your sales and purchase entries.
+
+### 2. Selecting Project and Cost Center in the Sales and Purchase Transactions
+
+#### 2.1 Selecting Project in the Sales Transactions
+
+In the sales transactions (which are Sales Order, Delivery Note and Sales Invoice), Project will be selected in the More Info section. On selection of a Project, respective Cost Center will be updated for all the items in that transaction.
+
+
+
+#### 2.2 Selecting Project in the Purchase Cycle Transactions
+
+In the purchase transactions, Project will be define for each item. This is because you can create a consolidated purchase entry of materials for various projects. Just like it works in sales cycle, same way in the purchase transactions, on selection of Project, its default cost center will be fetched automatically.
+
+
+
+### 3. Accounting Report for a Project
+
+#### 3.1 Projectwise Profitability
+
+Since Project's Cost Center has been updated in both sales and purchase entries made for a specific transaction, system will provide you a projectwise profitability report. Profitability for a Project will be derived based on total value income booked minus total value of expense booked where common Cost Center (of a Project) is tagged.
+
+
+
+#### 3.2 Projectwise Budgeting
+
+If you have also define budgets in the Cost Center of a Project, you will get Budget Variance Report for a Cost Center of a Project.
+
+To check Budget Variance report, go to:
+
+`Accounts > Standard Reports > Budget Variance Report`
+
+[Click here for detailed help on how to do budgeting from Cost Center](https://erpnext.com/user-guide/accounts/budgeting).
+
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/accounts/articles/c-form.md b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
new file mode 100644
index 0000000..c2f2061
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
@@ -0,0 +1,47 @@
+<h1>C-Form</h1>
+
+C-Form functionality is only applicable for Indian customers.
+
+**What is C-Form?**
+
+C-Form is issued by the Customer. If Customer Issues C-Form, supplier applies discounted CST (central sales tax) in the invoice. C-Form is only applicable on the inter-state transactions.
+
+C-Form functionality in ERPNext allows Supplier to update C-Form No. as received from Customer in the submitted Sales Invoice. Also you can create report on Sales Invoice and track invoices for which C-Form has not yet been received from Customer.
+
+Following are step to manage C-Form related sales in ERPNext.
+
+####Set C-Form Applicability
+
+While creating Sales invoice for the customer, set C-Form applicability in Sales Invoice. In More Info section of Sales Invoice, set field called **Is C-Form Applicable** as **Yes**. Bydefault, this field will have No for a value.
+
+
+
+Updating this field as Yes will allow you to pull this Sales Invoice in the C-Form Tool, and update C-Form No. as received from the Customer.
+
+####Create C-Form Record
+
+After receiving C-Form from your Customer, you should update that C-Form no. in the Sales Invoice by creating C-Form record.
+
+Go to `Accounts > Setup > C-Form > New`
+
+Enter details like C-Form No, Received Date, State and Amount etc. Select Customer and pull related Sales Invoices under provided table.
+
+
+
+####Save & Submit C-Form
+
+After entering details, save and submit C-Form record. On save system will generate C-Form record and on submission update that C-Form No. in the Sales Invoice.
+
+
+
+C-Form serial no will be updated in related invoice under the field 'C-Form No'.
+
+
+
+####Tracking Pending Invoice for C-Form
+
+To track invoices for which C-Form has not yet been received from Customer, you can create custom report on Sales Invoice. In this report, you can filter invoices which doesn't have C-Form updated in them yet, and followup with the customer accordingly.
+
+
+
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
new file mode 100644
index 0000000..02cbd66
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
@@ -0,0 +1,28 @@
+<h1>Changing Parent Account</h1>
+
+Chart of Account has hierarchical structure. This means each account has a parent account defined for it. You will have few ledger preset, and few ledger (like for Customer, Supplier, Warehouse) will be auto-created based on their master record. These ledger will be placed under pre-defined groups in the Chart of Account. If needed you can place specific account under another group by changing its Parent Account.
+
+Following are the steps to edit Parent for specific Account.
+
+####1. Go to Chart of Account
+
+`Accounts > Setup > Chart of Account`
+
+Click on Account for which Parent Account is to be changed.
+
+####2. Edit Account
+
+
+
+####3. Change Parent Account
+
+Search and select preferred Parent Account and save.
+
+
+
+Refresh system from Help menu to experience the change.
+
+
+
+<div class="well">Note: Change of Parent Account is not applicable for Root Accounts.</div>
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md b/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md
new file mode 100644
index 0000000..6770fa3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md
@@ -0,0 +1,27 @@
+<h1>Customer for Multiple Company</h1>
+
+ERPNext allows you managing multiple companies in one ERPNext account. It is possible that you will have Customer and Supplier which would belong to more than one company of yours. While creating sales and purchase transactions, system shows result of Customer and Suppliers for that Company only.
+
+It means if you have added (say) Wind Mills Limited as a customer for the first company, you will not be able to select it as a customer when creating Sales Order (or any other sales transaction) for another company.
+
+There are two approach to address this scenario.
+
+####Create Another Customer Record
+
+You should create another Customer record for Wind Mills Limited, but for the second company.
+
+If you try adding another customer with exact same name (as Wind Mills Limited), system will throw a validation message that, account already exist for Wind Mills Limited.
+
+
+
+>To be able to track customerwise receivables, ERPNext created accounting ledger for each customer in the Chart of Account, under Accounts Receivable group.
+
+As indicated in the error message, since Account Name already exist for the first customer, you should change customer name for second customer a bit (say Wind Mills Pvt. Limited) to bring uniqueness in it. Then you will be able to save Customer correctly.
+
+####Change Company in Existing Customer
+
+Since creating another Customer record for the same party will be over-load in the system, you can change company in the exist Customer master of Wind Mills Limited, and re-save it. On saving customer again, it will create another accounting ledger for Wind Mills in the Chart of Account of second company.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md
new file mode 100644
index 0000000..026657f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md
@@ -0,0 +1,30 @@
+<h1>Depreciation for Fixed Asset Items</h1>
+
+Depereciation of fixed asset items.
+
+####Separate Group of Depreciation Account
+
+
+
+####Depreciation Entry for Fixed Asset Items
+
+Depreciation is when you write off certain value of your assets as an expense. For example if you have a computer that you will use for say 5 years, you can distribute its expense over the period and pass a
+Journal Voucher at the end of each year reducing its value by a certain percentage.
+
+As per perpetual inventory valuation system (set by default), you should create Stock Reconciliation for depreciating value of fixed asset items. In the Stock Reconciliation template, you should only enter Item's Code, Warehouse and its current value.
+
+Let's assume current value of our computer is $250, and its purchase value was $320.
+
+
+
+In this case, depreciation amount of Computer will be $70 ($320-$250). Depreciation Amount will be booked under Difference (expense) Account selected in the stock reconciliation.
+
+
+
+Following is how general ledger will be posted for fixed this Stock Reconciliation.
+
+
+
+Click [here](https://erpnext.com/user-guide/setting-up/stock-reconciliation-for-non-serialized-item) for steps to be followed when making Stock Reconciliation entry.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html
new file mode 100644
index 0000000..30cae4e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html
@@ -0,0 +1,16 @@
+<h1>Difference Entry Button </h1>
+
+As per accounting standards Debit amount must be equal to Credit amount. If these amounts are not equal, then entry will not be executed in system. Also system will through validation message. And difference amount will reflect under Difference (Dr-Cr) field.
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_002.png"><br>
+When you press 'Make Difference Entry' button, one new Row will be added under Journal Entry Accounts table with difference amount. You can edit that row to select appropriate account.
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_003.png">
+<br>
+<br>On selecting account under new row, you will be able to submit Journal Entry.
+<br>
+<br>
+<div class="well">If debit and credit amount entered for accounts are already tallying, then you need not click on "Make Difference Entry" button.</div>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
new file mode 100644
index 0000000..e22a3ef
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
@@ -0,0 +1,32 @@
+<h1>Fixing Fiscal Year's Error</h1>
+
+While creating entries in ERPNext, system validates if dates (like Posting Date, Transaction Date etc.) matches with Fiscal Year selected in the entry. If not, system through an error message saying:
+
+`Date ##-##-#### not in fiscal year`
+
+You are more likely to receive this error message if your Fiscal Year has changes, but you still have old Fiscal Year updated. To ensure new Fiscal Year is auto updated in the transactions, you should setup your master as instructed below.
+
+####Create New Fiscal Year
+
+Only User with System Manager's Role Assigned has permission to create new Fiscal Year. To create new Fiscal Year, go to:
+
+`Accounts > Setup > Fiscal Year`
+
+Click [here](https://erpnext.com/user-guide/accounts/fiscal-year) to learn more about Fiscal Year master.
+
+####Set Fiscal Year as Default
+
+After Fiscal Year is saved, you will find option to set that Fiscal year as Default.
+
+
+
+Default Fiscal Year will be updated in the Global Default setting as well. You can manually update Default Fiscal Year from:
+
+`Setup > Settings > Global Default`
+
+
+
+Then Save Global Default, and refresh browser of your ERPNext account. After this, you will have default Fiscal Year auto-updated in your transactions as well.
+
+Note: In transactions, you can manually select required Fiscal Year from More Info section. You might have to click on "View Details" button to access View Details section, and edit Fiscal Year.
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html
new file mode 100644
index 0000000..38ecaf5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html
@@ -0,0 +1,3 @@
+<h1>How to freeze accounting entries upto a specific date?</h1>
+
+To freeze accounting entries upto a certain date, follow these steps:<br><br>1. Go to <b>Accounts -> Setup -> Accounts Settings</b>.<br>2. Set the date in <b>Accounts Frozen Upto</b> field.<br><img src="{{docs_base_path}}/assets/img/articles/freeze-accounting-entry.png" height="302" width="488"><br><br>Now, the system will not allow to make accounting entries before that date. <br><br>But you can allow a specific <b>Role,</b> to make/edit accounting entries before that date. To do that set the desired <b>Role</b>, in <b>Role Allowed to Set Frozen Accounts & Edit Frozen Entries</b> field.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
new file mode 100644
index 0000000..d76a331
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
@@ -0,0 +1,28 @@
+<h1>How To Freeze Accounting Ledger?</h1>
+
+You can freeze any accounting ledger in ERPNext. So that frozen accounting ledger became unsearchable in accounting transaction. Follow below step to understand the process.
+
+#### 1. Set Frozen Accounts Modifier
+
+To set frozen accounts modifier go to `Accounts > Setup > Accounts Setting`
+
+Search and select Role under Frozen Accounts Modifier field and save the Account Settings form.
+
+
+
+#### 2. Edit Accounting Ledger.
+
+To edit accounting ledger go to `Accounts > Setup > Chart of Accounts`
+
+
+
+#### 3. Set Frozen Status of Ledger.
+
+
+
+Set Frozen field status of ledger as 'Yes' and save the ledger form. On save this ledger will be frozen and you will became unable to search this ledger in accounting transactions.
+
+<div class ="well"> Note: If you want to make accounting transaction against this ledger in the future, then that time again set frozen field status as 'No'.</div>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md
new file mode 100644
index 0000000..5ba6d17
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md
@@ -0,0 +1,16 @@
+<h1>How to Nullify Balance From Temporary Accounts? </h1>
+
+There are two separate temporary accounts in Chart of Accounts. One is Temporary Account (Assets) and other one is Temporary Account (Liabilities). These accounts are available under Application of Funds and Source of Funds in Chart of Accounts respectively.
+
+These temporary accounts only used to update opening balances. [Click here to learn about update Opening balances](https://erpnext.com/kb/accounts/updating-opening-balance-in-accounts-using-temporary-account)
+
+After completing all opening entries against these temporary accounts balances for both accounts will updated. And Debit balance of Temporary Account (Assets) will became equal to Credit balance of Temporary Account (Liabilities).
+
+Since temporary account were used only for balancing purpose, it shall not have any balance in it.
+To nullify balance in these accounts, you should create a new Journal Voucher, where will you update balances against these accounts. To create new Journal Entry go to `Accounts > Documents > Journal Entry
+
+
+
+On submit of this journal entry, balances of these temporary accounts will be set to Zero.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.md b/erpnext/docs/user/manual/en/accounts/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
new file mode 100644
index 0000000..2eb1756
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt
@@ -0,0 +1,22 @@
+
+accounting-for-projects
+c-form
+changing-parent-account
+customer-for-multiple-company
+depreciation-for-fixed-asset-items
+difference-entry-button
+fiscal-year-error
+how-to-freeze-accounting-entries-upto-a-specific-date
+how-to-freeze-accounting-ledger
+how-to-nullify-balance-from-temporary-accounts
+manage-foreign-exchange-difference
+managing-transactions-in-multiple-currency
+new-fiscal-year-auto-create-feature
+pos-view
+post-dated-cheque-entry
+pricing-rule
+recurring-order-and-invoices
+update-stock-option-in-sales-invoice
+updating-opening-balance-in-accounts-using-temporary-account
+what-is-the-differences-of-total-and-valuation-in-tax-and-charges
+withdrawing-salary-from-owners-equity-account
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
new file mode 100644
index 0000000..6e24f86
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
@@ -0,0 +1,25 @@
+<h1>Manage Foreign Exchange Difference</h1>
+
+When you book Sales Invoices and Purchase invoices in multiple currencies, you will have to deal with currency difference while booking payment entry. You can easily manage this in ERPNext in following ways.
+
+####Add Expense Account
+
+To mange currency difference, create Account **Foreign Exchange Gain/Loss**.
+
+
+
+####Book Payment Entry
+
+In the payment voucher, update invoice amount against Customer or Supplier account, then update actual payment amount against Bank/ Cash account. Add new row and select Foreign Exchange Gain/Loss to update currency difference amount.
+
+####Scenario
+
+Below is the Sales Invoice for a customer in Europe. The base currency of a Company in USD. Sales Invoice is made at the exchange rate (USD to Eur) of 1.128.
+
+
+
+When receiving payment from the customer, exchange rate changed to 1.20. As per the update in the exchange rate, payment was for $120. Following is how payment entry will be booked to adjust the difference amount.
+
+
+
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html
new file mode 100644
index 0000000..3757a69
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html
@@ -0,0 +1,39 @@
+<h1>Managing Transactions In Multiple Currency</h1>
+
+You can make transaction in your base currency as well as in customer or supplier currencies. When you make transaction in your customer or supplier currency, the same currency reflects only in print format of that transaction. And system pass back end
+entry in your base currency.
+<br>
+<br>To understand this scenario will take example of Sales Invoice, where your base currency is INR and your customer currency is USD.
+<br>
+<br>Following are steps to create Sales Invoice in customer currency.
+<br>
+<br><b>Step 1:</b> Go to Selling >> Documents >> Sales Invoice >> (+) New.
+<br>
+<br><b>Step 2:</b> Select Customer and Enter other details.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_012.png">
+<br><b>Step 3:</b> Select customer currency and related Price List.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_016.png">
+<br>
+<br>
+<br>On selecting customer currency 'Exchange Rate' field will open under Currency field, where you will enter exchange rate of customer currency to basic currency. In our case for USD to INR. You can check exchange rate online
+for your customer currency to your currency.
+<br>
+<br>Also you can set default customer currency in customer master. Which will auto fetch in transactions.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_017.png">
+<br>System has Currency Exchange master, where you can set currency exchange masters for your multiple currencies. To Set this go to Accounts > Setup > Currency Exchange. <br><br><b>Step 4:</b> Select Item details.<br>
+<br>On selecting Item details Sales invoice Total section will look like below image.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_018.png" width="750">
+<br>
+<br>
+<br>
+<b>Step 5:</b> Save and Submit <br><br>Enter other details like Taxes and charges, Terms and Condition if there and save and submit the invoice form. After submit click on Printer Icon to check print preview. The same document print or email document will you send to your customer or supplier.<br>For our case it will look as below image.<br><br><img src="{{docs_base_path}}/assets/img/articles/Selection_019.png"> <br>
+<br>
+<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html b/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html
new file mode 100644
index 0000000..5b6c10f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html
@@ -0,0 +1,3 @@
+<h1>New Fiscal Year Auto-Create feature</h1>
+
+New Fiscal Year needs to be created each year at the end of the previous fiscal year. This Process however has been automated in ERPNext.<div><br></div><div>3 days prior to the end of the existing fiscal year; the system shall check if the user has created a new fiscal year for the incoming year. If not the system generates a new fiscal year. All fiscal year Companies are also linked with the new fiscal year as in the previous year.<br><br></div><div><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-03 at 5.03.10 pm.png"><br></div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/pos-view.html b/erpnext/docs/user/manual/en/accounts/articles/pos-view.html
new file mode 100644
index 0000000..fb3c500
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/pos-view.html
@@ -0,0 +1,3 @@
+<h1>POS View</h1>
+
+POS view renders form in a different layout, mainly designed for the quick selection of items. This view has primarily been designed for the retail business, who needs to be quick at invoicing.<div><br></div><div><img src="{{docs_base_path}}/assets/img/articles/$SGrab_219.png"><br></div><div><br></div><div>Using POS View, you can make complete Sales Invoice, without switching to standard form view.<br><div><br></div><div><b>Question: Why do I get error message for missing fields when making Purchase Receipt or other sales/purchase transactions from POS View?</b></div></div><div><br></div><div>Though POS View is mainly designed for Sales Invoice, but it is also made available in all the sales and purchase transactions. In other transactions, POS View is only meant for quick selection of items. This view will not provide all the fields which are available in the standard form view. Hence, you shall use POS View in other transactions just for Item selection, and revert to form view for enter values in other mandatory fields.</div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
new file mode 100644
index 0000000..12957d9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
@@ -0,0 +1,32 @@
+<h1>Post Dated Cheque Entry</h1>
+
+Post Dated Cheque is a cheque dated on future date given to another party. This actually works as an advance payment which will could be cleared post cheque date only.
+
+In ERPNext, you can manage post dated cheque entries via journal voucher. Following are step to book payment entry for post dated cheque.
+
+####New Journal Voucher
+
+To open new journal voucher go to
+
+`Accounts > Documents > Journal Voucher > New`
+
+####Set Posting Date and other details
+
+Assuming your Cheque Date is 31st December, 2014 (or any future date) and you need value of this cheque to reflect in the bank balance after cheque date only.
+
+
+
+Note: Journal Voucher Reference Date should equal to or less than Posting Date.
+
+####Step 3: Save and Submit Journal Voucher
+
+After entering required details Save and Submit the Journal Voucher.
+
+####Adjusting Post Dated Cheque Entry
+
+If Post Dated Journal Voucher needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool](https://erpnext.com/user-guide/accounts/payment-reconciliation).
+
+When cheque is cleared in the future date, i.e. actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool](https://erpnext.com/user-guide/accounts/bank-reconciliation).
+
+You might find value of this Journal Voucher already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of balance as per system, and balance expected in the bank.
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md
new file mode 100644
index 0000000..f1caf62
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md
@@ -0,0 +1,75 @@
+<h1>Pricing Rule</h1>
+
+Pricing Rule allows you to define rules based on which item's price or discount to be applied is determined.
+
+### Scenario:
+
+Following are the few cases which can be addressed using Pricing Rule.
+
+1. As per the promotional sale policy, if customer purchases more than 10 units of an item, he enjoys 20% discount.
+
+2. For Customer "XYZ", selling price for the specific or group of "Products" should be updated as ###.
+
+3. Items categorized under specific Item Group has same selling or buying price.
+
+4. Customers catering to specific Customer Group has same selling price.
+
+5. Supplier's categorized under common Supplier Type should have same buying rate applied.
+
+To have %Discount and Price List Rate for an Item auto-applied, you should set Pricing Rules for it.
+
+Pricing Rule master has two sections:
+
+### 1. Applicability Section:
+
+In this section, conditions are set for the Pricing Rule. When transaction meets condition as specified in the Pricing Rule, Price or Discount as specified in the Item master will be applicable. You can set condition on following values.
+
+####1.1 Applicable On:
+
+
+
+If you want Pricing Rule to be applied on all the items, you should apply rule based on Item Group, and select most Parent Item Group for a value.
+
+####1.2 Applicable For:
+
+Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
+
+
+
+####1.3 Quantity:
+
+Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
+
+
+
+###2. Application:
+
+Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
+
+
+
+####2.1 Price
+
+Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
+
+
+
+####2.2 Discount Percentage
+
+Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
+
+
+
+#### Validity
+
+Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
+
+
+
+####Disable
+
+Check Disable to inactive specific Pricing Rule.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html b/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html
new file mode 100644
index 0000000..6893761
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html
@@ -0,0 +1,3 @@
+<h1>Recurring Orders and Invoices</h1>
+
+If you have a contract with a <b>Customer</b> where you bill the Customer on a monthly, quarterly, half-yearly or annual basis, you should use recurring feature in orders and invoices. <br><br><h4>Scenario:</h4><br>Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Order for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Order as recurring. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.<br><br>Feature of setting document as recurring is available in Sales Order, Sales Invoice, Purchase Order and Purchase Invoice.<br><br>Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check <b>Is Recurring</b> to set document as recurring.<br><br><img src="{{docs_base_path}}/assets/img/articles/is-recurring.gif"><br><br><b>From Date and To Date: </b>This defines contract period with the customer.<br><br><b>Repeat on the Day of Month: </b>If recurring type is set as Monthly, then it will be day of the month on which recurring invoice will be generated.<br><br><b>End Date:</b> Date after which auto-creation of recurring invoice will be stopped.<br><br><b>Notification Email Address:</b> Email Addresses (separated by comma) on which recurring invoice will be emailed when auto-generated.<br><br><b>Recurring ID: </b>Recurring ID will be original document id which will be linked to all corresponding recurring document. For example, original Sales Invoice's id will be updated into all recurring Sales Invoices.<br><br><b>Recurring Print Format:</b> Select a print format to define document view which should be emailed to customer.<br><br><h4>Exception Handling:</h4><p>In a situation where recurring invoice is not created successfully, user with System Manager role is notified about it via email. Also the document on which recurring event failed, "Is Recurring" field is unchecked for it. This means system doesn't try creating recurring invoice for that document again.</p><p>Failure in creation of recurring invoice could be due to multiple reasons like wrong email id mentioned in the Email Notification field in Recurring section etc.</p><p>On receipt of notification, if cause of failure is fixed (like correcting email id) within 24 hours, then recurring invoice will be generated automatically. If issue is not fixed within the said time, then document should be created for that month/year manually.<br></p>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html
new file mode 100644
index 0000000..106f383
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html
@@ -0,0 +1,3 @@
+<h1>Update Stock Option in Sales Invoice</h1>
+
+The <i>Update Stock</i> check box is available in the <i>Items</i> section within <i>Sales Invoice</i> form.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_updatestk_field.png" height="221" width="603"><br><br>Usually the Sales Invoice is a voucher specifying the amount to be paid against Quantity delivered/to be delivered as per a particular Sales Order.<br><br>Checking the update Stock option before submitting an Invoice will directly deduct the Stock from the Inventory on submission of the Sales Invoice. In such a case the Sales Invoice also satisfies the function of a Delivery Note.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md b/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md
new file mode 100644
index 0000000..4962b82
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md
@@ -0,0 +1,44 @@
+<h1>Updating Opening Balance in Accounts using Temporary Account</h1>
+
+For updating opening balances in the Accounts, you will need to use temporary adjustment accounts. In the Chart of Account, two adjustment accounts will be created by default.
+
+1. Temporary Account (Assets)
+2. Temporary Account (Liabilities)
+
+Since ERPNext is a double entry accounting system, it requires balancing on debit side with credit side in an accounting entry. When start working on fresh ERPNext account, you will have to update opening balance in your Balance Sheet accounts. You can update opening balance in account(s), and use Temporary Account for balancing purpose.
+
+Let's consider a scenario of updating opening balance in an Account using temporary account.
+
+#### Identifying Accounts to Update Opening Balance
+
+Say we have following customer's ledger, and have receivable from them. This receivable should be updated as opening balance in their account.
+
+1. Comtek Solutions
+1. Walky Tele Solution
+
+Also we can update opening balance on Bank and Cash account.
+
+1. Bank of Baroda
+1. Cash
+
+All these accounts are located on the Current Asset side, hence will have Debit balance.
+
+#### Identifying Temporary Account
+
+To update debit balance in them, we will have to select Credit account for balancing it. Out of the temporary accounts available, we can use `Temporary Account (Liabilities)`.
+
+##### Opening Balance Entry
+
+For Current Asset account, their current balance will be updated on the Debit side. The total value of Debit will be entered as Credit Balance for the Temporary Account (Liability).
+
+
+
+Same way, you will update opening balance for the liability account. Since Liability accounts will have credit balance, you will have to select Temporary Account (Asset), which is a Debit account for balancing purpose.
+
+After you have updated opening balance in all the Asset and Liability account, you will find that balance in the temporary account will be equal. If balance in temporary accounts is not equal, it must be because opening balance is not updated in some account, or other account was used for balancing purpose.
+
+Since temporary account were used only for balancing purpose, it shall not have any balance in it. To nullify balance in these accounts, you should create a Journal Voucher which will set balance as zero in these account.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html
new file mode 100644
index 0000000..3d1c7db
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html
@@ -0,0 +1,34 @@
+<h1>Purchase Tax or Charges Categories</h1>
+
+Consider Tax or Charge field in Purchase Taxes and Charges master has three values.<br><br><ol>
+ <li>Total</li>
+ <li>Valuation</li>
+ <li>Total and Valuation<br><br><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-04-15 at 6.04.02 pm.png"><br></li>
+</ol>
+<p>Let's consider an example to understand an effect of value selected in Consider Tax or Charge field.</p>
+<p>We purchase 10 units of item, at the rate of 800, total purchase amount would be 800. Purchased item has 4% VAT tax and INR 100 transportation charges were incurred.
+
+</p><h4>Total:</h4>
+
+<p>An amount of tax/charge categorized Total will be accounted in the total of purchase transactions, but not in the value of purchased item.</p>
+<p>If VAT 4% is applied on item, it will amount to INR 32. Since VAT is the <a href="https://frappe.io/blog/erpnext-features/managing-consumption-tax" target="_blank">consumption tax</a>, its should be added value of Purchase Order/Invoice, since it will
+ be included in payable towards supplier, but its should not be added to the value of Purchased item.</p>
+<p>Hence for tax or charge you wish to be added to transaction total but not to the valuation of item, it should be categorized as Total.</p>
+<p>When Purchase Invoice is submitted, value of tax/charge is booked in respective account.
+ <br>
+</p>
+<h4>Valuation:</h4>
+<p>An amount of tax/charge categorized as Valuation will be added in the value of purchased item, but will not be added to the value of purchase transaction.</p>
+<p>Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, it will be not be added to the total of purchase transaction, because it should not be reflected to supplier,
+ as it will be irrelevant for them.
+ <br>
+</p>
+<p>When Purchase Invoice is submitted, value of tax/charge is booked in respective account. Transportation expense will be booked
+ <br>
+</p>
+<h4>Total and Valuation:</h4>
+<p>An amount of tax/charge categorized as for Total and Valuation will be added in the value of purchase item, as well as will be included in the totals of purchase transactions.</p>
+<p>Let's assume that transporter was 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 charges will be
+ added to actual purchase amount of INR 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.
+ <br>
+</p>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
new file mode 100644
index 0000000..860f6eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
@@ -0,0 +1,21 @@
+<h1>WIthdrawing Salary from Owner's Equity Account</h1>
+
+### Question
+
+After meeting with my accountant here in the US, I was informed that with my company being a sole member, I should not pay myself a salary that would hit the direct expenses account but instead should take a "draw" that hits the balance sheet and not the expenses. Can you please advise how I should set this up in ERP Next please?
+
+### Answer
+
+1. Create an account for **Owner's Equity** under Liabilities if you already do not have. This account will be your investment in the business and the accumulated profits (or losses). It will have a "Credit" type balance.
+2. In an Version 5, Equity will be a new head (not under Liabilities). (In either case Assets = Owner's Equity + Liabilities, so your balance sheet will be okay [Learn more about owner's equity account](http://www.accountingcoach.com/blog/what-is-owners-equity)).
+3. Create an account for **Owner's Draws** under **Owner's Equity**.
+4. Note that the balance of **Owner's Draws** will always be negative since you are reducing money from your total equity / profits.
+
+### Example
+
+Example journal entry (using Journal Voucher in ERPNext) for a withdrawal of $1000 would be:
+
+1. Credit **Cash** $1000
+2. Debit **Owner's Draws** $1000
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/budgeting.md b/erpnext/docs/user/manual/en/accounts/budgeting.md
new file mode 100644
index 0000000..a5f35d2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/budgeting.md
@@ -0,0 +1,58 @@
+ERPNext will help you set and manage budgets on your Cost Centers. This is
+useful when, for example, you are doing online sales. You have a budget for
+search ads, and you want ERPNext to stop or warn you from over spending, based
+on that budget.
+
+Budgets are also great for planning purposes. When you are making plans for
+the next financial year, you would typically target a revenue based on which
+you would set your expenses. Setting a budget will ensure that your expenses
+do not get out of hand, at any point, as per your plans.
+
+You can define it in the Cost Center. If you have seasonal sales you can also
+define a budget distribution that the budget will follow.
+
+In order to allocate budget, go to Accounts > Setup > Chart of Cost Centers and click on Chart of Cost Center.
+Select a Cost Center and click on Open.
+
+#### Step 1: Click on Edit.
+
+
+
+<img alt="Accounts Receivable" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
+
+#### Step 2: Enter Monthly Distribution.
+
+
+
+
+If you leave the** **distribution ID blank, ERPNext will calculate on a yearly
+basis or in equal proportion for every month.
+
+#### Step 3:Add New Row and select budget account.
+
+
+
+
+
+
+
+### To Create New Distribution ID
+
+ERPNext allows you to take a few budget actions. It signifies whether to stop
+, warn or Ignore if you exceed budgets.
+
+
+
+
+
+These can be defined from the Company record.
+
+
+
+
+
+Even if you choose to “ignore” budget overruns, you will get a wealth of
+information from the “Budget vs Actual” variance report. This report shows
+month wise actual expenses as compared to the budgeted expenses.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
new file mode 100644
index 0000000..99760e7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
@@ -0,0 +1,128 @@
+The Chart of Accounts forms the blueprint of your organization. The overall
+structure of your Chart of Accounts is based on a system of double entry
+accounting that has become a standard all over the world to quantify how a
+company is doing financially.
+
+The Chart of Accounts helps you to answer:
+
+ * What is your organisation worth?
+ * How much debt have you taken?
+ * How much profit are you making (and hence paying tax)?
+ * How much are you selling?
+ * What is your expense break-up
+
+You may note that as a business manager, it is very valuable to see how well
+your business is doing.
+
+> Tip: If you can’t read a Balance Sheet (It took me a long time to
+figure this out) it's a good opportunity to start learning about this. It will
+be worth the effort. You can also take the help of your accountant to setup
+your Chart of Accounts.
+
+Financial statement of your company is easily viewable in ERPNext. An Example
+of a financial statement is given below:
+
+<img class="screenshot" alt="Financial Analytics Balance Sheet" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-bl.png">
+
+To edit your Chart of Accounts in ERPNext go to:
+
+> Accounts > Setup > Chart of Accounts
+
+Chart of Accounts is a tree view of the names of the Accounts (Ledgers and
+Groups) that a Company requires to manage its books of accounts. ERPNext sets
+up a simple chart of accounts for each Company you create, but you have to
+modify it according to your needs and legal requirements. For each company,
+Chart of Accounts signifies the way to classify the accounting entries, mostly
+based on statutory (tax, compliance to government regulations) requirements.
+
+Let us understand the main groups of the Chart of Accounts.
+
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-1.png">
+
+### Balance Sheet Accounts
+
+The Balance Sheet has Application of Funds (/assets) and Sources of Funds
+(Liabilities) that signify the net-worth of your company at any given time.
+When you begin or end a financial period, all the Assets are equal to the
+Liabilities.
+
+> Accounting: If you are new to accounting, you might be wondering, how can
+Assets be equal to Liabilities? That would mean the company has nothing of its
+own. Thats right. All the “investment” made in the company to buy assets (like
+land, furniture, machines) is made by the owners and is a liability to the
+company. If the company would want to shut down, it would need to sell all the
+assets and pay back all the liabilities (including profits) to the owners,
+leaving itself with nothing.
+
+All the accounts under this represent an asset owned by the company like "Bank
+Account", "Land and Property", "Furniture" or a liability (funds that the
+company owes to others) like "Owners funds", "Debt" etc.
+
+Two special accounts to note here are Accounts Receivable (money you have to
+collect from your customers) and Accounts Payable (money you have to pay to
+your suppliers) under Assets and Liabilities respectively.
+
+### Profit and Loss Accounts
+
+Profit and Loss is the group of Income and Expense accounts that represent
+your accounting transactions over a period.
+
+Unlike Balance sheet accounts, Profit and Loss accounts (or PL accounts) do
+not represent net worth (/assets), but rather represent the amount of money
+spent and collected in servicing customers during the period. Hence at the
+beginning and end of your Fiscal Year, they become zero.
+
+In ERPNext it is easy to create a Profit and Loss analysis chart. An example
+of a Profit and Loss analysis chart is given below:
+
+<img class="screenshot" alt="Financial Analytics Profit and Loss Statement" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-pl.png">
+
+(On the first day of the year you have not made any profit or loss, but you
+still have assets, hence balance sheet accounts never become zero at the
+beginning or end of a period)
+
+### Groups and Ledgers
+
+There are two main kinds of Accounts in ERPNext - Group and Ledger. Groups can
+have sub-groups and ledgers within them, whereas ledgers are the leaf nodes of
+your chart and cannot be further classified.
+
+Accounting Transactions can only be made against Ledger Accounts (not Groups)
+
+> Info: The term "Ledger" means a page in an accounting book where entries are
+made. There is usually one ledger for each account (like a Customer or a
+Supplier).
+
+> Note: An Account “Ledger” is also sometimes called as Account “Head”.
+
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-2.png">
+
+### Other Account Types
+
+In ERPNext, you can also specify more information when you create a new
+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.
+
+### Creating / Editing Accounts
+
+To create new Accounts, explore your Chart of Accounts and click on an Account
+group under which you want to create the new Account. On the right side, you
+will see an option to “Open” or “Add Child” a new Account.
+
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-3.png">
+
+Option to create will only appear if you click on a Group (folder) type
+Account.
+
+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.
+
+Typically, you might want to create Accounts for
+
+ * Types of Expenses (travel, salaries, telephone etc) under Expenses.
+ * Taxes (VAT, Sales Tax etc based on your country) under Current Liabilities.
+ * Types of Sales (for example, Product Sales, Service Sales etc.) under Income.
+ * Types of Assets (building, machinery, furniture etc.) under Fixed Assets.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/credit-limit.md b/erpnext/docs/user/manual/en/accounts/credit-limit.md
new file mode 100644
index 0000000..299e670
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/credit-limit.md
@@ -0,0 +1,34 @@
+
+
+A credit limit is the maximum amount of credit that a financial institution or
+other lender will extend to a debtor for a particular line of credit. From an
+organisation's perspective, it is the maximum amount of credit which a
+customer gets on goods purchased.
+
+To set credit limit go to Customer - Master
+
+> Selling > Document > Customer
+
+
+#### Figure 1: Credit Limit
+
+<img class="screenshot" alt="Credit Limit" src="{{docs_base_url}}/assets/img/accounts/credit-limit-1.png">
+
+Go to the 'More Info section' and enter the amount in the field Credit Limit.
+
+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.
+
+To allow any other role to submit transactions by customers whose credit limit
+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.
+
+#### Figure 2: Credit Controller
+
+<img class="screenshot" alt="Credit Limit" src="{{docs_base_url}}/assets/img/accounts/credit-limit-2.png">
+
+Save the changes.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/index.md b/erpnext/docs/user/manual/en/accounts/index.md
new file mode 100644
index 0000000..ab93126
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/index.md
@@ -0,0 +1,13 @@
+At the end of sales and purchase cycle comes billing and payments. You may have
+an accountant in your team, or you may be doing accounting yourself, or you may
+have outsourced your accounting. In all the cases financial accounting forms the core of any business management system like an ERP.
+
+In ERPNext, your accounting operations consists of 3 main transactions:
+
+ * Sales Invoice: The bills that you raise to your Customers for the products or services you provide.
+ * Purchase Invoice: Bills that your Suppliers give you for their products or services.
+ * Journal Entrys: For accounting entries, like payments, credit and other types.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
new file mode 100644
index 0000000..323764e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/index.txt
@@ -0,0 +1,18 @@
+journal-entry
+sales-invoice
+purchase-invoice
+chart-of-accounts
+making-payments
+advance-payment-entry
+credit-limit
+opening-entry
+accounting-reports
+accounting-entries
+budgeting
+opening-accounts
+item-wise-tax
+point-of-sale-pos-invoice
+multi-currency-accounting
+tools
+setup
+articles
diff --git a/erpnext/docs/user/manual/en/accounts/item-wise-tax.md b/erpnext/docs/user/manual/en/accounts/item-wise-tax.md
new file mode 100644
index 0000000..8c1fc86
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/item-wise-tax.md
@@ -0,0 +1,30 @@
+
+Taxes selected in the Tax and Other Charges in transactions are applied on all the items. If you need different taxes applied on items selected in the same transaction, you should setup you item and tax master as explained in the steps below.
+
+####Step 1: Mention Tax Applicable in the Item master
+
+Item master has tax table where you can list taxes which will be applied on it.
+
+
+
+Tax rate mentioned in the item master gets preference over tax rate entered in the transactions.
+
+For example, if you provide tax rate for VAT as 10% for item ABC, where for same VAT ledger 12% rate is entered in the Sales Order/Invoice, for item ABC, tax rate applied would be 10%, as mentioned in the item master.
+
+####Step 2: Setup Taxes and Other Charges
+
+In Taxes and Other Charges master, you should select all the applicable taxes which could be applicable on item.
+
+For example, if few items has VAT 5 applied on them, other has Service Tax applied, and some other has Excise Duty applicable, then you tax master should have all these taxes selected.
+
+
+
+####Step 3: Set Tax Rate as Zero in Taxes and Charges Template
+
+In the Taxes and Other Charges master, tax rate will be updated as ZERO. It means, tax rate applicable on items will be pulled from the respective Item master. While for other items, 0% tax will be applied, means no other taxes will be applied on that item.
+
+Based on the above setting, you will have taxes applied on items as mentioned in the respective item master. Check following for an instance.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md
new file mode 100644
index 0000000..68ba22a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md
@@ -0,0 +1,71 @@
+All types of accounting entries other than **Sales Invoice** and **Purchase
+Invoice** are made using the **Journal Entry**. A **Journal Entry**
+is a standard accounting transaction that affects
+multiple Accounts and the sum of debits is equal to the sum of credits.
+
+To create a Journal Entry go to:
+
+> Accounts > Documents > Journal Entry > New
+
+<img class="screenshot" alt="Journal Entry" src="{{docs_base_url}}/assets/img/accounts/journal-entry.png">
+
+In a Journal Entry, you must select.
+
+ * Type of Voucher from the drop down.
+ * Add rows for the individual accounting entries. In each row, you must specify:
+ * The Account that will be affected
+ * The amount to Debit or Credit
+ * The Cost Center (if it is an Income or Expense)
+ * Against Voucher: Link it to a voucher or invoice if it affects the “outstanding” amount of that invoice.
+ * Is Advance: Select “Yes” if you want to make it selectable in an Invoice. Other information in case it is a Bank Payment or a bill.
+
+#### Difference
+
+The “Difference” field is the difference between the Debit and Credit amounts.
+This should be zero if the Journal Entry is to be “Submitted”. If this
+number is not zero, you can click on “Make Difference Entry” to add a new row
+with the amount required to make the total as zero.
+
+* * *
+
+## Common Entries
+
+A look at some of the common accounting entries that can be done via Journal
+Voucher.
+
+#### Expenses (non accruing)
+
+Many times it may not be necessary to accrue an expense, but it can be
+directly booked against an expense Account on payment. For example a travel
+allowance or a telephone bill. You can directly debit Telephone Expense
+(instead of your telephone company) and credit your Bank on payment.
+
+ * Debit: Expense Account (like Telephone expense)
+ * Credit: Bank or Cash Account
+
+#### Bad Debts or Write Offs
+
+If you are writing off an Invoice as a bad debt, you can create a Journal
+Voucher similar to a Payment, except instead of debiting your Bank, you can
+debit an Expense Account called Bad Debts.
+
+ * Debit: Bad Debts Written Off
+ * Credit: Customer
+
+> Note: There may be regulations in your country before you can write off bad
+debts.
+
+#### Depreciation
+
+Depreciation is when you write off certain value of your assets as an expense.
+For example if you have a computer that you will use for say 5 years, you can
+distribute its expense over the period and pass a Journal Entry at the end
+of each year reducing its value by a certain percentage.
+
+ * Debit: Depreciation (Expense)
+ * Credit: Asset (the Account under which you had booked the asset to be depreciated)
+
+> Note: There may be regulations in your country that define by how much
+amount you can depreciate a class of Assets.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/making-payments.md b/erpnext/docs/user/manual/en/accounts/making-payments.md
new file mode 100644
index 0000000..2038e6f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/making-payments.md
@@ -0,0 +1,98 @@
+Payments made against Sales Invoices or Purchase Invoices can be made by
+clicking on “Make Payment Entry” button on “Submitted” invoices.
+
+ 1. Update the “Bank Account” (you can also set the default account in the Company master).
+ 2. Update posting date.
+ 3. Enter the cheque number, cheque date.
+ 4. Save and Submit.
+
+<img class="screenshot" alt="Manking Payment" src="{{docs_base_url}}/assets/img/accounts/make-payment.png">
+
+Payments can also be made independent of invoices by creating a new Journal
+Voucher and selecting the type of payment.
+
+#### Incoming Payment
+
+For payments from Customers,
+
+ * Debit: Bank or Cash Account
+ * Credit: Customer
+
+> Note: Remember to add “Against Sales Invoice” or “Is Advance” as applicable.
+
+#### Outgoing Payment
+
+For payments to Suppliers,
+
+ * Debit: Supplier
+ * Credit: Bank or Cash Account
+
+### Example Payment Journal Entry
+
+<img class="screenshot" alt="Manking Payment" src="{{docs_base_url}}/assets/img/accounts/new-bank-entry.png">
+
+* * *
+
+### Reconciling Cheque Payments
+
+If you are receiving payments or making payments via cheques, the bank
+statements will not accurately match the dates of your entry, this is because
+the bank usually takes time to “clear” these payments. Also you may have
+mailed a cheque to your Supplier and it may be a few days before it is
+received and deposited by the Supplier. In ERPNext you can synchronize your
+bank statements and your Journal Entrys using the “Bank Reconciliation”
+tool.
+
+To use this, go to:
+
+> Accounts > Tools > Bank Reconciliation
+
+Select your “Bank” Account and enter the dates of your statement. Here you
+will get all the “Bank Voucher” type entries. In each of the entry on the
+right most column, update the “Clearance Date” and click on “Update”.
+
+By doing this you will be able to sync your bank statements and entries into
+the system.
+
+* * *
+
+## Managing Outstanding Payments
+
+In most cases, apart from retail sales, billing and payments are separate
+activities. There are several combinations in which these payments are done.
+These cases apply to both sales and purchases.
+
+ * They can be upfront (100% in advance).
+ * Post shipment. Either on delivery or within a few days of delivery.
+ * Part in advance and part on or post delivery.
+ * Payments can be made together for a bunch of invoices.
+ * Advances can be given together for a bunch of invoices (and can be split across invoices).
+
+ERPNext allows you to manage all these scenarios. All accounting entries (GL
+Entry) can be made against a Sales Invoice, Purchase Invoice or Journal
+Vouchers (in special cases, an invoice can be made via a Sales Invoice too).
+
+The total outstanding amount against an invoice is the sum of all the
+accounting entries that are made “against” (or are linked to) that invoice.
+This way you can combine or split payments in Journal Entrys to manage the
+scenarios.
+
+### Matching Payments to Invoices
+
+In complex scenarios, especially in the capital goods industry, sometimes
+there is no direct link between payments and invoices. You send invoices to
+your Customers and your Customer sends you block payments or payments based on
+some schedule that is not linked to your invoices.
+
+In such cases, you can use the Payment to Invoice Matching Tool.
+
+> Accounts > Tools > Payment Reconciliation
+
+In this tool, you can select an account (your Customer’s account) and click on
+“Pull Payment Entries” and it will select all un-linked Journal Entrys and
+Sales Invoices from that Customer.
+
+To cancel off some payments and invoices, select the Invoices and Journal
+Vouchers and click on “Reconcile”.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
new file mode 100644
index 0000000..a674f21
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -0,0 +1,119 @@
+In ERPNext, you can make accounting entries in multiple currency. For example, if you have a bank account in foreign currency, you can make transactions in that currency and system will show bank balance in that specific currency only.
+
+## Setup
+
+To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account.
+
+<img class="screenshot" alt="Set Currency from Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/multi-currency/chart-of-accounts.png">
+
+You can also assign / modify the currency by opening specific Account record for existing Accounts.
+
+<img class="screenshot" alt="Modify Account Currency" src="{{docs_base_url}}/assets/img/accounts/multi-currency/account.png">
+
+For Customer / Supplier (Party), you can also define it's accounting currency in the Party record. If the Party's accounting currency is different from Company Currency, you have to mention Default Receivable / Payable Account in that currency.
+
+<img class="screenshot" alt="Customer Accounting Currency" src="{{docs_base_url}}/assets/img/accounts/multi-currency/customer.png">
+
+
+Once you defined Accounting Currency in Party / Account record, you are ready to make transactions against them. If Party's accounting currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If accounting currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party's Accounting Currency. In any case, currency of Receivable Account will always be same as accounting currency of the Party.
+
+You can change accounting currency in Party / Account record, until making any transactions against them. After making accounting entries, system will not allow to change the accounting currency for both Party / Account record.
+
+In case of multi-company setup, accounting currency of Party must be same for all the companies.
+
+## Transactions
+
+### Sales Invoice
+
+In Sales Invoice, transaction currency must be same as accounting currency of Customer if Customer's accounting currency is other than Company Currency. Otherwise, you can select any currency in Invoice. On selection of Customer, system will fetch Receivable account from Customer / Company. The currency of receivable account must be same as Customer's accounting currency.
+
+Now, in POS, Paid Amount will be enetered in transaction currency, instead of earlier Company Currency. Write Off Amount will also be entered in transaction currency.
+
+Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency.
+
+<img class="screenshot" alt="Sales Invoice Outstanding" src="{{docs_base_url}}/assets/img/accounts/multi-currency/sales-invoice.png">
+
+### Purchase Invoice
+
+Similarly, in Purchase Invoice, accounting entries will be made based on Supplier's accounting currency. Outstanding Amount and Advance Amount will also be shown in the supplier's accounting currency. Write Off Amount will now be entered in transaction currency.
+
+### Journal Entry
+
+In Journal Entry, you can make transactions in different currencies. There is a checkbox "Multi Currency", to enable multi-currency entries. If "Multi Currency" option selected, you will be able to select accounts with different currencies.
+
+<img class="screenshot" alt="Journal Entry Exchange Rate" src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-multi-currency.png">
+
+
+In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually.
+
+In a single Journal Entry, you can select accounts with only one alternate currency, apart from accounts in Company Currency. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically.
+
+<img class="screenshot" alt="Journal Entry in multi currency" src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-row.png">
+
+#### Example 1: Payment Entry Against Customer With Alternate Currency
+
+Suppose, default currency of the company is INR and customer's accounting currency is USD. Customer made full payment against an outstanding invoice of USD 100. Exchange Rate (USD -> INR) in Sales Invoice was 60.
+
+Exchange Rate in the payment entry should always be same as invoice (60), even if exchange rate on the payment date is 62. The bank account will be credited by the amount considering exchange rate as 62. Hence, Exchnage Gain / Loss will be booked based on exchange rate difference.
+
+<img class="screenshot" alt="Payment Entry" src="{{docs_base_url}}/assets/img/accounts/multi-currency/payment-entry.png">
+
+#### Example 2: Inter-bank Transfer (USD -> INR)
+
+Suppose, default currency of the company is INR. You have an Paypal account for which Currency is USD. You receive payments in the paypal account and lets say, paypal transfers amount once in a week to your other bank account which is managed in INR.
+
+Paypal account gets debited on different date with different exchange rate, but on transfer date the exchange rate can be different. Hence, there is generally Exchange Loss / Gain on the transfer entry.
+In the bank transfer entry, system sets exchange rate based on the average incoming exchange rate Paypal account. You need to calculate and enter Exchange Loss / Gain based on the average exchange rate and the exchange rate on the transfer date.
+
+Lets say, Paypal account debited by following amounts over the week, which has not been transferred to your other bank account.
+
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <td>Date</td>
+ <td>Account</td>
+ <td>Debit (USD)</td>
+ <td>Exchange Rate</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>2015-09-02</td>
+ <td>Paypal</td>
+ <td>100</td>
+ <td>60</td>
+ </tr>
+ <tr>
+ <td>2015-09-02</td>
+ <td>Paypal</td>
+ <td>100</td>
+ <td>61</td>
+ </tr>
+ <tr>
+ <td>2015-09-02</td>
+ <td>Paypal</td>
+ <td>100</td>
+ <td>64</td>
+ </tr>
+ </tbody>
+</table>
+
+
+Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be look like below:
+
+<img class="screenshot" alt="Inter Bank Transfer" src="{{docs_base_url}}/assets/img/accounts/multi-currency/bank-transfer.png">
+
+
+## Reports
+
+### General Ledger
+
+In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency.
+
+<img class="screenshot" alt="General Ledger Report" src="{{docs_base_url}}/assets/img/accounts/multi-currency/general-ledger.png">
+
+### Accounts Receivable / Payable
+
+In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency.
+
+<img class="screenshot" alt="Accounts Receivable Report" src="{{docs_base_url}}/assets/img/accounts/multi-currency/accounts-receivable.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
new file mode 100644
index 0000000..214642d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
@@ -0,0 +1,94 @@
+Now that you have completed most of the setup, its time to start moving in!
+
+There are two important sets of data you need to enter before you start your
+operations.
+
+ * Opening Account balances.
+ * Opening Stock balances.
+
+To setup your accounts and stock correctly you will need accurate data to work
+with. Make sure you have the data setup for this.
+
+### Opening Accounts
+
+We usually recommend that you start using accounting in a new financial year,
+but you could start midway too. To setup your accounts, you will need the
+following for the “day” you start using accounting in ERPNext:
+
+Opening capital accounts - like your shareholder’s (or owner’) capital, loans,
+bank balances on that day. List of outstanding sales and purchase invoices
+(Payables and Receivables).
+
+Based on Voucher Type
+
+You can select accounts based on the voucher type. In such a scenario, your balance sheet should be balanced.
+
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-account-1.png">
+
+ Also, note that if there are more than 300 ledgers, the system will crash. Thus to avoid such a situation, you can open accounts by using temporary accounts.
+
+#### Temporary Accounts
+
+A nice way to simplify opening is to use a temporary account
+just for opening. These accounts will become zero once all your old
+invoices and opening balances of bank, debt stock etc are entered.
+In the standard chart of accounts, a **Temperory Opening** account is created under
+assets
+
+#### The Opening Entry
+
+In ERPNext Opening Accounts are setup by submitting a special Journal Entries
+(Journal Entry).
+
+Note: Make sure to set “Is Opening” as “Yes” in the More Info section.
+
+> Setup > Opening Accounts and Stock > Opening Accounting Entries.
+
+Complete Journal Entries on the Debit and Credit side.
+
+
+
+ To update opening balance is to make Journal Entry for an individual/group of accounts.
+
+For example, if you want to update balance in three bank accounts, then make Journal Entrys in this manner.
+
+
+
+
+
+
+Temporary Asset and Liability account is used for balancing purpose. When you update opening balance in Liability Account, you can use Temporary Asset Account for balancing.
+
+This way, you can update opening balance in Asset and Liability accounts.
+
+You can make two Opening Journal Entrys:
+
+ * 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 **Temperory 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 **Temperory Opening** account.
+ * In this method you can update opening balance of specific balancesheet accounts and not for all.
+ * Opening entry is only for balance sheet accounts and not for expense or Income accounts.
+
+After completing the accounting entries, the trial balance report will look
+like the one given below:
+
+
+
+
+#### Outstanding Invoices
+
+After your Opening Journal Entrys are made, you will need to enter each
+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 the temp opening account **Temporary Opening** in the “Income” and
+“Expense” accounts.
+
+> Note: Make sure to set each invoice as “Is Opening”!
+
+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.
+
+Once all your invoices are entered, your **Temperory Opening** account will have a balance of zero!
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/opening-entry.md b/erpnext/docs/user/manual/en/accounts/opening-entry.md
new file mode 100644
index 0000000..c6eb94d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/opening-entry.md
@@ -0,0 +1,7 @@
+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, please visit [Opening Entry.]({{docs_base_url}}/user/guides/accounts/opening-accounts.html)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
new file mode 100644
index 0000000..e45b460
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -0,0 +1,98 @@
+# Point of Sale Invoice
+
+Point of Sale (POS) is the place where a retail transaction is completed. It
+is the point at which a customer makes a payment to the merchant in exchange
+for goods or services. For retail operations, the delivery of goods, accrual
+of sale and payment all happens in one event, that is usually called the
+“Point of Sale”.
+
+You can make a Sales Invoice of type POS by checking on “Is POS”. When you
+check this, you will notice that some fields get hidden and some new ones
+emerge.
+
+> Tip: In retail, you may not create a separate Customer record for each
+customer. You can create a general Customer called “Walk-in Customer” and make
+all your transactions against this Customer record.
+
+#### Setting Up POS
+
+In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, Sales Order, Purchase Order etc. can be edited via the POS. There two steps to Setup POS:
+
+1. Enable POS View via (Setup > Customize > Feature Setup)
+2. Create a [POS Setting]({{docs_base_url}}/user/guides/setting-up/pos-setting.html) record
+
+#### Switch to POS View
+
+Open any sales / purchase transaction. Click on the Computer <i class="icon-desktop"></i> Icon.
+
+#### Different sections of the POS
+
+ * Update Stock: If this is checked, Stock Ledger Entries will be made when you “Submit” this Sales Invoice thereby eliminating the need for a separate Delivery Note.
+ * In your Items table, update inventory information like Warehouse (saved as default), Serial Number, or Batch Number if applicable.
+ * Update Payment Details like your Bank / Cash Account, Paid amount etc.
+ * If you are writing off certain amount. For example when you receive extra cash as a result of not having exact denomination of change, check on ‘Write off Outstanding Amount’ and set the Account.
+
+### Adding an Item
+
+At the billing counter, the retailer needs to select Items which the consumer
+buys. In the POS interface you can select an Item by two methods. One, is by
+clicking on the Item image and the other, is through the Barcode / Serial No.
+
+**Select Item** \- To select a product click on the Item image and add it into the cart. A cart is an area that prepares a customer for checkout by allowing to edit product information, adjust taxes and add discounts.
+
+**Barcode / Serial No** \- A Barcode / Serial No is an optical machine-readable representation of data relating to the object to which it is attached. Enter Barcode / Serial No in the box as shown in the image below and pause for a second, the item will be automatically added to the cart.
+
+
+
+> Tip: To change the quantity of an Item, enter your desired quantity in the
+quantity box. These are mostly used if the same Item is purchased in bulk.
+
+If your product list is very long use the Search field, type the product name
+in Search box.
+
+### Removing an Item
+
+There are two ways to remove an Item.
+
+ * Select an Item by clicking on the row of that Item from Item cart. Then click on “Del” button. OR
+
+ * Enter 0(zero) quantity of any item to delete that item.
+
+To remove multiple Items together, select multiple rows & click on “Del”
+button.
+
+> Delete button appears only when Items are selected.
+
+
+
+### Make Payment
+
+After all the Items and their quantities are added into the cart, you are
+ready to make the Payment. Payment process is divided into 3 steps -
+
+ 1. Click on “Make Payment” to get the Payment window.
+ 2. Select your “Mode of Payment”.
+ 3. Click on “Pay” button to Save the document.
+
+
+
+Submit the document to finalise the record. After the document is submitted,
+you can either print or email it directly to the customer.
+
+#### Accounting entries (GL Entry) for a Point of Sale:
+
+Debits:
+
+ * Customer (grand total)
+ * Bank / Cash (payment)
+
+Credits:
+
+ * Income (net total, minus taxes for each Item)
+ * Taxes (liabilities to be paid to the government)
+ * Customer (payment)
+ * Write Off (optional)
+
+To see entries after “Submit”, click on “View Ledger”.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
new file mode 100644
index 0000000..433219c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
@@ -0,0 +1,71 @@
+Purchase Invoice is the exact opposite of your Sales Invoice. It is the bill
+that your Supplier sends you for products or services delivered. Here you
+accrue expenses to your Supplier. Making a Purchase Invoice is very similar to
+making a Purchase Order.
+
+To make a new Purchase Invoice, go to:
+
+> Accounts > Documents > Purchase Invoice > New Purchase Invoice
+
+or click on “Make Purchase Invoice” in Purchase Order or Purchase Receipt.
+
+<img class="screenshot" alt="Purchase Invoice" src="{{docs_base_url}}/assets/img/accounts/purchase-invoice.png">
+
+The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and
+“Bill Date” helps to track the bill number as set by your Supplier for
+reference.
+
+#### Accounting Impact
+
+Like in Sales Invoice, you have to enter an Expense or an Asset account for
+each row in your Items table. This helps to indicate if the Item is an Asset
+or an Expense. You must also enter a Cost Center. These can also be set in the
+Item master.
+
+The Purchase Invoice will affect your accounts as follows:
+
+Accounting entries (GL Entry) for a typical double entry “purchase”:
+
+Debits:
+
+ * Expense or Asset (net totals, excluding taxes)
+ * Taxes (/assets if VAT-type or expense again).
+
+Credits:
+
+ * Supplier
+
+To see entries in your Purchase Invoice after you “Submit”, click on “View
+Ledger”.
+
+* * *
+
+#### Is purchase an “Expense” or an “Asset”?
+
+If the Item is consumed immediately on purchase, or if it is a service, then
+the purchase becomes an “Expense”. For example, a telephone bill or travel
+bill is an “Expense” - it is already consumed.
+
+For inventory Items, that have a value, these purchases are not yet “Expense”,
+because they still have a value while they remain in your stock. They are
+“Assets”. If they are raw-materials (used in a process), they will become
+“Expense” the moment they are consumed in the process. If they are to be sold
+to a Customer, they become “Expense” when you ship them to the Customer.
+
+* * *
+
+#### Deducting Taxes at Source
+
+In many countries, the law may require you to deduct taxes, while paying your
+suppliers. These taxes could be based on a standard rate. Under these type of
+schemes, typically if a Supplier crosses a certain threshold of payment, and
+if the type of product is taxable, you may have to deduct some tax (which you
+pay back to your government, on your Supplier’s behalf).
+
+To do this, you will have to make a new Tax Account under “Tax Liabilities” or
+similar and credit this Account by the percent you are bound to deduct for
+every transaction.
+
+For more help, please contact your Accountant!
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
new file mode 100644
index 0000000..f9a453e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -0,0 +1,74 @@
+A Sales Invoice is a bill that you send to your customers, against which the customer processes the payment. Sales Invoice is an accounting transaction. On submission of Sales Invoice, the system updates the receivable and books income against a Customer Account.
+
+You can create a Sales Invoice directly from
+
+> Accounting > Documents > Sales Invoice > New Sales Invoice
+
+or Click on Make Invoice at the right hand corner of the Delivery Note.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/accounts/sales-invoice.png">
+
+#### Accounting Impact
+
+All Sales must be booked against an “Income Account”. This refers to an
+Account in the “Income” section of your Chart of Accounts. It is a good
+practice to classify your income by type (like product income, service income
+etc). The Income Account must be set for each row of the Items table.
+
+> Tip: To set default Income Accounts for Items, you can set it in the Item or
+Item Group.
+
+The other account that is affected is the Account of the Customer. That is
+automatically set from “Debit To” in the heading section.
+
+You must also mention the Cost Centers in which your Income must be booked.
+Remember that your Cost Centers tell you the profitability of the different
+lines of business or product. You can also set a default Cost Center in the
+Item master.
+
+#### Accounting entries (GL Entry) for a typical double entry “Sale”:
+
+When booking a sale (accrual):
+
+**Debit:** Customer (grand total) **Credit:** Income (net total, minus taxes for each Item) **Credit:** Taxes (liabilities to be paid to the government)
+
+> To see entries in your Sales Invoice after you “Submit”, click on “View
+Ledger”.
+
+#### Dates
+
+Posting Date: The date on which the Sales Invoice will affect your books of
+accounts i.e. your General Ledger. This will affect all your balances in that
+accounting period.
+
+Due Date: The date on which the payment is due (if you have sold on credit).
+This can be automatically set from the Customer master.
+
+#### Recurring Invoices
+
+If you have a contract with a Customer where you bill the Customer on a
+monthly, quarterly, half-yearly or annual basis, you can check the “Recurring
+Invoice” box. Here you can fill in the details of how frequently you want to
+bill this Invoice and the period for which the contract is valid.
+
+ERPNext will automatically create new Invoices and mail it to the email ids
+you set.
+
+* * *
+
+#### "Pro Forma" Invoice
+
+If you want to give an Invoice to a Customer to make a payment before you
+deliver, i.e. you operate on a payment first basis, you should create a
+Quotation and title it as a “Pro-forma Invoice” (or something similar) using
+the Print Heading feature.
+
+“Pro Forma” means for formality. Why do this? Because if you book a Sales
+Invoice it will show up in your “Accounts Receivable” and “Income”. This is
+not ideal as your Customer may or may not decide to pay up. But since your
+Customer wants an “Invoice”, you could give the Customer a Quotation (in
+ERPNext) titled as “Pro Forma Invoice”. This way everyone is happy.
+
+This is a fairly common practice. We follow this at Frappe too.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
new file mode 100644
index 0000000..5242b39
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
@@ -0,0 +1,10 @@
+
+<img class="screenshot" alt="Account Settings" src="{{docs_base_url}}/assets/img/accounts/account-settings.png">
+
+* Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role.
+
+* Role Allowed to Set Frozen Accounts & Edit Frozen Entries: Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts.
+
+* Credit Controller: Role that is allowed to submit transactions that exceed credit limits set.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
new file mode 100644
index 0000000..8b9fcc1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -0,0 +1,78 @@
+Your Chart of Accounts is mainly designed to provide reports to the government
+and tax authorities. Most businesses have multiple activities like different
+product lines, market segments, areas of business, etc that share some common
+overheads. They should ideally have their own structure to report, whether they
+are profitable or not. For this purpose, there is an alternate structure,
+called the Chart of Cost Centers.
+
+### Cost Center
+
+You can create a tree of Cost Centers to represent your business better. Each
+Income / Expense entry is also tagged against a Cost Center.
+
+For example, if you have two types of sales:
+
+ * Walk-in Sales
+ * Online Sales
+
+You may not have shipping expenses for your walk-in customers, and no shop-
+rent for your online customers. If you want to get the profitability of each
+of these separately, you should create the two as Cost Centers and mark all
+sales as either "Walk-in" or "Online". Mark your all your purchases in the
+same way.
+
+Thus when you do your analysis you get a better understanding as to which side
+of your business is doing better. Since ERPNext has an option to add multiple
+Companies, you can create Cost Centers for each Company and manage it
+separately.
+
+Chart of Cost Centers
+
+To setup your Chart of Cost Centers go to:
+
+> Accounts > Setup > Chart of Cost Centers
+
+
+
+Cost centers help you in one more activity, budgeting.
+
+### Budgeting
+
+ERPNext will help you set and manage budgets on your Cost Centers. This is
+useful when, for example, you are doing online sales. You have a budget for
+search ads, and you want ERPNext to stop or warn you from over spending, based
+on that budget.
+
+Budgets are also great for planning purposes. When you are making plans for
+the next financial year, you would typically target a revenue based on which
+you would set your expenses. Setting a budget will ensure that your expenses
+do not get out of hand, at any point, as per your plans.
+
+You can define it in the Cost Center. If you have seasonal sales you can also
+define a budget distribution that the budget will follow.
+
+> Accounts > Setup > Budget Distribution > New Budget Distribution
+
+
+
+#### Budget Actions
+
+ERPNext allows you to either:
+
+ * Stop.
+ * Warn or,
+ * Ignore
+
+if you exceed budgets.
+
+These can be defined from the Company record.
+
+Even if you choose to “ignore” budget overruns, you will get a wealth of
+information from the “Budget vs Actual” variance report.
+
+> Note: When you set a budget, it has to be set as per Account under the Cost
+Center. For example if you have a Cost Center “Online Sales”, you can restrict
+“Advertising Budget” by creating a row with that Account and defining the
+amount.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
new file mode 100644
index 0000000..618d20b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
@@ -0,0 +1,23 @@
+A fiscal year is also known as a financial year or a budget year. It is used
+for calculating financial statements in businesses and other organisations.
+The fiscal year may or may not be the same as a calendar year. For tax
+purposes, companies can choose to be calendar-year taxpayers or fiscal-year
+taxpayers. In many jurisdictions, regulatory laws regarding accounting and
+taxation require such reports once per twelve months. However, it is not
+mandatory that the period should be a calendar year (that is, 1 January to 31
+December).
+
+A fiscal year usually starts at the beginning of a quarter, such as April 1,
+July 1 or October 1. However, most companies' fiscal year also coincides with
+the calendar year, which starts January 1. For the most part, it is simpler
+and easier that way. For some organizations, there are advantages in starting
+the fiscal year at a different time. For example, businesses that are seasonal
+might start their fiscal year on July 1 or October 1. A business that has most
+of its income in the fall and most of its expenses in the spring might also
+choose to start its fiscal year on October 1. That way, they know what their
+income will be for that year, and can adjust their expenses to maintain their
+desired profit margins.
+
+<img class="screenshot" alt="Fiscal Year" src="{{docs_base_url}}/assets/img/accounts/fiscal-year.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/index.md b/erpnext/docs/user/manual/en/accounts/setup/index.md
new file mode 100644
index 0000000..7b45044
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/index.md
@@ -0,0 +1,3 @@
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/setup/index.txt b/erpnext/docs/user/manual/en/accounts/setup/index.txt
new file mode 100644
index 0000000..916f96c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/index.txt
@@ -0,0 +1,4 @@
+fiscal-year
+cost-center
+accounts-settings
+tax-rule
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
new file mode 100644
index 0000000..72ecf11
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
@@ -0,0 +1,21 @@
+You can define which [Tax Template]({{docs_base_url}}/user/guides/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule.
+
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule.png">
+
+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 senario to understand Tax Rule Better.
+
+Suppose we define 2 Tax Rules as below.
+
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule-1.png">
+
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule-2.png">
+
+Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country as United Kingdom
+
+Now supposed we try to create a Sales Order for a customer whose default Billing Country is India, system shall select Tax Rule 1.
+In case the customers Billing Country was United Kingdom, the system would have selected Tax Rule 2.
+
diff --git a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
new file mode 100644
index 0000000..f2afe76
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
@@ -0,0 +1,52 @@
+### Bank Reconciliation Statement
+
+A Bank Reconciliation is a process that explains the difference between the
+bank balance shown in an organisation's bank statement, as supplied by the
+bank, and the corresponding amount shown in the organisation's own accounting
+records at a particular point in time.
+
+Such differences may occur, for example, because a cheque or a list of cheques
+issued by the organisation has not been presented to the bank, a banking
+transaction, such as a credit received, or a charge made by the bank, has not
+yet been recorded in the organisations books, or either the bank or the
+organisation itself has made an error.
+
+The Bank Reconciliation statement in ERPNext comes in the form of a report.
+
+#### Figure 1: Bank Reconciliation Statement
+
+
+
+
+
+When you get the report, check whether the field 'Balance as per bank' matches
+the Bank Account Statement. If there is a match then all the clearance dates
+are updated. If there is a mismatch then check clearance dates and journal
+entries.
+
+To add clearance entries go to Accounts > Tools > Bank Reconciliation
+
+### Bank Reconciliation Tool
+
+The Bank Reconciliation tool in ERPNext, helps add clearance dates to the
+account statements. To Reconcile cheque payments go to Accounts and click on
+Bank Reconciliation.
+
+__Step 1:__ Select the Bank Account against which you intend to reconcile. For
+example; HDFC Bank, ICICI Bank, or Citibank etc.
+
+__Step 2:__ Select the Date range that you wish to reconcile for.
+
+__Step 3:__ Click on 'Get Reconciled Entries'
+
+All the entries in the specified date range will be shown in a table below.
+
+__Step 4:__ Click on the JV from the table and update clearance date.
+
+#### Figure 2: Bank Reconciliation Tool
+
+<img class="screenshot" alt="Bank Reconciliation" src="{{docs_base_url}}/assets/img/accounts/bank-reconciliation.png">
+
+__Step 5:__ Click on the button 'Update Clearance Date'.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/tools/index.md b/erpnext/docs/user/manual/en/accounts/tools/index.md
new file mode 100644
index 0000000..7b45044
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/index.md
@@ -0,0 +1,3 @@
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/tools/index.txt b/erpnext/docs/user/manual/en/accounts/tools/index.txt
new file mode 100644
index 0000000..7f93166
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/index.txt
@@ -0,0 +1,4 @@
+bank-reconciliation
+payment-reconciliation
+period-closing-voucher
+payment-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
new file mode 100644
index 0000000..c719623
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
@@ -0,0 +1,31 @@
+Reconciliation is an accounting process used to compare two sets of records to
+ensure the figures are in agreement and are accurate. It is the key process
+used to determine whether the money leaving an account matches the amount
+spent, ensuring the two values are balanced at the end of the recording
+period. In Payment Reconciliation, the invoices are matched against the
+payments made to the bank. Thus if you have many payments which are not
+reconciled with their respective invoices, you can use the payment
+reconciliation tool.
+
+To use Payment Reconciliation Tool go to,
+
+Accounts > Tools > Payment Reconciliation
+
+<img class="screenshot" alt="Payment Reconciliation" src="{{docs_base_url}}/assets/img/accounts/payment-reconcile-tool.png">
+
+__Step 1:__ Select the Account against whom the payments need to be reconciled.
+
+__Step 2:__ Mention the Voucher Type, whether it is Purchase Invoice, Sales
+Invoice or Journal Entry.
+
+__Step 3:__ Select the Voucher Number and click on 'Get Unreconcilled Entries'.
+
+* All the payment entries will be pulled into a table below.
+
+__Step 4:__ Click on the entry row to allocate a particular amount.
+
+__Step 5:__ Click on the button 'Reconcile'
+
+* You will get a message that says 'Amount allocated successfully'
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
new file mode 100644
index 0000000..a5d6966
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
@@ -0,0 +1,24 @@
+###Payment Tool
+The Payment Tool Feature allows non-accounting personnel to generate Journal Entrys 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_base_url}}/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_base_url}}/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_base_url}}/assets/img/accounts/payment-tool-3.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
new file mode 100644
index 0000000..fbec8d1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
@@ -0,0 +1,30 @@
+At the end of every year or (quarterly or maybe even monthly), after completing auditing, you can close your books of accounts. This means that you make all your special entries like:
+
+ * Depreciation
+ * Change in value of Assets
+ * Defer taxes and liabilities
+ * Update bad debts
+
+etc. and book your Profit or Loss.
+
+By doing this, your balance in your Income and Expense Accounts become zero. You start a new Fiscal Year (or period) with a balanced Balance Sheet and fresh Profit and Loss account.
+
+In ERPNext after making all the special entries via Journal Entry for the current fiscal year, you should set all your Income and Expense accounts to zero via:
+
+> Accounts > Tools > Period Closing Voucher
+
+**Posting Date** will be when this entry should be executed. If your Fiscal Year ends on 31st December, then that date should be selected as Posting Date in the Period Closing Voucher.
+
+**Transaction Date** will be Period Closing Voucher's creation date.
+
+**Closing Fiscal Year** will be an year for which you are closing your financial statement.
+
+<img class="screenshot" alt="Period Closing Voucher" src="{{docs_base_url}}/assets/img/accounts/period-closing-voucher.png">
+
+This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a libility 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.
+
+<div class=well>If accounting entries are made in a closing fiscal year, even after Period Closing Voucher was created for that Fiscal Year, you should create another Period Closing Voucher. Later voucher will only transfer the pending P&L balance into Closing Account Head.</div>
+
+{next}
diff --git a/erpnext/docs/user/manual/en/buying/articles/index.md b/erpnext/docs/user/manual/en/buying/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/index.txt b/erpnext/docs/user/manual/en/buying/articles/index.txt
new file mode 100644
index 0000000..c0ed867
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/index.txt
@@ -0,0 +1,3 @@
+maintaining-suppliers-part-no-in-item
+managing-purchase-uom-and-stock-uom
+select-material-requests-based-on-supplier
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
new file mode 100644
index 0000000..52f4c97
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
@@ -0,0 +1,20 @@
+<h1>Maintaining Supplier's Item Code in the Item master</h1>
+
+Since each company has their own item coding standards, for each item, your item code differ from supplier's Item Code. ERPNext allows you to track Supplier's Item Code in your item master, so that you refer to each others item code while transacting. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code.
+
+#### 1. Updating Supplier Item Code In Item
+
+Under Purchase section in the Item master, you will find table to track Item Code for each Supplier.
+
+
+
+#### 2. Supplier's Item Code in Transactions
+
+Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+
+Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master.
+
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md b/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md
new file mode 100644
index 0000000..d4d97be
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md
@@ -0,0 +1,47 @@
+<h1>Managing Purchase UoM and Stock UoM</h1>
+
+When purchasing an item, you can set purchase UoM (Unit of Measurement) which could be different from item's stock UoM.
+
+### Scenario:
+
+Item ABC is stocked in Nos, but purchased in Cartons. Hence in the Purchase Order, you will need to update UoM as Carton.
+
+### 1. Editing Purchase UoM
+
+
+#### Step 1.1: Edit UoM in the Purchase Order
+
+In the Purchase Order, you will find two UoM fied.
+
+- UoM
+- Stock UoM
+
+In both the fields, default UoM of an item will be updated. You should edit UoM field, and select Purchase UoM (Carton in this case).
+
+
+
+#### Step 1.2: Update UoM Conversion Factor
+
+In one Carton, if you get 20 Nos. of item ABC, then UoM Conversion Factor would be 20.
+
+
+
+Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one carton, then Qty in the stock UoM will be set as 20.
+
+
+
+### 2. Stock Ledger Posting
+
+Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item only. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM.
+
+With this, we can conclude that, updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM.
+
+
+
+### 3. Setting Conversion Factor in the Item master
+
+In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md
new file mode 100644
index 0000000..6b59695
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md
@@ -0,0 +1,19 @@
+<h1>Select Material Requests based on Supplier</h1>
+
+<b>Question</b>: How to create a single Purchase Order from multiple Material Requests for all Items that are purchased from common Supplier?<br>
+<br><b>Answer</b>:
+<br>
+<br>Material Requests can be individually fetched from Purchase Orders using the 'From Material Request' button. However this procedure becomes tedious when there are multiple Material Requests for items that are purchased from a single supplier.<br>
+<br>A more efficient way;
+<br>
+<br><u><b>Step 1:</b></u> When creating a Purchase order use the <i>'For Supplier'</i> button in the form.
+<br>
+<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_forsupp.png" height="238" width="747"><br>
+<br><u><b>Step 2:</b></u> In the 'Get From Supplier' pop-up enter the Supplier name and click on <i>'Get'</i>.
+<br>
+<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_popup.png"><br>
+<br><u><b>Step 3:</b></u> All the items associated with a Material Request and having the default Supplier, will be fetched in the Items Table. Any Item that is not required can be deleted.
+<br>
+<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_itemtable.png" height="388" width="645"><br>
+<br><div class="well">Note: For this feature to map the Items correctly, the Default Supplier field in the Item Master must be filled.</div>
+<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/index.md b/erpnext/docs/user/manual/en/buying/index.md
new file mode 100644
index 0000000..55589ad
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/index.md
@@ -0,0 +1,15 @@
+# Buying
+
+If your business involves physical goods, buying is one of your core business
+activity. Your suppliers are as important as your customers and they must be
+provided with as much accurate information as possible.
+
+Buying in right amounts, in right quantities, can affect your cash flow and
+profitability.
+
+ERPNext contains a set of transactions that will make your buying process as
+efficient and seamless as possible.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/buying/index.txt b/erpnext/docs/user/manual/en/buying/index.txt
new file mode 100644
index 0000000..a12bb06
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/index.txt
@@ -0,0 +1,6 @@
+supplier
+supplier-quotation
+purchase-order
+setup
+articles
+purchase-taxes
diff --git a/erpnext/docs/user/manual/en/buying/purchase-order.md b/erpnext/docs/user/manual/en/buying/purchase-order.md
new file mode 100644
index 0000000..e7f2429
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/purchase-order.md
@@ -0,0 +1,86 @@
+A Purchase Order is analogous to a Sales Order. It is usually a binding
+contract with your Supplier that you promise to buy a set of Items under the
+given conditions.
+
+A Purchase Order can be automatically created from a Material Request or
+Supplier Quotation.
+
+#### Purchase Order Flow Chart
+
+
+
+In ERPNext, you can also make a Purchase Order directly by going to:
+
+> Buying > Documents > Purchase Order > New Purchase Order
+
+#### Create Purchase Order
+
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/purchase-order.png">
+
+Entering a Purchase Order is very similar to a Purchase Request, additionally
+you will have to set:
+
+ * Supplier.
+ * A “Required By” date on each Item: If you are expecting part delivery, your Supplier will know how much quantity to deliver at which date. This will help you from preventing over-supply. It will also help you to track how well your Supplier is doing on timeliness.
+
+### Taxes
+
+If your Supplier is going to charge you additional taxes or charge like a
+shipping or insurance charge, you can add it here. It will help you to
+accurately track your costs. Also, if some of these charges add to the value
+of the product you will have to mention them in the Taxes table. You can also
+use templates for your taxes. For more information on setting up your taxes
+see the Purchase Taxes and Charges Template.
+
+### Value Added Taxes (VAT)
+
+Many a times, the tax paid by you to a Supplier, for an Item, is the same tax
+which you collect from your Customer. In many regions, what you pay to your
+government is only the difference between what you collect from your Customer
+and what you pay to your Supplier. This is called Value Added Tax (VAT).
+
+For example you buy Items worth X and sell them for 1.3X. So your Customer
+pays 1.3 times the tax you pay your Supplier. Since you have already paid tax
+to your Supplier for X, what you owe your government is only the tax on 0.3X.
+
+This is very easy to track in ERPNext since each tax head is also an Account.
+Ideally you must create two Accounts for each type of VAT you pay and collect,
+“Purchase VAT-X” (asset) and “Sales VAT-X” (liability), or something to that
+effect. Please contact your accountant if you need more help or post a query
+on our forums!
+
+
+
+#### Purchase UOM and Stock UOM Conversion
+
+You can change your UOM as per your stock requirements in the Purchase Order
+form.
+
+For example, If you have bought your raw material in large quantities with UOM
+-boxes, and wish to stock them in UOM- Nos; you can do so while making your
+Purchase Order.
+
+__Step 1:__ Store UOM as Nos in the Item form.
+
+Note: The UOM in the Item form is the stock UOM.
+
+__Step 2:__ In the Purchase Order mention UOM as Box. (Since material arrives in
+Boxes)
+
+__Step 3:__ In the Warehouse and Reference section, the UOM will be pulled in as
+Nos (from the Item form)
+
+#### Figure 3: Conversion of Purchase UOM to stock UOM
+
+
+<img class="screenshot" alt="Purchase Order - UOM" src="{{docs_base_url}}/assets/img/buying/purchase-order-uom.png">
+
+__Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has
+100 pieces.
+
+__Step 5:__ Notice that the stock quantity will be updated accordingly.
+
+__Step 6:__ Save and Submit the Form.
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
new file mode 100644
index 0000000..871ff96
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
@@ -0,0 +1,38 @@
+For Tax Accounts that you want to use in the tax templates, you must mention
+them as type “Tax” in your Chart of Accounts.
+
+Similar to your Sales Taxes and Charges Template is the Purchase Taxes and
+Charges Master. This is the tax template that you can use in your Purchase
+Orders and Purchase Invoices.
+
+> Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
+Master
+
+
+
+
+
+You can specify if the tax / charge is only for valuation (not a part of
+total) or only for total (does not add value to the item) or for both.
+
+If you select a particular tax as your Default tax, the system will apply this
+tax to all the purchase transactions by default.
+
+### Calculation Type
+
+This can be on Net Total (that is the sum of basic amount). On Previous Row
+Total / Amount (for cumulative taxes or charges). If you select this option,
+the tax will be applied as a percentage of the previous row (in the tax table)
+amount or total. Actual (as mentioned).
+
+ * **Account Head:** The Account ledger under which this tax will be booked.
+ * **Cost Center:** If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+ * **Description:** Description of the tax (that will be printed in invoices / quotes).
+ * **Rate:** Tax rate.
+ * **Amount:** Tax amount.
+ * **Total:** Cumulative total to this point.
+ * **Enter Row:** If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+ * **Consider Tax or Charge for:** In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+ * **Add or Deduct:** Whether you want to add or deduct the tax.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/buying/setup/buying-settings.md b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
new file mode 100644
index 0000000..c89c5d1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
@@ -0,0 +1,39 @@
+Buying Settings is where you can define properties which will be applied in the Buying module's transactions.
+
+
+
+Let us look at the various options that can be configured:
+
+### 1. Supplier Naming By
+
+When a Supplier is saved, system generates a unique identity or name for that Supplier which can be used to refer the Supplier in various Buying transactions.
+
+If not configured otherwise, ERPNext uses the Supplier's Name as the unique name. If you want to identify Suppliers using names like SUPP-00001, SUPP-00002, or such other patterned series, select the value of Supplier Naming By as "Naming Series".
+
+You can define or select the Naming Series pattern from:
+
+> Setup > Settings > Naming Series
+
+[Click here to know more about defining a Naming Series.]({{docs_base_url}}/user/guides/setting-up/settings/naming-series.html)
+
+### 2. Default Supplier Type
+
+Configure what should be the value of Supplier Type when a new Supplier is created.
+
+### 3. Default Buying Price List
+
+Configure what should be the value of Buying Price List when a new Buying transaction is created.
+
+### 4. Maintain Same Rate Throughout Purchase Cycle
+
+If this is checked, ERPNext will stop you if you change the Item's price in a Purchase Invoice or Purchase Receipt created based on a Purchase Order, i.e. it will maintain the same price throughout the purchase cycle. If there is a requirement where you need the Item's price to change, you should uncheck this option.
+
+### 5. Purchase Order Required
+
+If this option is configured "Yes", ERPNext will prevent you from creating a Purchase Invoice or a Purchase Receipt without first creating a Purchase Order.
+
+### 6. Purchase Receipt Required
+
+If this option is configured "Yes", ERPNext will prevent you from creating a Purchase Invoice without first creating a Purchase Receipt.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/buying/setup/index.md b/erpnext/docs/user/manual/en/buying/setup/index.md
new file mode 100644
index 0000000..259b5eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/setup/index.md
@@ -0,0 +1,4 @@
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/setup/index.txt b/erpnext/docs/user/manual/en/buying/setup/index.txt
new file mode 100644
index 0000000..980e226
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/setup/index.txt
@@ -0,0 +1,2 @@
+buying-settings
+supplier-type
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
new file mode 100644
index 0000000..61f65fa
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
@@ -0,0 +1,28 @@
+A supplier may be distinguished from a contractor or subcontractor, who
+commonly adds specialized input to deliverables. A supplier is also known as a
+vendor. There are different types of suppliers based on their goods and
+products.
+
+ERPNext allows you to create your own categories of suppliers. These
+categories are known as Supplier Type. For Example, if your suppliers are
+mainly pharmaceutical companies and FMCG distributors, You can create a new
+Type for them and name them accordingly.
+
+Based on what the suppliers supply, they are classified into different
+categories called Supplier Type. There can be different types of suppliers.
+You can create your own category of Supplier Type.
+
+> Buying > Setup > Supplier Type > New Supplier Type
+
+<img class="screenshot" alt="Supplier Type" src="{{docs_base_url}}/assets/img/buying/supplier-type.png">
+
+You can classify your suppliers from a range of choice available in ERPNext.
+Choose from a set of given options like Distributor, Electrical,Hardware,
+Local, Pharmaceutical, Raw material, Services etc.
+
+Classifying your supplier into different types facilitates accounting and
+payments.
+
+Type your new supplier category and Save.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
new file mode 100644
index 0000000..0f1d51a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
@@ -0,0 +1,33 @@
+A Supplier Quotation is a formal statement of promise by potential supplier to
+supply the goods or services required by a buyer, at specified prices, and
+within a specified period. A quotation may also contain terms of sale and
+payment, and warranties. Acceptance of quotation by the buyer constitutes an
+agreement binding on both parties.
+
+You can make a supplier quotation from a Material Request
+
+#### Supplier Quotation Flow-Chart
+
+
+
+You can also make a Supplier Quotation directly from:
+
+> Buying > Documents > Supplier Quotation > New Supplier Quotation
+
+#### Create Supplier Quotation
+
+<img class="screenshot" alt="Supplier Quotation" src="{{docs_base_url}}/assets/img/buying/supplier-quotation.png">
+
+If you have multiple Suppliers who supply you with the same Item, you
+usually send out a message (Request for Quote) to various Suppliers. In
+many cases, especially if you have centralized buying, you may want to record
+all the quotes so that
+
+ * You can easily compare prices in the future
+ * Audit whether all Suppliers were given the opportunity to quote.
+
+Supplier Quotations are not necessary for most small businesses. Always
+evaluate the cost of collecting information to the value it really provides!
+You could only do this for high value items.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md
new file mode 100644
index 0000000..455e060
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/supplier.md
@@ -0,0 +1,37 @@
+Suppliers are companies or individuals who provide you with products or
+services. They are treated in exactly the same manner as Customers in ERPNext.
+
+You can create a new Supplier via:
+
+> Buying > Documents > Supplier > New Supplier
+
+<img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-master.png">
+
+### Contacts and Addresses
+
+Contacts and Addresses in ERPNext are stored separately so that you can attach
+multiple Contacts or Addresses to Customers and Suppliers. To add a Contact or
+Address go to Buying and click on “New Contact” or “New Address”.
+
+> Tip: When you select a Supplier in any transaction, one Contact and Address
+gets pre-selected. This is the “Default Contact or Address”. So make sure you
+set your defaults correctly!
+
+### Integration with Accounts
+
+In ERPNext, there is a separate Account record for each Supplier, of Each
+company.
+
+When you create a new Supplier, ERPNext will automatically create an Account
+Ledger for the Supplier under “Accounts Payable” in the Company set in the
+Supplier record.
+
+> Advanced Tip: If you want to change the Account Group under which the
+Supplier Account is created, you can set it in the Company master.
+
+If you want to create an Account in another Company, just change the Company
+value and “Save” the Supplier again.
+
+> Tip: You can also import from the Data Import Tool
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
new file mode 100644
index 0000000..83d7bf6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -0,0 +1,22 @@
+ERPNext Web Portal gives your customers quick access to their Orders, Invoices
+and Shipments Customers can check the status of their orders, invoices, and
+shipping status by logging on to the web.
+
+
+
+Once an order is raised, either using the Shopping Cart or from within
+ERPNext, your customer can view the order and keep an eye on the billing and
+shipment status. When the invoice and payment against these orders are
+submitted, the customer can see the updated status on the portal, at a glance.
+
+
+
+#### Invoice with paid status.
+
+
+
+#### Invoice with billed status.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/index.md b/erpnext/docs/user/manual/en/customer-portal/index.md
new file mode 100644
index 0000000..ddac7d2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/index.md
@@ -0,0 +1,8 @@
+Customer Portal is designed to give easy accesibility 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.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/customer-portal/index.txt b/erpnext/docs/user/manual/en/customer-portal/index.txt
new file mode 100644
index 0000000..a029f6b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/index.txt
@@ -0,0 +1,4 @@
+customer-orders-invoices-and-shipping-status
+portal-login
+sign-up
+issues
diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
new file mode 100644
index 0000000..79ac676
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/issues.md
@@ -0,0 +1,22 @@
+The customer portal makes it very easy for a customer to raise concerns. A
+simple and intuitive interface facilitates your customer to report their
+concerns as Issues. They can view the complete thread of their
+conversation.
+
+#### Empty Ticket List
+
+
+
+#### New Issue
+
+
+
+#### Open Issue
+
+
+
+#### Reply on Issue
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/portal-login.md b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
new file mode 100644
index 0000000..4a3b60c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
@@ -0,0 +1,6 @@
+To login into the customer account, the customer has to use his email id and
+the password sent by ERPNext; generated through the sign-up process.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
new file mode 100644
index 0000000..01929ec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -0,0 +1,22 @@
+Customers have to log-in to the Company Website, and sign-up as a customer.
+
+#### Step 1: Click on Login Icon
+
+
+
+
+
+#### Step 2: Click on Sign Up Icon
+
+
+
+
+
+#### Step 3: Enter Customer Name and ID
+
+
+
+After the sign up process, a mail will be sent to the customers email id with
+the password details.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
new file mode 100644
index 0000000..7460568
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
@@ -0,0 +1,26 @@
+<h1>Allow Fields to be Changed After Submit</h1>
+
+In many cases a field may need to be changed even after the document has been submitted to allow flexibility. The _Allow On Submit_ option is available for such a purpose. Certain standard fields in Doctypes are set as Allow On Submit by default (such as _Letterhead_ and _Print Heading_ in Invoices). The user can set Custom Fields as Allow On Submit using Customize Form.
+
+**Note:** Standard Fields cannot be set as Allow On Submit by a User
+
+#### Step 1: Go to Customize Form in Setup Module.
+
+```Setup >> Customize >> Customize Form```
+
+####
+####Step 2: Select the form containing the desired Custom Field in _Enter Form Type_ field.
+
+
+
+#### **Step 3:** In the _Fields_ section, scroll down, click on the Custom field and check the _Allow On Submit._
+
+
+
+_This field can now be changed even after the Document is submitted_.
+
+**Note:** The Custom Fields can also be set as Allow On Submit during the time of creation by checking the Allow On Submit option that is available.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html
new file mode 100644
index 0000000..cf27229
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html
@@ -0,0 +1,7 @@
+<h1>Creating Custom Link Fields</h1>
+
+Users can create Custom Link Fields within DocTypes by following these steps;
+
+
+
+<br><h4>Step 1: Go to Customize Form in Setup Module.</h4><code>Setup >> Customize >> Customize Form</code><br><br><h4>Step 2: Select the desired form in <em>Enter Form Type</em> field.</h4><img src="{{docs_base_path}}/assets/img/articles/kb_custom_name.png" height="194" width="697"><br><br><h4><strong>Step 3:</strong> In the <em>Fields</em> section;</h4><p>Insert a new Field row and set the attributes as;</p><ul><li><b>Label: </b>Desired label that user wishes to display in the form</li><li><b>Type: </b>Set as 'Link'</li><li><b>Name: </b>Desired name for the field</li><li><b>Options: </b>Enter the name of the Doctype to which the field is linked<br></li></ul><br><img src="{{docs_base_path}}/assets/img/articles/kb_customlink_newfield.png" height="311" width="697"><br><br><br><h4>Note: Please refer to https://frappe.io/kb/customization/form-architecture for more information about the form structure<br></h4><!-- html -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
new file mode 100644
index 0000000..cc7ac01
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
@@ -0,0 +1,29 @@
+<h1>Customizing Sorting Order in the List View</h1>
+
+**Question:** I want records in my Item List sorted based on Desc Order of Item Code.
+
+**Answers:** Following are the steps to customize Sort Order for the Item master. These steps will be applicable for customizing Sort Order for the other documents as well.
+
+####Step 1: Go to Customize Form
+
+`Setup > Customize > Customize Form`
+
+####Step 2: Select Doctype
+
+Select document for which you Sort Order is to be customized. Considering a scenario, Item should be selected in the Doctype field.
+
+####Step 3: Update Sort Details
+
+In the Customize Form, you will find these fields.
+
+
+
+1. Sort Field
+
+Select field based on which sorting will be done. It will be "Item_Code" field in scenario.
+
+2. Sort Order
+
+Sort Order will be two possible options, **Asc** for ascending, and **Desc** for descending.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
new file mode 100644
index 0000000..bb0461c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
@@ -0,0 +1,23 @@
+<h1>Deleting Custom Reports</h1>
+
+ERPNext has several [types of reports](https://erpnext.com/kb/report/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement.
+
+If there is a report custom report which needs to be deleted, it can be achieved by following steps given below. Please note that its applicable only for the Custom Report, and not for the standard reports.
+
+####Report List
+
+In the Awesome Bar, type and select "Report List" for an option.
+
+
+
+####Selecting and Deleting Report
+
+The Report List will have all the standard and custom reports of your account. You can select Custom Report to be deleted from the list itself, and click on Delete icon.
+
+
+
+Or you can open that report, and delete it from File menu option.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
new file mode 100644
index 0000000..2f9655c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
@@ -0,0 +1,23 @@
+<h1>Disable Rounded Total</h1>
+
+Each transaction in ERPNext has Standard print format. For transactions, Standard print format covers Rounded Total for that transaction by default.
+
+
+
+If you don't wish rounded total to be shown in the Standard Print Format, please complete following settings.
+
+####1. Go to Global Settings
+
+`Setup > Settings > Global Settings`
+
+####2. Set Global Defaults
+
+Check Disable Rounded Total, and Save Global Defaults.
+
+
+
+For system to take effect of this setting, you should clear cache and refresh your ERPNext account. Then your print formats shall not render value for the Rounded Total in the print formats.
+
+<div class=well>Note: This setting will only affect Standard print formats.</div>
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html
new file mode 100644
index 0000000..6b1c38b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html
@@ -0,0 +1,168 @@
+<h1>Field Types</h1>
+
+<p>Following are the types of fields you can define while creating new ones, or while amend standard ones.</p>
+<ul>
+ <li><b>Attach:</b>
+
+ <br>
+ <br>Attach field allows you browsing file from File Manager and attach in the transaction.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_184.png">
+ <br>
+ <br>
+ </li>
+ <li><b>Button:</b>
+
+ <br>
+ <br>This Field Type will generate a Button, on clicking which you can execute some function.
+ <br>
+ <br>
+ </li>
+ <li><b>Check:</b>
+
+ <br>
+ <br>Check will generate a check box field.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_185.png">
+ <br>
+ <br>
+ </li>
+ <li><b>Column Break:</b>
+
+ <br>
+ <br>Since ERPNext has two column layout, using Column Break fields, you can divide set of fields on either side.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_186.png">
+ <br>
+ <br>
+ </li>
+ <li><b>Currency:</b>
+
+ <br>
+ <br>Currency field holds numeric value, upto two decimal place. Also you can have currency symbol being shown for the currency field.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_187.png">
+ <br>
+ <br>
+ </li>
+</ul>
+<ul>
+ <li><b>Data:</b>
+
+ <br>
+ <br>Data field allows you entering value upto 255 character.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_183.png">
+ <br>
+ <br>
+ </li>
+ <li><b>Date and Time:<br><br></b>This field will give you date and time picker, with value for current date and time (as provided by your computer) set by default.
+ <br>
+ <br><b><img src="{{docs_base_path}}/assets/img/articles/$SGrab_188.png"><br><br></b>
+
+ </li>
+ <li><b>Dynamic Link:<br><br></b>Link field is one which pulls data from another master/table. Dynamic link field is connected with multiple masters at the same time. Its link is determined based on value selected in the previous field.
+ <br>
+ <br>Example: Customer will be Dynamic field in the Quotation form. If use selects Quotation made for Customer, then Customer field will be linked to Customer master, and suggest records accordingly. If user selects that Quotation is for Lead, then same Customer
+ field will be linked to Lead master.
+ <br>
+ <br>
+ </li>
+ <li><b>Float:</b>
+
+ <br>
+ <br>Float field carries numeric value, upto six decimal place. Float Precision set in Setup >> Settings >> System Setting will be applicable on all the link field. For float field, decimal places generated will be as define in Float Precision.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_189.png">
+ <br>If you need more than two decimal place in the Currency field, you can change its field type to Float field from Customize Form.
+ <br>
+ <br>
+ </li>
+ <li><b>Image:</b>
+
+ <br>
+ <br>Image field will render an image file selected in another attach field.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_190b611f3.png">
+ <br>
+ <br>For the Image field, under Option, Attach field name should be provide which this field will refer to for image file, and render that image file.
+ <br>
+ <br>
+ </li>
+ <li><b>Int (Integer):</b>
+
+ <br>
+ <br>Integer field holds numeric value, without decimal place.
+ <br>
+ <br>
+ </li>
+ <li>Link Field:
+ <br>
+ <br>Link field is connected with another master from where it fetches data.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_191.png">
+ <br>
+ <br>
+ </li>
+ <li><b>Password:<br><br></b>Password field will decode value in it. Extra coding will be required for validating password of specific user.<b><br><br></b>
+
+ </li>
+ <li><b>Read Only:<br><br></b>Read Only field will carry data fetched from another form, but they themselves will be non-editable. You should set Read Only as field type if its source for value is predetermined.
+ <br>
+ <br>
+ </li>
+ <li><b>Section Break:</b>
+
+ <br>
+ <br>Section Break can be used to divide form in multiple section.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_192.png">
+ <br>
+ <br>
+ </li>
+ <li><b>Select:<br><br></b>Select will be the drop-down field, with possible results (separate by row) define in the Option.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_193.png">
+ <br><b><br></b>
+
+ </li>
+ <li><b>Small Text:</b>
+
+ <br>
+ <br>Small Text field carries general text content, has little more character limit than Data field.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_194.png">
+ <br>
+ <br>
+ </li>
+ <li><b>Table:</b>
+
+ <br>
+ <br>Table will be (sort of) Link field which will render another docytpe within the current form. For example, Item table in the Sales Order form is Table field, which is linked to Sales Order Item doctype.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_196.png">
+ <br>
+ <br>
+ </li>
+ <li><b>Text Editor:</b>
+
+ <br>
+ <br>Text Editor will be large text field, with tools to format text.
+ <br>
+ <br>
+ <img src="{{docs_base_path}}/assets/img/articles/$SGrab_198.png">
+ <br>
+ </li>
+</ul>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html
new file mode 100644
index 0000000..450bfb1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html
@@ -0,0 +1,24 @@
+<h1>Increase Max Attachments</h1>
+
+You can increase Number of attachments which can be added to particular documents via Customize Form.
+<br>
+<br>Let's assume we need to increase Max Attachment limit for Quotation to five. Following will be the steps to achieve this.
+<br>
+<br>
+<b>Step 1</b>: Go to Setup > Customize > Customize Form.
+ <br>
+ <br><b>Step 2</b>: Enter Form Type.<br>
+ <br>In our case, it will be "Quotation".
+ <br><br><img src="{{docs_base_path}}/assets/img/articles/Selection_0179888b3.png"><br>
+ <br><b>Step 3:</b> Increase Numbers under the Max Attachments field.
+<br>
+ <br><br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_018ea50ef.png">
+ <br>
+ <br>After increasing numbers update the Customization Form.
+<br>
+<br>
+<div class="well">Note: Max limit/size of an attachment is 1MB.</div>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
new file mode 100644
index 0000000..3ac0897
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
@@ -0,0 +1,16 @@
+allow-fields-to-be-changed-after-submit
+creating-custom-link-field
+customizing-sorting-order-in-the-list-view
+deleting-custom-reports
+disable-rounded-total
+field-types
+increase-max-attachments
+make-field-visible-in-print-format
+making-custom-reports-in-erpnext
+managing-dynamic-link-fields
+module-visibility
+perm-level-error-in-permission-manager-1
+search-record-by-specific-field
+set-language
+set-precision-for-float-currency-and-percent-fields
+user-restriction
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html
new file mode 100644
index 0000000..ffdd9d2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html
@@ -0,0 +1,5 @@
+<h1>Make Fields Visible In Print Format</h1>
+
+The standard print formats only display certain fields by default. In case the user prefers more information from fields to be displayed, this can be achieved by using the <i>Customize Form</i> feature.<b><br><br>Step 1:</b> Go to Customize Form in Setup Module.<br><br>
+<div class="well">Setup >> Customize >> Customize Form</div>
+<b>Step 2: </b>Select the desired form in <i>Enter Form Type</i> field.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_custom_name.png"><br><br><b>Step 3:</b> In the <i>Fields</i> section, click on the field that must be visible in the Print Format and remove the check on <i>Print Hide</i> field.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_custom_printhide.png" height="214" width="674"><br><br>The field will now be visible in all print formats for that Document type.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
new file mode 100644
index 0000000..540d1cd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
@@ -0,0 +1,53 @@
+<h1>Reports in ERPNext</h1>
+
+There are three kind of reports in ERPNext.
+
+###1. Query Report
+
+Query Report is written in SQL which pull values from database and fetch in the report. Though SQL queries can be written from front end, like HTML for customer print format, its restricted from hosted users. Because it will allow users with no access to specific report to query data from query report.
+
+Check Purchase Order Item to be Received report in Stock module for example of Query report.
+
+###2. Script Report
+
+Script Reports are written in Python and stored on server side. These are complex reports which involves exception of logic and calculation. Since these reports are written on server side, its not available for hosted users.
+
+Check Financial Analytics report in Accounts module for example of Script Report.
+
+###3. Report Builder
+
+Report Builder is an in-built report customization tool in ERPNext. This allows you to define fields of the form which shall appear as column in the report. Also you can set required filters and do sorting as per your preference.
+
+Each form in ERPNext has Report Builder option in its list view.
+
+
+
+####Adding Column in Report
+
+Go to Menu and click on Pick Column option to select field which should be added as column in the report. You can also select the field from the child table (eg. Item table in Sales Invoice) of the form.
+
+
+
+####Applying Filters
+
+All the fields of the form will be applicable for setting filter as well.
+
+
+
+####Sorting
+
+Select field based on which report will be sorted.
+
+
+
+####Save Report
+
+Go to Menu and click on Save button to have this report saved with selected column, filters and sorting.
+
+
+
+Saved reports appear under Customize section in the module's home page. Customize Report section only appear if you have custom reports being saved for documents of that module.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
new file mode 100644
index 0000000..c14ef39
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
@@ -0,0 +1,46 @@
+<h1>Managing Dynamic Link Fields</h1>
+
+Dynamic Link field is one which can search and hold value of any document/doctype. Let's consider an example to learn how Dynamic Link field can benefit us.
+
+While creating Opportunity or Quotation, we have to explicitly define if it is for Lead or Customer. Based on our selection (Lead/Customer), another link field shows up where we can select actual Lead or Customer for whom we are creating this Quotation.
+
+If you set later field as Dynamic Link, where we select actual Lead or Customer, this field will be able to search Leads as well as Customers. Hence we need not insert separate link fields for Customer and Lead.
+
+Let's check steps to insert Custom Dynamic Field. For an instance, we will insert it under Journal Voucher Form.
+
+####Insert Link Field for Doctype
+
+Firstly we will create a link field which will be linked to the Doctype.
+
+
+
+By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just like Quotation is one Doctype, which has multiple Quotation under it. Same way, Doctype is also a Doctype which has Sales Order Doctype, Purchase Order Doctype and other form's doctype created under it as child Doctype.
+
+-- Doctype<br>
+----- Sales Order<br>
+----- Purchase Invoice<br>
+----- Quotation<br>
+----- Sales Invoice<br>
+----- Employee<br>
+----- Production Order<br>
+and so on, till all the forms/document of ERPNext is covered.
+
+So linking this field with parent Doctype master list all the child doctypes/forms.
+
+
+
+####Insert Dynamic Link Field
+
+It will be "Dynamic Link" for Field Type, and field name of Doctype field mentioned in its Option field.
+
+
+
+This field will allow us to select document id, based on value selected in the Doctype link field. For example, if we select Sales Order in the prior field, this field will list all the Sales Orders id. If we select Purchase Invoice in the prior field, this field will render all the Purchase Order for our selection.
+
+
+
+####Customizing options in the Doctype Link field
+
+Bydefault, Docytpe link field will provide all the forms/doctypes for selection. If you wish this field to show certain specific doctypes in the search result, you will need to write Custom Script for it.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
new file mode 100644
index 0000000..837ca92
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
@@ -0,0 +1,17 @@
+<h1>Module Visibility</h1>
+
+If you have permission on specific module, but it is still not visible to you, following is how you should go about checking setting to make it visible again.
+
+As step zero, reassure that you have role assigned which is required for accessing Website and Shopping Cart module. For modules in question, you should have "Website Manager" role assigned. If permissions has been customized in your account, check Role Permission Manager to know which Role has permission on Website and Shopping Cart module.
+
+If modules are hidden in-spite of assignment of required permission, then you should check if Website and Shopping Cart module is not disabled from All Application option on your desk/home page.
+
+
+
+If modules are still not visible, check if it is hidden by System Manager from Show/Hide Modules option in the Setup module.
+
+<div class="well">Setup >> Settings >> Show / Hide Modules</div>Ensure required module are checked, and not disabled in this page. If you just enabled/activated it, update Show/Hide Module page, and check your home page after Help >> Clear Cache.
+
+<div class="well">Note: In this help page, Website and Shopping Cart module is considered as an example. You can troubleshoot visibility issues for other modules following same steps.</div>
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager-1.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager-1.md
new file mode 100644
index 0000000..2fb27b6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager-1.md
@@ -0,0 +1,19 @@
+<h1>Perm Level Error in Permission Manager</h1>
+
+While customizing rules in the [Permission Manager](https://erpnext.com/user-guide/setting-up/permissions/role-based-permissions), you might receive an error message saying:
+
+`For System Manager_ (or other role) _at level 2_ (or other level) _in Customer_ (or document) _in row 8: Permission at level 0 must be set before higher levels are set`.
+
+Error message indicates problem in the existing permission setting for this document.
+
+For any role, before assigning permission at Perm Level 1, 2, permission at Perm Level 0 must be assigned. Error message says that System Manager has been assigned permission at Perm Level 1 and 2, but not at level 0. You should first correct the permission for System Manager's role by:
+
+- Assigning permission to System Manager at level 0.
+
+Or
+
+- By removing permission at level 1 and 2.
+
+After executing one of the above step, you should try adding additional rules in the Role Permission Manager.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
new file mode 100644
index 0000000..1505964
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
@@ -0,0 +1,21 @@
+<h1>Search Record by Specific Field</h1>
+
+While creating any document in ERPNext, you might have to select other record id in it (like selecting Customer in Quotation). For ease in selecting other record, you can search them based on value in various fields of that record. Search By functionality enables you searching and filtering records based on value in the specific fields of that record.
+
+Let's consider an example to learn Search By functionality better. While creating Sales Order, we need to select Customer in it. If we need to filter search result of Customer for specific Customer Group, we should go about following these steps to achieve it.
+
+####Search By in Customize Form
+
+In the Customize Form tool, you will find field called Search Field. You should enter field names based on which we can search and filter result for this document.
+
+Considering our scenario, we should update name of Customer Group field for Customer in the Customize Form.
+
+![Search By in Customize Form]()
+
+####Searching in Another Record.
+
+While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier.
+
+![Search for master]()
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
new file mode 100644
index 0000000..91e9e5f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
@@ -0,0 +1,38 @@
+<h1>Change the Language</h1>
+
+ERPNext is an multi-lingual application, which means user can select a preferred language for one's ERPNext account.
+
+### 1. Setting Language in User's Account
+
+Following are the steps to set language in your ERPNext account.
+
+#### 1.1 Go to My Setting
+
+
+
+#### 1.2 Select Language
+
+
+
+#### 1.3 Save User
+
+On saving User after selecting language, your ERPNext account will be refresh automatically. Then you will see ERPNext translated in your selected language.
+
+Being a System Manager, you can set language in other user's master as well.
+
+### 2. Set Language Globally for an Account
+
+#### 2.1 Go to Setup
+
+`Setup > Settings > System Settings`
+
+#### Set Language
+
+
+
+#### Save
+
+Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference.
+
+Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://frappe.io/translator).
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md
new file mode 100644
index 0000000..2cc39e1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md
@@ -0,0 +1,26 @@
+<h1>Set Precision for Float, Currency and Percent fields</h1>
+
+In ERPNext, default precision for `Float`, `Currency` and `Percent` field is 3. So, you can enter any number up-to 3 decimals in such fields.
+
+You can also change / customize the precision settings globally or for a specific field.
+
+To change the precision globally, go to `Setup > Settings > System Settings`.
+
+
+You can also set field specific precision. To do that go to `Setup > Customize > Customize Form` and select the DocType there. Then go to the specific field row and change precision. Precision field is only visible if field-type is one of the Float, Currency and Percent.
+
+
+**Note:**
+If you are changing precision of a field to a higher number, all the related fields should also be set to the same precision.
+
+For example, if you want to calculate invoice total upto 5 decimals, you need to change the precision of all related fields, which resulted total. In this case you have to change following fields to get correct total.
+
+ Sales Invoice Item: price_list_rate, base_price_list_rate, rate, base_rate, amount and base_amount
+
+ Taxes and Charges: tax_amount, total and tax_amount_after_discount
+
+ Sales Invoice: net_total, other_charges_total, discount_amount and grand_total
+
+And precision should be changed in all related documents as well, to get correct mapping. In this case, same precision should be set for Quotation, Sales order, Delivery Note and Sales Invoice.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html
new file mode 100644
index 0000000..09f9cb1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html
@@ -0,0 +1,29 @@
+<h1>Owner Restriction</h1>
+
+To restricting user based on Owner (creator of record), form/document should have field linked with User master. If that document is not linked with user, then you should create <a href="https://erpnext.com/user-guide/customize-erpnext/custom-field" target="_blank">custom field</a> and link it with User master.
+<br>
+<br>Following are the steps to restrict User based on Owner.
+<br>
+<br><b>Step 1: </b>Go to:
+<br>
+<br>Setup > Permissions > Role Permissions Manager
+<br>
+<br><b>Step 2:</b> Select Document Type for which you want to set user permission. After permissions are loaded for selected document, scroll to role for which you want to set restriction.
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_0045d151c.png"><br>
+<br><b>Step 3:</b> For Role to be resricted (Sales User in this case), check "Apply User Restriction". On checking Apply User Permission, two links will be show up called:
+<br>
+<br>- Select Document Type
+<br>- Select User Permissions
+<br>
+<br>Click on "Select Document Type".
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_0028834c2.png" height="168" width="691">
+<br>
+<br><b>Step 4:</b> Check mark on User, and un-check for others. If you want user to be restricted based on some other criteria as well, like territory, customer groups, then that should be checked as well.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_003fea339.png">
+<br>
+<div class="well">When restricting User based on User master itself, then there is no need to create User Permission Setting.</div>
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
new file mode 100644
index 0000000..fdca8da
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
@@ -0,0 +1,74 @@
+DocType or Document Type is a tool to insert form in ERPNext. The forms like Sales Order,
+Sales Invoices, Production Order are added as Doctype in the backend. Let's assume we are
+creating a Custom Doctype for a Book.
+
+Custom Doctype allows you to insert custom forms in ERPNext as per your requirement.
+
+To create a new **DocType**, go to:
+
+`Setup > Customize > Doctype > New`
+
+#### Doctype Detail
+
+1. Module: Select module in which this Doctype should be placed.
+1. Document Type: Specify if this Doctype will be to carry master data, or to track transactions. Doctype
+for book will be added as Master.
+1. Is Child table: If this Doctype is to be inserted as table into another Doctype, like Item table
+in the Sales Order Doctype, then you should check Is Child Table. Else no.
+1. Is Single: If checked, this Doctype will become a single form, like Selling Setting, which user will
+not be able to re-produce.
+1. Custom?: This field will be checked by default when adding Custom Doctype.
+
+
+
+#### Fields
+
+In the Fields Table, you can add the fields (properties) of the DocType (Article).
+
+Fields are much more than database columns, they can be:
+
+1. Columns in the database
+1. For Layout (section / column breaks)
+1. Child tables (Table type field)
+1. HTML
+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.
+
+You can also set other properties of the field like whether it is mandatory, read only etc.
+
+#### Naming
+
+In this section, you can define criteria based on which document for this doctype will be named. There are multiple criterion based on which document can be named, like naming based on the value in the specific field, or based on Naming Series, or based on value provided by the user in the prompt, which will be shown when saving document. In the following example, we are doing naming based on the value in the field **book_name**.
+
+
+
+#### Permission
+
+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
+
+To check this Doctype, open Module defined for this doctype. Since we have added Books doctype in the
+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.
+
+
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
new file mode 100644
index 0000000..8aefa80
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
@@ -0,0 +1,77 @@
+Custom Field feature allows you to insert fields in the existing masters and transactions as per your requirement. While inseting custom field, you can define its properties like.
+
+* Field Name/Label
+* Field Type
+* Mandatory/Non-Mandatory
+* Insert After Field
+
+To add a Custom Field, go to:
+
+> Setup > Customize > Custom Field > New Custom Field
+
+You can also insert new Custom Field from [Customize Form](https://erpnext.com/customize-erpnext/customize-form) tool.
+
+In Customize Form, for each field, you will find plus (+) option. When click on it, new row will be inserted above that field. You can enter properties for your Custom Field in the newly added blank row.
+
+
+
+Following are the steps to insert Custom Field in the existing form.
+
+####New Custom Field form / Row in Customize Form
+
+As mentioned above, you can insert Custom Field from Custom Field form, and also from Customize Form.
+
+####Select Document/Form
+
+You should select transaction or master in which you want to insert custom field. Let's assume you need to insert a custom link field in the Quotation form. In this case, Document will be "Quotation".
+
+
+
+####Set Field Label
+
+Custom Field's name will be set based on its Label. If you want to create Custom Field with specific name, but with different label, then you should first set Label as you want Field Name to be set. After Custom Field is saved, you can edit the Field Label again.
+
+
+
+####Select Insert After
+
+This field will have all the existing field of the form/doctype selected. Your Custom Field will be placed after field you select in the Insert After field.
+
+
+
+####Select Field Type
+
+Click [here](https://erpnext.com/kb/customize/field-types) to learn more about types of field you can set for your Custom Field.
+
+
+
+####Set Option
+
+If you are creating a Link field, then Doctype name with which this field will be linked to will be entered in the Option field. Click [here](https://erpnext.com/kb/customize/creating-custom-link-field) to learn more about creating custom link field.
+
+
+
+If field type is set as Select (drop down field), then all he possible result for this field should be listed in the Options field. Each possible result should be separate by row.
+
+
+
+For other field types, like Data, Date, Currency etc., Opton field will be left blank.
+
+####Set More Properties
+
+You can set properties as:
+
+1. Mandatory: Should this field be mandatory or non-mandatory.
+1. Print Hide: Should this field be visible in the print format or no.
+1. Field Description: It will be short field description which will appear just below that field.
+1. Default Value: Value entered in this field will be auto-updated in this field.
+1. Read Only: Checking this option will make custom field non-editable.
+1. Allow on Submit: Checking this option will allow editing value in the field when in submitted transaction.
+
+
+
+####Deleting Custom Field
+
+Given a permission, user will be able to delete Custom Fields. Incase, it was deleted by default, if you add another Custom Field with same name. Then you shall see new field auto-mapped with old-deleted Custom Field.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md
new file mode 100644
index 0000000..12054be
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md
@@ -0,0 +1,23 @@
+# Add a Custom Button
+
+ frappe.ui.form.on("Event", "refresh", function(frm) {
+ frm.add_custom_button(__("Do Something"), function() {
+ // When this button is clicked, do this
+
+ var subject = frm.doc.subject;
+ var event_type = frm.doc.event_type;
+
+ // do something with these values, like an ajax request
+ // or call a server side frappe function using frappe.call
+ $.ajax({
+ url: "http://example.com/just-do-it",
+ data: {
+ "subject": subject,
+ "event_type": event_type
+ }
+
+ // read more about $.ajax syntax at http://api.jquery.com/jquery.ajax/
+
+ });
+ });
+ });
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
new file mode 100644
index 0000000..38395f9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
@@ -0,0 +1,25 @@
+To pull a value of a link on selection, use the `add_fetch` method.
+
+
+
+ add_fetch(link_fieldname, source_fieldname, target_fieldname)
+
+
+### Example
+
+You create Custom Field **VAT ID** (`vat_id`) in **Customer** and **Sales
+Invoice** and want to make sure this value gets updated every time you select
+a Customer in a Sales Invoice.
+
+Then in the Sales Invoice Custom Script, add this line:
+
+
+
+ cur_frm.add_fetch('customer','vat_id','vat_id')
+
+
+* * *
+
+See: [How to create a custom script]({{docs_base_url}}/user/guides/customize-erpnext/custom-scripts.html)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
new file mode 100644
index 0000000..0d080af
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
@@ -0,0 +1,11 @@
+# Date Validation
+
+
+ frappe.ui.form.on("Event", "validate", function(frm) {
+ if (frm.doc.from_date < get_today()) {
+ msgprint(__("You can not select past date in From Date"));
+ throw "past date selected"
+ }
+ });
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
new file mode 100644
index 0000000..960aa89
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
@@ -0,0 +1,39 @@
+Add this in the Custom Script of **Item**, so that the new Item Code is
+generated just before the a new Item is saved.
+
+
+(Thanks to Aditya Duggal)
+
+
+
+ cur_frm.cscript.custom_validate = function(doc) {
+ // clear item_code (name is from item_code)
+ doc.item_code = "";
+
+ // first 2 characters based on item_group
+ switch(doc.item_group) {
+ case "Test A":
+ doc.item_code = "TA";
+ break;
+ case "Test B":
+ doc.item_code = "TB";
+ break;
+ default:
+ doc.item_code = "XX";
+ }
+
+ // add next 2 characters based on brand
+ switch(doc.brand) {
+ case "Brand A":
+ doc.item_code += "BA";
+ break;
+ case "Brand B":
+ doc.item_code += "BB";
+ break;
+ default:
+ doc.item_code += "BX";
+ }
+ }
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md
new file mode 100644
index 0000000..78edcfc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md
@@ -0,0 +1,18 @@
+### How to Create a Custom Script
+
+Create a Custom Script (you must have System Manager role for this):
+
+ 1. Got to: Setup > Custom Script > New Custom Script
+ 2. Select the DocType in which you want to add the Custom Script
+
+* * *
+
+### Notes
+
+ 1. Server Custom Scripts are only available for the Administrator.
+ 2. Client Custom Scripts are in Javascript and Server Custom Scripts are in Python.
+ 3. For testing, make sure to go to Tools > Clear Cache and refresh after updating a Custom Script.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.txt
new file mode 100644
index 0000000..2b49755
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.txt
@@ -0,0 +1,10 @@
+custom-script-fetch-values-from-master
+date-validation
+generate-item-code-based-on-custom-logic
+make-read-only-after-saving
+restrict-cancel-rights
+restrict-purpose-of-stock-entry
+restrict-user-based-on-child-record
+sales-invoice-id-based-on-sales-order-id
+update-date-field-based-on-value-in-other-date-field
+custom-button
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
new file mode 100644
index 0000000..4fda1bd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
@@ -0,0 +1,12 @@
+Use the method `cur_frm.set_df_property` to update the field's display.
+
+In this script we also use the `__islocal` property of the doc to check if the
+document has been saved atleast once or is never saved. If `__islocal` is `1`,
+then the document has never been saved.
+
+ frappe.ui.form.on("MyDocType", "refresh", function(frm) {
+ // use the __islocal value of doc, to check if the doc is saved or not
+ frm.set_df_property("myfield", "read_only", frm.doc.__islocal ? 0 : 1);
+ }
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
new file mode 100644
index 0000000..e5037fe
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
@@ -0,0 +1,17 @@
+Add a handler to `custom_before_cancel` event:
+
+
+
+ cur_frm.cscript.custom_before_cancel = function(doc) {
+ if (user_roles.indexOf("Accounts User")!=-1 && user_roles.indexOf("Accounts Manager")==-1
+ && user_roles.indexOf("System Manager")==-1) {
+ if (flt(doc.grand_total) > 10000) {
+ msgprint("You can not cancel this transaction, because grand total \
+ is greater than 10000");
+ validated = false;
+ }
+ }
+ }
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
new file mode 100644
index 0000000..9b37eb5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
@@ -0,0 +1,10 @@
+
+ frappe.ui.form.on("Material Request", "validate", function(frm) {
+ if(user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
+ msgprint("You are only allowed Material Receipt");
+ throw "Not allowed";
+ }
+ }
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
new file mode 100644
index 0000000..6c36a14
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
@@ -0,0 +1,20 @@
+
+ // restrict certain warehouse to Material Manager
+ cur_frm.cscript.custom_validate = function(doc) {
+ if(user_roles.indexOf("Material Manager")==-1) {
+
+ var restricted_in_source = wn.model.get("Stock Entry Detail",
+ {parent:cur_frm.doc.name, s_warehouse:"Restricted"});
+
+ var restricted_in_target = wn.model.get("Stock Entry Detail",
+ {parent:cur_frm.doc.name, t_warehouse:"Restricted"})
+
+ if(restricted_in_source.length || restricted_in_target.length) {
+ msgprint("Only Material Manager can make entry in Restricted Warehouse");
+ validated = false;
+ }
+ }
+ }
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
new file mode 100644
index 0000000..72dbb6d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
@@ -0,0 +1,19 @@
+Below script allows you to get naming series in Sales Invoice, same as of corresponding Sales Order.
+Invoice uses a prefix M- but the number duplicates the SO doc name (number).
+
+Example: If Sales Order id is SO-12345, then corresponding Sales Invoice id will be set as M-12345.
+
+ frappe.ui.form.on("Sales Invoice", "refresh", function(frm){
+ var sales_order = frm.doc.items[0].sales_order.replace("M", "M-");
+ if (!frm.doc.__islocal && sales_order && frm.doc.name!==sales_order){
+ frappe.call({
+ method: 'frappe.model.rename_doc.rename_doc',
+ args: {
+ doctype: frm.doctype,
+ old: frm.docname,
+ "new": sales_order,
+ "merge": false
+ },
+ });
+ }
+ });
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
new file mode 100644
index 0000000..b7a5e1c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
@@ -0,0 +1,7 @@
+Below script would auto-set value for the date field, based on the value in another date field.
+
+Example: Production Due Date must be set as two days before Delivery Date. If you have Production Due Date field already, with field type as Date, as per the below given script, date will be auto-updated in it, two days prior Deliver Date.
+
+ cur_frm.cscript.custom_delivery_date = function(doc, cdt, cd){
+ cur_frm.set_value("production_due_date", frappe.datetime.add_days(doc.delivery_date, -2));
+ }
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
new file mode 100644
index 0000000..e5e9d74
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
@@ -0,0 +1,11 @@
+If you wish to change any ERPNext form formats, you can do so by using Custom
+Scripts. For example, if you wish to add a submit button after saving, to a
+Lead form, you can do so by creating your own script.
+
+> Setup > Customization > Custom Script
+
+
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.txt
new file mode 100644
index 0000000..0fd3d46
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.txt
@@ -0,0 +1 @@
+custom-script-examples
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
new file mode 100644
index 0000000..232f34b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
@@ -0,0 +1,107 @@
+<!--markdown-->
+Before we venture to learn form customization tool, click [here](https://kb.frappe.io/kb/customization/form-architecture) to understand the architecture of forms in ERPNext. It shall help you in using Customize Form tool more efficiently.
+
+Customize Form is the tool which allows user to customize the property of standard fields as per the requirement. Let's assume we need to set Project Name field as mandatory in the Sales Order form. Following are the steps which shall be followed to achieve this.
+
+####Step 1: Go to Customize Form
+
+You can go to Customize Form from:
+
+> Setup >> Customize >> Customize Form
+
+System Manager will find Customize Form option in the Sales Order list (or any other form for that matter) view as well.
+
+
+
+####Step 2: Select Docytpe/Document
+
+You should select Docytpe/Document which has field-to-be-customized located in it.
+
+
+
+####Step 3:Edit Property
+
+On selecting Doctype/table, you will have all the fields of the table updated as rows in the Customize Form table. You should drill down to field you need to work on, Project Name in this case.
+
+On clicking Project Name row, fields to set various property for this field will be shown. To Customize the mandatory property for a field, there is a field called "Mandatory". Checking this field will set Project Name field as mandatory in the Quotation form.
+
+
+
+Like this, you can customize following properties of the field.
+
+* Change field types (for e.g. you want to increase the number of decimal places, you can convert come fields from Float to Currency).
+* Change labels to suit your industry / language.
+* Make certain fields mandatory.
+* Hide certain fields.
+* Change layout (sequence of fields). To do this, select a field in the grid and click on“Up” or “Down” in the grid toolbar.
+* Add / edit “Select” Options. (for example, you can add more sources in Leads etc).
+
+####Step 4: Update
+
+
+
+Before checking Sales Order form, you should clear cache and refresh browser tab for customization to take effect.
+
+For Customize Form, you can also allow attachments, set max number of attachments and set the default Print Format.
+
+>Note: Though we want you to do everything you can to customize your ERP based on your business needs, we recommend that you do not make “wild” changes to the forms. This is because, these changes may affect certain operations and may mess up your forms. Make small changes and see its effect before doing some more.
+
+Following are the properties which you can customize for a specific field from Customize Form.
+<style>
+ td {
+ padding:5px 10px 5px 5px;
+ };
+ img {
+ align:center;
+ };
+table, th, td {
+ border: 1px solid black;
+ border-collapse: collapse;
+}
+</style>
+<table border="1" width="700px">
+ <tbody>
+ <tr>
+ <td style="text-align: center;"><b>Field property</b></td>
+ <td style="text-align: center;"><b>Purpose</b></td>
+ </tr>
+ <tr>
+ <td>Print hide</td>
+ <td>Checking it will hide field from Standard print format.</td>
+ </tr>
+ <tr>
+ <td>Hidden</td>
+ <td>Checking it field will hide field in the data entry form.</td>
+ </tr>
+ <tr>
+ <td>Mandatory</td>
+ <td>Checking it will set field as mandatory.</td>
+ </tr>
+ <tr>
+ <td>Field Type</td>
+ <td>Click <a href="https://erpnext.com/kb/customize/field-types">here</a> to learn about of fields types.</td>
+ </tr>
+ <tr>
+ <td>Options</td>
+ <td>Possible result for a drop down fields can be listed here. Also for a link field, relevant Doctype can be provided.</td>
+ </tr>
+ <tr>
+ <td>Allow on submit</td>
+ <td>Checking it will let user update value in field even in submitted form.</td>
+ </tr>
+ <tr>
+ <td>Default</td>
+ <td>Value defined in default will be pulled on new record creation.</td>
+ </tr>
+ <tr>
+ <td>Description</td>
+ <td>Gives field description for users understanding.</td>
+ </tr>
+ <tr>
+ <td>Label</td>
+ <td>Label is the field name which appears in form.</td>
+ </tr>
+ </tbody>
+</table>
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/document-title.md b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md
new file mode 100644
index 0000000..639e358
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md
@@ -0,0 +1,33 @@
+You can customize the title of documents based on properties so that you have meaningful information for the list views.
+
+For example the default title on **Quotation** is the customer name, but if you are dealing a few customers and sending lots of quotes to the same customer, you may want to customize.
+
+#### Setting Title Fields
+
+From ERPNext Version 6.0 onwards, all transactions have a `title` property. If there is not a title property, you can add a **Custom Field** as title and set the **Title Field** via **Customize Form**.
+
+You can set the default value of that property by using Python style string formatting in **Default** or **Options**
+
+To edit a default title, go to
+
+1. Setup > Customize > Customize Form
+2. Select your transaction
+3. Edit the **Default** field in your form
+
+#### Defining Titles
+
+You can define the title by setting document properties in braces `{}`. For example if your document has properties `customer_name` and `project` here is how you can set the default title:
+
+ {customer_name} for {project}
+
+<img class="screenshot" alt = "Customize Title"
+ src="{{docs_base_url}}/assets/img/customize/customize-title.gif">
+
+#### Fixed or Editable Titles
+
+If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document.
+
+<img class="screenshot" alt = "Editable Title"
+ src="{{docs_base_url}}/assets/img/customize/editable-title.gif">
+
+If you want a fixed title, you can set the rule in the **Options** property. In this way, the title will be automatically updated everytime the document is updated.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
new file mode 100644
index 0000000..60addc1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
@@ -0,0 +1,30 @@
+### Hiding Unused Features
+
+As you have seen from this manual that ERPNext contains tons of features which
+you may not use. We have observed that most users start with using 20% of the
+features, though a different 20%. To hide fields belonging to features you
+dont require, go to:
+
+> Setup > Tools > Hide/Unhide Features
+
+
+
+Check / uncheck the features you want to use and refresh your page for the
+changes to take effect.
+
+* * *
+
+### Hiding Module Icons
+
+To hide modules (icons) from the home page, go to:
+
+Setup > Tools> Modules Setup
+
+
+
+> Note: Modules are automatically hidden for users that have no permissions on
+the documents within that module. For example, if a user has no permissions on
+Purchase Order, Purchase Request, Supplier, the “Buying” module will
+automatically be hidden.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/index.md b/erpnext/docs/user/manual/en/customize-erpnext/index.md
new file mode 100644
index 0000000..2132a95
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/index.md
@@ -0,0 +1,13 @@
+# Customize ERPNext
+
+ERPNext offers many tools to customize the system.
+
+You simplify the forms by hiding features you don’t need using Disable
+Features and Module Setup, add Custom Fields, change form properties, like
+adding more options to drop-downs or hiding fields using Customize Form View
+and make your own Print Formats by using HTML Templates. You can also create
+multiple Letter Heads for your Prints.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/index.txt
new file mode 100644
index 0000000..1113395
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/index.txt
@@ -0,0 +1,8 @@
+custom-field
+custom-doctype
+custom-scripts
+customize-form
+document-title
+hiding-modules-and-features
+print-format
+articles
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
new file mode 100644
index 0000000..e3c9450
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
@@ -0,0 +1,106 @@
+<!-- no-jinja -->
+
+Print Formats are the layouts that are generated when you want to Print or
+Email a transaction like a Sales Invoice. There are two types of Print
+Formats,
+
+ * The auto-generated “Standard” Print Format: This type of format follows the same layout as the form and is generated automatically by ERPNext.
+ * Based on the Print Format document. There are templates in HTML that will be rendered with data.
+
+ERPNext comes with a number of pre-defined templates in three styles: Modern,
+Classic and Standard.
+
+You can modify the templates or create your own. Editing
+ERPNext templates is not allowed because they may be over-written in an
+upcoming release.
+
+To create your own versions, open an existing template from:
+
+> Setup > Printing > Print Formats
+
+
+
+Select the type of Print Format you want to edit and click on the “Copy”
+button on the right column. A new Print Format will open up with “Is Standard”
+set as “No” and you can edit the Print Format.
+
+Editing a Print Format is a long discussion and you will have to know a bit of
+HTML, CSS, Python to learn this. For help, please post on our forum.
+
+Print Formats are rendered on the server side using the [Jinja Templating Language](http://jinja.pocoo.org/docs/templates/). All forms have access to the doc object which contains information about the document that is being formatted. You can also access common utilities via the frappe module.
+
+For styling, the [Boostrap CSS Framework](http://getbootstrap.com/) is provided and you can enjoy the full range of classes.
+
+> Note: Pre-printed stationary is usually not a good idea because your Prints
+will look incomplete (inconsistent) when you send them by mail.
+
+#### References
+
+1. [Jinja Tempalting Language: Reference](http://jinja.pocoo.org/docs/templates/)
+1. [Bootstrap CSS Framework](http://getbootstrap.com/)
+
+#### Print Settings
+
+To edit / update your print and PDF settings, go to:
+
+> Setup > Printing and Branding > Print Settings
+
+
+
+#### Example
+
+{% set example = '''<h3>{{ doc.select_print_heading or "Invoice" }}</h3>
+ <div class="row">
+ <div class="col-md-3 text-right">Customer Name</div>
+ <div class="col-md-9">{{ doc.customer_name }}</div>
+ </div>
+ <div class="row">
+ <div class="col-md-3 text-right">Date</div>
+ <div class="col-md-9">{{ doc.get_formatted("invoice_date") }}</div>
+ </div>
+ <table class="table table-bordered">
+ <tbody>
+ <tr>
+ <th>Sr</th>
+ <th>Item Name</th>
+ <th>Description</th>
+ <th class="text-right">Qty</th>
+ <th class="text-right">Rate</th>
+ <th class="text-right">Amount</th>
+ </tr>
+ {%- for row in doc.items -%}
+ <tr>
+ <td style="width: 3%;">{{ row.idx }}</td>
+ <td style="width: 20%;">
+ {{ row.item_name }}
+ {% if row.item_code != row.item_name -%}
+ <br>Item Code: {{ row.item_code}}
+ {%- endif %}
+ </td>
+ <td style="width: 37%;">
+ <div style="border: 0px;">{{ row.description }}</div></td>
+ <td style="width: 10%; text-align: right;">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>
+ <td style="width: 15%; text-align: right;">{{
+ row.get_formatted("rate", doc) }}</td>
+ <td style="width: 15%; text-align: right;">{{
+ row.get_formatted("amount", doc) }}</td>
+ </tr>
+ {%- endfor -%}
+ </tbody>
+ </table>''' %}
+
+ {{ example|e }}
+
+#### Notes
+
+1. To get date and currency formatted values use, `doc.get_formatted("fieldname")`
+1. For translatable strings, us `{{ _("This string is translated") }}`
+
+#### Footers
+
+Many times you may want to have a standard footer for your prints with your
+address and contact information. Unfortunately due to the limited print
+support in HTML pages, it is not possible unless you get it scripted. Either
+you can use pre-printed stationary or add this information in your header.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/appraisal.md b/erpnext/docs/user/manual/en/human-resources/appraisal.md
new file mode 100644
index 0000000..d3ec301
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/appraisal.md
@@ -0,0 +1,24 @@
+In ERPNext, you can manage Employee Appraisals by creating an Appraisal
+Template for each role with the parameters that define the performance by
+giving appropriate weightage to each parameter.
+
+> Human Resource > Appraisal > New
+
+#### Step 1: Select an Appraisal Template
+
+<img class="screenshot" alt="Appraisal" src="{{docs_base_url}}/assets/img/human-resources/appraisal.png">
+
+After you select the template, the remaining form appears.
+
+#### Step 2: Enter Employee Details
+
+<img class="screenshot" alt="Appraisal" src="{{docs_base_url}}/assets/img/human-resources/appraisal-employee.png">
+
+Once the Appraisal Template is completed, you can create Appraisal records for
+each period where you track performance. You can give points out of 5 for each
+parameter and the system will calculate the overall performance of the
+Employee.
+
+To make the Appraisal final, make sure to “Submit” it.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
new file mode 100644
index 0000000..fddab31
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
@@ -0,0 +1,55 @@
+<h1>Employees Loan Management</h1>
+
+Employee Loan is an sum of money paid by Employer to Employee based on certain terms and condition. There are multiple ways accounting for the Employee loan can be managed. Company could collect loan from an employee separately. Or they can choose to deduct loan installment from the employee's salary.
+
+Let's check below how accounting can be managed for Employee Loan in ERPNext.
+
+### 1. Setup Masters
+
+Create following Groups and Ledgers in Chart of Accounts if not there.
+
+#### 1.1 Employee Loan Account
+
+Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](https://erpnext.com/kb/setup/managing-tree-structure-masters)
+
+
+
+#### 1.2 Salaries Account
+
+Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it.
+
+
+
+#### 1.3 Interest Account
+
+Create Ledger as 'Interest on Loan' under Indirect Income.
+
+### 2. Book Loan Amount
+
+Once loan amount is finalized, make journal voucher to book loan payment entry. You should Credit Loan amount to Bank/Cash account and Debit Loan amount employee loan account.
+
+
+
+### 3. Book Loan Recovery and Interest
+
+#### 3.1 Loan Recovery Entry
+
+If your employee pays separately for his/her loan installment and loan interest, then create journal voucher.
+
+
+
+#### 3.2 Loan Adjustment in Salary
+
+And if you deduct loan installment and interest from employees salary, then book journal entry for the same.
+
+
+
+In the Salary Slip of an employee, then create two Deduction Types in Salary Structure. One as 'Loan Installment' and other one as 'Loan Interest'. So that you can update those values under this deduction heads.
+
+### 4. Loan Account Report
+
+After recovering loan and loan interest, General Ledger report will show the loan account details as follows.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/index.md b/erpnext/docs/user/manual/en/human-resources/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/index.txt b/erpnext/docs/user/manual/en/human-resources/articles/index.txt
new file mode 100644
index 0000000..3fbdc5b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/index.txt
@@ -0,0 +1,2 @@
+employees-loan-management
+leave-calculation-in-salary-slip
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
new file mode 100644
index 0000000..7153708
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
@@ -0,0 +1,52 @@
+<h1>Leave Calculation In Salary Slip</h1>
+
+There are two types of leave which user can apply for.
+<br>
+<br>
+<ol>
+ <li>Paid Leave (Sick Leave, Privilege Leave, Casual Leave etc.)</li>
+ <li>Unpaid Leave
+ <br>
+ </li>
+</ol>Paid Leave are firstly allocated by HR manager. As and when Employee creates Leave Application, leaves allocated to him/her are deducted. These leaves doesn't have impact on the employee's Salary Slip.
+<br>
+<br>When Employee is out of paid leave, he create Leave Application for unpaid leave. The term used for unpaid leave in ERPNext is Leave Without Pay (LWP). These leaves does have impact on the Employee's Salary Slip.
+<br>
+<br>
+<div class="well">Just marking Absent in the Attendance record do not have impact on salary calculation of an Employee, as that absenteeism could be because of paid leave. Hence creating Leave Application should be created incase of absenteeism.<br></div>Let's consider
+a scenario to understand how leaves impact employees Salary Slip.
+<br>
+<br><b>Masters:</b>
+
+<br>
+<br>
+<ol>
+ <li>Setup Employee</li>
+ <li>Allocate him paid leaves</li>
+ <li>Create Salary Structure for that Employee. In the Earning and Deduction table, select which component of salary should be affected if Employee takes LWP.</li>
+ <li>Create Holiday List (if any), and link it with Employee master.</li>
+</ol>
+<p>When creating Salary Slip for an Employee, following is what you will see:</p>
+<img src="{{docs_base_url}}/assets/img/articles/SGrab_282.png">
+<br>
+<br><b>Working Days:</b> Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
+<br>
+<br>
+<div class="well">Human Resource >> Setup >> HR Setting
+ <br>
+ <br>Uncheck field "Include Holidays in Total No. of Working Days"
+ <br>
+</div>Holidays are counted based on Holiday List attached to the Employee's master.<b><br><br>Leave Without Pay: </b>Leave Without Pay is updated based on Leave Application made for this Employee, in the month for which Salary Slip is created, and which has
+Leave Type as "Leave Without Pay".
+<br>
+<br><b>Payment Days:</b> Following is how Payment Days are calculated:
+<br>
+<br>Payment Days = Working Days - Leave Without Pay
+<br>
+<br>As indicated above, if you have LWP checked for components in the earning and deducted table, you will notice a reduction in Amount based on no. of LWP of an Employee for that month.
+<br>
+<br>
+<img src="{{docs_base_url}}/assets/img/articles/SGrab_283.png" width="760"><br>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/attendance.md b/erpnext/docs/user/manual/en/human-resources/attendance.md
new file mode 100644
index 0000000..961d528
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/attendance.md
@@ -0,0 +1,14 @@
+An Attendance record stating that an Employee has been present on a particular
+day can be created manually by:
+
+> Human Resources > Attendance > New Attendance
+
+<img class="screenshot" alt="Attendence" src="{{docs_base_url}}/assets/img/human-resources/attendence.png">
+
+You can get a monthly report of your Attendance data by going to the “Monthly
+Attendance Details” report.
+
+You can also bulk uppload attendence using the [Upload Attendence Tool ]({{docs_base_url}}/user/guides/human-resources/tools/upload-attendance.html)
+
+{next}
+
diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
new file mode 100644
index 0000000..fd14aa9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md
@@ -0,0 +1,9 @@
+There are many fields you can add in your Employee records.
+
+To create new Employee go to:
+
+> Human Resources > Employee > New
+
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/employee.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
new file mode 100644
index 0000000..187bf49
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
@@ -0,0 +1,39 @@
+Expense Claim is made when Employee’s make expenses out of their pocket on
+behalf of the company. For example, if they take a customer out for lunch,
+they can make a request for reimbursement via the Expense Claim form.
+
+To make a new Expense Claim, go to:
+
+> HR > Expense Claim > New Expense Claim
+
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/expense_claim.png">
+
+Set the Employee ID, date and the list of expenses that are to be claimed and
+“Submit” the record.
+
+### Approving Expenses
+
+The person making the claim must also set the id of the user who will
+“Approve” these expenses and set the “Assign To” to notify the user of the
+request Approve.
+
+If the Approver sees the “form”, she or he can update the “Approved Amounts”
+and click on “Approve”. To cancel the claim, they can click on the “Reject”
+button.
+
+Comments can be added in the Comments section explaining why the claim was
+approved or rejected.
+
+### Booking the Expense and Reimbursement
+
+The approved Expense Claim must then be converted into a Journal Entry and a
+payment must be made. Note: This amount should not be clubbed with Salary
+because the amount will then be taxable to the Employee.
+
+### Linking with Task & Project
+
+* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
+
+<img class="screenshot" alt="Expense Claim - Project Link" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
new file mode 100644
index 0000000..1a98ad3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
@@ -0,0 +1,59 @@
+Holiday List is a list which contains the dates of holidays along with the
+occasion of that holiday. The list is generally valid for one calendar year.
+
+Most organisations have a standard Holiday-List for their employees. Some even
+have different holiday lists for laborers and a different one for management
+staff.
+
+
+
+To set up a holiday list in the system, Go to Human Resources Module and Click
+on Holiday List.
+
+
+
+> Human Resources >Holiday List > New Holiday List
+
+
+#### Figure 1: Holiday List
+
+
+
+
+
+__Step 1:__ Give a name to the Holiday list
+
+__Step 2:__ Mention the Fiscal Year
+
+__Step 3:__ State the Weekly off.
+
+__Step 4:__ Click on the button 'Get Weekly Off Dates'
+
+This step will fill the box below with yearly off dates with day as the
+description.
+
+__Step 5:__ Click on Add new row to add more dates
+
+Mention the holiday reason in the description and select the date from the
+'Date' field.
+
+
+#### Figure 2: Adding new holidays to the list
+
+
+
+
+
+> Note 1: If you have selected a holiday list in the Employment Details form,
+the system will give priority to the form mentioned here. It will fetch the
+list mentioned in the form rather than the one which you may have specified as
+Default; However, if there is no list in the employment details form, the
+default list will be fetched.
+
+
+> Note 2: You can form as many holiday lists as you wish. For example, if you
+have a mill, you can have one list for mill workers and another list for
+office staff. You can manage between lists by attaching their respective
+holiday list to their respective employment detail form.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md b/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
new file mode 100644
index 0000000..8f29974
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
@@ -0,0 +1,35 @@
+The HR module has a setup process where you create the masters for all the
+major activities.
+
+### Organization Setup
+
+To setup your Employee master you must first create:
+
+ * Employment Type (like Permanent, Temp, Contractor, Intern etc).
+ * Branch (if there are multiple offices).
+ * Department (if any, like Accounting, Sales etc).
+ * Designation (CEO, Sales Manager etc).
+ * Grade (A, B, C etc, usually based on seniority).
+
+### Leave Setup
+
+To setup Leaves, create:
+
+ * Leave Type (like Sick Leave, Travel Leave etc)
+ * Holiday List (list of annual holidays for the year - these days will not be considered in Leave Applications).
+
+### Payroll (Salary) Setup
+
+In ERPNext, salaries have two types of components, earnings (basic salary,
+expenses paid by the company, like telephone bill, travel allowance etc) and
+deductions (amounts deducted for taxes, social security etc). To setup
+payroll, you must first setup all the different types of earnings and
+deductions. These are
+
+ * Earning Type
+ * Deduction Type
+
+These are just labels, we will see how to use them when we discuss the payroll
+section.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
new file mode 100644
index 0000000..664c07d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
@@ -0,0 +1,34 @@
+Human Resources Reports
+
+### Employee Leave Balance
+
+Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves.
+
+<img alt="Employee Leave Balance" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-balance-report.png">
+
+### Employee Birthday
+
+Employee Birthday Report shows Birthdays of your employees.
+
+<img alt="Employee Birthday" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-birthday-report.png">
+
+### Employee Information
+
+Employee Information Report shows Report View of important information recorded in Employee master.
+
+<img alt="Employee Information" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-information-report.png">
+
+### Monthly Salary Register
+
+Monthly Salary Register shows net pay and its components of employee(s) at a glance.
+
+<img alt="Monthly Salary Register" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/monthly-salary-register-report.png">
+
+
+### Monthly Attendance Sheet
+
+Monthly Attendance Sheet shows monthly attendance of selected employee at a glance.
+
+<img alt="Monthly Attendance Sheet" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/monthly-attendance-sheet-report.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/index.md b/erpnext/docs/user/manual/en/human-resources/index.md
new file mode 100644
index 0000000..02fcfc6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/index.md
@@ -0,0 +1,14 @@
+The Human Resources (HR) Module covers the processes linked to managing a team
+of co-workers. Most important feature here is processing the payroll by using
+Process Payroll to generate Salary Slips. Most countries have complex tax
+rules stating which expenses the company can make on behalf of the Employees.
+There are a set of rules for the company to deduct taxes and social security
+from employee payroll. ERPNext allows to accomodate all types of taxes and
+their calculation.
+
+It also maintains a complete employee database including contact information,
+salary details, attendance, performance evaluation, and appraisal records.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
new file mode 100644
index 0000000..caa3292
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -0,0 +1,15 @@
+employee
+leave-application
+expense-claim
+attendance
+salary-and-payroll
+appraisal
+job-applicant
+job-opening
+offer-letter
+tools
+human-resources-reports
+setup
+holiday-list
+human-resource-setup
+articles
diff --git a/erpnext/docs/user/manual/en/human-resources/job-applicant.md b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
new file mode 100644
index 0000000..3e885d9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
@@ -0,0 +1,25 @@
+You can mantain a list of People who have applied for a [Job Opening]({{docs_base_url}}/user/guides/human-resources/job-opening.html).
+
+To create a new Job Applicant go to
+
+> Human Resource > Job Applicant > New
+
+<img class="screenshot" alt="Job Applicant" src="{{docs_base_url}}/assets/img/human-resources/job-applicant.png">
+
+### Linking with an Email Account
+
+You can link Job Application with an Email account.
+Suppose you link Job Application with an email job@example.com
+system shall create a New Job Applicant against each email received on the mailbox.
+
+* To link Email Account with Job Applicant, go to
+
+> Setup > Email Account > New
+
+* Enter the email id and the password, and select 'Enable Incoming'
+
+* In 'Append To' select 'Job Applicant'
+
+<img class="screenshot" alt="Email Account" src="{{docs_base_url}}/assets/img/human-resources/email-account.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/job-opening.md b/erpnext/docs/user/manual/en/human-resources/job-opening.md
new file mode 100644
index 0000000..7e4f0c3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/job-opening.md
@@ -0,0 +1,10 @@
+You can make a record of the open vacancies in your company using Job Opening.
+
+To create a new Job Opening go to
+
+> Human Resource > Job Opening > New
+
+<img class="screenshot" alt="Job Opening" src="{{docs_base_url}}/assets/img/human-resources/job-opening.png">
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
new file mode 100644
index 0000000..04e3144
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -0,0 +1,24 @@
+If your company has a formal system where Employees have to apply for leaves
+to be able to qualify as paid leaveas, you can create Leave Application to
+track approval and usage of leaves. You have to mention the Employee, Leave
+Type and the period for which the leave is taken.
+
+> Human Resources > Leave Application > New Leave Application
+
+<img class="screenshot" alt="Leave Application" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
+
+###Setting Leave Approver
+
+* A leave approver is a user who can approve an leave application for an employee.
+
+* You need to mention a list of Leave Approvers against an Employee in the Employee Master.
+
+<img class="screenshot" alt="Leave Approver" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-approver.png">
+
+> Tip : If you want all users to create their own Leave Applications, you can set
+their “Employee ID” as a match rule in the Leave Application Permission
+settings. See the earlier discussion on [Setting Up Permissions]({{docs_base_url}}/user/guides/setting-up/users-and-permissions.html)
+for more info.
+
+You assign Leaves aginast an Employee check [Leave Allocation]({{docs_base_url}}/user/guides/human-resources/setup/leave-allocation.html)
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/offer-letter.md b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
new file mode 100644
index 0000000..c48fe64
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
@@ -0,0 +1,16 @@
+Offer Letter is given to candidate after Interview & selection which states the offered salary package,
+designation, grade, department working, no of days entitled for leave.
+
+In ERPNext you can make a record of the Offer Letters that you can given to candidates. To create a new offer Letter go to
+
+> Human Resource > Offer Letter > New
+
+<img class="screenshot" alt="Offer Letter" src="{{docs_base_url}}/assets/img/human-resources/offer-letter.png">
+
+> Note: An offer letter can be made only against a [Job Applicant]({{docs_base_url}}/user/guides/human-resources/job-applicant.html)
+
+There is a pre-designed print format to print you offer letter.
+
+<img class="screenshot" alt="Offer Letter" src="{{docs_base_url}}/assets/img/human-resources/offer-letter-print.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
new file mode 100644
index 0000000..05e01e1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -0,0 +1,116 @@
+Salary is a fixed amount of money or compensation paid to an employee by an employer in return for the work performed .
+
+Payroll is the administration of financial records of employees' salaries, wages, bonuses, net pay, and deductions.
+
+To process Payroll in ERPNext,
+
+ 1. Create Salary Structures for all Employees.
+ 2. Generate Salary Slips via Process Payroll.
+ 3. Book the Salary in your Accounts.
+
+### Salary Structure
+
+The Salary Structure represents how Salaries are calculated based on Earnings
+and Deductions.
+
+Salary structures are used to help organizations:
+ 1. Maintain pay levels that are competitive with the external labor market,
+ 2. Maintain internal pay relationships among jobs,
+ 3. Recognize and reward differences in level of responsibility, skill, and performance, and manage pay expenditures.
+
+The usual components of the salary structure (in india) include:
+
+__Basic Salary:__ It is the taxable base income and generally not more than 40% of CTC.
+
+__House Rent Allowance:__ The HRA constitutes 40 to 50% of the basic salary.
+
+__Special Allowances:__ Makes up for the remainder part of the salary, mostly smaller than the basic salary which is completely taxable.
+
+__Leave Travel Allowance:__ The non-taxable amount paid by the employer to the employee for vacation/trips with family within India.
+
+__Gratuity:__ It is basically a lump sum amount paid by the employer when the employee resigns from the organization or retires.
+
+__PF:__ Fund collected during emergency or old age. 12% of the basic salary is automatically deducted and goes to the employee provident fund.
+
+__Medical Allowance:__ The employer pays the employee for the medical expenditures incurred. It is tax free up to Rs.15,000.
+
+__Bonus:__ Taxable part of the CTC, usually a once a year lump sum amount, given to the employee based on the individual’s as well as the organizational performance for the year.
+
+__Employee Stock Options:__ ESOPS are Free/discounted shares given by the company to the employees. This is done to primarily increase employee retention.
+
+To create a new Salary Structure go to:
+
+> Human Resources > Setup > Salary Structure > New Salary Structure
+
+#### Figure 1:Salary Structure
+
+<img class="screenshot" alt="Salary Structure" src="{{docs_base_url}}/assets/img/human-resources/salary-structure.png">
+
+### In the Salary Structure,
+
+ * Select the Employee
+ * Set the starting date from which this is valid (Note: There can only be one Salary Structure that can be “Active” for an Employee during any period)
+ * In the “Earnings” and “Deductions” table all your defined Earning Type and Deductions Type will be auto-populated. Set the values of the Earnings and Deductions and save the Salary Structure.
+
+### Leave Without Pay (LWP)
+
+Leave Without Pay (LWP) happens when an Employee runs out of allocated leaves
+or takes a leave without an approval (via Leave Application). If you want
+ERPNext to automatically deduct salary in case of LWP, then you must check on
+the “Apply LWP” column in the Earning Type and Deduction Type masters. The
+amount of pay cut is the proportion of LWP days divided by the total working
+days for the month (based on the Holiday List).
+
+If you don’t want ERPNext to manage LWP, just don’t click on LWP in any of the
+Earning Types and Deduction Types.
+
+* * *
+
+### Creating Salary Slips
+
+Once the Salary Structure is created, you can make a salary slip from the same
+form or you can process your payroll for the month using Process Payroll.
+
+To create a salary slip from Salary Structure, click on the button Make Salary
+Slip.
+
+#### Figure 2: Salary Slip
+
+<img class="screenshot" alt="Salary Slip" src="{{docs_base_url}}/assets/img/human-resources/salary-slip.png">
+
+You can also create salary slip for multiple employees using Process Payroll:
+
+> Human Resources > Process Payroll
+
+#### Figure 3: Process Payroll
+
+<img class="screenshot" alt="Process Payroll" src="{{docs_base_url}}/assets/img/human-resources/process-payroll.png">
+
+In Process Payroll,
+
+ 1. Select the Company for which you want to create the Salary Slips.
+ 2. Select the Month and the Year for which you want to create the Salary Slips.
+ 3. Click on “Create Salary Slips”. This will create Salary Slip records for each active Employee for the month selected. If the Salary Slips are created, the system will not create any more Salary Slips. All updates will be shown in the “Activity Log” section.
+ 4. Once all Salary Slips are created, you can check if they are created correctly or edit it if you want to deduct Leave Without Pay (LWP).
+ 5. After checking, you can “Submit” them all together by clicking on “Submit Salary Slips”. 1. If you want them to be automatically emailed to the Employee, make sure to check the “Send Email” box.
+
+### Booking Salaries in Accounts
+
+The final step is to book the Salaries in your Accounts.
+
+Salaries in businesses are usually dealt with extreme privacy. In most cases,
+the companies issues a single payment to the bank combining all salaries and
+the bank distributes the salaries to each employee’s salary account. This way
+there is only one payment entry in the company’s books of accounts and anyone
+with access to the company’s accounts will not have access to the individual
+salaries.
+
+The salary payment entry is a Journal Entry entry that debits the total
+salary of all Employees to the Salary Account and credits the company’s bank
+Account.
+
+To generate your salary payment voucher from Process Payroll, click on
+“Make Bank Voucher” and a new Journal Entry with the total salaries will be
+created.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/branch.md b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
new file mode 100644
index 0000000..8116ca4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
@@ -0,0 +1,5 @@
+Branches of your organization
+
+<img class="screenshot" alt="Branch" src="{{docs_base_url}}/assets/img/human-resources/branch.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
new file mode 100644
index 0000000..4371b62
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
@@ -0,0 +1,10 @@
+You can make a record of the tax and other salary deductions and describe it as Deduction Type
+
+To create a new Deduction Type
+
+> Human Resource > Setup > Deduction Type > New
+
+<img class="screenshot" alt="Deduction Type" src="{{docs_base_url}}/assets/img/human-resources/deduction-type.png">
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/department.md b/erpnext/docs/user/manual/en/human-resources/setup/department.md
new file mode 100644
index 0000000..1b088b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/department.md
@@ -0,0 +1,5 @@
+Departments in your organization
+
+<img class="screenshot" alt="Department" src="{{docs_base_url}}/assets/img/human-resources/department.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/designation.md b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
new file mode 100644
index 0000000..1de779e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
@@ -0,0 +1,5 @@
+Designations in your organization
+
+<img class="screenshot" alt="Designation" src="{{docs_base_url}}/assets/img/human-resources/designation.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
new file mode 100644
index 0000000..e5c35c6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
@@ -0,0 +1,10 @@
+You can make a record of the Salary Components and describe it as Earning Type
+
+To create a new Earning Type
+
+> Human Resource > Setup > Earning Type > New
+
+<img class="screenshot" alt="Earning Type" src="{{docs_base_url}}/assets/img/human-resources/earning-type.png">
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
new file mode 100644
index 0000000..37d0fd3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
@@ -0,0 +1,5 @@
+Various employment contracts you have with your employees.
+
+<img class="screenshot" alt="Employment Type" src="{{docs_base_url}}/assets/img/human-resources/employment-type.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md
new file mode 100644
index 0000000..31094f7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md
@@ -0,0 +1,5 @@
+You can specify the Holidays for a particular year using Holiday List.
+
+<img class="screenshot" alt="Holiday List" src="{{docs_base_url}}/assets/img/human-resources/holiday-list.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
new file mode 100644
index 0000000..1741df4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
@@ -0,0 +1,7 @@
+# HR Settings
+
+GLobal settings for HR related documents
+
+<img class="screenshot" alt="HR Settings" src="{{docs_base_url}}/assets/img/human-resources/hr-settings.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.md b/erpnext/docs/user/manual/en/human-resources/setup/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.txt b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
new file mode 100644
index 0000000..550236a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
@@ -0,0 +1,10 @@
+hr-settings
+employment-type
+branch
+department
+designation
+earning-type
+deduction-type
+leave-allocation
+leave-type
+holiday-list
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
new file mode 100644
index 0000000..91cf990
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
@@ -0,0 +1,7 @@
+Helps you allocate Leaves to a particular Employee
+
+<img class="screenshot" alt="Leave Allocation" src="{{docs_base_url}}/assets/img/human-resources/leave-allocation.png">
+
+To assign leaves to multiple employees use the [Leave Allocation Tool]({{docs_base_url}}/user/guides/human-resources/tools/leave-allocation-tool.html)
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
new file mode 100644
index 0000000..d52cb2e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
@@ -0,0 +1,9 @@
+Specify the Type of Leave that can be allocated against an Employee
+
+<img class="screenshot" alt="Leave Type" src="{{docs_base_url}}/assets/img/human-resources/leave-type.png">
+
+* 'Max Days Leave Allowed' specifies the maximum number of days this type of leave can be taken at a strech.
+* 'Is LWP' specifies if the Leave is without Pay.
+* 'Allow Negative Balance' specifies if system can maintain negative leaves.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.md b/erpnext/docs/user/manual/en/human-resources/tools/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.txt b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
new file mode 100644
index 0000000..3da2e71
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
@@ -0,0 +1,2 @@
+upload-attendance
+leave-allocation-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
new file mode 100644
index 0000000..56e8d3d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
@@ -0,0 +1,5 @@
+Leave Allocation tool helps you allocated a specific number of leaves for your employees.
+
+<img class="screenshot" alt="Leave Application" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
new file mode 100644
index 0000000..adfc66d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
@@ -0,0 +1,9 @@
+This tool helps you to upload bulk attendence from a csv file.
+
+To upload the attendance go to:
+
+> Human Resources > Upload Attendance
+
+<img class="screenshot" alt="Attendence upload" src="{{docs_base_url}}/assets/img/human-resources/attendence-upload.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/index.md b/erpnext/docs/user/manual/en/index.md
new file mode 100644
index 0000000..2184273
--- /dev/null
+++ b/erpnext/docs/user/manual/en/index.md
@@ -0,0 +1,5 @@
+# User Manual (English)
+
+### Contents:
+
+{index}
diff --git a/erpnext/docs/user/manual/en/index.txt b/erpnext/docs/user/manual/en/index.txt
new file mode 100644
index 0000000..97a8cd8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/index.txt
@@ -0,0 +1,15 @@
+introduction
+setting-up
+accounts
+stock
+CRM
+selling
+buying
+manufacturing
+projects
+support
+human-resources
+customer-portal
+website
+using-erpnext
+customize-erpnext
diff --git a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
new file mode 100644
index 0000000..e445963
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
@@ -0,0 +1,423 @@
+Before you start implementation, lets get familiar with the terminology that
+is used and some basic concepts in ERPNext.
+
+* * *
+
+### Basic Concepts
+
+#### Company
+
+This represents the Company records for which ERPNext is setup. With this same
+setup, you can create multiple Company records, each representing a different
+legal entity. The accounting for each Company will be different, but they will
+share the Customer, Supplier and Item records.
+
+> Setup > Company
+
+#### Customer
+
+Represents a customer. A Customer can be an individual or an organizations.
+You can create multiple Contacts and Addresses for each Customer.
+
+> Selling > Customer
+
+#### Supplier
+
+Represents a supplier of goods or services. Your telephone company is a
+Supplier, so is your raw materials Supplier. Again, a Supplier can be an
+individual or an organization and has multiple Contacts and Addresses.
+
+> Buying > Supplier
+
+#### Item
+
+A Product, sub-product or Service that is either bought, sold or manufactured
+and is uniquely identified.
+
+> Stock > Item
+
+#### Account
+
+An Account is a heading under which financial and business transactions are
+carried on. For example, “Travel Expense” is an account, “Customer Zoe”,
+“Supplier Mae” are accounts. ERPNext creates accounts for Customers and
+Suppliers automatically.
+
+> Accounts > Chart of Accounts
+
+#### Address
+
+An address represents location details of a Customer or Supplier. These can be
+of different locations such as Head Office, Factory, Warehouse, Shop etc.
+
+> Selling > Address
+
+#### Contact
+
+An individual Contact belongs to a Customer or Supplier or is just an
+independent. A Contact has a name and contact details like email and phone
+number.
+
+> Selling > Contact
+
+#### Communication
+
+A list of all Communication with a Contact or Lead. All emails sent from the
+system are added to the Communication table.
+
+> Support > Communication
+
+#### Price List
+
+A Price List is a place where different rate plans can be stored. It’s a name
+you give to a set of Item Prices stored under a particular List.
+
+> Selling > Price List
+
+
+> Buying > Price List
+
+* * *
+
+### Accounting
+
+#### Fiscal Year
+
+Represents a Financial Year or Accounting Year. You can operate multiple
+Fiscal Years at the same time. Each Fiscal Year has a start date and an end
+date and transactions can only be recorded in this period. When you “close” a
+fiscal year, it's balances are transferred as “opening” balances for the next
+fiscal year.
+
+> Setup > Company > Fiscal Year
+
+#### Cost Center
+
+A Cost Center is like an Account, but the only difference is that its
+structure represents your business more closely than Accounts.
+For example, in your Chart of Accounts, you can separate your expenses by its type
+(i.e., travel, marketing, etc.). In your Chart of Cost Centers, you can separate
+them by product line or business group (e.g., online sales, retail sales, etc.).
+
+> Accounts > Chart of Cost Centers
+
+#### Journal Entry
+
+A document that contains General Ledger (GL) entries and the sum of Debits and
+Credits of those entries is the same. In ERPNext you can update Payments,
+Returns, etc., using Journal Entrys.
+
+> Accounts > Journal Entry
+
+#### Sales Invoice
+
+A bill sent to Customers for delivery of Items (goods or services).
+
+> Accounts > Sales Invoice
+
+#### Purchase Invoice
+
+A bill sent by a Supplier for delivery of Items (goods or services).
+
+> Accounts > Purchase Invoice
+
+#### Currency
+
+ERPNext allows you to book transactions in multiple currencies. There is only
+one currency for your book of accounts though. While posting your Invoices with
+payments in different currencies, the amount is converted to the default
+currency by the specified conversion rate.
+
+> Setup > Currency
+
+* * *
+
+### Selling
+
+#### Customer Group
+
+A classification of Customers, usually based on market segment.
+
+> Selling > Setup > Customer Group
+
+#### Lead
+
+A person who could be a future source of business. A Lead may generate
+Opportunities. (from: “may lead to a sale”).
+
+> Selling > Lead
+
+#### Opportunity
+
+A potential sale. (from: “opportunity for a business”).
+
+> Selling > Opportunity
+
+#### Sales Order
+
+A note confirming the terms of delivery and price of an Item (product or
+service) by the Customer. Deliveries, Production Orders and Invoices are made
+on basis of Sales Orders.
+
+> Selling > Sales Order
+
+#### Territory
+
+A geographical area classification for sales management. You can set targets
+for Territories and each sale is linked to a Territory.
+
+> Selling > Setup > Territory
+
+#### Sales Partner
+
+A third party distributer / dealer / affiliate / commission agent who sells
+the company’s products usually for a commission.
+
+> Selling > Setup > Sales Partner
+
+#### Sales Person
+
+Someone who pitches to the Customer and closes deals. You can set targets for
+Sales Persons and tag them in transactions.
+
+> Selling > Setup > Sales Person
+
+* * *
+
+### Buying
+
+#### Purchase Order
+
+A contract given to a Supplier to deliver the specified Items at the specified
+cost, quantity, dates and other terms.
+
+> Buying > Purchase Order
+
+#### Material Request
+
+A request made by a system User, or automatically generated by ERPNext based
+on reorder level or projected quantity in Production Plan for purchasing a set
+of Items.
+
+> Buying > Material Request
+
+* * *
+
+### Stock (Inventory)
+
+#### Warehouse
+
+A logical Warehouse against which stock entries are made.
+
+> Stock > Warehouse
+
+#### Stock Entry
+
+Material transfer from a Warehouse, to a Warehouse or from one Warehouse to
+another.
+
+> Stock > Stock Entry
+
+#### Delivery Note
+
+A list of Items with quantities for shipment. A Delivery Note will reduce the
+stock of Items for the Warehouse from where you ship. A Delivery Note is
+usually made against a Sales Order.
+
+> Stock > Delivery Note
+
+#### Purchase Receipt
+
+A note stating that a particular set of Items were received from the Supplier,
+most likely against a Purchase Order.
+
+> Stock > Purchase Receipt
+
+#### Serial Number
+
+A unique number given to a particular unit of an Item.
+
+> Stock > Serial Number
+
+#### Batch
+
+A number given to a group of units of a particular Item that may be purchased
+or manufactured in a group.
+
+> Stock > Batch
+
+#### Stock Ledger Entry
+
+A unified table for all material movement from one warehouse to another. This
+is the table that is updated when a Stock Entry, Delivery Note, Purchase
+Receipt, and Sales Invoice (POS) is made.
+
+#### Stock Reconciliation
+
+Update Stock of multiple Items from a spreadsheet (CSV) file.
+
+> Stock > Stock Reconciliation
+
+#### Quality Inspection
+
+A note prepared to record certain parameters of an Item at the time of Receipt
+from Supplier, or Delivery to Customer.
+
+> Stock > Quality Inspection
+
+#### Item Group
+
+A classification of Item.
+
+> Stock > Setup > Item Group
+
+* * *
+
+### Human Resource Management
+
+#### Employee
+
+Record of a person who has been in present or past, in the employment of the
+company.
+
+> Human Resources > Employee
+
+#### Leave Application
+
+A record of an approved or rejected request for leave.
+
+> Human Resource > Leave Application
+
+#### Leave Type
+
+A type of leave (e.g., Sick Leave, Maternity Leave, etc.).
+
+> Human Resource > Leave and Attendance > Leave Type
+
+#### Process Payroll
+
+A tool that helps in creation of multiple Salary Slips for Employees.
+
+> Human Resource > Salary and Payroll > Process Payroll
+
+#### Salary Slip
+
+A record of the monthly salary given to an Employee.
+
+> Human Resource > Salary Slip
+
+#### Salary Structure
+
+A template identifying all the components of an Employees' salary (earnings),
+tax and other social security deductions.
+
+> Human Resource > Salary and Payroll > Salary Structure
+
+#### Appraisal
+
+A record of the performance of an Employee over a specified period based on
+certain parameters.
+
+> Human Resources > Appraisal
+
+#### Appraisal Template
+
+A template recording the different parameters of an Employees' performance and
+their weightage for a particular role.
+
+> Human Resources > Employee Setup > Appraisal Template
+
+#### Attendance
+
+A record indicating presence or absence of an Employee on a particular day.
+
+> Human Resources > Attendance
+
+* * *
+
+### Manufacturing
+
+#### Bill of Materials (BOM)
+
+A list of Operations and Items with their quantities, that are required to
+produce another Item. A Bill of Materials (BOM) is used to plan purchases and
+do product costing.
+
+> Manufacturing > BOM
+
+#### Workstation
+
+A place where a BOM operation takes place. It is useful to calculate the
+direct cost of the product.
+
+> Manufacturing > Workstation
+
+#### Production Order
+
+A document signaling production (manufacture) of a particular Item with
+specified quantities.
+
+> Manufacturing > Production Order
+
+#### Production Planning Tool
+
+A tool for automatic creation of Production Orders and Purchase Requests based
+on Open Sales Orders in a given period.
+
+> Manufacturing > Production Planning Tool
+
+* * *
+
+### Website
+
+#### Blog Post
+
+A short article that appears in the “Blog” section of the website generated
+from the ERPNext website module. Blog is a short form of “Web Log”.
+
+> Website > Blog Post
+
+#### Web Page
+
+A web page with a unique URL (web address) on the website generated from
+ERPNext.
+
+> Website > Web Page
+
+* * *
+
+### Setup / Customization
+
+#### Custom Field
+
+A user defined field on a form / table.
+
+> Setup > Customize ERPNext > Custom Field
+
+#### Global Defaults
+
+This is the section where you set default values for various parameters of the
+system.
+
+> Setup > Data > Global Defaults
+
+#### Print Heading
+
+A title that can be set on a transaction just for printing. For example, you
+want to print a Quotation with a title “Proposal” or “Pro forma Invoice”.
+
+> Setup > Branding and Printing > Print Headings
+
+#### Terms and Conditions
+
+Text of your terms of contract.
+
+> Selling > Setup > Terms and Conditions
+
+#### Unit of Measure (UOM)
+
+How quantity is measured for an Item. E.g., Kg, No., Pair, Packet, etc.
+
+> Stock > Setup > UOM
+
+{next}
diff --git a/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md b/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
new file mode 100644
index 0000000..0c2a0a5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
@@ -0,0 +1,19 @@
+ERPNext is a modern tool that covers not only accounting but also all other
+business functions, on an integrated platform. It has many benefits over both
+traditional accounting as well as ERP applications.
+
+### Benefits over traditional accounting software:
+
+ * Do a lot more than just accounting! Manage inventory, billing, quotes, leads, payroll and a lot more.
+ * Keep all your data safe and in one place. Don’t keep hunting for data when you need it across spreadsheets and different computers. Manage everyone on the same page. All users get the same updated data.
+ * Stop repetitive work. Don’t enter the same information from your word processor to your accounting tool. It's all integrated.
+ * Keep track. Get the entire history of a customer or a deal in one place.
+
+### Benefits over big ERPs
+
+ * $$$ - Saves money.
+ * **Easier to configure:** Big ERPs are notoriously hard to setup and will ask you a zillion questions before you can do something meaningful.
+ * **Easier to use:** Modern web like user interface will keep your users happy and in familiar territory.
+ * **Open Source :** This software is always free and you can host it anywhere you like.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
new file mode 100644
index 0000000..5439d51
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
@@ -0,0 +1,35 @@
+There are many ways to get started with ERPNext.
+
+### 1\. See the Demo
+
+If you want to check out the user interface and **feel** the application, just
+see the demo at:
+
+ * <https://demo.erpnext.com>
+
+### 2\. Start a Free Account at ERPNext.com
+
+
+ERPNext.com is managed by the organization (Frappe) that publishes ERPNext.
+You can start with your own account by [signing up on the
+website](https://erpnext.com).
+
+You can also decide to host your application at erpnext.com by buying the
+hosting plans. This way you support the organization that develops and
+improves ERPNext. You also get one-to-one functional (usage) support with the
+hosting plans.
+
+### 3\. Download a Virtual Machine
+
+To avoid the trouble of installing an instance, ERPNext is available as a
+Virtual Image (a full loaded operating system with ERPNext installed). You can
+use this on **any** platform including Microsoft Windows.
+
+[Click here to see instructions on how to use the Virtual
+Image](https://erpnext.com/download)
+
+### 4\. Install ERPNext on your Unix/Linux/Mac machine
+
+If you are familiar to installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/frappe-bench).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/introduction/implementation-strategy.md b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
new file mode 100644
index 0000000..bbfbbd6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
@@ -0,0 +1,32 @@
+Before you start managing your Operations in EPRNext, you must first become
+familiar with the system and the terms used. For this we recommend
+implementation should happen in two phases.
+
+ * A **Test Phase**, where you enter dummy records representing your day to day transactions and a **Live Phase**, where we start entering live data.
+
+### Test Phase
+
+ * Read the Manual
+ * Create a free account at [https://erpnext.com](https://erpnext.com) (the easiest way to experiment).
+ * Create your first Customer, Supplier and Item. Add a few more so you get familiar with them.
+ * Create Customer Groups, Item Groups, Warehouses, Supplier Groups, so that you can classify your Items.
+ * Complete a standard sales cycle - Lead > Opportunity > Quotation > Sales Order > Delivery Note > Sales Invoice > Payment (Journal Entry)
+ * Complete a standard purchase cycle - Material Request > Purchase Order > Purchase Receipt > Payment (Journal Entry).
+ * Complete a manufacturing cycle (if applicable) - BOM > Production Planning Tool > Production Order > Material Issue
+ * Replicate a real life scenario into the system.
+ * Create custom fields, print formats etc as required.
+
+### Live Phase
+
+Once you are familiar with ERPNext, start entering your live data!
+
+ * Clean up the account of test data or better, start a fresh install.
+ * If you just want to clear your transactions and not your master data like Item, Customer, Supplier, BOM etc, you can click delete the Company against which you have made the transactions and start with a fresh Bill of Materials. To delete a company, open the Company Record via Setup > Masters > Company and delete the company by clicking on the **Delete Company** button at the bottom.
+ * You can also setup a new account at [https://erpnext.com](https://erpnext.com), and use the 30-day free trial. [Find out more ways of deploying ERPNext](/introduction/getting-started-with-erpnext)
+ * Setup all the modules with Customer Groups, Item Groups, Warehouses, BOMs etc.
+ * Import Customers, Suppliers, Items, Contacts and Addresses using Data Import Tool.
+ * Import opening stock using Stock Reconciliation Tool.
+ * Create opening accounting entries via Journal Entry and create outstanding Sales Invoices and Purchase Invoices.
+ * If you need help, [you can buy support](https://erpnext.com/pricing) or [ask in the user forum](https://discuss.erpnext.com).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/introduction/index.md b/erpnext/docs/user/manual/en/introduction/index.md
new file mode 100644
index 0000000..76e77b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/index.md
@@ -0,0 +1,46 @@
+## What is an ERP and why should I care?
+
+(If you are already convinced you need an all-in-one system for your
+organization, you can skip this page.)
+
+If you are running a small business that has a few employees, you understand
+that it's hard to manage the dynamic nature of doing businesses. You are
+already using a software like Accounting, and may be some more to manage your
+inventory and sales (or CRM).
+
+An ERP brings all of this together in one place.
+
+Small businesses are not so different from large ones. They contain most of
+the complexities of a large business along with many other constraints. Small
+businesses have to communicate with customers, do accounts, pay taxes, do
+payroll, manage timelines, deliver quality, answer questions, and keep
+everyone happy just like in large businesses.
+
+Large businesses have the advantage of using advanced data systems to manage
+their process efficiently. Small businesses, on the other hand, typically
+struggle to keep things organized. They often use a mix of apps like
+spreadsheets, accounting software, web CRM etc to manage.The problem is, not
+everyone is on the same page. An ERP changes that.
+
+## What is ERPNext?
+
+ERPNext helps you to manage all your business information in one application
+and use it to manage operations and take decisions based on data.
+
+Among other things, ERPNext will help you to:
+
+ * Track all Invoices and Payments.
+ * Know what quantity of which product is available in stock.
+ * Identify open customer queries.
+ * Manage payroll.
+ * Assign tasks and follow up on them.
+ * Maintain a database of all your customers, suppliers and their contacts.
+ * Prepare quotes.
+ * Get reminders on maintenance schedules.
+ * Publish your website.
+
+And a lot lot lot more.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/introduction/index.txt b/erpnext/docs/user/manual/en/introduction/index.txt
new file mode 100644
index 0000000..535fcfe
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/index.txt
@@ -0,0 +1,7 @@
+do-i-need-an-erp
+open-source
+getting-started-with-erpnext
+the-champion
+implementation-strategy
+key-workflows
+concepts-and-terms
diff --git a/erpnext/docs/user/manual/en/introduction/key-workflows.md b/erpnext/docs/user/manual/en/introduction/key-workflows.md
new file mode 100644
index 0000000..8c8d6ec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/key-workflows.md
@@ -0,0 +1,14 @@
+# Flow Chart Of Transactions In ERPNext
+
+This diagram covers how ERPNext tracks your company information across key
+functions. This diagram does not cover all the features of ERPNext.
+
+
+
+
+[Full Resolution]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
+
+_Note: Not all of the steps are mandatory. ERPNext allows you to freely skip
+steps if you want to simplify the process._
+
+{next}
diff --git a/erpnext/docs/user/manual/en/introduction/open-source.md b/erpnext/docs/user/manual/en/introduction/open-source.md
new file mode 100644
index 0000000..0089ba8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/open-source.md
@@ -0,0 +1,33 @@
+The source code is an Open Source software. It is open for anyone to
+understand, extend or improve. And it is free!
+
+Advantages of an Open Source software are:
+
+ 1. You can choose to change your service provider anytime.
+ 2. You can host the application anywhere, including your own server to gain complete ownership and privacy of the data.
+ 3. You can access a community to support you, incase you need help. You are not dependant on your service provider.
+ 4. You can benefit from using a product that is critiqued and used by a wide range of people, who have reported hundreds of issues and suggestions to make this product better, and this will always continue.
+
+
+---
+
+### ERPNext Source Code
+
+ERPnext source repository is hosted at GitHub and can be found here
+
+- [https://github.com/frappe/erpnext](https://github.com/frappe/erpnext)
+
+
+---
+
+### Alternatives
+
+There are many Open Source ERPs you can consider. Popular ones are:
+
+ 1. Odoo
+ 2. OpenBravo
+ 3. Apache OfBiz
+ 4. xTuple
+ 5. Compiere (and forks)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/introduction/the-champion.md b/erpnext/docs/user/manual/en/introduction/the-champion.md
new file mode 100644
index 0000000..21a2383
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/the-champion.md
@@ -0,0 +1,46 @@
+<!-- no-heading -->
+
+<h1 class="white">The Champion</h1>
+
+<img class="cover" src="{{docs_base_url}}/assets/old_images/erpnext/implementation-image.png">
+
+We have seen dozens of ERP implementations over the past few years and we
+realize that successful implementation is a lot about intangibles and
+attitude.
+
+**ERPs are not required.**
+
+Like exercise.
+
+Human body may seem like it does not require exercise today or even tomorrow,
+but in the long run, if you wish to maintain your body and its health, you
+should get on the treadmill.
+
+In the same way, ERPs improve the health of your organization over a long run
+by keeping it fit and efficient. The more you delay putting things in order,
+the more time you lose, and the closer you get to a major disaster.
+
+So when you start implementing an ERP, keep your sight on the long term
+benefits. Like exercise, its painful in the short run, but will do wonders if
+you stay on course.
+
+* * *
+
+## The Champion
+
+ERP means organization wide change and it does not happen without effort.
+Every change requires a champion and it is the duty of the champion to
+organize and energize the entire team towards implementation. The champion
+needs to be resilient incase something goes wrong .
+
+In many organizations we have seen, the champion is most often the owner or a
+senior manager. Occasionally, the champion is an outsider who is hired for a
+particular purpose.
+
+In either case, you must identify your champion first.
+
+Most likely it's **you!**
+
+Lets Begin!
+
+{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.md b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.txt b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt
new file mode 100644
index 0000000..59f3503
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt
@@ -0,0 +1,4 @@
+nested-bom-structure
+partial-production-entry
+production-planning-subassembly
+valuation-based-on-field-in-bom
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
new file mode 100644
index 0000000..266ae12
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
@@ -0,0 +1,30 @@
+<h1>Nested BOM Structure</h1>
+
+**Question:** Our manufacturing process involves producing sub-assembly items before final product. How should we manage BOM master in this scenario?
+
+**Answer:** You should create BOM for item in the order of their production. Let's consider an example to understand this better.
+
+If Computer manufacturer assembles Hard Disk and DVD Drive (sub-assemblies) themselves, they should first create BOM for Hard Disk and DVD Drive. After that BOM for Computer will be created, which is finished and saleable item. BOM of computer will have
+Hard Disk and DVD Drive (sub-assemblies) will be selected as raw-material items in it. BOM ID will be fetched for the respective sub-assembly item.
+
+
+<img src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-02 at 3.58.19 pm.png">
+
+<br>Following is how the structure of nested BOM will look:
+<br>
+<br><b>Computer (FG Item)</b>
+<br><b>---</b> Mother Board
+<br><b>---</b> SMTP
+<br><b>---</b> Accessories and wires
+<br><b>---</b> <i>Hard Disk (sub-assembly)</i>
+<br> ------ Item A
+<br> ------ Item B
+<br> ------ Item C
+<br><b>---</b> <i>DVD Drive (sub-assembly)</i>
+<br> ------ Item X
+<br> ------ Item Y
+<br> ------ Item Z
+<br>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md b/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md
new file mode 100644
index 0000000..e2a702e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md
@@ -0,0 +1,25 @@
+<h1>Partial Production Entry</h1>
+
+If you completed production for few items, then you can make Partial Production Entry for that items in system. For example, your production order is for 15 quantity and you completed production for 10 quantity only. Then you can make production entry for 5 quantity. Following are step to make Partial Production Entry
+
+#### 1. Stock Entry
+
+Click on Update Finish Goods button from submitted Product Order, You will land on new Stock entry form.
+
+#### 2. Edit Manufacturing Quantity
+
+In the Update Finished Goods entry, check "From Bill of Material section", and edit Manufacturing Quantity to actual quantity produced. Production Order quantity will be fetched as Manufacturing Quantity by default.
+
+#### 3. Update Qty of Items
+
+Click on **Get Items**. With this, quantity will be updated for both raw-material as well as finish good item.
+
+
+
+#### 4. Save and Submit
+
+After updating quantity in stock entry form, save and submit the stock entry. On submit stock will update for quantity entered in this stock entry.
+
+When will you create another finish goods entry against this Production Order, system will only fetch pending quantity to be produced.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html
new file mode 100644
index 0000000..5568750
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html
@@ -0,0 +1,8 @@
+<h1>Production Planning & Subassembly</h1>
+
+if you need Production Planning Tool to consider raw-materials required for the manufacturing of sub-assembly items selected in the BOM, please check following instructions to achieve the same.<br><br>Production Planning Tool has field called "Use Multi-Level BOM", checking which will consider raw-material of sub-assemblies as well in the material planning. If this field is not checked, then it will consider sub-assembly as an item, and won't consider raw-material required for the manufacturing of that sub-assembly.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_203.png"><br><br>You will find same field in the Production Order and Stock Entry as well.<br><br>This feature is very useful for the companies who create BOM for the
+ sub-assemblies, but Production Order is created only for the finished
+item. They do not create separate Production Order for the
+sub-assemblies, but raw-materials as listed in the BOM of sub-assembly
+items are consumed in the production process, and not sub-assembly item
+directly.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html
new file mode 100644
index 0000000..4460ce0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html
@@ -0,0 +1,10 @@
+<h1>'Valuation Based On' Field in BOM</h1>
+
+<div><b>Question:</b> What do the various options in <i>Valuation Based On </i>Field in Bill Of Materials (BOM) Form mean? <br><br><b>Answer:</b> There are 3 available options in the <i>Valuation Based On</i> field;<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_bom_field.png"><br><br><ul><li><b><i>Valuation Rate:</i></b> <br></li><ul><li>Item valuation rate is
+defined based on it's purchase/manufacture value + other charges. <br></li><li>For
+Purchase Item, it is defined based on charges entered in the Purchase
+Receipt. If you don't have any Purchase Receipt
+ made for an item or a Stock Reconciliation, then you won't have
+Valuation Rate for that item.</li></ul></ul><ul><li><b><i>Price List Rate:</i></b> <br></li><ul><li>Just like you pull item prices in sales and purchase transaction, it can be pulled in BOM via Price List Rate.</li></ul></ul></div><div><ul><li><i><b>Last Purchase Rate</b>:</i> <br></li><ul><li>It will be the last Purchase Rate value of an item. This
+value is updated in the item master as well, based on rate in the
+Purchase Order for this item.</li></ul></ul><p><br></p></div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
new file mode 100644
index 0000000..34d8530
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -0,0 +1,41 @@
+At the heart of the Manufacturing system is the **Bill of Materials** (BOM).
+The **BOM** is a list of all materials (either bought or made) and operations
+that go into a finished product or sub-Item. In ERPNext, the component could
+have its own BOM hence forming a tree of Items with multiple levels.
+
+To make accurate Purchase Requests, you must always maintain correct BOMs.
+To make a new BOM:
+
+> Manufacturing > Bill of Materials > New BOM
+
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/bom.png">
+
+* To add Operations select 'With Operation'. The Operations table shall appear.
+
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/bom-operations.png">
+
+ * Select the Item for which you want to make the BOM.
+ * Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary.
+ * Workstations are defined only for product costing and Production Order Operations scheduling purposes not inventory.
+ * Inventory is tracked in Warehouses not Workstations.
+
+###Costing of a BOM
+
+* The Costing section in BOM gives an approximate cost of producing the Item.
+
+* Add the list of Items you require for each operation, with its quantity. This Item could be a purchased Item or a sub-assembly with its own BOM. If the row Item is a manufactured Item and has multiple BOMs, select the appropriate BOM. You can also define if a part of the Item goes into scrap.
+
+<img class="screenshot" alt="Costing" src="{{docs_base_url}}/assets/img/manufacturing/bom-costing.png">
+
+* This cost can be updated on by using the 'Update Cost' button.
+
+<img class="screenshot" alt="Update Cost" src="{{docs_base_url}}/assets/img/manufacturing/bom-update-cost.png">
+
+### Materials Required(exploded)
+
+This table lists down all the Material required for the Item to be Manufactured.
+It also fetches sub-assemblies along with the quantity.
+
+<img class="screenshot" alt="Exploded Section" src="{{docs_base_url}}/assets/img/manufacturing/bom-exploded.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/index.md b/erpnext/docs/user/manual/en/manufacturing/index.md
new file mode 100644
index 0000000..3fcccf4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/index.md
@@ -0,0 +1,10 @@
+# Manufacturing
+
+The Manufacturing module in ERPNext helps you to maintain multi-level Bill of
+Materials (BOMs) for your Items.
+It helps in product costing, production planning, creating production orders for your manufacturing shop floors and
+planning inventory by getting your material requirement via BOMs (also called Material Requirements Planning MRP).
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/manufacturing/index.txt b/erpnext/docs/user/manual/en/manufacturing/index.txt
new file mode 100644
index 0000000..3b932a5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/index.txt
@@ -0,0 +1,9 @@
+introduction
+bill-of-materials
+production-order
+workstation
+operation
+subcontracting
+tools
+setup
+articles
diff --git a/erpnext/docs/user/manual/en/manufacturing/introduction.md b/erpnext/docs/user/manual/en/manufacturing/introduction.md
new file mode 100644
index 0000000..f9d827c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/introduction.md
@@ -0,0 +1,24 @@
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing.png">
+
+### Types of Production Planning
+
+Broadly there are three types of Production Planning Systems
+
+ * __Make-to-Stock:__ In these systems, production is planned based on a forecast and the Items are then sold to distributors or customers. All fast moving consumer goods that are sold in retail shops like soaps, packaged water etc and electronics like phones etc are Made-to-Stock.
+ * __Make-to-Order:__ In these systems, manufacturing takes place after a firm order is placed by a customer.
+ * __Engineer-to-Order:__ In this case each sale is a separate project and has to be designed and engineered to the requirements of the customer. Common examples of this are any custom business like furniture, machine tools, speciality devices, metal fabrication etc.
+
+Most small and medium sized manufacturing businesses are based on a make-to-
+order or engineer-to-order system and so is ERPNext.
+
+For engineer-to-order systems, the Manufacturing module should be used along
+with the Projects module..
+
+#### Manufacturing and Inventory
+
+You can track work-in-progress by creating work-in-progress Warehouses.
+
+ERPNext will help you track material movement by automatically creating Stock
+Entries from your Production Orders by building from Bill of Materials.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/operation.md b/erpnext/docs/user/manual/en/manufacturing/operation.md
new file mode 100644
index 0000000..b21304e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/operation.md
@@ -0,0 +1,11 @@
+### Operation
+
+Stores a list of all Manufacturing Operations, its description and the Default Workstation for the Operation.
+
+You can also create a Operation by:
+
+> Manufacturing > Documents > Operation > New
+
+<img class="screenshot" alt="Operation" src="{{docs_base_url}}/assets/img/manufacturing/operation.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
new file mode 100644
index 0000000..6438d81
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -0,0 +1,106 @@
+Production Order (also called as Work Order) is a document that is given to
+the manufacturing shop floor by the Production Planner as a signal to produce
+a certain quantity of a certain Item. Production Order also helps to generate
+the material requirements (Stock Entry) for the Item to be produced from its
+**Bill of Materials**.
+
+The **Production Order** is generated from the **Production Planning
+Tool** based on Sales Orders. You can also create a direct Production Order
+by:
+
+> Manufacturing > Documents > Production Order > New
+
+<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/production-order.png">
+
+### Creating Production Orders
+
+ * Select the Item to be produced.
+ * The default BOM for that item will be fetched by the system. You can also change BOM.
+ * If the selected BOM has operartion mentioned in it, the system shall fetch all operations from BOM.
+ * Mention the Planned Start Date (an Estimated Date at which you want the Production to begin.)
+ * Select Warehouses. Work-in-Progress Warehouse is where your Items will be transferred when you begin production and Target Warehouse is where you store finished Items before they are shipped.
+
+> Note : You can save a Production Order without selecting the warehouses, but warehouses are mandatory for submitting a Production Order
+
+###Reassigning Workstation/Duration for Operations
+
+* By default the system fetchs workstation and duration for Production Order Operations from the selected BOM.
+
+<img class="screenshot" alt="PO Opeartions" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations.png">
+
+* If you wish to reassign the wrokstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order.
+
+<img class="screenshot" alt="PO reassigning Operations" src="{{docs_base_url}}/assets/img/manufacturing/PO-reassigning-operations.png">
+
+* Select the respective operation, and change its workstation.
+* You can also change the Operating Time for that operation
+
+### Capacity Planning in Production Order
+
+* When a Production Order is submitted, based on the Planned Start Date and the availability of the workstations, system schedules all operations for the Production Order (if Production Order has operations specified).
+* Drafts of Time Logs are also created based on the scheduled operations.
+
+### Transfering Materials for Manufacturing
+
+* Once you have submitted your Production Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process.
+* This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
+
+* Click on 'Transfer Materials for Manufacturing'.
+
+<img class="screenshot" alt="Transfer Materials" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
+
+* Mention the quantity of materials to be transfered.
+
+<img class="screenshot" alt="Material Transfer Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-qty.png">
+
+* Submit the Stock Entry
+
+<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-SE-for-material-transfer.png">
+
+* Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry.
+
+<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-updated.png">
+
+### Making Time Logs
+
+* Progress in the Production Order can be tracked using [Time Log]({{docs_base_url}}/user/guides/projects/time-log.html)
+* Time Logs are created against Production Order Operations.
+* Drafts of Time Logs are also created based on the scheduled operations when an Production Order is Submitted.
+* To create more Time Logs against an operation select 'Make TIme Log' in the respective operation.
+
+<img class="screenshot" alt="Make TL against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png">
+
+###Updating Finished Goods
+
+* Once you are done with the Production Order you need to update the Finished Goods.
+* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
+* Click on 'Update Finished Goods'.
+
+<img class="screenshot" alt="Update Finished Goods" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
+
+* Mention the quantity of materials to be transfered.
+
+<img class="screenshot" alt="Update Finished Goods Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update-qty.png">
+
+ > Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry.
+
+### Stopping a Production Order
+
+* When you stop a Production Order its status is changed to Stop indicating that all production process against that Production Order is to be ceased.
+* To stop the Production Order click on the 'stop' Button
+
+ 1. On Submitting the Production Order, the system will reserve a slot for each of the Production Order Operations serially after the planned start date based on the workstation availability. The Workstation availability depends on the Workstation timings, holiday list and if some other Production Order Operation was scheduled in that slot. You can mention the number of days for the system to try scheduling the operations in the Manufacturing Settings. This is set to 30 Days by default. If the operation requires time exceeding the available slot, system shall ask you to break the operations. Once the scheduling is done system shall create Time Logs and save them. You can Modify them and submit them later.
+ 2. You can also create additional time logs against an Operation. For doing so select the respective operation and click on 'Make Time Log'
+ 3. Transfer Raw Material: This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
+ 4. Update Finished Goods: This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
+ 5. To check all Time Logs made against the Production Order click on 'Show Time Logs'
+
+<img class="screenshot" alt="PO - stop" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
+
+* You can Also re-start a stopped Production Order.
+
+> Note : In order to make a Production Order against an Item you must specify 'Yes' to "Allow Production Order" on the Item form.
+
+> Note : In order to make a Production Order against an Item you must specify 'Yes' to "Allow Production Order" on the Item form.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/index.md b/erpnext/docs/user/manual/en/manufacturing/setup/index.md
new file mode 100644
index 0000000..ec22505
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/index.md
@@ -0,0 +1,5 @@
+Global settings for manufacturing Processes
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/index.txt b/erpnext/docs/user/manual/en/manufacturing/setup/index.txt
new file mode 100644
index 0000000..68a2ad8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/index.txt
@@ -0,0 +1 @@
+manufacturing-settings
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
new file mode 100644
index 0000000..dc59689
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
@@ -0,0 +1,15 @@
+* Manufacturing Settings can be found at
+
+> Manufacturing > Production Order > Setup > Manufacturing Settings
+
+<img class="screenshot" alt="Manufacturing Settings" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-settings.png">
+
+* Allow Overtime - Specify if workstations are to allow overtime.(schedule operations outside working hours)
+
+* Allow Production on Holidays - Specify if system is to allow scheduling of operations on Holidays.
+
+* Capacity Planning for (Days) - Specify no. of Days for Capacity Planning.
+
+* Time Between Operations (in mins) - Specify the gap between two Production Operations.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
new file mode 100644
index 0000000..6f2b86b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
@@ -0,0 +1,40 @@
+Subcontracting is a type of job contract that seeks to outsource certain types
+of work to other companies. It allows work on more than one phase of the
+project to be done at once, often leading to a quicker completion.
+Subcontracting is practiced by various industries. For example, manufacturers
+making a number of products from complex components subcontract certain
+components and package them at their facilities.
+
+If your business involves outsourcing certain processes to a third party
+Supplier, where you buy the raw material from, you can track this by using the
+sub-contracting feature of ERPNext.
+
+### Setup Sub-Contracting:
+
+ 1. Create separate Items for the unprocessed and the processed product. For example if you supply unpainted X to your Supplier and the Supplier returns you X, you can create two Items: “X-unpainted” and “X”.
+ 2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go).
+ 3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”.
+
+
+
+
+
+__Step 1:__ Make a Bill of Materials for the processed Item, with the unprocessed
+Items as sub-items. For example, If you are manufacturing a pen, the processed
+pen will be named under Bill of Materials(BOM), whereas, the refill, knob, and
+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 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier.
+
+__Step 4:__ Receive the Items from your Supplier via Purchase Receipt. Make sure to check the “Consumed Quantity” in the “Raw Materials” table so that the
+correct stock is maintained at the Supplier’s end.
+
+> Note 1: Make sure that the “Rate” of processed Item is the processing rate
+(excluding the raw material rate).
+
+> Note 2: ERPNext will automatically add the raw material rate for your
+valuation purpose when you receive the finished Item in your stock.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
new file mode 100644
index 0000000..794d982
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
@@ -0,0 +1,44 @@
+# BOM Replace Tool
+
+Replace BOM is the utility to replace BOM of sub-assembly item, which is already updated in the BOM of Finished Good item.
+
+To use the Production Planning Tool, go to:
+
+> Manufacturing > Tools > BOM Replace Tool
+
+Let's consider a scenario to understand this better.
+
+If company manufactures computers, Bill of Material of its finished item will constitute of:
+
+1. Monitor
+1. Key Board
+1. Mouse
+1. CPU
+
+Out of all the items above, CPU is asembled separately. Hence separate BOM will be created for the CPU. Following are the items from the BOM of CPU.
+
+1. 250 GB Hard Disk
+1. Mother Board
+1. Processor
+1. SMTP
+1. DVD player
+
+If we have more items to be added , or existing items to be edited in the BOM of CPU, then we should create new BOM for it.
+
+1. _350 GB Hard Disk_
+1. Mother Board
+1. Processor
+1. SMTP
+1. DVD player
+
+To update new BOM updated in the BOM of finished item, where CPU is selected as raw-material, you can use BOM Replace tool.
+
+<img class="screenshot" alt="BOM replace Tool" src="{{docs_base_url}}/assets/img/manufacturing/bom-replace-tool.png">
+
+In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer).
+
+**Will BOM Replace Tool work for replacing finsihed item in BOM?**
+
+No. You should Cancel and Amend current BOM, or create a new BOM for finished item.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/index.md b/erpnext/docs/user/manual/en/manufacturing/tools/index.md
new file mode 100644
index 0000000..259b5eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/index.md
@@ -0,0 +1,4 @@
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/index.txt b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt
new file mode 100644
index 0000000..aaf7cec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt
@@ -0,0 +1,2 @@
+production-planning-tool
+bom-replace-tool
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
new file mode 100644
index 0000000..61ec4c7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
@@ -0,0 +1,62 @@
+Production Planning Tool helps you plan production and purchase of Items for a
+period (usually a week or a month).
+
+This list of Items can be generated from the open Sales Orders in the system
+and will generate:
+
+ * Production Orders for each Item.
+ * Purchase Requests for Items whose Projected Quantity is likely to fall below zero.
+
+To use the Production Planning Tool, go to:
+
+> Manufacturing > Tools > Production Planning Tool
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt.png">
+
+
+
+#### Step 1: Select and get Sales Order
+
+* Select sales orders for MRP using filters (Time, Item, and Customer)
+* Click on Get Sales Order to generate a list.
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-sales-orders.png">
+
+
+
+#### Step 2: Get Item from Sales Orders.
+
+You can add/remove or change quantity of these Items.
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-item.png">
+
+#### Step 3: Create Production Orders
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-production-order.png">
+
+
+
+#### Step 4: Create Material Request
+
+Create Material Request for Items with projected shortfall.
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-material-request.png">
+
+
+
+The Production Planning Tool is used in two stages:
+
+ * Selection of Open Sales Orders for the period based on “Expected Delivery Date”.
+ * Selection of Items from those Sales Orders.
+
+The tool will update if you have already created Production Orders for a
+particular Item against its Sales Order (“Planned Quantity”).
+
+You can always edit the Item list and increase / reduce quantities to plan
+your production.
+
+> Note: How do you change a Production Plan? The output of the Production
+Planning Tool is the Production Order. Once your orders are created, you can
+change them by amending the Production Orders.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md
new file mode 100644
index 0000000..4e27eb5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md
@@ -0,0 +1,19 @@
+### Workstation
+
+Workstation stores information regarding the place where the workstation operations is carried out.
+Data regarding the operation cost of the place can be stored here.
+We can also specify the workstation operation timings and a Holiday List.
+
+You can also create a Workstation by:
+
+> Manufacturing > Documents > Workstation > New
+
+<img class="screenshot" alt="Workstation" src="{{docs_base_url}}/assets/img/manufacturing/workstation.png">
+
+In workstation specify the workstation working hours under the 'working hour' section.
+You can also specify the working hours based on shifts.
+While scheduling Production Order, system will check for the availability of the workstation based on the working hours specified.
+
+> Note : You can enable overtime for your workstation in [Manufacturing Settings]({{docs_base_url}}/user/guides/manufacturing/setup/manufacturing-settings.html)
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/activity-cost.md b/erpnext/docs/user/manual/en/projects/activity-cost.md
new file mode 100644
index 0000000..d4e2106
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/activity-cost.md
@@ -0,0 +1,4 @@
+Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type.
+This rate is pulled by the system while making Time Logs. It is used for Project Costing.
+
+<img class="screenshot" alt="Activity Cost" src="{{docs_base_url}}/assets/img/project/activity_cost.png">
diff --git a/erpnext/docs/user/manual/en/projects/activity-type.md b/erpnext/docs/user/manual/en/projects/activity-type.md
new file mode 100644
index 0000000..7f37f51
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/activity-type.md
@@ -0,0 +1,13 @@
+Activity Type makes a list of the different types of activities against which a Time Log can be made.
+
+<img class="screenshot" alt="Activity Type" src="{{docs_base_url}}/assets/img/project/activity_type.png">
+
+By default the following Activity Types are created.
+
+* Planning
+* Research
+* Proposal Writing
+* Execution
+* Communication
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/articles/index.md b/erpnext/docs/user/manual/en/projects/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/articles/index.txt b/erpnext/docs/user/manual/en/projects/articles/index.txt
new file mode 100644
index 0000000..56c193c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/index.txt
@@ -0,0 +1 @@
+project-costing
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/articles/project-costing.md b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
new file mode 100644
index 0000000..e5c5940
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
@@ -0,0 +1,39 @@
+<h1>Project Costing</h1>
+
+Each project has multiple task associated with it. To track actual costing of a Project, primarily in terms of services, user has to create Time Log based on actual time spent on Project-Task. Following the steps on how you can track actual service cost against Project.
+
+#### Activity Type
+
+Activity Type is a master of service offered by your personnel. You can add new Activity type from:
+
+`Project > Activity Type > New`
+
+#### Activity Cost
+
+Activity Cost is a master where you can track billing and costing rate for each Employee, and for each Activity Type.
+
+
+
+#### Time Log
+
+Based on Actual Time spent on the Project-Task, Employee will create a time log.
+
+
+
+On selection of Activity Type in the Time Log, Billing and Costing Rate will fetched for that Employee from respective Activity Cost master.
+
+
+
+Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log.
+
+#### Costing in Project and Task
+
+Based on total Time Logs created for a specific Task, its costing will be updated in the respective Task master.
+
+
+
+Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/index.md b/erpnext/docs/user/manual/en/projects/index.md
new file mode 100644
index 0000000..220c67f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/index.md
@@ -0,0 +1,13 @@
+ERPNext helps you manage your Projects by breaking them into Tasks and
+allocating them to different people.
+
+Purchasing and selling can also be tracked against Projects and this can help
+the company keep tabs on its budget, delivery and profitability for a Project.
+
+Projects can be used to manage internal projects, manufacturing jobs or
+service jobs. For service jobs, Time Sheets can also be created that can be
+used to bill Customers if billing is done on a Time & Money basis.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/projects/index.txt b/erpnext/docs/user/manual/en/projects/index.txt
new file mode 100644
index 0000000..f2bae77
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/index.txt
@@ -0,0 +1,7 @@
+tasks
+project
+time-log
+time-log-batch
+activity-type
+activity-cost
+articles
diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
new file mode 100644
index 0000000..e4558e1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/project.md
@@ -0,0 +1,87 @@
+Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
+
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project.png">
+
+### Managing tasks
+Project can be divided into multiple Tasks.
+Task can be created via Project document itself or can be created via [Task]({{docs_base_url}}/user/guides/projects/tasks.html)
+
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project_task.png">
+
+* To view Task made against a Project click on 'Tasks'
+
+<img class="screenshot" alt="Project - View Task" src="{{docs_base_url}}/assets/img/project/project_view_task.png">
+
+<img class="screenshot" alt="Project - Task List" src="{{docs_base_url}}/assets/img/project/project_task_list.png">
+
+* You can also view the Tasks from the Project document itself
+
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/project_task_grid.png">
+
+### Managing time
+
+ERPNext uses [Time Log]({{docs_base_url}}/user/guides/projects/time-log.html) to track the progress of a Project.
+You can create Time Logs against each task.
+The Actual Start and End Time along with the costing shall then be updated based on the Time Log.
+
+* To view Time Log made against a Project click on 'Time Logs'
+
+<img class="screenshot" alt="Project - View Time Log" src="{{docs_base_url}}/assets/img/project/project_view_time_log.png">
+
+<img class="screenshot" alt="Project - Time Log List" src="{{docs_base_url}}/assets/img/project/project_time_log_list.png">
+
+* You can also create a Time Log directlly and link it to the Project.
+
+<img class="screenshot" alt="Project - Link Time Log" src="{{docs_base_url}}/assets/img/project/project_time_log_link.png">
+
+### Managing expenses
+
+You can book [Expense Claim]({{docs_base_url}}/user/guides/human-resources/expense-claim.html) against a project task.
+The system shall update the total amount from expense claims in the project costing section.
+
+* To view Expense Claims made against a Project click on 'Expense Claims'
+
+<img class="screenshot" alt="Project - View Expense Claim" src="{{docs_base_url}}/assets/img/project/project_view_expense_claim.png">
+
+* You can also create a Expense Claims directlly and link it to the Project.
+
+<img class="screenshot" alt="Project - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
+
+* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
+
+<img class="screenshot" alt="Project - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/project_total_expense_claim.png">
+
+### Cost Center
+
+You can make a [Cost Center]({{docs_base_url}}/user/guides/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
+
+<img class="screenshot" alt="Project - Cost Center" src="{{docs_base_url}}/assets/img/project/project_cost_center.png">
+
+###Project Costing
+
+The Project Costing section helps you track the time and expenses incurred against the project.
+
+<img class="screenshot" alt="Project - Costing" src="{{docs_base_url}}/assets/img/project/project_costing.png">
+
+* The Costing Section is updated based on Time Logs made.
+
+* Gross Margin is the difference between Total Costing Amount and Total Billing Amount
+
+###Billing
+
+You can make/link a [Sales Order]({{docs_base_url}}/user/guides/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project.
+
+<img class="screenshot" alt="Project - Sales Order" src="{{docs_base_url}}/assets/img/project/project_sales_order.png">
+
+###Gantt Chart
+
+A Gantt Chart illustrates a project schedule.
+ERPNext gives you a illustrated view of tasks scheduled against that project in Gantt Chart View.
+
+* To view gantt chart against a project, go to that project and click on 'Gantt Chart'
+
+<img class="screenshot" alt="Project - View Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_view_gantt_chart.png">
+
+<img class="screenshot" alt="Project - Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_gantt_chart.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
new file mode 100644
index 0000000..bf1e9af
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/tasks.md
@@ -0,0 +1,59 @@
+Project is divided into Tasks.
+In ERPNext, you can also create a Task independently.
+
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/project/task.png">
+
+### Status of the Task
+
+A Task can have either of the following status - Open, Working, Pending Review, Closed, Cancelled.
+
+<img class="screenshot" alt="Task - Status" src="{{docs_base_url}}/assets/img/project/task_status.png">
+
+* By default each new Task created shall have the status set to 'Open'.
+
+* If a Time Log is made against a task, its status shall be set to 'Working'.
+
+### Dependent Task
+
+You can specify a list of dependent task under the 'Depends On' section.
+
+<img class="screenshot" alt="Depends On" src="{{docs_base_url}}/assets/img/project/task_depends_on.png">
+
+* You cannot close the parent Task until all 'Dependant Task' are closed.
+
+* If the Dependent Task are delayed and overlap with the expected Start Date of the Parent task, the system will reschedule the parent task.
+
+### Managing Time
+
+ERPNext uses [Time Log]({{docs_base_url}}/user/guides/projects/time-log.html) to track the progress of a Task.
+You can create multiple Time Logs against each task.
+The Actual Start and End Time along with the costing shall then be updated based on the Time Log.
+
+* To view Time Log made against a Task click on 'Time Logs'
+
+<img class="screenshot" alt="Task - View Time Log" src="{{docs_base_url}}/assets/img/project/task_view_time_log.png">
+
+<img class="screenshot" alt="Task - Time Log List" src="{{docs_base_url}}/assets/img/project/task_time_log_list.png">
+
+* You can also create a Time Log directlly and link it to the Task.
+
+<img class="screenshot" alt="Task - Link Time Log" src="{{docs_base_url}}/assets/img/project/task_time_log_link.png">
+
+### Managing Expenses
+
+You can book [Expense Claim]({{docs_base_url}}/user/guides/human-resource-management/expense-claim.html) against a task.
+The system shall update the total amount from expense claims in the costing section.
+
+* To view Expense Claims made against a Task click on 'Expense Claims'
+
+<img class="screenshot" alt="Task - View Expense Claim" src="{{docs_base_url}}/assets/img/project/task_view_expense_claim.png">
+
+* You can also create a Expense Claims directlly and link it to the Task.
+
+<img class="screenshot" alt="Task - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/task_expense_claim_link.png">
+
+* Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section
+
+<img class="screenshot" alt="Task - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/task_total_expense_claim.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
new file mode 100644
index 0000000..d48633a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md
@@ -0,0 +1,23 @@
+You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Log Batch, go to
+
+> Projects > Time Log Batch > New Time Log Batch
+
+OR
+
+Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Log Batch" button and these Time Logs will be selected.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_batch.gif">
+
+###Making Sales Invoice
+
+* After submitting the Time Log Batch, "Make Invoice" button shall appear.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_batch_make_invoice.png">
+
+* Click on that button to raise a Sales Invoice against the Time Log Batch.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_batch_sales_invoice.png">
+
+* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Log Batch and their status will change to "Billed".
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/time-log.md b/erpnext/docs/user/manual/en/projects/time-log.md
new file mode 100644
index 0000000..1739240
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/time-log.md
@@ -0,0 +1,49 @@
+Time Logs are a way to track time worked.
+They can be used to track the following
+
+* Billable work to Customers
+* Production Order Operations
+* Tasks
+* Project
+* Internal References
+
+<img class="screenshot" alt="Time Log" src="{{docs_base_url}}/assets/img/project/time_log.png">
+
+###Creating Time Logs
+
+1. To create a new Time Log, you can go to
+> Projects > Time Log > new Time Log
+
+2. You can also create a new Time Log via Calendar
+
+To create Time Logs via Calender, go to Time Log and select Calendar.
+
+<img class="screenshot" alt="Time Log - View Calender" src="{{docs_base_url}}/assets/img/project/time_log_view_calendar.png">
+
+* To create a Time Log for multiple days, click and drag the cursor across days.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_calendar_day.gif">
+
+* You can also create Time Logs from 'week' and 'day' view of the calender.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_calendar_week.gif">
+
+* Time Logs for Manufacturing processes needs to be created from the Production Order.
+* To create more Time Logs against Operations select the respective operation and click on the 'Make Time Log' button.
+
+###Billing using Time Logs
+
+* If you wish to bill against a Time Log you need to select the 'Billable' option.
+
+* In the costing section, the system will pull up the Costing & Billing rate from [Activity Cost]({{docs_base_url}}/user/guides/projects/activity-cost.html)
+ based on the Employee and Activity Type specified.
+
+* The system shall then calculate the Costing and Billing amount based on the Hours mentioned in the Time Log.
+
+* If 'Billable' is not selected, the system shall display the 'Billing Amount' as 0.
+
+<img class="screenshot" alt="Time Log - Costing" src="{{docs_base_url}}/assets/img/project/time_log_costing.png">
+
+* After submitting the Time Log, you need to create [Time Log batch]({{docs_base_url}}/user/guides/projects/time-log-batch.html) to further bill the Time Log.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
new file mode 100644
index 0000000..9dfc730
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
@@ -0,0 +1,31 @@
+<h1>Applying Discount</h1>
+
+There are two ways Discount can be applied on an items in the sales transactions.
+
+#### 1. Discount on "Price List Rate" of an item
+
+In the Item table of transaction, after Price List Rate field, you will find Discount (%) field. Discount Rate applied in this field will be applicable on the Price List Rate of an item.
+
+Before applying Discount (%).
+
+
+
+After applying Discount (%) under Discount on Price List Rate (%) field.
+
+
+
+You can apply percent discount in all sales and purchase transactions.
+
+#### 2. Discount on Grand Total
+
+In transactions, after Taxes and Charges table, you will find option to enter "Additional Discount Amount". Based on Amount entered in this field, item's Basic Rate and Taxes will be recalculated.
+
+Before applying Additional Discount Amount,
+
+
+
+After applying Additional Discount Amount.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
new file mode 100644
index 0000000..8c3af05
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -0,0 +1,34 @@
+**Drop shipping** is a supply chain management technique in which the retailer does not keep goods in stock. Instead they transfer customer orders and shipment details to either the manufacturer, another retailer, or a wholesaler, who then ships the goods directly to the customer
+
+In ERPNext, you can create a Drop Shipping by creating Purchase Order against Sales Order.
+
+> Selling > Documents > Sales Order > Purchase Order
+
+#### Setup on Item Master
+
+Set **_Delivered by Supplier (Drop Ship)_** and **_Default Supplier_** in Item Master.
+<img class="screenshot" alt="Setup Item Master" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-item-master.png">
+
+#### Setup on Sales Order
+If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Salse Order Item.
+
+You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
+<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-sales-order-item.png">
+
+#### Create Purchase Order
+After submitting a Sales Order, create Puchase Order.<br>
+<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="{{docs_base_url}}/assets/img/selling/drop-ship-sales-order.png">
+
+From Sales Order, all items, having **Supplier delivers to Customer** checked or **Supplier**(matching with supplier selected on For Supplier popup) mentioned, will get mapped onto Purchase Order.
+
+It will automatically set Customer, Customer Address and Contact Person.
+
+After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order.
+<img class="screenshot" alt="Purchase Order for Drop Shipping" src="{{docs_base_url}}/assets/img/selling/drop-ship-purchase-order.png">
+
+<span style="color:#18B52D">**_Close_**</span>, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment.
+<img class="screenshot" alt="Close Sales Order" src="{{docs_base_url}}/assets/img/selling/close-sales-order.png">
+
+###Drop Shipping Print Format
+You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format.
+<img class="screenshot" alt="Drop Dhip Print Format" src="{{docs_base_url}}/assets/img/selling/drop-ship-print-format.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
new file mode 100644
index 0000000..2fafa68
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
@@ -0,0 +1,28 @@
+<h1>ERPNext for Service Organizations</h1>
+
+**Question:** At first look, ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by service companies as well?
+
+**Answer:**
+About 30% of ERPNext customers comes from services background. These are companies into software development, certification services, individual consultants and many more. Being into services business ourselves, we use ERPNext to manage our sales, accounting, support and HR operations.
+
+https://conf.erpnext.com/2014/videos/umair-sayyed
+
+###Master Setup
+
+Between the service and trading company, the most differentiating master is an item master. While trading and manufacturing business has stock item, with warehouse and other stock details, service items will have none of these details.
+
+To create a services item, which will be non-stock item, in the Item master, you should set "Is Stock Item" field as "No".
+
+
+
+###Hiding Non-required Features
+
+####Feature Setup
+
+In Feature Setup, you can activate specific functionalities, and disable others. Based on this setting, forms and fields not required for your business will be hidden. [More on feature setup here](https://manual.erpnext.com/customize-erpnext/hiding-modules-and-features).
+
+####Permissions
+
+ERPNext is the permission driven system. User will be able to access system based on permissions assigned to him/her. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from user. [More on permission management in ERPNext here](https://manual.erpnext.com/setting-up/users-and-permissions).
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/index.md b/erpnext/docs/user/manual/en/selling/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/index.txt b/erpnext/docs/user/manual/en/selling/articles/index.txt
new file mode 100644
index 0000000..70b4ac2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/index.txt
@@ -0,0 +1,6 @@
+applying-discount
+drop-shipping
+erpnext-for-services-organization
+manage-shipping-rule
+managing-sales-persons-in-sales-transactions
+stopping-sales-order
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md b/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md
new file mode 100644
index 0000000..c9c4f91
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md
@@ -0,0 +1,25 @@
+<h1>Manage Shipping Rule</h1>
+
+Shipping Rule master help you define rules based on which shipping charge will be applied on sales transactions.
+
+Most of the companies (mainly retail) have shipping charge applied based on invoice total. If invoice value is above certain range, then shipping charge applied will be lesser. If invoice total is less, then shipping charges applied will be higher. You can setup Shipping Rule to address the requirement of varying shipping charge based on total.
+
+To setup Shipping Rule, go to:
+
+Selling/Accounts >> Setup >> Shipping Rule
+
+Here is an example of Shipping Rule master:
+
+
+
+Referring above, you will notice that shipping charges are reducing as range of total is increasing. This shipping charge will only be applied if transaction total falls under one of the above range, else not.
+
+If shipping charges are applied based on Shipping Rule, then more values like Shipping Account, Cost Center will be needed as well to add row in the Taxes and Other Charges table of sales transaction. Hence these details are tracked as well in the Shipping Rule itself.
+
+
+
+Apart from price range, Shipping Rule will also validate if its territory and company matches with that of Customer's territory and company.
+
+Following is an example of how shipping charges are auto-applied on sales order based on Shipping Rule.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md
new file mode 100644
index 0000000..ae92e63
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md
@@ -0,0 +1,43 @@
+<h1>Managing Sales Persons In Sales Transactions</h1>
+
+In ERPNext, Sales Person master is maintained in [tree structure](https://erpnext.com/kb/setup/managing-tree-structure-masters). Sales Person table is available in all the Sales transactions, at the bottom of transactions form.
+
+If you have specific Sales Person attached to Customer, you can mention Sales Person details in the Customer master itself. On selection of Customer in the transactions, you will have Sales Person details auto-fetched in that transaction.
+
+####Sales Person Contribution
+
+If you have more than one sales person working together on an order, then with listing all the sales person for that order, you will also need to define contribution based on their effort. For example, Sales Person Aasif, Harish and Jivan are working on order. While Aasif and Harish followed this order throughout, Jivan got involved just in the end. Accordingly you should define % Contribution in the sales transaction as:
+
+
+
+Where Sales Order Net Total is 30,000.
+
+<div class=well>Total % Contribution for all Sales Person must be 100%. If only one Sales Person is selected, then enter % Contribution as 100% for him/her.</div>
+
+####Sales Person Transaction Report
+
+You can check Sales Person Transaction Report from
+
+`Selling > Standard Reports > Sales Person-wise Transaction Summary`
+
+This report will be generated based on Sales Order, Delivery Note and Sales Invoice. This report will give you total amount of sales made by an employee over a period. Based on data provided from this report, you can determine incentives and plan appraisal for an employee.
+
+
+
+####Sales Person wise Commission
+
+ERPNext doesn't calculate commission payable to an Employee, but only provide total amount of sales made by him/her. As a work around, you can add your Sales Person as Sales Partner, as commission calculation feature is readily available in ERPNext. You can check Sales Partner's Commission report from
+
+`Accounts > Standard Reports > Sales Partners Commission`
+
+####Disable Sales Person Feature
+
+If you don't track sales person wise performance, and doesn't wish to use this feature, you can disable it from:
+
+`Setup > Customize > Features Setup`
+
+
+
+After uncheck Sales Extras from Sales and Purchase section, refresh your ERPNext account's tab, so that forms will take effect based on your setting.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md b/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md
new file mode 100644
index 0000000..96a15de
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md
@@ -0,0 +1,17 @@
+<h1>Stopping a Sales Order</h1>
+
+In the submitted Sales Orders, you will find **Stop** option. Stopping Sales Order will restrict user from creating Delivery Note and Sales Invoice against it.
+
+
+
+####Scenario
+
+East Wind receives an order for ten laptops. Sales Order is also created for ten units. Due to scarcity of stock, only seven units are delivered to customer. Pending three units are to be delivered soon. Customer inform East Wind need not deliver pending item, as they have purchased it from other vendor.
+
+In this case, after East Wind will create Delivery Note and Sales Invoice only for the seven units of Laptop, and set Sales Order as stopped.
+
+
+
+Once Sales Order is set as stopped, you will not have pending quantities (three in this case) reflecting in Pending to Deliver and Pending to Invoice reports. To make further transactions against Stopped Sales Order, you should first Unstop it.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/index.md b/erpnext/docs/user/manual/en/selling/index.md
new file mode 100644
index 0000000..36a99d2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/index.md
@@ -0,0 +1,11 @@
+# Selling
+
+Selling is the communication that happens with the customer prior to and
+during the sale. You might be managing all the communication yourself or you
+may have a small team of sales people to handle this. ERPNext helps you track
+the communication leading up to the sale, by keeping all your documents in an
+organized and searchable manner.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/selling/index.txt b/erpnext/docs/user/manual/en/selling/index.txt
new file mode 100644
index 0000000..14332b7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/index.txt
@@ -0,0 +1,5 @@
+quotation
+sales-order
+drop-shipping
+setup
+articles
diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
new file mode 100644
index 0000000..5be1508
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/quotation.md
@@ -0,0 +1,89 @@
+During a sale, the customer may request for a written note about the products
+or services you are planning to offer, along with the prices and other terms
+of engagement. This is called a “Proposal” or an “Estimate” or a “Pro Forma
+Invoice”or a Quotation.
+
+To create a new Quotation go to:
+
+> Selling > Quotation > New Quotation
+
+###Creating Quotation from Oppurtunity
+
+You can also create a Quotation from an Opportunity.
+
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quote-from-opp.png">
+
+Or You can create a new Quotation and pull details from an Opportunity.
+
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quotation.gif">
+
+A Quotation contains details about:
+
+ * The recipient of the Quotation
+ * The Items and quantities you are offering.
+ * The rates at which they are offered. For details refer
+ * The taxes applicable.
+ * Other charges (like shipping, insurance) if applicable.
+ * The validity of contract.
+ * The time of delivery.
+ * Other conditions.
+
+> Tip: Images look great on Quotations. To add images to your Quotations,
+attach the corresponding image in the Item master.
+
+### Rates
+
+The rates you quote may depend on two things.
+
+ * The Price List: If you have multiple Price Lists, you can select a Price List or tag it to the Customer (so that it is auto-selected). Your Item prices will automatically be updated from the Price List.For details refer [Price List]({{docs_base_url}}/user/guides/setting-up/price-lists.html)
+
+ * The Currency: If you are quoting to a Customer in a different currency, you will have to update the conversion rates to enable ERPNext to save the information in your standard Currency. This will help you to analyze the value of your Quotations in standard Currency.
+
+### Taxes
+
+To add taxes to your Quotation, you can either select a tax template, Sales
+Taxes and Charges Template or add the taxes on your own. To understand taxes in
+detail visit [Taxes]({{docs_base_url}}/user/guides/setting-up/setting-up-taxes.html)
+
+You can add taxes in the same manner as the Sales Taxes and Charges Template.
+
+### Terms and Conditions
+
+Each Quotation must ideally contain a set of terms, of your contract. It is
+usually a good idea to make templates of your Terms and Conditions, so that
+you have a standard set of terms. You can do this by going to:
+
+> Selling > Terms and Conditions
+
+#### What should Terms and Conditions Contain?
+
+ * Validity of the offer.
+ * Payment Terms (In Advance, On Credit, part advance etc).
+ * What is extra (or payable by the Customer).
+ * Safety / usage warning.
+ * Warranty if any.
+ * Returns Policy.
+ * Terms of shipping, if applicable.
+ * Ways of addressing disputes, indemnity, liability, etc.
+ * Address and Contact of your Company.
+
+### Submission
+
+Quotation is a “Submittable” transaction. Since you send this Quotation to
+your Customer or Lead, you must freeze it so that changes are not made after
+you send the Quotation. See Document Stages.
+
+> Tip: Quotations can also be titled as “Proforma Invoice” or “Proposal”.
+Select the right heading in the “Print Heading” field in the “More Info”
+section. To create new Print Headings go to Setup > Branding and Printing >
+Print Headings.
+
+### Discount
+
+While making your sales transactions like a Quotation (or Sales Order) you
+would already have noticed that there is a “Discount” column. On the left is
+the “Price List Rate” on the right is the “Basic Rate”. You can add a
+“Discount” value to update the basic rate. To understand more about discount
+read [Discount.](http://erpnext.org/discount)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
new file mode 100644
index 0000000..269473a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -0,0 +1,119 @@
+# Sales Order
+
+The Sales Order confirms your sales and triggers purchase (**Material
+Request**) shipment (**Delivery Note**), billing (**Sales Invoice**) and
+manufacturing (**Production Plan**)
+
+A Sales Order is usually a binding Contract with your Customer.
+
+Once your customer confirms the Quotation you can convert your Quotation into
+a Sales Order.
+
+### Sales Order Flow-Chart
+
+
+
+To create a new Sales Order go to:
+
+> Selling > Sales Order > New Sales Order
+
+### Creating Sales Order from Quotation
+
+You can also create a Sales Order from a submitted Quotation.
+
+<img class="screenshot" alt="Make Sales Order from Quotation" src="{{docs_base_url}}/assets/img/selling/make-SO-from-quote.png">
+
+Or you can create a new Sales Order and pull details from an Quotation.
+
+<img class="screenshot" alt="Make Sales Order from Quotation" src="{{docs_base_url}}/assets/img/selling/make-so.gif">
+
+Most of the information in your Sales Order is the same as the Quotation.
+There are a few amongst other things that a Sales Order will ask you to
+update.
+
+ * Expected date of delivery.
+ * Customer Purchase Order number: If your customer has sent you a Purchase Order, you can update its number for future reference (in billing).
+
+### Packing List
+
+The “Packing List” table will be automatically updated when you “Save” the
+Sales Order. If any Items in your table are Product Bundle (packets), then the
+“Packing List” will contain the exploded (detailed) list of your Items.
+
+### Reservation and Warehouses
+
+If your Sales Order contains Items for which inventory is tracked (Is Stock
+Item is “Yes”) then, ERPNext will ask you for “Reservation Warehouse”. If you
+have set a default Warehouse for the Item, it will automatically set this
+Warehouse here.
+
+This “reserved” quantity will help you project what is the quantity you need
+to purchase based on all your commitments.
+
+### Sales Team
+
+**Sales Partner:** If this Sale was booked via a Sales Partner, you can update the Sales Partner’s details with commission and other info that you can aggregate.
+
+**Sales Persons:** ERPNext allows you to tag multiple Sales Persons who may have worked on this deal. You can also split the amount in targets of different Sales Persons and track how much incentives they earned on this deal.
+
+### Recurring Sales Orders
+
+If you have a recurring contract with a Customer where you are required to generate a Sales Order on a monthly, quarterly, half-yearly or annual basis, you can check the “Convert To Recurring Order” box.
+
+Here you can fill in the details like; of how frequently you want to generate an Order in the 'Recurring Type' field, specify the day of of the month on which the Order needs to be generated in the 'Repeat On Day Of Month' field and the date on which the recurring orders should stop in the 'End Date' field.
+
+**Recurring Type:** Here you can update how frequently you want to generate an Order.
+
+**Repeat On Day Of Month:** You can specify the day of of the month on which the Order needs to be generated.
+
+**End Date:** The date on which the recurring orders should stop can be specified here.
+
+On updating the Sales Order, a Recurring ID will be generated which will be same for all recurring orders generated from this particular Sales Order.
+
+ERPNext will automatically create new Order and mail a notification to the email IDs you set in the 'Notification Email Address'field.
+
+<img class="screenshot" alt="Reccuring Sales Order" src="{{docs_base_url}}/assets/img/selling/recurring-sales-order.png">
+
+### Next Steps
+
+Once you “Submit” your Sales Order, you can now trigger different aspects of
+your organization:
+
+ * To begin purchase click on “Make Purchase Request”
+ * To make a shipment entry click on “Make Delivery Note”
+ * To bill, make “Make Sales Invoice”
+ * To stop further process on this Sales Order, click on “Stop”
+
+### Submission
+
+Sales Order is a “Submittable” transaction. See Document Stages. You will be
+able to execute dependent steps (like making a Delivery Note) only after
+“Submitting” this Sales Order.
+
+### Sales Order with Order type Maintenance
+
+When the 'Order Type' of the Sales Order is 'Maintenance' follow the steps
+given below:
+
+__Step 1:__ Enter Currency, Price list and Item details.
+
+__Step 2:__ Mention taxes and other information.
+
+__Step 3:__ Save and Submit the form
+
+__Step 4:__ Once the form is submitted, the Action button will provide three
+choices.i) Maintenance Visit ii) Maintenance Schedule iii) Invoice.
+
+
+
+> **Note 1:**
+By clicking on the Action button and selecting 'Maintenance Visit' you can directly fill the visit form. The Sales Order details will be fetched directly.
+
+> **Note 2:**
+By clicking on the Action button and selecting 'Maintenance Schedule' you can fill the schedule details. The Sales Order details will be fetched directly.
+
+> **Note 3:**
+By clicking on the Invoice button you can make an Invoice for your
+services . The sales orders details will be fetched directly.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/index.md b/erpnext/docs/user/manual/en/selling/setup/index.md
new file mode 100644
index 0000000..0ab4b5a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/index.md
@@ -0,0 +1,7 @@
+This section includes information on how to setup customer groups, sales partners, sales persons and terms and conditions.
+
+It has instructions on how to configure selling settings, in order to enable default fields.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/selling/setup/index.txt b/erpnext/docs/user/manual/en/selling/setup/index.txt
new file mode 100644
index 0000000..67a93e5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/index.txt
@@ -0,0 +1,8 @@
+selling-settings
+sales-partner
+shipping-rule
+product-bundle
+item-price.md
+sales-person-target-allocation.md
+item-price.md
+sales-person-target-allocation.md
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
new file mode 100644
index 0000000..b877e8d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md
@@ -0,0 +1,43 @@
+Item Price is the record in which you can log sellig and buying rate of an item.
+
+There are two ways to reach to new Item Price form.
+
+> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price
+
+Or
+
+> Item >> Add/Edit Prices >> Click on "+" >> New Item Price
+
+Following are the steps to create new Item Price.
+
+Step 1: Select Price List
+
+You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
+
+
+
+On selection of Price List, its currency and for selling or buying property will be fetched as well.
+
+To have Item Price fetching in the sales or purchase transaction, you should have Price List id selected in the transaction, just above Item table.
+
+Step 2: Select Item
+
+Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
+
+
+
+Step 3: Enter Rate
+
+Enter selling/buying rate of an item in Price List currency.
+
+
+
+Step 4: Save Item Price
+
+To check all Item Price together, go to:
+
+Stock >> Main Report >> Itemwise Price List Rate
+
+You will find option to create new Item Price record (+) in this report as well.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
new file mode 100644
index 0000000..fa7f948
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
@@ -0,0 +1,47 @@
+#Product Bundle
+
+Product Bundle stands for Sales Bill-of-Material. It's a master where you can list item which are bundled together and
+sold as one item. For instance, when laptop is delivered, you need to ensure that charger, mouse and laptop bag are
+delivered and stock level of these items gets affected. To address this scenario, you can set create Product Bundle for
+the main item, i.e. laptop, and list deliverable items i.e. laptop + charger + other accessories as child items.
+
+Following are the steps on how to setup Product Bundle master, and how is it used in the sales transactions.
+
+####Create new Product Bundle
+
+To create new Product Bundle, Go to:
+
+Selling > Setup > Product Bundle > New
+
+<img class="screenshot" alt="Product Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.png">
+
+###Select Parent Item
+
+In Product Bundle master, there are two sections. Product Bundle Item and Package Item.
+
+In Product Bundle item, you will select a Parent Item. The parent item must be a <b>non-stock item</b>.
+This is non-stock item because there is no stock maintained for it but only the Package Items.
+If you want to maintain stock for the Parent Item, then you must create a regular Bill of Material (BOM)
+and package them using a Stock Entry Transactions.
+
+###Select Child Items
+
+In Package Item section, you will list all the child items for which we maintain stock and is delivered to customer.
+
+###Product Bundle in the Sales Transactions
+
+When making Sales transactions like Sales Invoice, Sales Order and Delivery Note,
+Parent Item will be selected in the main item table.
+
+<img class="screenshot" alt="Product Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.gif">
+
+On selection on Parent Item in the main item table, its child items will be fetched in Packing List
+table of the transaction. If child item is the serialized item, you will be able to specify its Serial Mo.
+in packing List table itself. On submission of transaction, system will reduce the stock level of child items from
+warehouse specified in Packing List table.
+
+<div class="well"><b>Use Product Bundle to Manage Schemes:</b>
+<br>
+This work-around in Product Bundle was discovered when a customer dealing into nutrition product asked for feature to manage schemes like "Buy One Get One Free". To manage the same, he created a non-stock item which was used as Parent Item. In description of item, he entered scheme details with items image indicating the offer. The saleable product was selected in Package Item where qty was two. Hence every time they sold one qty of Parent item under scheme, system deducted two quantities of product from Warehouse.</div>
+
+{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
new file mode 100644
index 0000000..1174969
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
@@ -0,0 +1,34 @@
+People who assist you in getting business are termed as Sales Partners. Sales Partners can be represented by different names in ERPNext. You can call them Channel Partner, Distributor, Dealer, Agent, Retailer, Implementation Partner, Reseller etc.
+
+For each Sales Partner, you can define commission offer to them. When Sales Partner is selected in transactions, there commission is calculated over Net Total of Sales Order/Invoice or Delivery Note.
+
+You can track Sales Personwise commission in the report under Selling module.
+
+To create a sales partner go to:
+
+`Selling > Setup > Sales Partner`
+
+Sales Partners are saved with Sales Partner name provided by user.
+
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/selling/sales-partner.png">
+
+You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount.
+
+### Including Sales Partners in Your Website
+
+To include the name of your Partner on your website, check the "Show in
+Website" box. When click on "Show in Website", you will see field where you can attach logo of partner's company and enter brief and introduction of partner.
+
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/selling/sales-partner-website.png">
+
+To see listing of partner, you should go to:
+
+https://example.erpnext.com/partners
+
+
+
+Following is the complete partners details published on the website.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
new file mode 100644
index 0000000..134a9b4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -0,0 +1,86 @@
+With management of Sales Person, ERPNext also allow you to assign target to Sales Persons based on Item Group and Territory. Based on target allocated and actual sales booked by Sales Person, you will get target variance report for the Sales Person.
+
+###1. Sales Person - Item Groupwise Target Allocation
+
+####1.1 Open Sales Person's Master
+
+To allocate target, you should open specific Sales Person master.
+
+`Selling > Setup > Sales Person > (Open Sales Person)`
+
+####1.2 Allocate Item Groupwise Target
+
+In the Sales Person master, you will find table called Sales Person Target.
+
+
+
+In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
+
+<div class=well>You can give target in amount or quantity, or in both. Item Group can also be left blank. In this case the system will calculate target based on all the Items.</div>
+
+####1.3 Target Distribution
+
+If you wish to spread allocated target across months, then you shoult setup Target Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation).
+
+
+
+####Report - Sales Person Target Variance Item Groupwise
+
+To check this report, go to:
+
+`Selling > Standard Report > Sales Person Target Variance (Item Group-wise)'
+
+This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
+
+
+
+As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report.
+
+---
+
+###2. Sales Person - Territorywise Target Allocation
+
+To allocate target to Sales Person based on Territory, you can should select specific Sales Person in the Territory master. This Sales Person is entered just for the reference. Sales Person details are not updated in the variance report of Territorywise Target Allocation.
+
+####2.1 Go to Territory master
+
+`Selling > Setup > Territory > (Open specific Territory master)`
+
+In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
+
+
+
+####2.2 Allocating Target
+
+Allocation Target in the Territory master is same as in Sales Person master. You can follow same steps as given above to specify target in the Territory master as well.
+
+####2.3 Target Distribution
+
+Using this master, you can divide target Qty or Amount across various months.
+
+####2.4 Report - Territory Target Variance Item Groupwise
+
+This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report.
+
+
+
+---
+
+###3. Target Distribution
+
+Target Distribution master allows you to divide allocated target across multiple months. If your product and services is seasonal, you can distribute the sales target accordingly. For example, if you are into umbrella business, then target allocated in the monsoon seasion will be higher than in other months.
+
+To create new Budget Distriibution master, go to:
+
+`Accounts > Setup > Budget Distributon`
+
+
+
+You can link target distribution while allocation targets in Sales Person as well as in Territory master.
+
+###See Also
+
+1. [Managing Sales Person](https://erpnext.com/selling/selling-setup/sales-person)
+2. [Using Sales Person in transactions](https://erpnext.com/kb/selling/managing-sales-persons-in-sales-transactions)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/selling-settings.md b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
new file mode 100644
index 0000000..d5d7117
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
@@ -0,0 +1,71 @@
+Selling Setting is where you can define propertiese which will be applied in your selling transactions.
+Let's check into each property one by one.
+
+<img class="screenshot" alt="Selling Settings" src="{{docs_base_url}}/assets/img/selling/selling-settings.png">
+
+####1. Customer Naming By
+
+When customer is saved, system generated unique ID for that Customer. Using that Customer ID,
+you can select Customer in other transactions.
+
+Bydefault Customer will be saved with Customer Name. If you wish to save Customer using
+a naming series, you should set Customer Naming By as "Naming Series".
+
+Example of Customer Id's saved in Naming Series - `CUST00001,CUST00002, CUST00003...` and so on.
+
+You can set Naming Series for customer naming from:
+
+> Setup > Settings > Naming Series`
+
+####2. Campaign Naming By
+
+Just like for Customer, you can also configure as how ID will be generated for the Campaign master.
+Bydefault Campaign will be saved with Campaign Name provided while its creation.
+
+####3. Default Customer Group
+
+Customer Group in this field will be auto-updated when you open new Customer form.
+While converting Quotation created for Lead into Sales Order, system attempts to convert
+Lead into Customer in the backend. While creating Customer in the backend, system pickup
+Customer Group and Territory as defined in the Selling Setting. If system doesn't find
+any values, then following validation message will be raised.
+To resolve this, you should:
+Either manually convert Lead into Customer, and define Customer Group and Territory manually while
+creating Customer or define Default Customer Group and Territory in the Selling Setting.
+Then you should have Lead automatically converted into Customer when convert Quotation into Sales Order.
+
+####4. Default Territory
+
+Territory defined in this field will be auto-updated in the Territory field of Customer master.
+
+Just like Customer Group, Territory is also checked when system tries creating Customer in the backend.
+
+####5. Default Price List
+
+Price List set in this field will be auto-updated in the Price List field of Sales transactions.
+
+####6. Sales Order Required
+
+If you wish to make Sales Order creation mandatory before creation of Sales Invoice, then you should
+set Sales Order Required field as Yes. Bydefault, this will be "No" for a value.
+
+####7. Delivery Note Required
+
+To make Delivery Note creation as mandatory before Sales Invoice creation, you should set
+this field as "Yes". It will be "No" by default.
+
+####8. Maintain Same Rate Throughout Sales Cycle
+
+System bydefault validates that item price will be same throughout sales cycle
+(Sales Order - Delivery Note - Sales Invoice). If you could have item price changing within the cycle,
+and you need to bypass validation of same rate throughout cycle, then you should uncheck this field and save.
+
+####9. Allow User to Edit Price List Rate in Transaction
+
+Item table of the sale transactions has field called Price List Rate. This field be non-editale
+by default in all the sales transactions. This is to ensure that price of an item is fetched from
+Item Price record, and user is not able to edit it.
+
+If you need to enable user to edit Item Price, fetched from Price List of an item, you should uncheck this field.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
new file mode 100644
index 0000000..c4369cb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
@@ -0,0 +1,6 @@
+Using Shipping Rule you can define the cost for delivering the product to the customer.
+You can define different shipping rules for the same item across different territories.
+
+<img class="screenshot" alt="Shipping Rule" src="{{docs_base_url}}/assets/img/selling/shipping-rule.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
new file mode 100644
index 0000000..c65cc8b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
@@ -0,0 +1,17 @@
+<h1>Change Password</h1>
+
+Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password.
+
+
+####Step 1: Go to My Setting.
+
+
+
+####Step 2: Set New Password.
+
+
+
+Enter the new password and save the form to save changes.
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
new file mode 100644
index 0000000..04e5203
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
@@ -0,0 +1,20 @@
+<h1>Delete All Related Transactions for a Company</h1>
+
+Often, users setup all the master data and then create a few dummy records. Then they want to delete the dummy records and the company and start over again, keeping the other master data like Customers, Items, BOMs intact.
+
+Version 5 onwards, you can now delete all dummy transactions related to a company.
+
+To do that, open the company record.
+
+`Setup > Accounts > Company` or `Accounts > Setup > Company`
+
+In Company master, click on the **Delete Company Transactions** button right at the bottom of the form. Then you must re-type the company name to confirm if you are sure you want to continue with this.
+
+This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful
+
+
+
+
+**Note:** If you want to delete the company record itself, the use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
new file mode 100644
index 0000000..366d8a3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
@@ -0,0 +1,28 @@
+<h1>Edit Submitted Document</h1>
+
+ To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
+<br>
+<br><b>Step 1: Cancel Submitted Document</b><br>
+<br>You will find Cancel button on upper right corner of submitted document.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_001.png">
+<br>
+<br><b>Step 2: Amend the document</b><br>
+<br>On cancellation of submitted document, <b>Amend</b> button will be became visible.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_00256341a.png">
+<br>
+<br><b>Step 3: Save and Submit the document</b><br>
+<br>On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_0036e00ef.png">
+<br>
+<br><div class="well">Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. Example:<br><br>If you have created Delivery Note and Sales Invoice against Sales Order, which you need to amend, then you should first Cancel Delivery Note and Sales Invoice made for that Sales Order. Then amend Sales Order, re-save and re-submit it.<br>
+</div><br>
+<br>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.md b/erpnext/docs/user/manual/en/setting-up/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
new file mode 100644
index 0000000..6f99f89
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
@@ -0,0 +1,13 @@
+change-password
+delete-a-company-and-all-related-transactions
+edit-submitted-document
+integrating-erpnext-with-other-application
+manage-header-and-footer
+managing-multiple-companies
+managing-perm-level
+managing-tree-structure-masters
+naming-series-current-value
+overwriting-data-from-data-import-tool
+rename-user
+setting-up-dropbox-backups
+using-custom-domain-on-erpnext
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md b/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md
new file mode 100644
index 0000000..1b7adf4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md
@@ -0,0 +1,14 @@
+<h1>Integrating ERPNext with other Applications</h1>
+
+For now, ERPNext doesn't have out-of-the-box integration available for the third party applications. However, Frappe has REST API using which you can get ERPNext integrated with any other solution.
+
+Learn more about Frappe API here.
+
+[https://frappe.io/help/rest_api](https://frappe.io/help/rest_api)
+
+For experts services on integration, you can connect with our service providers from community portal.
+
+[https://frappe.io/community/service-providers](https://frappe.io/community/service-providers)
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
new file mode 100644
index 0000000..eee9618
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
@@ -0,0 +1,4 @@
+<h1>Manage Header And Footer</h1>
+
+<h1>Manage Header And Footer</h1>
+
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
new file mode 100644
index 0000000..dc9f667
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
@@ -0,0 +1,42 @@
+<h1>Managing Multiple Companies</h1>
+
+<h1>Managing Multiple Companies</h1>
+
+ERPNext allows you to create multiple companies in the same/common ERPNext account.
+
+With this, you will find option to select Company in your transactions. While most of the transactions will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which can be used across all the companies.
+
+If you have separate teams working on each company, you can also restrict the access of user to the data of specific company. Click [here](https://manual.erpnext.com/search?txt=user%20permission) to know more about how to set permission to achieve the same.
+
+Following are the steps to create companies in your ERPNext account.
+
+####Go to Setup Module
+
+`Setup > Masters > Company > New`
+
+####Enter Company Details
+
+Company master will be saved with Company Name provided at the time of its creation.
+
+
+
+Also, you can define other properties for new company like:
+
+* Country
+* Currency
+* Default Cash and Bank Account
+* Income/Expense Account
+* Company Registration Details
+
+Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement.
+
+
+
+####Chart of Account for New Company
+
+A separate Chart of Account master will be set for each company in the ERPNext. This allows you managing Accounts/Ledger master separately for each company. Also it allows you avail financial statement and reports like Balance Sheet and Profit and Loss Statement separately for each company.
+
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
new file mode 100644
index 0000000..c44d1ea
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -0,0 +1,27 @@
+<h1>Managing Perm Level in Permission Manager</h1>
+
+<h1>Managing Perm Level in Permission Manager</h1>
+
+In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.
+
+Perm Level for a field can be defined in the [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+
+
+
+If you need to assign different permission of particular field to different users, you can achieve it via Perm Level. Let's consider an example for better understanding.
+
+Delivery Note is accessible to Stock Manager as well as Stock User. You don't wish Stock User to access Amount related field in Delivery Note, but other field should be visible just like it is visible Stock Manager.
+
+For the amount related fields, you should set Perm Level as (say) 2.
+
+For Stock Manager, they will have permission on fields on Delivery Note as Perm Level 2 whereas a Stock User will not have any permission on Perm Level 2 for Delivery Note.
+
+
+
+Considering the same scenario, if you want a Stock User to access a field at Perm Level 2, but not edit it, the Stock User will be assigned permission on Perm Level 2, but only for read, and not for write/edit.
+
+
+
+Perm Level (1, 2, 3) not need be in order. Perm Level is primarily for grouping number of fields together, and then assigning permission to Roles for that group. Hence, you can set any perm level for an item, and then do permission setting for it.
+
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
new file mode 100644
index 0000000..0de7869
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
@@ -0,0 +1,58 @@
+<h1>Managing Tree Structure Masters</h1>
+
+<h1>Managing Tree Structure Masters</h1>
+
+Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent masters, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy.
+
+Following is the partial list of masters which are maintained in the tree structure.
+
+* Chart of Accounts
+
+* Chart of Cost Centers
+
+* Customer Group
+
+* Territory
+
+* Sales Person
+
+* Item Group
+
+Following are the steps to manage and create record in the tree structured master. Let's consider Territory master to understand managing tree masters.
+
+####Step 1 : Go to Master
+
+`Selling > Setup > Territory`
+
+Also you can type master name in Awesome Bar to go to the related master.
+
+Tree master allows you to set Parent Territories, and Child Territories Groups under those Parents.
+
+####Step 2 : New Parent Territory
+
+
+
+When click on Parent Territory, you will see option to add child territory under it. All default Territory groups will be listed under parent group called "All Territories". You can add further parent or child Territory Groups under it.
+
+####Step 3: Name The Territory Group
+
+When click on Add Child, a dialog box will provide two fields.
+
+**Territory Group Name**
+
+Territory will be saved with Territory Name provided here.
+
+**Group Node**
+
+If Group Node selected as Yes, then this Territory will be created as Parent, which means you can further create sub-territories under it. If select No, then it will become child Territory which you will be able to select in another masters.
+
+<div class="well">Only child Territory Groups are selectable in another masters and transactions.</div>
+
+
+Following is how Child Territories will be listed under a Parent Territory.
+
+
+
+Following this steps, you can manage other tree masters in ERPNext.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
new file mode 100644
index 0000000..47cf1a4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
@@ -0,0 +1,63 @@
+<h1>Setting the Current Value for Naming Series</h1>
+
+<h1>Setting the Current Value for Naming Series</h1>
+
+Naming Series feature allows you to define prefix for number series of documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO00001, SO00002... and so on. Click [here](https://erpnext.com/user-guide/setting-up/document-naming-series) to learn how you can customize Number Series for a transaction/master in ERPNext.
+
+### 1. Setting the Current Value
+
+Naming Series feature also offers a tool where you can set Current Value for specific prefix. This is generally required if you have recently started using ERPNext, and have old transactions in the previous system, and you want the numbering series to start in from where it ended in the old system. Let's consider a scenario to learn this better.
+
+For example, you have 322 Sales Orders created in your old system with SO00322 as highest Sales Order Id. In ERPNext, you need the first Sales Order to pick up #323 when it is saved. To enable this, you should set Current Value for SO series in following steps.
+
+#### Go to Naming Series Tool
+
+`Setup > System > Naming Series`
+
+#### Update Series Section
+
+
+
+#### Select Prefix
+
+Considering our scenario, prefix for Sales Order will be "SO".
+
+
+
+#### Current Value
+
+If you have currently 12 Sales Orders created in your account, then current value updated will be 12. You can edit Current Value to 322, and then click on Update Series Number.
+
+
+
+With this setting, you will have numbering for the New Sales Orders starting with #323.
+
+### 2. Error Due Series Number
+
+If you receive a Duplicate Name error while saving a transaction, for example, while saving Item Price, you receive an error saying:
+
+`Duplicate name Item Price RFD/00016`
+
+This error message indicates that when you are saving Item Price, system is trying to allocate "RFD/00016" to that Item Price record. But it is finding that Item Price with this ID is already existing in your system.
+
+This error could arise because Current Value for Series/Prefix of Item Price is disturbed and not in sync with actual Current Value. While actual Current Value for Item Price could be 20 (or any number more than 16), someone has set Current Value for this series as 15.
+
+To confirm actual Current Value for particular Series, you should check report for document in question (Item Price in this case), and check for the Item Price ID with highest value.
+
+Let's assume we find that actual Current Value for Item price is 22, then you go Naming Series, and set Current Value for the Prefix/Series of Item Price to 22, and Update Series Number.
+
+These instructions is applicable for all the documents in ERPNext for which user can customize Series and its Current Value.
+
+Let's consider another scenario to learn this better. On assigning a document to another user, error message says:
+
+`Duplicate name ToDo TDI00014286`
+
+This indicate the Current Value for Series/Prefix of ToDo (TDI) has been disturbed. You should follow these steps to correct value for Current Value for TDI prefix.
+
+1. Check ToDo report for the highest ToDo id value.
+1. Setup >> Settings >> Naming Series
+1. Check section B of Update Series
+1. Select Prefix for ToDo "TDI"
+1. Ensure that highest number for ToDo is updated as Current Value in Naming Series. If not, correct Current Value, and click on "Update Series Numbering".
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html
new file mode 100644
index 0000000..1ae6cb5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html
@@ -0,0 +1,11 @@
+<h1>Overwriting Data from Data Import Tool</h1>
+
+<h1>Overwriting Data from Data Import Tool</h1>
+
+Data Import Tool allows importing documents (like customers, Suppliers, Orders, Invoices etc.) from spreadsheet file into ERPNext. The very same tool can also be used for overwrite values in the existing documents.
+<br>
+<br><div class="well">Over-writing data from Data Import Tool works only for Saved transactions, and not for Submitted ones.</div>
+Let's assume there are no. of items for which we need to overwrite Item Group.
+Following are the steps to go about overwriting Item Groups for existing Items.<br><br><h4>Step 1: Download Template</h4><br>Template Used for overwriting data will be same as one used for importing new items. Hence, you should first download template from.<br><br>Setup >> Data >> Import/Export Data<br><br>Since items to be over-written will be already available in the system, while downloading template, "Download with data" field should be checked. With this, we will have all the existing items being downloaded with the template.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_285.png"><br><br><h4>Step 2: Prepare Data</h4><br>In the download template, We will only keep rows of the items to be worked on and delete the rest. Then we will enter new value in the Item Group column for an item. Since Item Group is a master in itself, we should ensure that Item Group entered in the excel file is already available in the Item Group master as well.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_287.png"><br><br>Since we are overwriting only Item Group, only following columns will be mandatory.<br><br><ol><li>Column A (since it has main values of template)<br></li><li>Name (Column B)<br></li><li>Item Group<br></li></ol>Columns of other field which won't have any impact of overwriting can be
+ removed, even if they are mandatory. This is applicable only for
+overwriting, and not when importing new records.<br><br><h4>Step 3: Import Data</h4><br>Once excel file is ready for importing, come back to Data Import Tool in ERPNext. We should first browser and select the File/template which has data to be overwritten. "Overwrite" field should be checked since we are overwriting Item Group in the existing items.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_288.png"><br><br><h4>Step 4: Upload</h4><br>On clicking Upload and Import, if values as provided in the spreadsheet file is validated, it will be successfully updated in the item master.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_289.png"><br><br>If validation of values fails, then it will indicate row no. of spreadsheet for which validation failed and needs correction. In that case, you should corrected value in that row, and then try importing/uploading file again. If validation fails for even one row, none of the records are imported/updated.<br>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
new file mode 100644
index 0000000..51fb637
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
@@ -0,0 +1,31 @@
+<h1>Rename User</h1>
+
+<h1>Rename User</h1>
+
+Renaming functionality allows you to edit id of specific record. User is saved with person's email id. Only User with System Manager's role will be able to rename User IDs.
+
+Following are the steps to rename user id.
+
+#### Step 1: Go to User List
+
+Setup > Users > User
+
+Click to open user id you want to rename.
+
+#### Step 2: Go to Menu and click on Rename option.
+
+When will you click on Rename option, pop up will open on same form.
+
+<img src="{{docs_base_url}}/assets/img/articles/Selection_019811b13.png">
+
+
+#### Step 3: Enter new user ID and Press Rename Button.
+
+
+<img src="{{docs_base_url}}/assets/img/articles/Selection_021ac61a5.png">
+
+After successful renaming user can login to their ERPNext account with new ID.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
new file mode 100644
index 0000000..1b7e4f7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
@@ -0,0 +1,74 @@
+<h1>Setting Up Dropbox Backups</h1>
+
+<h1>Setting Up Dropbox Backups</h1>
+
+<p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;">If you wish to store your backups on a periodic basis,on Dropbox, you can do it directly through ERPNext.</p>
+<blockquote style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px; background-color: rgb(247, 247, 247);">
+ <p>Setup > Manage 3rd Party Backups</p>
+</blockquote>
+<p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;"><strong>Step 1:</strong> Click on Integrations > Backup Manager
+ <br>
+</p>
+<br>
+<div>
+ <p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;">In the Backup Manager page, enter the email addresses of those people whom you wish to notify about the upload status. Under the topic 'Sync with Dropbox', select whether you wish to upload Daily, Weekly or Never.</p>
+ <p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;"><strong>Step 2</strong> Click on <strong>Allow Dropbox Access</strong>.</p>
+ <blockquote style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px; background-color: rgb(247, 247, 247);">
+ <p>Tip: In future, if you wish to discontinue uploading backups to dropbox, then select the Never option.</p>
+ </blockquote>
+ <img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-09-23 at 1.02.52 pm.png">
+</div>
+<div>
+ <br>
+</div>
+<div><b>
+ Step 3</b>
+ <br>
+</div>
+<div>
+ <p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;">You need to login to your dropbox account, with your user id and password.</p>
+</div>
+<div>
+ <img src="{{docs_base_path}}/assets/img/articles/dropbox-access.png" style="line-height: 1.42857143;">
+ <br>
+</div>
+<div>
+ <br>
+ <hr>
+</div>
+<div>
+ <h3 style="font-family: 'Noto Sans', Helvetica, Arial, sans-serif; color: rgb(51, 51, 51);">Open Source Users</h3>
+
+</div>
+<div>
+ <br>
+</div>
+<div><b>Step 1: </b>Go to <a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
+
+</div>
+<div><b>Step 2:</b> Create a new app</div>
+<div>
+ <img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-11 at 11.22.38 pm.png">
+ <br>
+</div>
+<div><b>Step 3: </b>Fill in details for the app.</div>
+<div>
+ <img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-11 at 11.23.32 pm.png">
+ <br>
+</div>
+<div>
+ <br>
+</div>
+<div><b>Step 4: </b>After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows,</div>
+<div>
+ <br>
+</div>
+<div><pre><code>{
+ "db_name": "demo",
+ "db_password": "DZ1Idd55xJ9qvkHvUH",
+ "dropbox_access_key": "ACCESSKEY",
+ "dropbox_secret_key": "SECRECTKEY"
+} </code></pre>
+ <br>
+</div>
+<div><b>Step 5: </b>Setup dropbox backups from the backup manager as shown in previous section.</div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md b/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
new file mode 100644
index 0000000..ff631b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
@@ -0,0 +1,13 @@
+<!-- markdown -->
+
+If you have subscribed to any of the plans at [ERPNext](https://erpnext.com), you can have us serve your site on your custom domain (for example at http://example.com). This enables your website to be served on a custom domain.
+
+To enable this feature, you will first have to edit DNS settings of your domain as follows.
+
+- Make a CNAME record for a subdomain (www in most cases) to {youraccountname}.erpnext.com
+- If you want serve the website on a naked domain (ie. http://example.com), set a URL redirect to http://www.example.com and not a CNAME record. Making a CNAME record in this case can have unexpected consequences including you not being able to receive emails anymore.
+
+After you've setup the DNS records, you will have to raise a support ticket by sending an email to support@erpnext.com and we'll take it from there.
+
+**Note**: We do not support HTTPS on custom domains. HTTPS enables end to end encryption (from your browser to our server). Although not critical for the website but we strongly recommend against using the ERPNext app over an unencrypted protocol. To be safe always use the ERP at your erpext.com address.
+
diff --git a/erpnext/docs/user/manual/en/setting-up/authorization-rule.md b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
new file mode 100644
index 0000000..6b79b6d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
@@ -0,0 +1,43 @@
+Authorization Rule is a tool to define rule for conditional authorization.
+
+If you sales and purchase transactions of higher value or discount requires an authorization from senior manager, you can set authorization rule for it.
+
+To create new Authorization Rule, go to:
+
+> Setup > Customize > Authorization Rule
+
+Let's consider an example of Authorization Rule to learn better.
+
+Assume that Sales Manager needs to authorize Sales Orders, only if its Grand Total value exceeds 10000. If Sales Orer values is less than 10000, then even Sales User will be able to submit it. It means Submit permision of Sales User will be restricted only upto Sales Order of Grand Total less than 10000.
+
+**Step 1:**
+
+Open new Authorization Rule
+
+**Step 2:**
+
+Select Company and Transaction on which Authorization Rule will be applicable. This functionality is available for limited transactions only.
+
+**Step 3:**
+
+Select Based On. Authorization Rule will be applied based on value selected in this field.
+
+**Step 4:**
+
+Select Role on whom this Authorization Rule will be applicable. As per the example considered, Sales User will be selected as Application To (Role). To be more specific you can also select Applicale To User, if you wish to apply to rule for specific Sales User, and not all Sales User. Its okay to not select Sales User, as its not mandatory.
+
+**Step 5:**
+
+Select approvers Role. It will be Sales Manager role which if assigned to user, will be able to submit Sales Order above 10000. Also you can select specific Sales Manager, and then rule should be applicable for that User only. Selecting Approving User field is not mandatory.
+
+**Step 6:**
+
+Set Above Value. Given the exmaple, Above Value will be set as 10000.
+
+<img class="screenshot" alt="Authorization Rule" src="{{docs_base_url}}/assets/img/setup/auth-rule.png">
+
+If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message.
+
+>If you wish to restrict Sales User from submitting Sales Orders, then instead of creating Authorization Rule, you should remove submit previledge from Role Permission Manager for Sales User.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/bar-code.md b/erpnext/docs/user/manual/en/setting-up/bar-code.md
new file mode 100644
index 0000000..2077842
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/bar-code.md
@@ -0,0 +1,50 @@
+A Barcode is a machine-readable code in the form of numbers and a pattern of
+parallel lines of varying widths, printed on a commodity and used especially
+for stock control.
+
+When you purchase an item from any store, you will notice a label with thin,
+black lines across it, along with a variation of different numbers. This label
+is then scanned by the cashier, and the item's description and price
+automatically comes up. This set of lines and numbers on the label are termed
+as bar-code.
+
+A bar-code machine scans the number from the label of an Item. To work with
+ERPNext and the bar-code mechanism, connect the bar-code machine to your
+operating hardware. Then go to ERPNext setup and activate bar-code by going to
+tools and clicking on 'hide / unhide features'. Under Materials, feature
+setup, check the box that says Item Barcode.
+
+> Setup > Customize > Hide/ Unhide Features > Item Barcode.
+
+#### Figure 1: Check the box 'Item Barcode'
+
+<img class="screenshot" alt="Barcode" src="{{docs_base_url}}/assets/img/setup/barcode-1.png">
+
+
+To start scanning with a bar-code, go to
+
+> Accounts > Sales Invoice
+
+Under Item, click on Add new row. The item row will expand to show new fields.
+Place your cursor on the bar-code field and begin scanning. The bar-code will
+be updated in the field. Once the bar-code is entered, all the Item details
+will be fetched automatically by the system.
+
+For more ease, activate the POS view in ERPnext. The activation process is
+same as the bar-code activation. Go to Setup and click on 'hide/unhide
+features'. Check the 'POS view' box.
+
+Then go to Accounts and click on Sales Invoice. Check the box 'Is POS'
+
+
+#### Figure 2: Check the box 'Is POS'
+
+<img class="screenshot" alt="Barcode" src="{{docs_base_url}}/assets/img/setup/barcode-2.png">
+
+
+Go to Item and click on Add new row.
+
+The cursor will automatically be placed in the bar-code field. Thus you can
+immediately scan the bar-code and proceed with your operations.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md b/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
new file mode 100644
index 0000000..72f36c0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
@@ -0,0 +1,22 @@
+Can be used in any Sales Transaction with **Sales Team** Table:
+
+
+
+ cur_frm.cscript.custom_validate = function(doc) {
+ // calculate incentives for each person on the deal
+ total_incentive = 0
+ $.each(wn.model.get("Sales Team", {parent:doc.name}), function(i, d) {
+
+ // calculate incentive
+ var incentive_percent = 2;
+ if(doc.grand_total > 400) incentive_percent = 4;
+
+ // actual incentive
+ d.incentives = flt(doc.grand_total) * incentive_percent / 100;
+ total_incentive += flt(d.incentives)
+ });
+
+ doc.total_incentive = total_incentive;
+ }
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/company-setup.md b/erpnext/docs/user/manual/en/setting-up/company-setup.md
new file mode 100644
index 0000000..e73aa25
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/company-setup.md
@@ -0,0 +1,10 @@
+Enter your company details to complete Company Setup. Mention the type of
+business, under Domain. You can enter manufacturing, retail, or services
+depending on the nature of your business activity. If you have more than one
+companies, create the setup under the Company Setup page.
+
+After clicking on Setup, go to Masters and click on Company.
+
+> Setup > Masters > Company > New Company
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
new file mode 100644
index 0000000..499ee32
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
@@ -0,0 +1,17 @@
+# Bulk Renaming of Records
+
+You can rename a document if ERPNext (if it is allowed) by going to **Menu > Rename** in the document.
+
+Alternatively, if you want to rename a whole bunch of records, just go to:
+
+> Setup > Data > Rename Tool
+
+This tool will allow you to rename multiple records at the same time.
+
+### Example
+
+To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**.
+
+<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
new file mode 100644
index 0000000..e59ed21
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -0,0 +1,110 @@
+The Data Import Tool is a great way to upload (or edit) bulk data, specially
+master data, into the system.
+
+To Open the data import tool, you either go to Setup or go to the Transaction
+you want to Import. If Data Import is allowed, you will see an Import Button:
+
+<img alt="Start Import" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-1.png">
+
+The tool has two sections, one to download a template and the second to upload
+the data.
+
+(Note: Only those DocTypes are allowed for Import whose Document Type is
+"Master" or Allow Import property is set.)
+
+### 1\. Downloading The Template
+
+Data in ERPNext is stored in tables, much like a spreadsheet with columns and
+rows of data. Each entity in ERPNext can have multiple child tables associated
+with it too. The child tables are linked to the parent tables and are
+implemented where there are multiple values for any property. For example an
+Item can have multiple prices, An Invoice has multiple Items and so on.
+
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-2.png">
+
+ * Click on the table you want to download or "All Tables"
+ * For bulk editing, you can click on "Download With Data"
+
+### 2\. Fill in the Template
+
+After downloading the template, open it in a spreadsheet application and fill
+in the data below the column headings.
+
+
+
+Then export your template or save it as a **Comma Separated Values** (CSV)
+file.
+
+
+
+### 3\. Upload the .csv File
+
+Finally attach the .csv file in the section. Click on the "Upload and Import"
+button.
+
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-3.png">
+
+#### Notes:
+
+1. Make sure that if your application allows, use encoding as UTF-8.
+1. Keep the ID column blank for new records.
+
+### 4\. Uploading All Tables (Main + Child)
+
+If you select all tables, you will get columns belonging to all the tables in
+one row separated by `~` columns.
+
+If you have multiple child rows then you must start a new main item on a new
+row. See the example:
+
+
+ Main Table ~ Child Table
+ Column 1 Column 2 Column 3 ~ Column 1 Column 2 Column 3
+ v11 v12 v13 c11 c12 c13
+ c14 c15 c17
+ v21 v22 v23 c21 c22 c23
+
+> To see how its done, enter a few records manually using forms and export
+"All Tables" with "Download with Data"
+
+### 5\. Overwriting
+
+ERPNext also allows you to overwrite all / certain columns. If you want to
+update certain columns, you can download the template with data. Remember to
+check on the “Overwrite” box before uploading.
+
+> Note: For child records, if you select Overwrite, it will delete all the
+child records of that parent.
+
+### 6\. Upload Limitations
+
+ERPNext restricts the amount of data you can upload in one file. Though the
+number may vary based on the type of data. It is usually safe to upload around
+1000 rows of a table at one go. If the system will not accept, then you will
+see an error.
+
+Why is this? Uploading a lot of data can cause your system to crash, specially
+if there are other users doing things in parallel. Hence ERPNext restricts the
+number of “writes” you can process in one request.
+
+***
+
+#### How to Attach files?
+
+When you open a form, on the right sidebar, you will see a section to attach
+files. Click on “Add” and select the file you want to attach. Click on
+“Upload” and you are set.
+
+#### What is a CSV file?
+
+A CSV (Comma Separated Value) file is a data file that you can upload into
+ERPNext to update various data. Any spreadsheet file from popular spreadsheet
+applications like MS Excel or Open Office Spreadsheet can be saved as a CSV
+file.
+
+If you are using Microsoft Excel and using non-English characters, make sure
+to save your file encoded as UTF-8. For older versions of Excel, there is no
+clear way of saving as UTF-8. So save your file as a CSV, then open it in
+Notepad, and save as “UTF-8”. (Sorry blame Microsoft for this!)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/data/index.md b/erpnext/docs/user/manual/en/setting-up/data/index.md
new file mode 100644
index 0000000..60942fd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/index.md
@@ -0,0 +1,7 @@
+# Data Management
+
+You can import, export bulk edit data from and to spreadsheet files (**.csv**) from the Data Import Export Tool. This tool will be very helpful initially to setup your data from other systems.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/data/index.txt b/erpnext/docs/user/manual/en/setting-up/data/index.txt
new file mode 100644
index 0000000..998b5a2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/index.txt
@@ -0,0 +1,2 @@
+data-import-tool
+bulk-rename
diff --git a/erpnext/docs/user/manual/en/setting-up/email/.md b/erpnext/docs/user/manual/en/setting-up/email/.md
new file mode 100644
index 0000000..feb724f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/.md
@@ -0,0 +1,95 @@
+Emails are the nervous system of business communication and ERPNext has been
+designed to make good use of this.
+
+## Sending Emails
+
+You can email any document from the system, by clicking on the “Email” button
+on the right sidebar. Before that you will need to set your outgoing email
+settings (SMTP server).
+
+All emails sent from the system are added to the Communication table.
+
+> **Info:** What is SMTP? There are two types of email services, sending and
+receiving emails. Sending is done via a protocol called SMTP (Simple Mail
+Transfer Protocol) and the server (computer) that sends your email to its
+destination is called SMTP Server.
+
+
+Bulk Emails, especially those that are sent without consent (spam), are considered as bad behavior. While it may be okay to send emails to those who have “opted-in” to receive mails, it is very difficult for the internet community to know what is spam and what is allowed. To overcome this problem, most email servers share a black and white list of email senders. If your emails have been marked as spam, you will be blacklisted. So be careful. Many times, it may be a good idea to send email via whitelisted services also known as SMTP relay services which are paid services.These
+services will block you from sending spam while ensuring that most of your email does not go in the spam folder. There are many such services available like SendGrid and SMTP.com.
+
+To setup your outgoing mails, go to
+
+> Setup > Outgoing Email Settings
+
+#### Figure 1: Set up outgoing mail server.
+
+
+
+Set your outgoing mail server settings here. These are the same settings you
+would use in your Outlook, Thunderbird, Apple Mail or other such email
+applications. If you are not sure, get in touch with your email service
+provider.
+
+> **Tip:** If you are using EPRNext hosted service, keep the first section
+blank. Emails will still be sent from your email id, but via our SMTP relay
+service.
+
+### Creating Issues from Incoming Emails
+
+A very useful email integration is to sync the incoming emails from support
+inbox into Issue, so that you can track, assign and monitor support
+issues.
+
+> **Case Study:** Here at ERPNext, we have regularly tracked incoming support
+issues via email at “support@erpnext.com”. At the time of writing we had
+answered more than 3000 tickets via this system.
+
+To setup your Support integration, go to:
+
+> Setup > Support Email Settings
+
+#### Figure 2: Setup support Integration
+
+
+
+To make ERPNext pull emails from your mail box, enter the POP3 settings. (POP3
+is a way of extracting emails from your mailbox. It should be fairly easy to
+find out what your POP3 settings are. If you have problems, contact your email
+service provider). If you want to setup an auto reply, check on the “Send
+Autoreply” box and whenever someone sends an email, an autoreply will be sent.
+Add a custom signature which you want to send with your replies.
+
+### Setting Auto-notification on Documents
+
+ERPNext allows you to automatically email documents on “Submission” to the
+contact mentioned in the document. To set this up, go to:
+
+> Setup > Tools > Enable / Disable Notifications.
+
+#### Figure 3: Set Auto Notification
+
+
+
+Check on the transactions you want to send via email directly on Submission
+and add a custom message if you want on these documents.
+
+### Email Digests
+
+Email Digests allow you to get regular updates about your sales, expenses and
+other critical numbers directly in your Inbox.
+
+Set your frequency, check all the items you want to receive in your weekly
+update and select the user ids whom you want to send the Digest to.
+
+Email Digests are a great way for top managers to keep track of the big
+numbers like “Sales Booked” or “Amount Collected” or “Invoices Raised” etc.
+
+To setup Email Digests, go to:
+
+> Setup > Email Digest > New Email Digest
+
+#### Figure 4: Set up Email Digest
+
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
new file mode 100644
index 0000000..4392bf4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
@@ -0,0 +1,39 @@
+# Email Accounts
+
+You can manage multiple incoming and outgoing Email Accounts in ERPNext. There has to be atleast one default outgoing account and one default incoming account. If you are on the ERPNext cloud, the default outgoing email is set by us.
+
+> **Note for self implementers:** For outgoing emails, you should setup your own SMTP server or sign up with an SMTP relay service like mandrill.com or sendgrid.com that allows a larger number of transactional emails to be sent. Regular email services like GMail will restrict you to a limited number of emails per day.
+
+### Default Email Accounts
+
+ERPNext will create templates for a bunch of email accounts by default. Not all of them are enabled. To enable them, you must set your account details.
+
+There are 2 types of email accounts, outgoing and incoming. Outgoing email accounts use an SMTP service to send emails and emails are retrived from your inbox using a POP service. Most email providers such as GMail, Outlook or Yahoo provide these services.
+
+<img class="screenshot" alt="Defining Criteria" src="{{docs_base_url}}/assets/img/setup/email/email-account-list.png">
+
+### Outgoing Email Accounts
+
+All emails sent from the system, either by the user to a contact or notifications or transaction emails, will be sent from an Outgoing Email Account.
+
+To setup an outgoing Email Account, check on **Enable Outgoing** and set your SMTP server settings, if you are using a popular email service, these will be preset for you.
+
+<img class="screenshot" alt="Outgoing EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-sending.png">
+
+### Incoming Email Accounts
+
+To setup an incoming Email Account, check on **Enable Incoming** and set your POP3 settings, if you are using a popular email service, these will be preset for you.
+
+<img class="screenshot" alt="Incoming EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-incoming.png">
+
+### How ERPNext handles replies
+
+In ERPNext when you send an email to a contact like a customer, the sender will be the user who sent the email. In the **Reply-To** property, the email id will be of the default incoming account (like `replies@yourcompany.com`). ERPNext will automatically extract these emails from the incoming account and tag it to the relvant communication
+
+### Notification for unreplied messages
+
+If you would like ERPNext to notify you if an email is unreplied for a certain amount of time, then you can set **Notify if Unreplied**. Here you can set the number of minutes to wait before notifications are sent and whom the notifications must go to.
+
+<img class="screenshot" alt="Incoming EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-unreplied.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
new file mode 100644
index 0000000..f4cccd3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
@@ -0,0 +1,41 @@
+# Email Alerts
+
+You can configure various email alerts in your system to remind you of important activities such as:
+
+1. Completion date of a Task.
+1. Expected Delivery Date of a Sales Order.
+1. Expected Payment Date.
+1. Reminder of followup.
+1. If an Order greater than a particular value is received or sent.
+1. Expiry notification for a Contract.
+1. Completion / Status change of a Task.
+
+For this, you need to setup an Email Alert.
+
+> Setup > Email > Email Alert
+
+### Setting Up An Alert
+
+To setup an Email Alert:
+
+1. Select which Document Type you want watch changes on
+1. Define what events you want to watch. Events are:
+ 1. New: When a new document of the selected type is made.
+ 2. Save / Submit / Cancel: When a document of the selected type is saved, submitted, cancelled.
+ 3. Value Change: When a particular value in the selected type changes.
+ 4. Days Before / Days After: Trigger this alert a few days before or after the **Reference Date.** To set the days, set **Days Before or After**. This can be useful in reminding you of upcoming due dates or reminding you to follow up on certain leads of quotations.
+1. Set additional conditions if you want.
+1. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed email ids.
+1. Compose the message
+
+---
+
+### Example
+
+1. Defining the Criteria
+ <img class="screenshot" alt="Defining Criteria" src="{{docs_base_url}}/assets/img/setup/email/email-alert-1.png">
+
+1. Setting the Recipients and Message
+ <img class="screenshot" alt="Set Message" src="{{docs_base_url}}/assets/img/setup/email/email-alert-2.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-digest.md b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
new file mode 100644
index 0000000..5fa836e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
@@ -0,0 +1,17 @@
+# Email Digest
+
+Email Digests allow you to get regular updates about your sales, expenses and other critical numbers directly in your Inbox.
+
+Email Digests are a great way for top managers to keep track of the big numbers like “Sales Booked” or “Amount Collected” or “Invoices Raised” etc.
+
+To set up Email Digest, go to:
+
+> Setup > Email > Email Digest
+
+## Example
+
+Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to.
+
+<img class="screenshot" alt="Email Digest" src="{{docs_base_url}}/assets/img/setup/email/email-digest.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/index.md b/erpnext/docs/user/manual/en/setting-up/email/index.md
new file mode 100644
index 0000000..74ef1cc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/index.md
@@ -0,0 +1,7 @@
+# Email
+
+Email is at the heart of electronic communication and ERPNext is deeply integrated with Email. You can create multiple email accounts, automatically create transactions like Lead, Issue from incoming emails, send documents to your contacts via ERPnext. You can also setup email digests and email alerts to send you reminders.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/index.txt b/erpnext/docs/user/manual/en/setting-up/email/index.txt
new file mode 100644
index 0000000..b25c0d5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/index.txt
@@ -0,0 +1,6 @@
+email-account
+email-alerts
+email-digest
+sending-email
+setting-up-email.md
+setting-up-email.md
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
new file mode 100644
index 0000000..cabcff5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
@@ -0,0 +1,9 @@
+# Sending Email from any Document
+
+In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document.
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/email/send-email.gif">
+
+**Note:** You must have outgoing [email accounts]({{docs_base_url}}/user/guides/setting-up/email/email-account.html) setup for this.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/index.md b/erpnext/docs/user/manual/en/setting-up/index.md
new file mode 100644
index 0000000..9f5de0f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/index.md
@@ -0,0 +1,13 @@
+# Setting Up
+
+Setting up an ERP system is like starting your business all over again,
+although in the virtual world. Thankfully it is not as hard as the real
+business and you get to do a trial too!
+
+Implementation requires the implementer to take a step back and set aside some
+time to do this right. This is usually not a couple-of-hours, after-work kind
+of a project.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/index.txt b/erpnext/docs/user/manual/en/setting-up/index.txt
new file mode 100644
index 0000000..9237825
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/index.txt
@@ -0,0 +1,19 @@
+setup-wizard
+users-and-permissions
+settings
+data
+email
+print
+setting-up-taxes
+pos-setting
+price-lists
+authorization-rule
+sms-setting
+stock-reconciliation-for-non-serialized-item
+territory
+third-party-backups
+workflows
+bar-code
+company-setup
+calculate-incentive-for-sales-team
+articles
diff --git a/erpnext/docs/user/manual/en/setting-up/pos-setting.md b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
new file mode 100644
index 0000000..d04580c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
@@ -0,0 +1,23 @@
+# Point of Sale Setting
+
+POS includes advanced features to cater to different functionality, such as
+inventory management, CRM, financials, warehousing, etc., all built into the
+POS software. Prior to the modern POS, all of these functions were done
+independently and required the manual re-keying of information, which could
+lead to entry errors.
+
+If you are in retail operations, you want your Point of Sale to be as quick
+and efficient as possible. To do this, you can create a POS Setting for a user
+from:
+
+> Accounts > Setup > Point-of-Sale Setting
+
+Set default values as defined.
+
+<img class="screenshot" alt="POS Setting" src="{{docs_base_url}}/assets/img/pos-setting/pos-setting.png">
+
+> Important : If you specify a particular User, the POS setting will be
+applied only to that User. If the User option is left blank, the setting will
+be set for all users. To understand POS in detail visit [Point of Sale]({{docs_base_url}}/user/guides/accounts/point-of-sale-pos-invoice.html)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/price-lists.md b/erpnext/docs/user/manual/en/setting-up/price-lists.md
new file mode 100644
index 0000000..156e66d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/price-lists.md
@@ -0,0 +1,21 @@
+ERPNext lets you maintain multiple selling and buying prices for an Item using Price Lists. A PriceList is a name you can give to a set of Item prices.
+
+Why would you want Price Lists? You have different prices for different zones (based on the shipping costs), for different currencies etc.
+
+An Item can have multiple prices based on customer, currency, region, shipping cost etc, which can be stored as different rate plans. In ERPNext, you are required to store all the lists separately. Buying Price List is different from Selling Price List and thus is stored separately.
+
+You can create new Price List
+
+> Selling/Buying/Stock > Setup > Price List >> New
+
+<img class="screenshot" alt="Price List" src="{{docs_base_url}}/assets/img/price-list/price-list.png">
+
+* These Price List will be used when creating Item Price record to track selling or buying price of an item. Click here to learn more about Item Price.
+
+* To disable specific Price List, uncheck Enabled field in it. Disabled Price List will not be availale for selection in the Sales and Purchase transactions.
+
+* Standard Buying and Selling Price List are created by default.
+
+To disable specific Price List, uncheck Enabled field in it. Disabled Price List will not be availale for selection in the Sales and Purchase transactions.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/address-template.md b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
new file mode 100644
index 0000000..c2b9bb7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
@@ -0,0 +1,31 @@
+# Address Template
+
+Each region has its own way of defining Addresses. To manage multiple address formats for your Documents (like Quotation, Purchase Invoice etc.), you can create country-wise **Address Templates**.
+
+> Setup > Printing and Branding > Address Template
+
+A default Address Template is created when you setup the system. You can either edit or update it or create a new template.
+
+One template is default and will apply to all countries that do not have an specific template.
+
+#### Template
+
+The templating engine is based on HTML and the [Jinja Templating](http://jinja.pocoo.org/docs/templates/) system and all the fields (including Custom Fields) will be available for creating the template.
+
+Here is the default template:
+
+ {{ address_line1 }}<br>
+ {% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
+ {{ city }}<br>
+ {% if state %}{{ state }}<br>{% endif -%}
+ {% if pincode %}PIN: {{ pincode }}<br>{% endif -%}
+ {{ country }}<br>
+ {% if phone %}Phone: {{ phone }}<br>{% endif -%}
+ {% if fax %}Fax: {{ fax }}<br>{% endif -%}
+ {% if email_id %}Email: {{ email_id }}<br>{% endif -%}
+
+### Example
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/address-format.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.md b/erpnext/docs/user/manual/en/setting-up/print/index.md
new file mode 100644
index 0000000..1204cbc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.md
@@ -0,0 +1,7 @@
+# Printing and Branding
+
+Documents that you send to your customers carry your brand and image and they must be tailored to your requirements. ERPNext gives you many options so that you can set your oraganization's branding in your documents.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
new file mode 100644
index 0000000..0ddb217
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.txt
@@ -0,0 +1,6 @@
+print-settings
+print-format-builder
+print-headings
+letter-head
+address-template
+terms-and-conditions
diff --git a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
new file mode 100644
index 0000000..d3c24f2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
@@ -0,0 +1,23 @@
+# Letter Heads
+
+You can manage multiple letter heads in ERPNext. In a letter head you can:
+
+ * Create an image with your logo, brand and other information that you want to put on your letter head.
+ * Attach the image in your Letter Head record by clicking on image icon to automatically generate the HTML required for this Letter Head.
+ * If you want to make this the default letter head, click on “Is Default”.
+
+Your letter head will now appear in all Prints and Emails of documents.
+
+You can create / manage Letter Heads from:
+
+> Setup > Printing > Letter Head > New Letter Head
+
+### Example
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/letter-head.png">
+
+This is how the letter head looks in a document print:
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/letter-head-1.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
new file mode 100644
index 0000000..f979927
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
@@ -0,0 +1,37 @@
+# Print Format Builder
+
+The Print Format Builder helps you quickly make a simple customized Print Format by dragging and dropping data fields and adding custom text or HTML.
+
+You can create a new Print Format either by going to:
+
+> Setup > Printing and Branding > Print Format Builder
+
+or Open the document for which you want to make a print format. Click the Printer icon, or go to Menu > Print and click on the **Edit** button. Note: You must have System Manager permission to do this.
+
+### Step 1: Make a new Format
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-1.gif">
+
+### Step 2: Add a new Field
+
+To add a field, just drag it from the left sidebar and add it in your layout. You can edit the layout by clicking on the settings <i class="octicon octicon-gear"></i> icon.
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-2.gif">
+
+### Step 3
+
+To remove a field, just drag it back into the fields sidebar.
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-3.gif">
+
+### Step 4
+
+You can add customized text, HTML in your print format, just add the **Custom HTML** field (in dark colour) and add it to the the place where you want to add the text.
+
+Then click on **Edit HTML** to edit your content.
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-4.gif">
+
+To save your format, just click on the **Save** button on the top.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
new file mode 100644
index 0000000..98fbf53
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
@@ -0,0 +1,17 @@
+Print Headings are the names which you can give to your sales invoices,
+supplier quotations etc. You can create a list of names for different business
+communications.
+
+You can create print headings from :
+
+> Setup > Printing > Print Heading > New Print Heading
+
+#### Figure 1: Save Print Heading
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/print-heading.png">
+
+Example of a change in print heading is shown below:
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/print-heading-1.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-settings.md b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
new file mode 100644
index 0000000..cdf3c54
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
@@ -0,0 +1,11 @@
+# Print Settings
+
+In Print Settings you can set your default printing preferences like Paper Size, default text size, whether you want output as PDF or HTML etc.
+
+To edit print settings, go to:
+
+> Setup > Printing and Branding > Print Settings
+
+<img class="screenshot" alt="Print Settings" src="{{docs_base_url}}/assets/img/setup/print/print-settings.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
new file mode 100644
index 0000000..8c939d0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
@@ -0,0 +1,25 @@
+Terms and conditions are the general and special arrangements, provisions, requirements, rules, specifications, and standards that a company follows. These specifications are an integral part of an agreement or contract that the company gets into with its customers, suppliers or partners.
+
+### 1. Make a new Terms and Conditions
+
+To setup Terms and Condition master, go to:
+
+`Selling > Terms and Condition > New`
+
+<img class="screenshot" alt="Terms and Conditions" src="{{docs_base_url}}/assets/img/setup/print/terms-1.png">
+
+### 2. Editing in HTML
+
+Content of Terms and Condition can be formatted as per your preference, and also insert images where needed. If you have expertise in HTML, you will also find option to edit the content of Terms and Condition in HTML.
+
+<img class="screenshot" alt="Terms and Conditions, Edit HTML" src="{{docs_base_url}}/assets/img/setup/print/terms-2.png">
+
+This also allows you to use Terms and Condition master for footer, which otherwise is not availale in ERPNext as dedicated functionality. Since contents of Terms and Condition is always the last to appear in the print format, details of footer should be inserted at the end of the content, so that it actually appears as footer in the print format.
+
+### 3. Select in Transaction
+
+In transactions, you will find section of Terms and Condition where you will be able to search and fetched required Terms and Condition master.
+
+<img class="screenshot" alt="Terms and Conditions, Select in document" src="{{docs_base_url}}/assets/img/setup/print/terms-3.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
new file mode 100644
index 0000000..a3c11ab
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -0,0 +1,99 @@
+One of the primary motivator for compulsory use of accounting tools is
+calculation of Taxes. You may or may not make money but your government will
+(to help your country be safe and prosperous). And if you don’t calculate your
+taxes correctly, they get very unhappy. Ok, philosophy aside, ERPNext allows
+you to make configurable tax templates that you can apply to your sales or
+purchase.
+
+### Tax Accounts
+
+For Tax Accounts that you want to use in the tax templates, you must go to
+Chart of Accounts and mention them as type “Tax” in your Chart of Item.
+
+## Item Tax
+
+If some of your Items require different tax rates as compared to others,
+mention them in the Item tax table. Even if you have selected your sales and
+purchase taxes as default tax rates, the system will pull the Item tax rate
+for calculations. Item tax will get preference over other sales or purchase
+taxes. However, if you wish to apply default sales and purchase taxes, do not
+mention item tax rates in the Item master. The system will then select the
+sales or purchase tax rate specified by you as default rates.
+
+Item Tax table can be found as a section within the Item Master document.
+
+<img class="screenshot" alt="Item Tax" src="{{docs_base_url}}/assets/img/taxes/item-tax.png">
+
+ * **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive.
+
+<img class="screenshot" alt="Inclusive Tax" src="{{docs_base_url}}/assets/img/taxes/inclusive-tax.png">
+
+ * **Exception to the rule**: Item tax settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account
+ * **Item tax is overwrite-able**: You can overwrite or change the item tax rate by going to the Item master in the Item tax table.
+
+## Sales Taxes and Charges Template
+
+You must usually collect taxes from your Customer and pay them to the
+government. At times, you may have to pay multiple taxes to multiple
+government bodies like local government, state or provincial and federal or
+central government.
+
+The way ERPNext sets up taxes is via templates. Other types of charges that
+may apply to your invoices (like shipping, insurance etc.) can also be
+configured as taxes.
+
+Select template and modify as per your need.
+
+To create a new sales tax template called Sales Taxes and Charges Template, you
+have to go to:
+
+> Setup > Accounts > Sales Taxes and Charge Master
+
+<img class="screenshot" alt="Sales Tax Master" src="{{docs_base_url}}/assets/img/taxes/sales-tax-master.png">
+
+When you create a new master, you will have to add a row for each tax type.
+
+The tax rate you define here will be the standard tax rate for all Items. If
+there are Items that have different rates, they must be added in the Item Tax
+table in the Item master.
+
+In each row, you have to mention:
+
+ * Calculation Type:
+
+ * On Net Total : This can be on net total (total amount without taxes).
+ * On Previous Row Total/Amount: You can apply taxes on previous row total / amount. If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total. Previous row amount means a particular tax amount.And, previous row total means net total plus taxes applied up to that row. In the Enter Row Field, mention row number on which you want to apply the current tax. If you want to apply the tax on the 3rd row, mention "3" in the Enter Row field.
+
+ * Actual : Enter as per actual amount in rate column.
+
+ * Account Head: The Account ledger under which this tax will be booked
+
+ * Cost Center: If the tax / charge is an income (like shipping) it needs to be booked against - a Cost Center.
+ * Description: Description of the tax (that will be printed in invoices / quotes).
+ * Rate: Tax rate.
+ * Amount: Tax amount.
+ * Total: Cumulative total to this point.
+ * Enter Row: If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+ * Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the rate in your main item table. This is useful when you want to give a flat price (inclusive of all taxes) to your customers.
+
+Once you setup your template, you can select this in your sales transactions.
+
+## Purchase Taxes and Charges Template
+
+Similar to your Sales Taxes and Charges Template is the Purchase Taxes and
+Charges Master.
+
+This is the tax template that you can use in your Purchase Orders and Purchase
+Invoices. If you have value added taxes (VAT), where you pay to the government
+the difference between your incoming and outgoing taxes, you can select the
+same Account that you use for sales taxes.
+
+The columns in this table are similar to the Sales Taxes and Charges Template
+with the difference as follows:
+
+Consider Tax or Charge for: In this section you can specify if the tax /
+charge is only for valuation (not a part of total) or only for total (does not
+add value to the item) or for both.
+
+{next}
+
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
new file mode 100644
index 0000000..412572a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
@@ -0,0 +1,11 @@
+# Global Defaults
+
+You can set default values for your documents from Global Defaults
+
+> Setup > Settings > Global Defaults
+
+Whenever a new document is created, these values will be set as default.
+
+<img class="screenshot" alt="Global Defaults" src="{{docs_base_url}}/assets/img/setup/settings/global-defaults.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/index.md b/erpnext/docs/user/manual/en/setting-up/settings/index.md
new file mode 100644
index 0000000..4cba991
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/index.md
@@ -0,0 +1,7 @@
+# Settings
+
+In `Setup > Settings` you will find ways to manage your system settings like defaults, number and currency formats, global session timeout settings etc.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/index.txt b/erpnext/docs/user/manual/en/setting-up/settings/index.txt
new file mode 100644
index 0000000..e33aedc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/index.txt
@@ -0,0 +1,4 @@
+system-settings
+module-settings
+naming-series
+global-defaults
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
new file mode 100644
index 0000000..ecfb282
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
@@ -0,0 +1,15 @@
+# Show or Hide Modules
+
+You can globally switch off certain desktop module via:
+
+> Setup > Settings > Show or Hide Modules
+
+For example if you are in the services business, you want to hide the Manufacturing Module, you can do this via **Show or Hide Modules**
+
+### Example
+
+Check / uncheck the items to show / hide.
+
+<img class="screenshot" alt="Module Settings" src="{{docs_base_url}}/assets/img/setup/settings/show-hide-modules.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
new file mode 100644
index 0000000..df7de6d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
@@ -0,0 +1,48 @@
+# Naming Series
+
+### 1. Introduction
+
+Data records are broadly classified as “Master” or “Transaction”. A master
+record is a record that has a “name”, for example a Customer, Item, Supplier,
+Employee etc. A Transaction is a record that has a “number”. Examples of
+transactions include Sales Invoices, Quotations etc. You make transactions
+against a number of master records.
+
+ERPNext allows you to make prefixes to your transactions, with each prefix
+forming its own series. For example a series with prefix INV12 will have
+numbers INV120001, INV120002 and so on.
+
+You can have multiple series for all your transactions. It is common to have a
+separate series for each financial year. For example in Sales Invoice you
+could have:
+
+ * INV120001
+ * INV120002
+ * INV-A-120002
+
+etc. You could also have a separate series for each type of Customer or for
+each of your retail outlets.
+
+### 2. Managing Naming Series for Documents
+
+To setup a series, go to:
+
+> Setup > Tools > Update Numbering Series
+
+In this form,
+
+ 1. Select the transaction for which you want to make the series The system will update the current series in the text box.
+ 2. Edit the series as required with unique prefixes for each series. Each prefix must be on a new line.
+ 3. The first prefix will be the default prefix. If you want the user to explicitly select a series instead of the default one, check the “User must always select” check box.
+
+You can also update the starting point of a series by entering the series
+name and the starting point in the “Update Series” section.
+
+### 3. Example
+
+See how to set the naming series
+
+<img class="screenshot" alt="Naming Series" src="{{docs_base_url}}/assets/img/setup/settings/naming-series.gif">
+
+{next}
+
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
new file mode 100644
index 0000000..053b4f1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
@@ -0,0 +1,11 @@
+# System Settings
+
+You can localize ERPNext to use particular timezone, date, number or currency format and also set global session expiry via System Settings.
+
+To open System Settings, go to:
+
+> Setup > Settings > System Settings
+
+<img class="screenshot" alt="System Settings" src="{{docs_base_url}}/assets/img/setup/settings/system-settings.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
new file mode 100644
index 0000000..244d893
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
@@ -0,0 +1,7 @@
+# Setup Wizard
+
+The Setup Wizard helps you quickly setup your ERPnext by helping you create your company, Items, Customer, Suppliers and will also setup a basic website with this data.
+
+Here is a quick overview of the steps:
+
+{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
new file mode 100644
index 0000000..74f6a42
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
@@ -0,0 +1,10 @@
+step-1-language
+step-2-currency-and-timezone
+step-3-user-details
+step-4-company-details
+step-5-letterhead-and-logo
+step-6-add-users
+step-7-tax-details
+step-8-customer-names
+step-9-suppliers
+step-10-item
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
new file mode 100644
index 0000000..00219fd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
@@ -0,0 +1,11 @@
+# Step 1: Language
+
+Select your language. ERPNext is available in more than 20 languages.
+
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-1.png">
+
+---
+
+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/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
new file mode 100644
index 0000000..bc71b98
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
@@ -0,0 +1,16 @@
+# Step 9: Item Names
+
+In this final step, please enter the names of the Items you buy or sell.
+
+<img alt="Add Items" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-10.png">
+
+Please set the group of the item (Product / Service) and unit of measure. Don't worry you will be able to edit all of this later.
+
+---
+
+## Thats it!
+
+Once you are done with the setup wizard you will see the familiar desktop page.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
new file mode 100644
index 0000000..5dc1648
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
@@ -0,0 +1,13 @@
+# Step 2: Currency and Timezone
+
+Set your country name, currency and timezone.
+
+<img alt="Currency" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-2.png">
+
+---
+
+### Default Currency
+
+For most countries, your currency and timezone will be automatically set
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
new file mode 100644
index 0000000..b9eff18
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
@@ -0,0 +1,12 @@
+# Step 3: User Details
+
+Enter Users Profile Details like Name, User ID and preferred password.
+
+<img alt="User" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-3.png">
+
+---
+
+Note: Add your own photograph, not your company's
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md
new file mode 100644
index 0000000..f88d31c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md
@@ -0,0 +1,22 @@
+# Step 4: Company Details
+
+Enter Company Details like Name, Abbreviation and Financial Year Details.
+
+<img alt="Company Details" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-4.png">
+
+---
+
+### 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}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md
new file mode 100644
index 0000000..7cc258b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md
@@ -0,0 +1,24 @@
+# Step 5: Letterhead and Logo
+
+Attach Company Letterhead and Company Logo.
+
+<img alt="Company Logo and Letterhead" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-5.png">
+
+---
+
+### Letterhead
+
+A letterhead is the heading at the top of a sheet of letter paper (stationery). That heading usually consists of a name and an address, and a logo or corporate design.
+
+Click on the box ‘Attach Letterhead’ . Select the image file from the place it is stored and click enter.
+
+You may choose to skip this step if your letterhead is not ready.
+
+To select letterhead later through the setup module, read [Letter-head]({{docs_base_url}}/user/guides/setting-up/print/letter-head.html)
+
+#### To "attach as web-link"
+
+For any attachments in ERPNext, you can also attach as a web-link. If you are using other tools like Dropbox or Google Docs to manage your files, you can set its public link.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md
new file mode 100644
index 0000000..7e8f083
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md
@@ -0,0 +1,8 @@
+# Step 6: Add Users
+
+Add other users and assign them roles based on their job responsibilities.
+
+<img alt="Users" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-6.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md
new file mode 100644
index 0000000..ead3fc9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md
@@ -0,0 +1,22 @@
+# Step 6: Tax Details
+
+Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type.
+
+<img alt="Tax Details" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-7.png">
+
+Just set the tax name and the standard percentage levied.
+
+---
+
+Some examples of tax types are given below.
+
+#### VAT
+
+A value added tax (VAT) is a form of consumption tax. From the perspective of the buyer, it is a tax on the purchase price. From that of the seller, it is a tax only on the value added to a product, material, or a service. From an accounting point of view, by the stage of its manufacture or distribution. The manufacturer remits to the government the difference between these two amounts, and retains the rest for themselves to offset the taxes they had previously paid on the inputs.
+
+The purpose of VAT is to generate tax revenues to the government similar to the corporate income tax or the personal income tax. For Example: When you shop at a departmental store and avail discount on the products, the store charges you 5% extra on the total bill as the VAT.
+
+To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes]({{docs_base_url}}/user/guides/setting-up/setting-up-taxes.html)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
new file mode 100644
index 0000000..b82202c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
@@ -0,0 +1,23 @@
+# Step 7: Customers
+
+Enter your Customer names and the contact person from that organisation.
+
+
+<img alt="Customers" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-8.png">
+
+---
+
+#### Difference between a customer name and a contact name
+
+A customer name is the name of the organisation and a contact name is the name of the user who is operating the ERPNext system.
+
+For Example: If American Power Mills is an organisation name and their founder Shiv Agarwal has installed ERPNext on his system. Then,
+
+Customer Name: American Power Mills
+
+Contact Name: Shiv Agarwal
+
+To understand Customer in detail visit [Customer Details]({{docs_base_url}}/user/guides/CRM/customer.html)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md
new file mode 100644
index 0000000..5d2f381
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md
@@ -0,0 +1,12 @@
+# Step 8: Suppliers
+
+Enter a few of your Suppliers' names.
+
+<img alt="Suppliers" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-9.png">
+
+---
+
+To understand Suppliers in detail visit [Supplier Master]({{docs_base_url}}/user/guides/buying/supplier-master.html)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/sms-setting.md b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
new file mode 100644
index 0000000..4871ed1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
@@ -0,0 +1,40 @@
+# SMS Setting
+
+To integrate SMS in ERPNext, approach a SMS Gateway Provider who provides HTTP
+API. They will create an account for you and will provide an unique username
+and password.
+
+To configure SMS Settings in ERPNext, find out their HTTP API (a document
+which describes the method of accessing their SMS interface from 3rd party
+applications). In this document, you will get an URL which is used to send the
+SMS using HTTP request. Using this URL, you can configure SMS Settings in
+ERPNext.
+
+Example URL:
+
+
+
+ http://instant.smses.com/web2sms.php?username=<USERNAME>&password;=<PASSWORD>&to;=<MOBILENUMBER>&sender;=<SENDERID>&message;=<MESSAGE>
+
+
+
+
+> Note: the string up to the "?" is the SMS Gateway URL
+
+Example:
+
+
+
+ http://instant.smses.com/web2sms.php?username=abcd&password;=abcd&to;=9900XXXXXX&sender;
+ =DEMO&message;=THIS+IS+A+TEST+SMS
+
+The above URL will send SMS from account abcd to mobile number 9900XXXXXX with
+sender ID as DEMO with text message as "THIS IS A TEST SMS"
+
+Note that some parameters in the URL are static.You will get static values
+from your SMS Provider like username, password etc. These static values should
+be entered in the Static Parameters table.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
new file mode 100644
index 0000000..bd46bf1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -0,0 +1,154 @@
+Stock Reconciliation is the process of counting and evaluating stock-in-trade,
+usually at an organisations year end in order to value the total stock for
+preparation of the accounts. In this process actual physical stocks are
+checked and recorded in the system. The actual stocks and the stock in the system should be in agreement and accurate. If they are not, you can
+use the stock reconciliation tool to reconcile stock balance and value with actuals.
+
+**Difference between Serialized and Non-serialized Items.**
+
+A serial number is a unique, identifying number or group of numbers and
+letters assigned to an individual Item. Serialized items are generally high value items for which you need to warranty's and service agreements. Mostly items as machinery, equipments and high-value electronics (computers, printers etc.) are serialized.
+
+Non Serialized items are generally fast moving and low value item, hence doesn't need tracking for each unit. Items like screw, cotton waste, other consumables, stationary products can be categorized as non-serialized.
+
+> Stock Reconciliation option is available for the non serialized Items only. For seriazlized and batch items, you should create Material Receipt entry in Stock Entry form.
+
+### Opening Stocks
+
+You can upload your opening stock balance in the system using Stock Reconciliation.
+Stock Reconciliation will update your stock for a given Item on a given date
+for a given Warehouse to the given quantity.
+
+To perform Stock Reconciliation, go to:
+
+> Stock > Tools > Stock Reconciliation > New
+
+#### Step 1: Download Template
+
+A predefined template of an spreadsheet file should be followed for importing item's stock levels and valuations. Open new Stock Reconciliation form to see download option.
+
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-recon-1.png">
+
+#### Step 2: Enter Data in csv file.
+
+
+
+The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse.
+
+#### **Step 3: Upload file and Enter Values in Stock Reconciliation Form
+
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-recon-2.png">
+
+**Posting Date**
+
+Posting Date will be date when you want uploaded stock to reflect in the report. Posting Date selection option allows you making back dated stock reconcialiation as well.
+
+**Difference Account:**
+
+When making Stock Reconciliation for updating **opening balance**, then you should select Balance Sheet account. By default **Temporary Opening** is created in the chart of account which can be used here.
+
+If you are making Stock Reconciliation for **correcting stock level or valuation of an item**, then you can select any expense account in which you would want difference amount (derived from difference of valuation of item) should be booked. If Expense Account is selected as Difference Account, you will also need to select Cost Center as it is mandatory with any income and expense account selection.
+
+After reviewing saved Reconciliation Data, submit the Stock Reconciliation. On
+successful submission, the data will be updated in the system. To check the
+submitted data go to stock and view stock level report.
+
+Note: While filling the valuation rates of Items, if you wish to find out the
+valuation rates of all items, you can go to stock and click on Item Prices
+report. The report will show you all types of rates.
+
+#### Step 4: Review the reconciliation data
+
+
+
+### Stock Ledger Report
+
+
+
+**How Stock Reconciliation Works**
+
+Stock Reconciliation on a specific date means balance quantity frozen for that item on reconciliation date, and shall not get affected due to stock entries made before its date.
+
+Example:
+
+Item Code: ABC001
+Warehouse: Mumbai
+Let's assume stock as on 10th January is 100 nos.
+Stock Reconciliation is made on 12th January to bring stock balance to 150 nos.
+Existing Stock Ledger:
+<html>
+<style>
+ td {
+ padding:5px 10px 5px 5px;
+ };
+ img {
+ align:center;
+ };
+ table, th, td {
+ border: 1px solid black;
+ border-collapse: collapse;
+ }
+</style>
+ <table border="1" cellspacing="0px">
+ <tbody>
+ <tr align="center" bgcolor="#EEE">
+ <td><b>Posting Date</b>
+ </td>
+ <td><b>Qty</b>
+ </td>
+ <td><b>Balance Qty</b>
+ </td>
+ <td><b>Voucher Type</b>
+ </td>
+ </tr>
+ <tr>
+ <td>10/01/2014</td>
+ <td align="center">100</td>
+ <td>100 </td>
+ <td>Purchase Receipt</td>
+ </tr>
+ <tr>
+ <td>12/01/2014</td>
+ <td align="center">50</td>
+ <td>150</td>
+ <td>Stock Reconciliation</td>
+ </tr>
+ </tbody>
+ </table>
+</html>
+Let's assume Purchase Receipt entry is made on 5th January, 2014, that is on date before Stock Reconciliation entry.
+<html>
+ <table border="1" cellspacing="0px">
+ <tbody>
+ <tr align="center" bgcolor="#EEE">
+ <td><b>Posting Date</b></td>
+ <td><b>Qty</b></td>
+ <td><b>Balance Qty</b></td>
+ <td><b>Voucher Type</b></td>
+ </tr>
+ <tr>
+ <td>05/01/2014</td>
+ <td align="center">20</td>
+ <td style="text-align: center;">20</td>
+ <td>Purchase Receipt</td>
+ </tr>
+ <tr>
+ <td>10/01/2014</td>
+ <td align="center">100</td>
+ <td style="text-align: center;">120</td>
+ <td>Purchase Receipt</td>
+ </tr>
+ <tr>
+ <td>12/01/2014</td>
+ <td align="center"><br></td>
+ <td style="text-align: center;"><b>150</b></td>
+ <td>Stock Reconciliation<br></td>
+ </tr>
+ </tbody>
+ </table>
+</html>
+As per the updated logic, irrespective of receipt/issue entry made for an item, balance quantity as set via Stock Reconciliation will not be affected.
+
+> Check out the video tutorial at https://www.youtube.com/watch?v=0yPgrtfeCTs
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/territory.md b/erpnext/docs/user/manual/en/setting-up/territory.md
new file mode 100644
index 0000000..3a1abfd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/territory.md
@@ -0,0 +1,10 @@
+If your business operates in multiple Territories (could be countries, states
+or cities) it is usually a great idea to build your structure in the system.
+Once you group your Customers by Territories, you can set annual targets for
+each Item Group and get reports that will show your actual performance in the
+territory v/s what you had planned.
+You can also set different pricing for the same product sold across different territories.
+
+<img class="screenshot" alt="Territory Tree" src="{{docs_base_url}}/assets/img/crm/territory-tree.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/third-party-backups.md b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
new file mode 100644
index 0000000..c4e74ca
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
@@ -0,0 +1,54 @@
+If you wish to store your backups on a periodic basis,on Dropbox, you can do
+it directly through ERPNext.
+
+> Setup > Manage 3rd Party Backups
+
+__Step 1:__ Click on Setup.
+
+__Step 2:__ Click on Manage Third Party Backup
+
+#### Figure 1: Manage Third Party Backup
+
+
+
+On the Backup Manager page, enter the email addresses of those people whom you
+wish to notify about the upload status. Under the topic 'Sync with Dropbox',
+select whether you wish to upload Daily, Weekly or Never.
+
+__Step 3__ Click on **Allow Dropbox Access**.
+
+> Tip: In future, if you wish to discontinue uploading backups to dropbox,
+then select the Never option.
+
+#### Figure 2: Allow Dropbox Access
+
+
+
+You need to login to your dropbox account, with your user id and password.
+
+
+
+## Open Source Users
+
+Installing Pre-Requisites
+
+
+
+ pip install dropbox
+ pip install google-api-python-client
+
+
+
+
+#### Create an App in Dropbox
+
+First create your Dropbox account and create a new app (https://www.dropbox.com/developers/apps).
+After successful creation of account you will receive `app_key`, `app_secret` and `access_type`. Now edit `site_config.json` of your site (/frappe-bench/sites/your-site/) and add the following lines:
+- `"dropbox_access_key": "app_key",` and
+- `"dropbox_secret_key": "app_secret"`
+
+Then you can go to the "Integrations" module and Allow Dropbox Access.
+
+> Note: Please ensure Allow Pop-ups are enabled in your browser.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
new file mode 100644
index 0000000..dfd9ea0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
@@ -0,0 +1,48 @@
+# Adding Users
+
+Users can be added by the System Manager. If you are a System Manager, you can add Users via
+
+There are two main classes of users: Web Users and System Users. System Users are people using ERPNext in the company. Web users are customers or suppliers (or portal users).
+
+Under User a lot of info can be entered. For the sake of usability the information entered for webs users is minimal: First Name and email.
+Important is to realize that the email address is the unique key (ID) identifying the Users.
+
+> Setup > User
+
+### 1. List of Users
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-1.png" alt="User List">
+
+
+To add a new user, click on "New"
+
+### 2. Add the user details
+
+Add user details such as First Name, Last Name, Email etc.
+
+The user's Email will become the user id.
+
+After adding these details, save the user.
+
+### 3. Setting Roles
+
+After saving, you will see a list of roles and a checkbox next to it. Just check the roles you want the
+the user to have and save the document. To click on what permissions translate into roles, click on the role
+name.
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-2.png" alt="User Roles">
+
+### 4. Setting Module Access
+
+Users will have access to all modules for which they have role based access. If you want to block certain modules for certain users, un-check the module from the list.
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-3.png" alt="User Block Module">
+
+### 5. Security Settings
+
+If you wish to give the user access to the system only between office hours,
+or during weekends, mention it under security settings.
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-4.png" alt="User Security">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
new file mode 100644
index 0000000..05ad060
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
@@ -0,0 +1,11 @@
+
+In ERPNext, you can create multiple users and assign them different roles. There are some users which can only access the public facing part of ERPNext (i.e. the website). Such users are called "Website Users".
+
+ERPNext implements permission control at the User and Role level. Each user in the system can be assigned multiple
+roles and permissions.
+
+The most important role is the "System Manager". Any user having this role can add other users and set roles to all users.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
new file mode 100644
index 0000000..b00f32a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
@@ -0,0 +1,4 @@
+adding-users
+role-based-permissions
+user-permissions
+sharing
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
new file mode 100644
index 0000000..9a96b17
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
@@ -0,0 +1,74 @@
+# Role Based Permissions
+
+ERPNext has a role-based permission system. It means that you can assign Roles to Users, and set Permissions on Roles. The permission structure also allows you to define different permission rules for different fields, using a concept called **Permission "Level"** of a field. Once roles are assigned to a user, it gives you the ability to limit access for a user to only specific documents.
+
+To start with, go to:
+> Setup > Permissions > Role Permissions Manager
+
+<img alt="Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-application.png">
+
+Permissions are applied on a combination of:
+
+ * **Roles:** As we saw earlier, Users are assigned to Roles and it is on these Roles that permission rules are applied.
+
+ *Examples of Roles include Accounts Manager, Employee, HR User.*
+
+ * **Document Types:** Each type of document, master or transaction, has a separate list of Role based permissions.
+
+ *Examples of Document Types are Sales Invoice, Leave Application, Stock Entry, etc.*
+
+ * **Permission "Levels":** In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3, etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.
+
+ *Permission "Level" connects the group of fields with level X to a permission rule with level X.*
+
+ * **Document Stages:** Permissions are applied on each stage of the document like on Creation, Saving, Submission, Cancellation and Amendment. A role can be permitted to Print, Email, Import or Export data, access Reports, or define User Permissions.
+
+ * **Apply User Permissions:** This switch decides whether User Permissions should be applied for the role on selected Document Stages.
+
+ If enabled, a user with that role will be able to access only specific Documents for that Document Type. Such specific Document access is defined in the list of User Permissions. Additionally, User Permissions defined for other Document Types also get applied if they are related to the current Document Type through Link Fields.
+
+ To set, User Permissions go to:
+ > Setup > Permissions > [User Permissions Manager]({{docs_base_url}}/user/guides/setting-up/users-and-permissions/user-permissions.html)
+
+---
+
+**To add a new rule**, click on "Add a New Rule" button and a pop-up box will ask you to select a Role and a Permission Level. Once you select this and click on "Add", this will add a new row to your rules table.
+
+---
+
+Leave Application is a good **example** that encompasses all areas of Permission System.
+
+<img class="screenshot" alt="Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png">
+
+ 1. **It should be created by an Employee.**
+ For this, Employee Role should be given Read, Write, Create permissions.
+
+<img class="screenshot" alt="Giving Read, Write and Create Permissions to Employee for Leave Application" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-employee-role.png">
+
+ 1. **An Employee should only be able to access his/her Leave Application.**
+ Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.)
+
+<img class="screenshot" alt="Limiting access to Leave Applications for a user with Employee Role via User Permissions Manager" src="{{docs_base_url}}/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png">
+
+ 1. **HR Manager should be able to see all Leave Applications.**
+ Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled.
+
+<img class="screenshot" alt="Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png">
+
+ 2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.**
+ Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.)
+
+<img class="screenshot" alt="Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png">
+
+ 3. **It should be Approved / Rejected only by HR User or Leave Approver.**
+ The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1.
+
+<img class="screenshot" alt="Limiting read access for a set of fields to certain Roles" src="{{docs_base_url}}/assets/old_images/erpnext/setting-up-permissions-level-1.png">
+
+
+ 4. **HR User should be able to delegate Leave Applications to his/her subordinates**
+ HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users.
+
+<img class="screenshot" alt="Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application'" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
new file mode 100644
index 0000000..a939e65
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
@@ -0,0 +1,9 @@
+# Sharing
+
+In addition to user and role permissions, you can also Share a document with another user if you have sharing rights.
+
+To share a document, open the document, click on the "+" icon under sharing and select the user
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/share.gif">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
new file mode 100644
index 0000000..c1cefc6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -0,0 +1,72 @@
+# User Permissions
+
+Limit access for a User to a set of documents using User Permissions Manager
+
+Role Base Permissions define the periphery of document types within which a user with a set of Roles can move around in. However, you can have an even finer control by defining User Permissions for a User. By setting specific documents in User Permissions list, you can limit access for that User to specific documents of a particular DocType, on the condition that "Apply User Permissions" is checked in Role Permissions Manager.
+
+To start with, go to:
+> Setup > Permissions > User Permissions Manager
+
+<figure>
+ <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-company.png"
+ class="img-responsive" alt="User Permissions Manager">
+ <figcaption>User Permissions Manager displaying how users can access only a specific Company.</figcaption>
+</figure>
+
+#### Example
+
+User 'aromn@example.com' has Sales User role and we want to limit the user to access records for only a specific Company 'Wind Power LLC'.
+
+ 1. We add a User Permissions row for Company.
+ <figure>
+ <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permission-user-limited-by-company.png"
+ class="img-responsive" alt="User Permissions For Company">
+ <figcaption>Add User Permissions row for a combination of User 'aromn@example.com' and Company 'Wind Power LLC'.</figcaption>
+ </figure>
+
+ 1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked.
+ <figure>
+ <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-company-role-all.png"
+ class="img-responsive" alt="Role Permissions for All on Company">
+ <figcaption>Read Permission with Apply User Permissions checked for DocType Company.</figcaption>
+ </figure>
+
+ 1. The combined effect of the above two rules lead to User 'aromn@example.com' having only Read access to Company 'Wind Power LLC'.
+ <figure>
+ <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-company-wind-power-llc.png"
+ class="img-responsive" alt="Effect of Role and User Permissions on Company">
+ <figcaption>Access is limited to Company 'Wind Power LLC'.</figcaption>
+ </figure>
+
+ 1. We want this User Permission on Company to get applied on other documents like Quotation, Sales Order, etc.
+These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'aromn@example.com' to acces these documents having Company 'Wind Power LLC'.
+ <figure>
+ <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png"
+ class="img-responsive" alt="Sales User Role Permissions for Quotation">
+ <figcaption>Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked.</figcaption>
+ </figure>
+ <figure>
+ <img src="{{docs_base_url}}/assets/old_images/erpnext/user-permissions-quotation-list.png"
+ class="img-responsive" alt="Quotation List limited to results for Company 'Wind Power LLC'">
+ <figcaption>Quotation List is limited to results for Company 'Wind Power LLC' for User 'aromn@example.com'.</figcaption>
+ </figure>
+
+ 1. User Permissions get applied automatically based on Link Fields, just like how it worked for Quotation. But, Lead Form has 4 Link fields: Territory, Company, Lead Owner and Next Contact By. Say, you want Leads to limit access to Users based only on Territory, even though you have defined User Permissions for DocTypes User, Territory and Company. You can do this by setting 'Ignore User Permissions' for Link fields: Company, Lead Owner and Next Contact By.
+ <figure>
+ <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png"
+ class="img-responsive" alt="Role Permissions on Lead for Sales User Role">
+ <figcaption>Sales User can Read, Write and Create Leads limited by User Permissions.</figcaption>
+ </figure>
+ <figure>
+ <img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png"
+ class="img-responsive" alt="Set Ingore User Permissions from Setup > Customize > Customize Form">
+ <figcaption>Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.</figcaption>
+ </figure>
+ <figure>
+ <img src="{{docs_base_url}}/assets/old_images/erpnext/user-permissions-lead-based-on-territory.png"
+ class="img-responsive" alt="Lead List is limited to records with Territory 'United States'">
+ <figcaption>Due to the effect of the above combination, User 'aromn@example.com' can only access Leads with Territory 'United States'.</figcaption>
+ </figure>
+
+{next}
+
diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
new file mode 100644
index 0000000..a4ddc38
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md
@@ -0,0 +1,66 @@
+In order to allow multiple people to submit multiple requests, for approvals,
+by multiple users, ERPNext requires you to fill the workflow conditions.
+ERPNext tracks the multiple permissions before submission.
+
+Example of a leave application workflow is given below:
+
+If an user applies for a leave, then his request will be sent to the HR
+department. The HR department(HR User) will either reject or approve this
+request. Once this process is completed, the user's Manager(leave approver)
+will get an indication that the HR department has Accepted or Rejected. The
+Manager, who is the approving authority, will either Approve or Reject this
+request. Accordingly,the user will get his Approved or Rejected status.
+
+
+
+To make this Workflow and transition rules go to :
+
+> Setup > Workflow > New Workflow
+
+#### Step 1: Enter the different states of Leave Approval Process.
+
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-1.png">
+
+#### Step 2: Enter Transition Rules.
+
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-2.png">
+
+#### Notes:
+
+> Note 1: When you make a workflow you essentially overwrite the code that is
+written for that document. Thus the document will function based on your
+workflow and not based on the pre-set code settings. Hence there might be no
+submit button / option if you have not specified it in the workflow.
+
+> Note 2: Document status of saved is 0, of submitted is 1, and of cancelled is
+2.
+
+> Note 3: A document cannot be cancelled unless it is submitted.
+
+> Note 4: If you wish to give the option to cancel, you will have to write a
+workflow transition step that says from submitted you can cancel.
+
+
+
+#### Example of a Leave Application Process:
+
+Go to the Human Resources Module and click on Leave Application. Apply for a
+Leave.
+
+When a Leave Application is submitted, the status on the right hand corner of
+the page shows as "Applied"
+
+
+
+When the HR User logs in, he can either Approve or Reject. If approved the
+status on the right hand corner of the page shows as Approved. However, a blue
+band of information is displayed saying approval is pending by leave approver.
+
+
+
+When the leave approver opens the Leave Application page, he should select the
+status and convert to Approved or Rejected.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
new file mode 100644
index 0000000..f98f511
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
@@ -0,0 +1,69 @@
+The value of available inventory is treated as an Asset in company's Chart of
+Accounts. Depending on the type of items, it can be treated as Fixed Asset or
+Current Asset. To prepare Balance Sheet, you should make the accounting
+entries for those assets. There are generally two different methods of
+accounting for inventory:
+
+### **Auto / Perpetual Inventory**
+
+In this process, for each stock transactions, the system posts relevant
+accounting entries to sync stock balance and accounting balance. This is the
+default setting in ERPNext for new accounts.
+
+When you buy and receive items, those items are booked as the company’s assets
+(stock-in-hand / fixed-assets). When you sell and deliver those items, an
+expense (cost-of-goods-sold) equal to the buying cost of the items is booked.
+General Ledger entries are made after every stock transaction. As a result,
+the value as per Stock Ledger always remains same with the relevant account
+balance. This improves accuracy of Balance Sheet and Profit and Loss
+statement.
+
+To check accounting entries for a particular stock transaction, please check
+[examples]({{docs_base_url}}/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.html)
+
+#### **Advantages**
+
+Perpetual Inventory system will make it easier for you to maintain accuracy of
+company's asset and expense values. Stock balances will always be synced with
+relevant account balances, so no more periodic manual entry has to be done to
+balance them.
+
+In case of new back-dated stock transactions or cancellation/amendment of an
+existing transaction, all the future Stock Ledger entries and GL Entries will
+be recalculated for all items of that transaction. The same is applicable if
+any cost is added to the submitted Purchase Receipt, later through the Landed
+Cost Wizard.
+
+> Note: Perpetual Inventory totally depends upon the item valuation rate.
+Hence, you have to be more careful entering valuation rate while making any
+incoming stock transactions like Purchase Receipt, Material Receipt, or
+Manufacturing / Repack.
+
+* * *
+
+### **Periodic Inventory**
+
+In this method, accounting entries are manually created periodically, to sync
+stock balance and relevant account balance. The system does not create
+accounting entries automatically for assets, at the time of material purchases
+or sales.
+
+In an accounting period, when you buy and receive items, an expense is booked
+in your accounting system. You sell and deliver some of these items.
+
+At the end of an accounting period, the total value of items to be sold, need
+to be booked as the company’s assets, often known as stock-in-hand.
+
+The difference between the value of the items remaining to be sold and the
+previous period’s stock-in-hand value can be positive or negative. If
+positive, this value is removed from expenses (cost-of-goods-sold) and is
+added to assets (stock-in-hand / fixed-assets). If negative, a reverse entry
+is passed.
+
+This complete process is called Periodic Inventory.
+
+If you are an existing user using Periodic Inventory and want to use Perpetual
+Inventory, you have to follow some steps to migrate. For details, check
+[Migration From Periodic Inventory]({{docs_base_url}}/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt
new file mode 100644
index 0000000..21624e5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt
@@ -0,0 +1,2 @@
+perpetual-inventory
+migrate-to-perpetual-inventory
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
new file mode 100644
index 0000000..ffc5f40
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
@@ -0,0 +1,38 @@
+Existing Users, need to follow some steps to activate the new Perpetual
+Inventory system. As Perpetual Inventory always maintains a sync between stock
+and account balance, it is not possible to enable it with existing Warehouse
+setup. You have to create a whole new set of Warehouses, each linked to
+relevant account.
+
+Steps:
+
+ * Nullify the balance of account heads (stock-in-hand / fixed-asset) which you are using to maintain available stock value, through a Journal Entry.
+
+ * As existing warehouses are linked to stock transactions which does not have corresponding accounting entries, those warehouses can not be used for perpetual inventory. You have to create new warehouses for the future stock transactions which will be linked to their respective accounts. While creating new warehouses, select an account group under which the child account for the warehouse will be created.
+
+ * Setup the following default accounts for each Company
+
+ * Stock Received But Not Billed
+ * Stock Adjustment Account
+ * Expenses Included In Valuation
+ * Cost Center
+ * Activate Perpetual Inventory
+
+> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
+
+
+
+
+ * Create Stock Entry (Material Transfer) to transfer available stock from existing warehouse to new warehouse. As stock will be available in the new warehouse, you should select the new warehouse for all the future transactions.
+
+System will not post any accounting entries for existing stock transactions
+submitted prior to the activation of Perpetual Inventory as those old
+warehouses will not be linked to any account. If you create any new
+transaction or modify/amend existing transactions, with old warehouse, there
+will be no corresponding accounting entries. You have to manually sync stock
+and account balance through Journal Entry.
+
+> Note: If you are already using old Perpetual Inventory system, it will be
+deactivated automatically. You need to follow the above steps to reactivate
+it.
+
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
new file mode 100644
index 0000000..fbe880f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -0,0 +1,371 @@
+In perpetual inventory, system creates accounting entries for each stock
+transactions, so that stock and account balance will always remain same. The
+account balance will be posted against their respective account heads for each
+Warehouse. On saving of a Warehouse, the system will automatically create an
+account head with the same name as warehouse. As account balance is maintained
+for each Warehouse, you should create Warehouses, based on the type of items
+(Current / Fixed Assets) it stores.
+
+At the time of items received in a particular warehouse, the balance of asset
+account (linked to that warehouse) will be increased. Similarly when you
+deliver some items from that warehouse, an expense will be booked and the
+asset account will be reduced, based on the valuation amount of those items.
+
+## **Activation**
+
+ 1. Setup the following default accounts for each Company
+
+ * Stock Received But Not Billed
+ * Stock Adjustment Account
+ * Expenses Included In Valuation
+ * Cost Center
+ 2. In perpetual inventory, the system will maintain seperate account balance for each warehouse under separate account head. To create that account head, enter "Create Account Under" in Warehouse master.
+
+ 3. Activate Perpetual Inventory
+
+> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
+
+* * *
+
+## **Example**
+
+Consider following Chart of Accounts and Warehouse setup for your company:
+
+#### Chart of Accounts
+
+ * Assets (Dr)
+ * Current Assets
+ * Accounts Receivable
+ * Jane Doe
+ * Stock Assets
+ * Stores
+ * Finished Goods
+ * Work In Progress
+ * Tax Assets
+ * VAT
+ * Fixed Assets
+ * Fixed Asset Warehouse
+ * Liabilities (Cr)
+ * Current Liabilities
+ * Accounts Payable
+ * East Wind Inc.
+ * Stock Liabilities
+ * Stock Received But Not Billed
+ * Tax Liabilities
+ * Service Tax
+ * Income (Cr)
+ * Direct Income
+ * Sales Account
+ * Expenses (Dr)
+ * Direct Expenses
+ * Stock Expenses
+ * Cost of Goods Sold
+ * Expenses Included In Valuation
+ * Stock Adjustment
+ * Shipping Charges
+ * Customs Duty
+
+#### Warehouse - Account Configuration
+
+ * Stores
+ * Work In Progress
+ * Finished Goods
+ * Fixed Asset Warehouse
+
+### **Purchase Receipt**
+
+Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of
+item "Desktop" at **$100** from supplier "East Wind Inc". Following are the
+details of Purchase Receipt:
+
+**Supplier:** East Wind Inc.
+
+**Items:**
+
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <th>Item</th>
+ <th>Warehouse</th>
+ <th>Qty</th>
+ <th>Rate</th>
+ <th>Amount</th>
+ <th>Valuation Amount</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>RM0001</td>
+ <td>Stores</td>
+ <td>10</td>
+ <td>200</td>
+ <td>2000</td>
+ <td>2200</td>
+ </tr>
+ <tr>
+ <td>Desktop</td>
+ <td>Fixed Asset Warehouse</td>
+ <td>5</td>
+ <td>100</td>
+ <td>500</td>
+ <td>550</td>
+ </tr>
+ </tbody>
+</table>
+<p><strong>Taxes:</strong>
+</p>
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <th>Account</th>
+ <th>Amount</th>
+ <th>Category</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Shipping Charges</td>
+ <td>100</td>
+ <td>Total and Valuation</td>
+ </tr>
+ <tr>
+ <td>VAT</td>
+ <td>120</td>
+ <td>Total</td>
+ </tr>
+ <tr>
+ <td>Customs Duty</td>
+ <td>150</td>
+ <td>Valuation</td>
+ </tr>
+ </tbody>
+</table>
+<p><strong>Stock Ledger</strong>
+</p>
+
+
+
+**General Ledger**
+
+
+
+As stock balance increases through Purchase Receipt, "Store" and "Fixed Asset
+Warehouse" accounts are debited and a temporary account "Stock Receipt But Not
+Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
+
+* * *
+
+### **Purchase Invoice**
+
+On receiving Bill from supplier, for the above Purchase Receipt, you will make
+Purchase Invoice for the same. The general ledger entries are as follows:
+
+**General Ledger**
+
+
+
+Here "Stock Received But Not Billed" account is debited and nullified the
+effect of Purchase Receipt.
+
+* * *
+
+### **Delivery Note**
+
+Lets say, you have an order from "Jane Doe" to deliver 5 nos of item "RM0001"
+at $300. Following are the details of Delivery Note:
+
+**Customer:** Jane Doe
+
+**Items:**
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <th>Item</th>
+ <th>Warehouse</th>
+ <th>Qty</th>
+ <th>Rate</th>
+ <th>Amount</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>RM0001</td>
+ <td>Stores</td>
+ <td>5</td>
+ <td>300</td>
+ <td>1500</td>
+ </tr>
+ </tbody>
+</table>
+<p><strong>Taxes:</strong>
+</p>
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <th>Account</th>
+ <th>Amount</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Service Tax</td>
+ <td>150</td>
+ </tr>
+ <tr>
+ <td>VAT</td>
+ <td>100</td>
+ </tr>
+ </tbody>
+</table>
+
+**Stock Ledger**
+
+
+
+**General Ledger**
+
+
+
+As item is delivered from "Stores" warehouse, "Stores" account is credited and
+equal amount is debited to the expense account "Cost of Goods Sold". The
+debit/credit amount is equal to the total valuation amount (buying cost) of
+the selling items. And valuation amount is calculated based on your prefferred
+valuation method (FIFO / Moving Average) or actual cost of serialized items.
+
+
+
+
+ In this example, we have considered valuation method as FIFO.
+ Valuation Rate = Purchase Rate + Charges Included in Valuation
+ = 200 + (250 * (2000 / 2500) / 10)
+ = 220
+ Total Valuation Amount = 220 * 5
+ = 1100
+
+
+
+* * *
+
+### **Sales Invoice with Update Stock**
+
+Lets say, you did not make Delivery Note against the above order and instead
+you have made Sales Invoice directly, with "Update Stock" options. The details
+of the Sales Invoice are same as the above Delivery Note.
+
+**Stock Ledger**
+
+
+
+**General Ledger**
+
+
+
+Here, apart from normal account entries for invoice, "Stores" and "Cost of
+Goods Sold" accounts are also affected based on the valuation amount.
+
+* * *
+
+### **Stock Entry (Material Receipt)**
+
+**Items:**
+
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <th>Item</th>
+ <th>Target Warehouse</th>
+ <th>Qty</th>
+ <th>Rate</th>
+ <th>Amount</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>RM0001</td>
+ <td>Stores</td>
+ <td>50</td>
+ <td>220</td>
+ <td>11000</td>
+ </tr>
+ </tbody>
+</table>
+
+**Stock Ledger**
+
+
+
+**General Ledger**
+
+
+
+* * *
+
+### **Stock Entry (Material Issue)**
+
+**Items:**
+
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <th>Item</th>
+ <th>Source Warehouse</th>
+ <th>Qty</th>
+ <th>Rate</th>
+ <th>Amount</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>RM0001</td>
+ <td>Stores</td>
+ <td>10</td>
+ <td>220</td>
+ <td>2200</td>
+ </tr>
+ </tbody>
+</table>
+
+**Stock Ledger**
+
+
+
+**General Ledger**
+
+
+
+* * *
+
+### **Stock Entry (Material Transfer)**
+
+**Items:**
+
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <th>Item</th>
+ <th>Source Warehouse</th>
+ <th>Target Warehouse</th>
+ <th>Qty</th>
+ <th>Rate</th>
+ <th>Amount</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>RM0001</td>
+ <td>Stores</td>
+ <td>Work In Progress</td>
+ <td>10</td>
+ <td>220</td>
+ <td>2200</td>
+ </tr>
+ </tbody>
+</table>
+
+**Stock Ledger**
+
+
+
+**General Ledger**
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
new file mode 100644
index 0000000..bfee143
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
@@ -0,0 +1,15 @@
+<h1>Allow over delivery / billing against Sales Order upto certain limit</h1>
+
+<h1>Allow over delivery / billing against Sales Order upto certain limit</h1>
+
+To setup over delivery / receipt / billing against a Sales / Purchase Order upto certain limit:
+
+1. Go to `Stock > Setup > Stock Settings`.
+2. Set `Allowance Percentage` and save the Stock Settings.
+
+For example: If you have ordered 100 units. and your Allowance is 50% then you are allowed to receive 150 units.
+3. To set item-specific limit, set `Allowance Percentage` in `Item` master.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
new file mode 100644
index 0000000..e95b113
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
@@ -0,0 +1,25 @@
+<h1>Auto Creation of Material Request</h1>
+
+<h1>Auto Creation of Material Request</h1>
+
+ERPNext allows you to define item-wise and warehouse-wise reorder level in the item master. Reorder level is the item's stock level at which item should be re-ordered.
+
+With reorder level, you can also define what should be the next action. Either new purchase or transfer from another warehouse. Based on setting in Item master, purpose will be updated in the Material Request as well.
+
+
+
+You can have Material Request automatically created for items whose stock level reaches re-order level. You can enable this feature from:
+
+`Stock > Setup > Stock Settings`
+
+
+
+A separate Material Request will be created for each item. User with Purchase Manager's role will be informed about these Material Request. He can further process this Material Request, and create Supplier Quotation and Purchase Order against it.
+
+If auto creation of Material Request is failed, Purchase Manager will be informed about error message via email. One of the most encountered error message is:
+
+**An error occurred for certain Items while creating Material Requests based on Re-order level.
+Date 01-04-2015 not in any Fiscal Year.**
+
+One of the reason of error could be Fiscal Year as well. Click [here](https://erpnext.com/kb/accounts/fiscal-year-error) to learn more about it.
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
new file mode 100644
index 0000000..6115ed5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
@@ -0,0 +1,27 @@
+<h1>Creating Depreciation For Item</h1>
+
+<h1>Creating Depreciation For Item</h1>
+
+<b>Question:</b> A Fixed Asset Item has been purchased and stored in a warehouse. How can the user create a depreciation for a Fixed Asset Item?<u><b><br><br></b></u><b>Answer:</b><u><b><br><br></b></u>Though there is no direct, automated method to book
+Asset Depreciation. A suitable work around to achieve this is by creating a Stock Reconciliation Entry.
+<br><u><b><br>Step 1:</b></u> In the Attachment file, fill in the appropriate columns;
+<br>
+<ul>
+ <li><i>Item Code</i> whose value is to be depreciated</li>
+ <li><i>Warehouse </i>in which it is stored</li>
+ <li><i>Qty (Quantity) </i>Leave this column blank</li>
+ <li> <i>Valuation Rate </i>Enter the Value after Depreciation</li>
+</ul>
+<p>
+ <br>
+</p>
+<img src="{{docs_base_path}}/assets/img/articles/kb_deprec_csv.png"><br>
+<p><u><b><br></b></u>
+</p>
+<p><u><b>Step 2:</b></u> In the Stock Reconciliation Form, enter the Expense account for depreciation in <i>Difference Account</i>.</p>
+<br><img src="{{docs_base_path}}/assets/img/articles/kb_deprec_form.png" height="302" width="652"><br>
+<p>
+ <br>
+</p>
+<div class="well">Note: For more information on Stock Reconciliation, see the <a href="https://erpnext.com/user-guide/setting-up/stock-reconciliation-for-non-serialized-item" target="_blank">User Guide</a>.</div>
+<div class="well"> Note: An Automated Asset Depreciation feature in on our To-Do List. See this <a href="https://github.com/frappe/erpnext/issues/191" target="_blank">Github Issue</a>.</div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.md b/erpnext/docs/user/manual/en/stock/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
new file mode 100644
index 0000000..fc039b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt
@@ -0,0 +1,15 @@
+allow-over-delivery-billing-against-sales-order-upto-certain-limit
+auto-creation-of-material-request
+creating-depreciation-for-item
+is-stock-item-field-frozen-in-item-master
+manage-rejected-finished-goods-items
+managing-assets
+managing-batch-wise-inventory
+managing-fractions-in-uom
+opening-stock-balance-entry-for-the-serialized-and-batch-item
+repack-entry
+serial-no-naming
+stock-entry-purpose
+stock-level-report
+track-items-using-barcode
+using-batch-feature-in-stock-entry
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md b/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
new file mode 100644
index 0000000..a012827
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
@@ -0,0 +1,19 @@
+<h1>Is Stock Item field Frozen in the Item master</h1>
+
+<h1>Is Stock Item field Frozen in the Item master</h1>
+
+In the item master, you might witness values in the following fields be frozen.
+
+1. Is Stock Item
+1. Has Batch No.
+1. Has Serial No.
+
+
+
+For an item, once stock ledger entry is created, values in these fields will be froze. This is to prevent user from changing value which can lead to mis-match of actual stock, and stock level in the system of an item.
+
+For the serialized item, since its stock level is calculated based on count of available Serial Nos., setting Item as non-serialized mid-way will break the sync, and item's stock level shown in the report will not be accurate, hence Has Serial No. field is froze.
+
+To make these fields editable once again, you should delete all the stock transactions made for this item. For the Serialized and Batch Item, you should also delete Serial No. and Batch No. record for this item.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
new file mode 100644
index 0000000..9bb0103
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
@@ -0,0 +1,32 @@
+<h1>Manage Rejected Finished Goods Items</h1>
+
+<h1>Manage Rejected Finished Goods Items</h1>
+
+There could be manufactured Items which would not pass quality test, and would be rejected.
+
+Standard manufacturing process in ERPNext doesn't cover managing rejected items separately. Hence you should create finished goods entry for both accepted as well as rejected items. With this, you will have rejected items also received in the finished goods warehouse.
+
+To move rejected items from the finished goods warehouse, you should create Material Transfer entry. Steps below to create Material Transfer entry.
+
+####New Stock Entry
+
+`Stock > Stock Entry > New`
+
+####Entry Purpose
+
+Purpose = Material Transfer
+
+####Warehouse
+
+Source Warehouse = Finished Goods warehouse
+Target Warehouse = Rejected items warehouse
+
+####Items
+
+Select item which failed quality test, and enter total rejected items as Qty.
+
+####Submit Stock Entry
+
+On Saving and Submitting Stock Entry, stock of rejected items will be moved from Finished Goods Warehouse to Rejected Warehouse.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-assets.md b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
new file mode 100644
index 0000000..5032dcd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
@@ -0,0 +1,24 @@
+<h1>Managing Assets</h1>
+
+<h1>Managing Assets</h1>
+
+Items like machinery, furniture, land and property, patents etc. can be categorized as fixed asset of a company. In ERPNext, you can maintain fixed asset items in a separate Warehouse.
+
+Item can be created for each type of an asset. Whereas unique Serial No. will be created for each unit of that asset item. Maintaining serialized inventory of asset item will have in tracking item's warranty and expiry details.
+
+####Fixed Asset Master
+
+While creating Item Code for the fixed asset item, you should updated field "Is Fixed Asset" as "Yes".
+
+
+
+Other item properties like Stock/Non-stock item can be updated on the nature of asset. Like patent and trademarks will be non-stock assets.
+
+If your asset item is serialized, click [here](https://erpnext.com/user-guide/stock/serialized-inventory) to learn how serialized inventory is managed in ERPNext.
+
+####Warehouse for Fixed Asset
+
+Separate Warehouse should be created for the fixed asset items. All the sales, purchase and stock transactions for asset items will be done in that fixed asset warehouse only.
+
+Also, as per the perpetual inventory valuation system, you will have accounting ledger auto-created for the warehouse. You can move the accounting ledger of warehouse created for fixed asset from Stock Asset group to fixed asset group. This will be helpful while preparing financial statement for a company.
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
new file mode 100644
index 0000000..23cd46d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
@@ -0,0 +1,5 @@
+<h1>Managing Batch wise Inventory</h1>
+
+<h1>Managing Batch wise Inventory</h1>
+
+To maintain batches against an Item you need to mention 'has batch no' as yes in the Item Master. You can create a new Batch from <div><br></div><div><p >Stock > Documents > Batch > New</p></div><div><br></div><div>To learn more about batch check out the manual page at https://manual.erpnext.com/contents/stock/batch</div><div><br></div><div>While making a purchase receipt or delivery note, mention the batch number against the item.</div><div><br></div><div><p ><strong>Batch No. in Purchase Receipt</strong></p><p ><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-06-23 at 5.33.37 pm.png"><br></p><p ><strong>Batch No. in Delivery Note</strong></p><p ><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-06-23 at 5.35.28 pm.png"><br></p><p ><b>Batch-wise Stock Balance Report</b></p><p >To check batch-wise stock balance report, go to:</p><p >Stock > Standard Reports > Batch-wise Balance History</p><p ><br></p></div>
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
new file mode 100644
index 0000000..75acd38
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
@@ -0,0 +1,34 @@
+<h1>Managing Fractions in UoM</h1>
+
+<h1>Managing Fractions in UoM</h1>
+
+UoM stands for Unit of Measurement. Few examples of UoM are Numbers (Nos), Kgs, Litre, Meter, Box, Carton etc.
+
+There are few UoMs which cannot have value decimal places. For example, if we have television for an item, with Nos as its UoM, we cannot have 1.5 Nos. of television, or 3.7 Nos. of computer sets. The value of quantity for these items must be whole number.
+
+You can configure if particular UoM can have value in decimal place or no. Bydefault, decimal places will be allowed in all the UoMs. To restrict decimal places or value in fraction for any UoM, you should follow these steps.
+
+####UoM List
+
+For UoM list, go to:
+
+`Stock > Setup > UoM`
+
+For the list of UoM, select one which you want to restrict value in fraction. Let's assume that UoM is Nos.
+
+####Configure
+
+In the UoM form, you will find a field called "Must be whole number". Check this field to restrict user from enter decimal places in quantity field for item with this UoM.
+
+
+
+####While Creating Entry
+
+While creating transaction, if you enter value in fraction for item who's UoM has "Must be whole number" checked, you will get error message stating:
+
+`Quantity cannot be a fraction at row #`
+
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
new file mode 100644
index 0000000..5251a8e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
@@ -0,0 +1,63 @@
+<h1>Opening Stock Balance Entry for the Serialized and Batch Item</h1>
+
+<h1>Opening Stock Balance Entry for the Serialized and Batch Item</h1>
+
+Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them will be update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](https://erpnext.com/user-guide/stock/serialized-inventory).
+
+Why Opening Balance entry for the Serialized and Batch Item cannot be updated via Stock Reconciliation?
+
+In the ERPNext, stock level of a serialized items is derived based on the count of Serial Nos for that item. Hence, unless Serial Nos. are created for the serialized item, its stock level will not be updated. In the Stock Reconciliation Tool, you can only update opening quantity of an item, and not their Serial No. and Batch No.
+
+Let's check steps for create opening stock balance entry for the Serialized and Batch item.
+
+#### Step 1: New Stock Entry
+
+`Stock > Stock Entry > New`
+
+#### Step 2: Select Purpose
+
+Stock Entry Purpose should be updated as `Material Receipt`.
+
+#### Step 3: Update Posting Date
+
+Posting Date should be date on which you wish to update opening balance for an item.
+
+#### Step 4: Update Target Warehouse
+
+Target Warehouse will be one in which opening balance of an item will be updated.
+
+#### Step 5: Select Items
+
+Select Items in the Stock Entry table.
+
+#### Step 6: Update Opening Qty
+
+For the serialized item, you should update as many Serial Nos as their Qty. If you have updated Prefix in the Item master, on the submission of Stock Entry Serial Nos. will be auto-created following that prefix.
+
+
+
+For a batch item, you should provide Batch ID in which opening balance will be updated. You should keep batch master ready, and updated it for the Batch Item. To create new Batch, go to:
+
+`Stock > Setup > Batch > New`
+
+[Click here to learn how Batchwise inventory is managed in ERPNext](https://erpnext.com/user-guide/stock/batchwise-inventory).
+
+#### Step 7: Update Valuation Rate an Item
+
+Valuation Rate is the mandatory field, where you should update `per unit value of item`. If you have unit of items having different valuation rates, they should be updated in a separate row, with different Valuation Rate.
+
+#### Step 8: Difference Account
+
+As per perpetual inventory valuation system, accounting entry is created for every stock entry. Accounting system followed in the ERPNext requires Total Debit in an entry matching with Total Credit. On the submission of Stock Entry, system Debits accounting ledger of a Warehouse by total value of items. To balance the same, we use Temporary Liability account in the Difference Account field. [Click here to learn more about use of Temporary Accounts in updating opening balance](https://erpnext.com/kb/accounts/updating-opening-balance-in-accounts-using-temporary-account).
+
+
+
+#### Step 9: Save and Submit Stock Entry
+
+On submission of Stock Entry, stock ledger entry will be posted, and opening balance will be updated for the items on a given posting date.
+
+If Serial Nos. for your items are set to be created based on prefix, then on submission of Stock Entry, Serial Nos. will be created as well.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
new file mode 100644
index 0000000..59bf983
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
@@ -0,0 +1,35 @@
+<h1>Repack Entry</h1>
+
+<h1>Repack Entry</h1>
+
+If you buy items in bulk to be repacked into smaller packs, you can create a **Stock Entry** of type "Repack". For example, item bought in tons can be repacked into Kgs.
+
+Notes:
+1. Separate purchase and repacked Items must be made.
+2. Repack entry can be made with or without BOM (Bill of Material).
+
+Let's check below scenario to understand this better.
+
+Assume you buy crude oil in barrel, and get diesel and gasoline as its output. To create production entry, go to:
+
+#### 1. New Stock Entry
+
+`Stock > Documents > Stock Entry > New Stock Entry`
+
+#### 2. Enter Items
+
+Select Purpose as 'Repack Entry'.
+
+For raw-material/input item, only Source Warehouse will be provided.
+
+For repacked/production item, only Target Warehouse will be entered. You will have to provide valuation for the repacked/production item.
+
+
+
+#### 3. Submit Stock Entry
+
+On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repacked/production item will be added in the Target Warehouse.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
new file mode 100644
index 0000000..c4e8774
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
@@ -0,0 +1,41 @@
+<h1>Serial No. Naming</h1>
+
+<h1>Serial No. Naming</h1>
+
+Serial Nos. are unique value assigned on each unit of an item. Serial no. helps in locating and tracking item's warranty and expiry details.
+
+To make item Serialized, in the Item master, on selecting **Has Serial No** field should be updated as "Yes".
+
+There are two ways Serial no. can be generated in ERPNext.
+
+###1. Serializing Purchase Items
+
+If purchased items are received with Serial Nos. applied by OEM (original equipment manufacturer), you should follow this approach. While creating Purchase Receipt, you shall scan or manually enter Serial nos. for an item. On submitting Purchase Receipt, Serial Nos. will be created in the backend as per Serial No. entered for an item.
+
+If received items already has its Serial No. barcoded, you can simply scan that barcode for entering Serial No. in the Purchase Receipt. Click [here](https://frappe.io/blog/management/using-barcodes-to-ease-data-entry) to learn more about it.
+
+On submission of Purchase Receipt or Stock entry for the serialized item, Serial Nos. will be auto-generated.
+
+
+
+Generated Serial numbers will be updated for each item.
+
+
+
+###2. Serializing Manufacturing Item
+
+To Serialize Manufacturing Item, you can define Series for Serial No. Generation in the Item master itself. Following that series, system will create Serial Nos. for Item when its Production entry is made.
+
+####2.1 Serial No. Series
+
+When Item is set as serialized, it will allow you to mentioned Series for it.
+
+
+
+####2.2 Production Entry for Serialized Item
+
+On submission of production entry for manufacturing item, system will automatically generate Serial Nos. following Series as specified in the Item master.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
new file mode 100644
index 0000000..26b6346
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
@@ -0,0 +1,53 @@
+<h1>Stock Entry Purpose</h1>
+
+<h1>Stock Entry Purpose</h1>
+
+Stock Entry document records Item movement from a Warehouse, to a Warehouse and between Warehouses. And in stock entry form selection of 'Purpose' belongs to type of item movement. Following are the uses of Stock Entry Purposes in stock entry form.
+
+#### 1.Purpose = Material Issue
+
+This purpose is selected to issue item from a warehouse. In this stock entry, you should define Source Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+
+
+
+#### 2.Purpose = Material Receipt
+
+This purpose is selected to receive item in a warehouse. In this stock entry, you should define Target Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+
+
+
+#### 3.Purpose = Material Transfer
+
+This purpose is selected to transfer item from warehouse to warehouse or to transfer raw material for production. In this stock entry, you should define Source Warehouse and Target Warehouse also.
+
+
+
+#### 4.Purpose = Manufacture
+
+This purpose is selected to perform finished goods entry. This purpose is auto selected in stock entry form, when you Update Finished Goods entry from Submitted Production Order. 
+
+
+
+#### 5.Purpose = Repack
+
+This purpose is selected to perform repack of item. 
+
+#### 6.Purpose = Subcontract
+
+This purpose is selected to transfer row material to supplier for manufacturing subcontracting item.
+
+
+
+#### 6.Purpose = Sales Return
+
+This purpose is selected to receive returned item by customer. 
+
+
+
+#### 6.Purpose = Purchase Return
+
+This purpose is selected to issue purchased item to supplier. 
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
new file mode 100644
index 0000000..fa92612
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
@@ -0,0 +1,41 @@
+<h1>Stock Level Report</h1>
+
+<h1>Stock Level Report</h1>
+
+Stock Level report list stock item's quantity available in a particular warehouse.
+
+There are multiple reports available you can check for item's stock level.
+
+####Stock Projected Quantity Report
+
+You can access this report from `Stock > Main Report > Stock Projected Quantity`
+
+This report list item wise - warehouse wise stock level of an item considering all the stock transactions. With Actual Quantity of an item, it also provide other details like:
+
+1. Actual Qty: Quantity available in the warehouse.
+2. Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.
+3. Requested Qty: Quantity requested for purchase, but not ordered.
+4. Ordered Qty: Quantity ordered for purchase, but not received.
+5. Reserved Qty: Quantity ordered for sale, but not delivered.
+6. Project Qty: Project Quantity is calculated as
+
+<div class="well">Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty - Reserved Qty</div>
+
+The projected inventory is used by the planning system to monitor the reorder point and to determine the reorder quantity. The projected Quantity is used by the planning engine to monitor the safety stock levels. These levels are maintained to serve unexpected demands.
+
+Having a tight control of the projected inventory is crucial to determine shortages and to calculate the right order quantity.
+
+####Stock Balance Report
+
+Stock Ledger report helps you check stock balance of an item on a given date.
+
+You can access this report from
+
+`Stock > Main Report > Stock Balance`
+
+This allows you to go back in time, and check what was stock level of an item in a particular warehouse in the near past.
+
+With item's stock levels, you will also get their valuation details in this report.
+
+Based on the date filters, this report provides item's Opening Stock on From Date, and Closing Stock on To From. It will also list the In Quantity and Out Quantity for an item between the date range.
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
new file mode 100644
index 0000000..5b0d99a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
@@ -0,0 +1,20 @@
+<h1>Track items using Barcode</h1>
+
+A barcode, is a code using multiple lines and spaces of varying widths, designed to represent some alpha-numeric characters. For example, in retail, it generally represents item code / serial number. Most barcode scanners behave like an external keyboard. When it scans a barcode, the data appears in the computer screens at the point of cursor.
+
+To enable barcode feature in ERPNext go to `Setup –> Customize –> Features Setup` and check "Item Barcode" option.
+
+
+Now, a new field "Barcode" will be appear in Item master, enter barcode while creating a new item. You can update barcode field for existing items using "Data Import Tool".
+
+If you are creating your own barcode, then you should print those same barcodes and attach to your products.
+
+
+
+Once you have updated barcode field in item master, you can fetch items using barcode in Delivery Note, Sales Invoice and Purchase Receipt document.
+
+For example, in Delivery Note Item table, a new field "Barcode" will be appear and if you point your mouse cursor to that field and scan the barcode using Barcode Scanner, the code will appear in that field. At the same time, system will pull item details, based on the barcode.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md b/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
new file mode 100644
index 0000000..eeb5cdf
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
@@ -0,0 +1,13 @@
+<h1>Using Batch feature in Stock Entry.</h1>
+
+1. You need to first create an Item Master Record. You can do so by typing 'new Item' in the Awesome bar.
+ <img class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 17:56:19.png">
+2. In the Item Master fill in all item related details. In the 'Inventory' section select 'Has Batch No.' as 'YES'
+ <img class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:00:57.png">
+ NOTE: This option can be changed after submit but only as long as there are no Stock Entries created against that Item. Once an Stock Entry is created against that item this field freezes. To modify it again you need to cancel all outstanding 'Stock Entries'
+3. You can then create a batch. To do so you can type 'new Batch' in the Awesome bar.
+4. Fill in the batch related details and save the Doc.
+ <img class="screenshot"
+ src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:09:42.png">
+5. Now in Stock Transaction You can associate a batch against that item under the 'Serial No / Batch' Section.<br>
+ <img class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:13:22.png"><br></div>
diff --git a/erpnext/docs/user/manual/en/stock/batch.md b/erpnext/docs/user/manual/en/stock/batch.md
new file mode 100644
index 0000000..e6a1253
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/batch.md
@@ -0,0 +1,25 @@
+Batch inventory feature in ERPNext allows you to group multiple units of an item,
+and assign them a unique value/number/tag called Batch No.
+
+The practise of stocking based on batch is mainly followed in the pharmaceutical industry.
+Medicines/drugs produced in a particular batched is assigned a unique id.
+This helps them updating and tracking manufacturing and expiry date for all the units produced under specific batch.
+
+> Note: To set item as a batch item, "Has Batch No" field should be updated as Yes in the Item master.
+
+On every stock transaction (Purchase Receipt, Delivery Note, POS Invoice) made for batch item,
+you should provide item's Batch No. To create new Batch No. master for an item, go to:
+
+> Stock > Setup > Batch > New
+
+Batch master is created before creation of Purchase Receipt.
+Hence eveytime there is Purchase Receipt or Production entry being made for a batch item,
+you will first create its Batch No, and then select it in Purcase order or Production Entry.
+
+<img class="screenshot" alt="batch" src="{{docs_base_url}}/assets/img/stock/batch.png">
+
+> Note: In stock transactions, Batch IDs will be filtered based on Item Code, Warehouse,
+Batch Expiry Date (compared with Posting date of a transaction) and Actual Qty in Warehouse.
+While searching for Batch ID without value in Warehouse field, then Actual Qty filter won't be applied.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md
new file mode 100644
index 0000000..f7e7f1e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/delivery-note.md
@@ -0,0 +1,56 @@
+A Delivery Note is made when a shipment is shipped from the company’s
+Warehouse.
+
+A copy of the Delivery Note is usually sent with the transporter. The Delivery
+Note contains the list of Items that are sent in the shipment and updates the
+inventory.
+
+The entry of the Delivery Note is very similar to a Purchase Receipt. You can
+create a new Delivery Note from:
+
+> Stock > Delivery Note > New
+
+or from a “Submitted” Sales Order (that is not already shipped) by clicking on
+“Make Delivery Note”.
+
+<img class="screenshot" alt="Delivery Note" src="{{docs_base_url}}/assets/img/stock/delivery-note.png">
+
+You can also “fetch” the details from an unshipped Sales Order.
+
+You will notice that all the information about unshipped Items and other
+details are carried over from your Sales Order.
+
+### Shipping Packets or Items with Product Bundle
+
+If you are shipping Items that have a [Product Bundle]({{docs_base_url}}/user/guides/selling/setup/sales-bom.html), ERPNext will automatically
+create a “Packing List” table for you based on the sub-Items in that Item.
+
+If your Items are serialized, then for Product Bundle type of Items, you will have
+to update the Serial Number in the “Packing List” table.
+
+### Packing Items in to Cases, for Container Shipment
+
+If you are doing container shipment or by weight, then you can use the Packing
+Slip to breakup your Delivery Note into smaller units. To make a Packing Slip
+go to:
+
+> Stock > Packing Slip > New Packing Slip
+
+You can create multiple Packing Slips for your Delivery Note and ERPNext will
+ensure that the quantities in the Packing Slip do not exceed the quantities in
+the Delivery Note.
+
+* * *
+
+#### Q. How to Print Without Amounts?
+
+If you want to print your Delivery Notes without the amount (this might be
+useful if you are shipping high value items), just check the “Print without
+Amount” box in the “More Info” section.
+
+#### What happens when the Delivery Note is “Submitted”?
+
+A Stock Ledger Entry is made for each Item and stock is updated. Pending
+Quantity in the Sales Order is updated (if applicable).
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/index.md b/erpnext/docs/user/manual/en/stock/index.md
new file mode 100644
index 0000000..971c33c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/index.md
@@ -0,0 +1,27 @@
+For most small business that deal in physical goods, a large part of their net
+worth is invested in the stock in hand.
+
+### Material Flow
+
+There are three main types of entries:
+
+ * Purchase Receipt: Items received from Suppliers against Purchase Orders.
+ * Stock Entry: Items transferred from one Warehouse to another.
+ * Delivery Note: Items shipped to Customers.
+
+#### How does ERPNext track stock movement / levels?
+
+Tracking stock is not just about adding and subtracting quantities. Some
+complications arise when:
+
+ * Back-dated (past) entries are made / edited: This affects future stock levels and may lead to negative stock.
+ * Stock has to be valued based on First-in-First-out: ERPNext needs to maintain a sequence of all transactions to know the exact value of your Items.
+ * Stock reports are required at any point in time in the past: You have to lookup what was the quantity / value your stock of Item X on date Y.
+
+To manage this, ERPNext collects all inventory transactions in a table called
+the Stock Ledger Entry. All Purchase Receipts, Stock Entries and Delivery
+Notes update this table.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/stock/index.txt b/erpnext/docs/user/manual/en/stock/index.txt
new file mode 100644
index 0000000..cd36ac6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/index.txt
@@ -0,0 +1,20 @@
+material-request
+stock-entry
+delivery-note
+purchase-receipt
+installation-note
+item
+warehouse
+serial-no
+batch
+projected-quantity
+accounting-of-inventory-stock
+tools
+setup
+sales-return
+purchase-return
+articles
+item-price
+item-valuation-fifo-and-moving-average
+opening-stock
+stock-how-to
diff --git a/erpnext/docs/user/manual/en/stock/installation-note.md b/erpnext/docs/user/manual/en/stock/installation-note.md
new file mode 100644
index 0000000..0519652
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/installation-note.md
@@ -0,0 +1,5 @@
+You can use installation note to record the instalation of a product having a serial number.
+
+<img class="screenshot" alt="Installation Note" src="{{docs_base_url}}/assets/img/stock/installation-note.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item-price.md b/erpnext/docs/user/manual/en/stock/item-price.md
new file mode 100644
index 0000000..b877e8d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item-price.md
@@ -0,0 +1,43 @@
+Item Price is the record in which you can log sellig and buying rate of an item.
+
+There are two ways to reach to new Item Price form.
+
+> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price
+
+Or
+
+> Item >> Add/Edit Prices >> Click on "+" >> New Item Price
+
+Following are the steps to create new Item Price.
+
+Step 1: Select Price List
+
+You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
+
+
+
+On selection of Price List, its currency and for selling or buying property will be fetched as well.
+
+To have Item Price fetching in the sales or purchase transaction, you should have Price List id selected in the transaction, just above Item table.
+
+Step 2: Select Item
+
+Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
+
+
+
+Step 3: Enter Rate
+
+Enter selling/buying rate of an item in Price List currency.
+
+
+
+Step 4: Save Item Price
+
+To check all Item Price together, go to:
+
+Stock >> Main Report >> Itemwise Price List Rate
+
+You will find option to create new Item Price record (+) in this report as well.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item-valuation-fifo-and-moving-average.md
new file mode 100644
index 0000000..9344870
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item-valuation-fifo-and-moving-average.md
@@ -0,0 +1,28 @@
+### How are Items Valued?
+
+One of the major features of any inventory system is that you can find out the
+value of any item based on its historic or average price. You can also find
+the value of all your items for your balance sheet.
+
+Valuation is important because:
+
+ * The buying price may fluctuate.
+ * The value may change because of some process (value add).
+ * The value may change because of decay, loss etc.
+
+You may encounter these terms, so lets clarify:
+
+ * Rate: Rate at which the transaction takes place.
+ * Valuation Rate: Rate at which the items value is set for your valuation.
+
+There are two major ways in which ERPNext values your items.
+
+ * **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y.
+
+
+
+ * **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
+
+> New Value X2 = (X * Y + X1 * Y1) / (Y + Y1)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
new file mode 100644
index 0000000..4fe0aad
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -0,0 +1,91 @@
+An Item is your companys' product or a service. The term Item is applicable to your core products as well as your raw materials. It can be a product or service that you buy/sell from your customers/ suppliers. ERPNext allows you to manage all sorts of items like raw-materials, sub-assemblies, finished goods, item variants and service items.
+
+ERPNext is optimized for itemized management of your sales and purchase. If you are in services, you can create an Item for each services that your offer. Completing the Item Master is very essential for successful implementation of ERPNext.
+
+## Item Properties
+
+ * **Item Name:** Item name is the actual name of your product or service.
+ * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification]({{docs_base_url}}/user/guides/stock/item/item-codification.html)
+ * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group]({{docs_base_url}}/user/guides/stock/setup/item-group.html)
+ * **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list.
+ * **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item.
+ * **Variant:** A Item Variant is a different version of a Item.To learn more about managing varaints see [Item Variants]({{docs_base_url}}/user/guides/stock/item/item-variants.html)
+
+### Upload an Image
+
+To upload an image for your icon that will appear in all transactions, save
+the partially filled form. Only after your file is saved the 'upload' button will
+work above the Image icon. Click on this sign and upload the image.
+
+### Inventory : Warehouse and Stock Setting
+
+In ERPNext, you can select different type of Warehouses to stock your
+different Items. This can be selected based on Item types. It could be Fixed
+Asset Item, Stock Item or even Manufacturing Item.
+
+ * **Stock Item:** If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item.
+ * **Default Warehouse:** This is the Warehouse that is automatically selected in your transactions.
+ * **Allowance Percentage:** This is the percent by which you will be allowed to over-bill or over-deliver this Item. If not set, it will select from the Global Defaults.
+ * **Valuation Method:** There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit “ Item Valuation, FIFO and Moving Average”.
+
+### Serialized and Batched Inventory
+
+These numbers help to track individual units or batches of Items which you sell. It also tracks warranty and returns. In case any individual Item is recalled by the supplier the number system helps to track individual Item. The numbering system also manages expiry dates. Please note that if you sell your items in thousands, and if the items are very small like pens or erasers, you need not serialize them. In ERPNext, you will have to mention the serial number in some accounting entries. To create serial numbers you will have to manually create all the numbers in your entries. If your product is not a big consumer durable Item, if it has no warranty and has no chances of being recalled, avoid giving serial numbers.
+
+> Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
+
+ * [Discussion on Serialized Inventory]({{docs_base_url}}/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.html)
+
+### Re Ordering
+
+ * **Re-order level** suggests the amount of stock balance in the Warehouse.
+ * **Re-order Qty** suggests the amount of stock to be ordered to maintain minimum stock levels.
+ * **Minimum Order Qty** is the minimum quantity for which a Material Request / Purchase Order must be made.
+
+### Item Tax
+
+These settings are required only if a particular Item has a different tax rate
+than the rate defined in the standard tax Account. For example, If you have a
+tax Account, “VAT 10%” and this particular Item is exempted from tax, then you
+select “VAT 10%” in the first column, and set “0” as the tax rate in the
+second column.
+
+Go to [Setting Up Taxes]({{docs_base_url}}/user/guides/setting-up/setting-up-taxes.html) to understand this topic in detail.
+
+### Inspection
+
+Inspection Required: If an incoming inspection (at the time of delivery from
+the Supplier) is mandatory for this Item, mention “Inspection Required” as
+“Yes”. The system will ensure that a Quality Inspection will be prepared and
+approved before a Purchase Receipt is submitted.
+
+Inspection Criteria: If a Quality Inspection is prepared for this Item, then
+this template of criteria will automatically be updated in the Quality
+Inspection table of the Quality Inspection. Examples of Criteria are: Weight,
+Length, Finish etc.
+
+### Purchase Details
+
+
+
+**Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse.
+
+**Default Expense Account:** It is the account in which cost of the Item will be debited.
+
+**Default Cost Centre:** It is used for tracking expense for this Item.
+
+### Sales Details
+
+
+
+**Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
+
+**Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.
+
+### Manufacturing And Website
+
+
+
+Visit [Manufacturing]({{docs_base_url}}/user/guides/manufacturing.html) and [Website ]({{docs_base_url}}/user/guides/website.html)to understand these topics in detail.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/item/index.txt b/erpnext/docs/user/manual/en/stock/item/index.txt
new file mode 100644
index 0000000..eadae6c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/index.txt
@@ -0,0 +1,6 @@
+item-codification
+item-variants
+purchase-details.md
+reorder.md
+purchase-details.md
+reorder.md
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/item-codification.md b/erpnext/docs/user/manual/en/stock/item/item-codification.md
new file mode 100644
index 0000000..eeb4f49
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/item-codification.md
@@ -0,0 +1,78 @@
+If you already have a full-fledged business with a number of physical items,
+you would have probably coded your items. If you have not, you have a choice.
+We recommend that you should codify if you have lot of products with long or
+complicated names. In case you have few products with short names, it is
+preferable to keep the Item Code same as Item Name.
+
+Item codification has been a sensitive topic and wars have been fought on this
+(not joking). In our experience, when you have items that cross a certain
+size, life without codification is a nightmare.
+
+### Benefits
+
+ * Standard way of naming things.
+ * Less likely to have duplicates.
+ * Explicit definition.
+ * Helps to quickly find if a similar item exists.
+ * Item names get longer and longer as more types get introduced. Codes are shorter.
+
+### Pain
+
+ * You have to remember the codes!
+ * Harder for new team members to pick up.
+ * You have to create new codes all the time.
+
+### Example
+
+You should have a simple manual / cheat-sheet to codify your Items instead of
+just numbering them sequentially. Each letter should mean something. Here is
+an example:
+
+If your business involves wooden furniture, then you may codify as follows:
+
+Item Codification Summary Sheet (SAMPLE)
+
+
+
+ First letter: "Material" Third letter: "Size"
+
+ - W - Wood - 0 - less than 1mm
+ - H - Hardware - 1 - 1mm - 5mm
+ - G - Glass - 2 - 5mm - 10mm
+ - U - Upholstery - 3 - 10mm - 10cm
+ - P - Plastic
+
+ Second Letter: "Type"
+
+ For Wood: For Hardware:
+
+ - S - Sheet - S - Screw
+ - B - Bar - N - Nut
+ - L - L-section - W - Washer
+ - M - Molded - B - Bracket
+ - R - Round
+
+
+The last few letters could be sequential. So by looking at code **WM304** \-
+you know its a wooden molding less than 10cm in size
+
+### Standardization
+
+If you have more than one person naming items, the style of naming items will
+change for everyone. Sometimes, even for one person, he or she may forget how
+they had named the item and may create a duplicate name _"Wooden Sheet 3mm" or
+"3mm Sheet of Wood"?_
+
+### Rationalizing
+
+It is a good practice to have minimum varieties of items so that you keep
+minimum stock, housekeeping is simpler etc. When you are planning a new
+product and you want to know if you are already purchasing a part in some
+other product, the item codes will help you quickly determine if you are using
+a similar raw material in another product.
+
+We believe if you do this small investment, it will help you rationalize
+things as your business grows, though its okay not to codify if you have less
+items.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
new file mode 100644
index 0000000..c10addb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md
@@ -0,0 +1,24 @@
+A Item Variant is a different version of a Item, such as differing sizes or differing colours.
+Without Item variants, you would have to treat the small, medium and large versions of a t-shirt as three separate Items;
+Item variants let you treat the small, medium and large versions of a t-shirt as variations of the same Item.
+
+To use Item Variants in ERPNext, create an Item and check 'Has Variants'
+
+* The Item shall then be referred as a 'Template'
+
+<img class="screenshot" alt="Has Variants" src="{{docs_base_url}}/assets/img/stock/item-has-variants.png">
+
+On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table.
+In case the attribute has Numeric Values, you can specify the range and increment values here.
+
+<img class="screenshot" alt="Valid Attributes" src="{{docs_base_url}}/assets/img/stock/item-attributes.png">
+
+> Note: You cannot make Transactions against a 'Template'
+
+To create 'Item Variants' against a 'Template' select 'Make Variants'
+
+<img class="screenshot" alt="Make Variants" src="{{docs_base_url}}/assets/img/stock/make-variant.png">
+
+<img class="screenshot" alt="Make Variants" src="{{docs_base_url}}/assets/img/stock/make-variant-1.png">
+
+To learn more about setting Attributes Master check [Item Attributes]({{docs_base_url}}/user/guides/stock/setup/item-attribute.html)
diff --git a/erpnext/docs/user/manual/en/stock/item/purchase-details.md b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
new file mode 100644
index 0000000..5749178
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
@@ -0,0 +1,22 @@
+# purchase details
+
+# How Do I Track Warranty Status?
+
+To track a warranty period, it is necessary that the Item is a serialized Item.
+When this Item is delivered, the delivery date and the expiry period is saved in the serial number master. Through the serial number master you can track the warranty status.
+
+A warranty means a guarantee or a promise which provides assurance by one party to the other party which allows for a legal remedy if that promise is not true or followed. A warranty period is a time period in which a purchased product may be returned or exchanged.
+
+
+
+# How To Name A Manufacturer Part Number?
+
+Go to the purchase details section of the Item form, and enter the number on the right hand side in the field ‘Manufacturer Part Number’
+
+> Stock > Item
+
+A manufacturer part number is a series of numbers and /or letters that has been given to a part by the manufacturer. The manufacturer part number belongs to the manufacturer and helps distinguish the part from other manufacturers. If two parts come from different manufacturers, they will have different MPNs. This allows businesses to identify which company made the part.
+
+
+
+__For Example:__ A refrigerator will have different parts which will have manufacturer part number. Thus, when any part fails and you want to replace it, you can simply order that part based on its part number.
diff --git a/erpnext/docs/user/manual/en/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md
new file mode 100644
index 0000000..4537d95
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/reorder.md
@@ -0,0 +1,26 @@
+# Re-Order
+
+# How To Setup Re-order Level?
+
+Go to the Re-order section of the Item form in the Stock module.
+
+> Stock > Item
+
+The Re-order level is the point at which stock on a particular item has diminished to a point where it needs to be replenished. To order based on Re-order level can avoid shortages. Re-order level can be determined based on the lead time and the average daily consumption.
+
+
+
+__For example:__ You can set your reorder level of bath towels at 10. When there are only 10 towels remaining in stock, the system will either send a mail or take action depending upon what you have selected in global settings.
+
+# How To Setup Reorder Quantity?
+
+To setup Reorder quantity, go to the Re-order section of the Item form. In the field ‘Re-order Qty’ type the amount that is needed.
+
+> Stock> Item
+
+Re-order quantity is the quantity to order, so that the sum of ordering cost and holding cost is at its minimum.The re-order quantity is based on the minimum order quantity specified by the supplier and many other factors.
+
+
+
+__For example:__ If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption.
+
diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
new file mode 100644
index 0000000..784778d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -0,0 +1,30 @@
+A Material Request is a simple document identifying a requirement of a set of
+Items (products or services) for a particular reason.
+
+
+
+To generate a Material Request manually go to:
+
+> Stock > Documents > Material Request > New
+
+#### Creating Material Request
+
+<img class="screenshot" alt="Material Request" src="{{docs_base_url}}/assets/img/buying/material-request.png">
+
+A Material Request can be generated:
+
+ * Automatically from a Sales Order.
+ * Automatically when the Projected Quantity of an Item in stores reaches a particular level.
+ * Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing activities.
+ * If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the [Projected Quantity]({{docs_base_url}}/user/guides/stock/projected-quantity.html) for this Item.
+
+A Material Request can be of type:
+
+* Purchase - If the request material is to be purchased.
+* Material Transfer - If the requested material is to be shifted from one warehouse to another.
+* Material Issue - If the requested material is to be Issued.
+
+> Info: Material Request is not mandatory. It is ideal if you have centralized
+buying so that you can collect this information from various departments.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/opening-stock.md b/erpnext/docs/user/manual/en/stock/opening-stock.md
new file mode 100644
index 0000000..463eef4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/opening-stock.md
@@ -0,0 +1,15 @@
+# Opening Stock
+
+<p class="lead"> Opening Stock is the Stock quantity in the beginning of every accounting year of an organisation. The closing Stock with the prior accounting year becomes the opening Stock with the existing accounting year.</p>
+
+Opening Stock can be done for serialized Items as well as non-serialized Items.To update opening stock for non-serialized Item, you should perform Stock Reconciliation. For serialised Item, you can make Stock Entry of type Material Receipt.
+
+> Stock > Stock Reconciliation > New Stock Reconciliation
+
+In both cases, you should enter "Difference/Expense Account" as **Temporary Opening** account. On submission of the document, system will debit Warehouse account which is an asset account and credit difference/expense account. Before making these entries, make sure you have enabled "Perpetual Inventory" by checking Stock Settings page.
+
+If you are not making opening Stock Entry, you can select "Stock Adjustment" account in Difference/Expense Account field which is an expense account.
+
+To understand Opening Stock for serialzed Items visit [Stock Reconciliation]({{docs_base_url}}/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.html)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
new file mode 100644
index 0000000..9251a1b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md
@@ -0,0 +1,26 @@
+Projected Quantity is the level of stock that is predicted for a particular
+Item, based on the current stock levels and other requirements. It is the
+quantity of gross inventory that includes supply and demand in the past which
+is done as part of the planning process.
+
+The projected inventory is used by the planning system to monitor the reorder
+point and to determine the reorder quantity. The projected Quantity is used by
+the planning engine to monitor the safety stock levels. These levels are
+maintained to serve unexpected demands.
+
+Having a tight control of the projected inventory is crucial to determine
+shortages and to calculate the right order quantity.
+
+
+
+
+> Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
+Reserved Qty
+
+ * Actual Qty: Quantity available in the warehouse.
+ * Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.
+ * Requested Qty: Quantity requested for purchase, but not ordered.
+ * Ordered Qty: Quantity ordered for purchase, but not received.
+ * Reserved Qty: Quantity ordered for sale, but not delivered.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/purchase-receipt.md b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
new file mode 100644
index 0000000..0f43b58
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
@@ -0,0 +1,78 @@
+Purchase Receipts are made when you accept material from your Supplier usually
+against a Purchase Order.
+
+You can also accept Purchase Receipts directly ( Set Purchase Order
+Required as “No” in Global Defaults).
+
+You can make a Purchase Receipt directly from:
+
+> Stock > Purchase Receipt > New Purchase Receipt
+
+or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”.
+
+<img class="screenshot" alt="Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-receipt.png">
+
+### Rejections
+
+In the Purchase Receipt, you are required to enter whether all the materials
+you receive are of acceptable quality (in case you check). If you have any
+rejections, update the “Rejected Quantity” column in the Items table.
+
+If you reject, you are required to enter a “Rejected Warehouse” to indicate
+where you are storing the rejected Items.
+
+### Quality Inspections
+
+If for certain Items, it is mandatory to record Quality Inspections (if you
+have set it in your Item master), you will need to update the “Quality
+Inspection No” (QA No) column. The system will only allow you to “Submit” the
+Purchase Receipt if you update the “Quality Inspection No”.
+
+### UOM Conversions
+
+If your Purchase Order for an Item is in a different Unit of Measure (UOM)
+than what you stock (Stock UOM), then you will need to update the “UOM
+Conversion Factor”.
+
+### Currency Conversions
+
+Since the incoming Item affects the value of your inventory, it is important
+to convert it into your base Currency, if you have ordered in another
+Currency. You will need to update the Currency Conversion Rate if applicable.
+
+### Taxes and Valuation
+
+Some of your taxes and charges may affect your Items value. For example, a Tax
+may not be added to your Item’s valuation, because if you sell the Item, you
+will have to add the tax at that time. So make sure to mark all your taxes in
+the Taxes and Charges table correctly for accurate valuation.
+
+### Serial Numbers and Batches
+
+If your Item is serialized or batched, you will have to enter Serial Number
+and Batch in the Item's table. You are allowed to enter multiple Serial Numbers
+in one row (each on a separate line) and you must enter the same number of
+Serial Numbers as the quantity. You must enter each Batch number on a separate
+line.
+
+* * *
+
+#### What happens when the Purchase Receipt is “Submitted”?
+
+A Stock Ledger Entry is created for each Item adding the Item in the Warehouse
+by the “Accepted Quantity” If you have rejections, a Stock Ledger Entry is
+made for each Rejection. The “Pending Quantity” is updated in the Purchase
+Order.
+
+* * *
+
+#### Adding value to your Items post Purchase Receipt:
+
+Some times, certain expenses that add value to your purchased Items are known
+only after a while. Common example is, if you are importing the Items, you
+will come to know of Customs Duty etc only when your “Clearing Agent” sends
+you a bill. If you want to attribute this cost to your purchased Items, you
+will have to use the Landed Cost Wizard. Why “Landed Cost”? Because it
+represents the charges that you paid when it landed in your possession.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/purchase-return.md b/erpnext/docs/user/manual/en/stock/purchase-return.md
new file mode 100644
index 0000000..328ed08
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/purchase-return.md
@@ -0,0 +1,21 @@
+ERPNext has an option for products that are need to be returned to the
+supplier. This may be on account of a number of reasons like defects in goods,
+quality not matching, the buyer not needing the stock, etc.
+
+You can create a Purchase Return by simply making a Purchase Receipt with negative quantity.
+
+First open the original Purchase Receipt, against which supplier delivered the items.
+
+<img class="screenshot" alt="Original Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-return-original-purchase-receipt.png">
+
+Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount.
+
+<img class="screenshot" alt="Return Against Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-return-against-purchase-receipt.png">
+
+On submission of Return Purchase Return, system will decrease item qty from the mentioned warehouse. To maintain correct stock valuation, stock balance will also go up according to the original purchase rate of the returned items.
+
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/purchase-return-stock-ledger.png">
+
+If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
+
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/purchase-return-general-ledger.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/sales-return.md b/erpnext/docs/user/manual/en/stock/sales-return.md
new file mode 100644
index 0000000..1ce922d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/sales-return.md
@@ -0,0 +1,27 @@
+Goods sold being returned is quite a common practice in business. They could
+be returned by the customer on quality issues, non-delivery on agreed date, or
+any other reason.
+
+In ERPNext, you can create a Sales Return by simply making a Delivery Note / Sales Invoice with negative quantity.
+
+First open the original Delivery Note / Sales Invoice, against which customer returned the items.
+
+<img class="screenshot" alt="Original Delivery Note" src="{{docs_base_url}}/assets/img/stock/sales-return-original-delivery-note.png">
+
+Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount.
+
+<img class="screenshot" alt="Return Against Delivery Note" src="{{docs_base_url}}/assets/img/stock/sales-return-against-delivery-note.png">
+
+You can also create the return entry against original Sales Invoice, to return stock along with credit note, check "Update Stock" option in Return Sales Invoice.
+
+<img class="screenshot" alt="Return Against Sales Invoice" src="{{docs_base_url}}/assets/img/stock/sales-return-against-sales-invoice.png">
+
+On submission of Return Delivery Note / Sales Invoice, system will increase stock balance in the mentioned warehouse. To maintain correct stock valuation, stock balance will go up according to the original purchase rate of the returned items.
+
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/sales-return-stock-ledger.png">
+
+In case of Return Sales Invoice, Customer account will be credited and associated income and tax account will be debited.
+
+If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
+
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/sales-return-general-ledger.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/serial-no.md b/erpnext/docs/user/manual/en/stock/serial-no.md
new file mode 100644
index 0000000..fbbfb1a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/serial-no.md
@@ -0,0 +1,33 @@
+As we discussed in the **Item** section, if an **Item** is _serialized_, a
+**Serial Number** (Serial No) record is maintained for each quantity of that
+**Item**. This information is helpful in tracking the location of the Serial
+No, its warranty and end-of-life (expiry) information.
+
+**Serial Nos** are also useful to maintain fixed assets. **Maintenance Schedules** can also be created against serial numbers for planning and scheduling maintenance activity for these assets (if they require maintenance).
+
+You can also track from which **Supplier** you purchased the **Serial No** and
+to which **Customer** you have sold it. The **Serial No** status will tell you
+its current inventory status.
+
+If your Item is _serialized_ you will have to enter the Serial Nos in the
+related column with each Serial No in a new line.
+You can maintain single units of serialized items using Serial Number.
+
+### Serial Nos and Inventory
+
+Inventory of an Item can only be affected if the Serial No is transacted via a
+Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales
+Invoice). When a new Serial No is created directly, its warehouse cannot be
+set.
+
+<img class="screenshot" alt="Serial Number" src="{{docs_base_url}}/assets/img/stock/serial-no.png">
+
+* The Status is set based on Stock Entry.
+
+* Only Serial Numbers with status 'Available' can be delivered.
+
+* Serial Nos can automatically be created from a Stock Entry or Purchase Receipt. If you mention Serial No in the Serial Nos column, it will automatically create those serial Nos.
+
+* If in the Item Master, the Serial No Series is mentioned, you can leave the Serial No column blank in a Stock Entry / Purchase Receipt and Serial Nos will automatically be set from that series.
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/setup/index.md b/erpnext/docs/user/manual/en/stock/setup/index.md
new file mode 100644
index 0000000..6f3f1cb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/index.md
@@ -0,0 +1,3 @@
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/stock/setup/index.txt b/erpnext/docs/user/manual/en/stock/setup/index.txt
new file mode 100644
index 0000000..b21c4f9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/index.txt
@@ -0,0 +1,3 @@
+stock-settings
+item-group
+item-attribute
diff --git a/erpnext/docs/user/manual/en/stock/setup/item-attribute.md b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
new file mode 100644
index 0000000..0b2ab74
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
@@ -0,0 +1,16 @@
+You can define Attributes and attribute values for your Item Variants here.
+
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute.png">
+
+#### Non Numeric Attributes
+
+* For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table.
+
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute-non-numeric.png">
+
+#### Numeric Attributes
+
+* If your attribute is Numeric, select Numeric Values
+* Specify the Range and the Increment Value
+
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute-numeric.png">
diff --git a/erpnext/docs/user/manual/en/stock/setup/item-group.md b/erpnext/docs/user/manual/en/stock/setup/item-group.md
new file mode 100644
index 0000000..cf6a75a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/item-group.md
@@ -0,0 +1,26 @@
+Item Group is the classification category. Depending on the type of product,
+categorise it under its respective field. If the product is
+service oriented, name it under the group head - service. If the
+product is used as a raw-material, you have to name it under the Raw-material
+category. In case, your product is used only in trading, you can categorise it
+under Trading.
+
+<img class="screenshot" alt="Item Group Tree" src="{{docs_base_url}}/assets/img/stock/item-group-tree.png">
+
+### Create a Item Group
+
+* Select an Item Group under which you wish to create the group.
+
+* Select 'Add Child'
+
+<img class="screenshot" alt="Add Item Group" src="{{docs_base_url}}/assets/img/stock/item-group-new.gif">
+
+### Delete an Item Group
+
+* Select the Item Group you want to delete.
+
+* Select 'delete'
+
+<img class="screenshot" alt="Add Item Group" src="{{docs_base_url}}/assets/img/stock/item-group-del.gif">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
new file mode 100644
index 0000000..f8cb9ea
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
@@ -0,0 +1,5 @@
+You can set default settings for your stock related transactions here.
+
+<img class="screenshot" alt="Stock Settings" src="{{docs_base_url}}/assets/img/stock/stock-settings.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
new file mode 100644
index 0000000..b7e0860
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md
@@ -0,0 +1,43 @@
+A Stock Entry is a simple document that lets you record Item movement from a
+Warehouse, to a Warehouse and between Warehouses.
+
+To make a Stock Entry you have to go to:
+
+> Stock > Stock Entry > New
+
+<img class="screenshot" alt="Stock Entry" src="{{docs_base_url}}/assets/img/stock/stock-entry.png">
+
+Stock Entries can be made for the following purposes:
+
+* Material Issue - If the material is being issued. (Outgoing Material)
+* Material Receipt - If the material is being received. (Incoming Material)
+* Material Transfer - If the material is being moved from one warehouse to another.
+* Material Transfer for Manufacturing - If the material being transfered is for Manufacturing Process.
+* Manufacture - If the Material is being received from a Manufacturing/Production Operation.
+* Repack - If the Original item/items is being repacked into new item/items.
+* Subcontract - If the Material is being issued for a sub-contract activity.
+
+In the Stock Entry you have to update the Items table with all your
+transactions. For each row, you must enter a “Source Warehouse” or a “Target
+Warehouse” or both (if you are recording a movement).
+
+**Additional Costs:**
+
+If the stock entry is an incoming entry i.e any item is receiving at a target warehouse, you can add related additional costs (like Shipping Charges, Customs Duty, Operating Costs etc) assotiated with the process. The additional costs will be considered to calculate valuation rate of the items.
+
+To add additional costs, enter the description and amount of the cost in the Additional Costs table.
+
+<img class="screenshot" alt="Stock Entry Additional Costs" src="{{docs_base_url}}/assets/img/stock/additional-costs-table.png">
+
+The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate.
+
+<img class="screenshot" alt="Stock Entry Item Valuation Rate" src="{{docs_base_url}}/assets/img/stock/stock-entry-item-valuation-rate.png">
+
+If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account.
+
+<img class="screenshot" alt="Additional Costs General Ledger" src="{{docs_base_url}}/assets/img/stock/additional-costs-general-ledger.png">
+
+
+> **Note:** To update Stock from a spreadsheet, see Stock Reconciliation.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/stock-how-to.md b/erpnext/docs/user/manual/en/stock/stock-how-to.md
new file mode 100644
index 0000000..e0f5b2f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/stock-how-to.md
@@ -0,0 +1,2 @@
+This page contains most frequently asked questions on Stocks.
+
diff --git a/erpnext/docs/user/manual/en/stock/tools/index.md b/erpnext/docs/user/manual/en/stock/tools/index.md
new file mode 100644
index 0000000..6f3f1cb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/index.md
@@ -0,0 +1,3 @@
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/stock/tools/index.txt b/erpnext/docs/user/manual/en/stock/tools/index.txt
new file mode 100644
index 0000000..3aca9b7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/index.txt
@@ -0,0 +1,3 @@
+packing-slip
+quality-inspection
+landed-cost-voucher
diff --git a/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
new file mode 100644
index 0000000..1209aff
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
@@ -0,0 +1,33 @@
+Landed Cost is the total cost of a product to reach the product at the buyer’s door. Landed costs include the original cost of the item, complete shipping costs, customs duties, taxes, insurance and currency conversion fees etc. All of these components might not be applicable in every shipment, but relevant components must be considered as a part of the landed cost.
+
+> To understand landed cost better, let’s take an example based on our daily lives. You need to purchase a new washing machine for your home. Before making actual purchase, you probably do some investigation to know the best price. In this process, you often found a better deal from a store which is long away from your home. But you should also consider shipping cost while buying from that store. Total cost including transportation might be more than the price you get in your nearby store. In that case you will choose to buy from your nearest store, as landed cost of the item is cheaper in the nearest store.
+
+Similarly in business, identifying landed cost for a item / product is very crucial, as it helps to decide selling cost of that item and impacts company’s profitability. Hence all applicable landed cost charges should be included in item’s valuation rate.
+
+According to the [Third-Party Logistics Study](http://www.3plstudy.com/), only 45% of the respondents stated that they use Landed Cost extensively. The main reasons of not using Landed Cost are unavailability of necessary data (49%), lack of right tools (48%), do not have sufficient time (31%) and not sure how to apply landed cost (27%).
+
+### Landed Cost via Purchase Receipt
+
+In ERPNext, you can add landed cost related charges in “Taxes and Charges” table while creating Purchase Receipt (PR). You should add those charges for “Total and Valuation” or “Valuation”. Charges which are payable to the same supplier from whom you are buying the items, should be tagged as “Total and Valuation”. Otherwise if applicable charges are payable to a 3rd party, it should be tagged as “Valuation”. On submission of PR, system will calculate landed cost of all items, considering those charges and that landed cost will be considered to calculate item’s valuation rate (based on FIFO / Moving Average method).
+
+But in reality, while making Purchase Receipt we might not know all the charges which are applicable for landed cost. Your transporter can send the invoice after 1 month, but there is no point in waiting for booking Purchase Receipt till then. Companies who imports their products / parts, pays a huge amount as Customs Duty. And generally they get invoices from Customs Department after a period of time. In these cases, “Landed Cost Voucher” becomes handy, as it allows you to add those additional charges on a later date, and to update landed cost of purchased items.
+
+### Landed Cost Voucher
+
+You can update landed cost any time in the future via Landed Cost Voucher.
+
+> Stock > Tools > Landed Cost Voucher
+
+In the document, you can select multiple Purchase Receipts and fetch all items from those Purchase Receipts. Then you should add applicable charges in “Taxes and Charges” table. You can easily delete an item if the added charges is not applicable to that item. The added charges are proportionately distributed among all the items based their amount.
+
+<img class="screenshot" alt="Landed Cost Vouher" src="{{docs_base_url}}/assets/img/stock/landed-cost.png">
+
+### What happend on submission?
+
+1. On submission of Landed Cost Voucher, the applicable landed cost charges are updated in Purchase Receipt Item table.
+
+2. Valuation Rate of items are recalculated based on new landed cost.
+
+3. If you are using “Perpetual Inventory”, the system will post general ledger entries to correct Stock-in-Hand balance. It will debit (increase) corresponding “warehouse account” and credit (decrease) “Expense Included in Valuation” account. If items are already delivered, the Cost-of-Goods-Sold (CoGS) value has been booked as per old valuation rate. Hence, general ledger entries are reposted for all future outgoing entries of associated items, to correct CoGS value.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/stock/tools/packing-slip.md b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
new file mode 100644
index 0000000..0820959
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
@@ -0,0 +1,7 @@
+A packing slip is a document listing the items in a shipment. Usually attached to the goods delivered.
+While Shipping a product 'Draft' for Delivery Notes are created.
+You can make a Packing Slip from these Delivery Notes (Draft)
+
+<img class="screenshot" alt="Packing Slip" src="{{docs_base_url}}/assets/img/stock/packing-slip.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
new file mode 100644
index 0000000..34bea40
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
@@ -0,0 +1,8 @@
+In ERPNext, you can mark your incoming or outgoing products for Quality
+Inspection. To enable ERPNext to perform this function, go to :
+
+> Stock > Quality Inspection > New
+
+<img class="screenshot" alt="Quality Inspection" src="{{docs_base_url}}/assets/img/stock/quality-inspection.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md
new file mode 100644
index 0000000..d86f401
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/warehouse.md
@@ -0,0 +1,38 @@
+A warehouse is a commercial building for storage of goods. Warehouses are used
+by manufacturers, importers, exporters, wholesalers, transport businesses,
+customs, etc. They are usually large plain buildings in industrial areas of
+cities, towns, and villages. They mostly have loading docks to load and unload
+goods from trucks.
+
+To go to Warehouse, click on Stock and go to Warehouse under Masters. You
+could also go to the Setup module and click on Warehouse under Master Data.
+
+> Stock > Warehouse > New Warehouse
+
+<img class="screenshot" alt="Warehouse" src="{{docs_base_url}}/assets/img/stock/warehouse.png">
+
+In ERPNext, every Warehouse must belong to a specific company, to maintain
+company wise stock balance. The Warehouses are saved with their respective
+company’s abbreviations. This facilitates in identifying which Warehouse
+belongs to which company, at a glance.
+
+You can include user restrictions for these Warehouses. In case you do not
+wish a particular user to operate on a particular Warehouse, you can refrain
+the user from accessing that Warehouse.
+
+### Merge Warehouse
+
+In day to day transactions, duplicate entries are done by mistake, resulting
+in duplicate Warehouses. Duplicate records can be merged into a single
+Warehouse. From the top bar of the system select the File menu. Select Rename
+and Enter the correct Warehouse and check the Merge button. The system will
+replace all the links of wrong Warehouse with the correct Warehouse, in all
+transactions. Also, the available quantity (actual qty, reserved qty, ordered
+qty etc) of all items in the duplicate warehouse will be transferred to the
+correct warehouse. Once merging is done, delete the duplicate Warehouse.
+
+> Note: ERPNext system maintains stock balance for every distinct combination
+of Item and Warehouse. Thus you can get stock balance for any specific Item in
+a particular Warehouse on any particular date.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/support/index.md b/erpnext/docs/user/manual/en/support/index.md
new file mode 100644
index 0000000..7777049
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/index.md
@@ -0,0 +1,15 @@
+Great customer support and maintenance is at the heart of any successful small
+business. ERPNext gives you the tools to track all incoming requests and issues
+from your customers so that you can respond quickly. Your database of incoming
+queries will also help you track where the biggest opportunities are for
+improvements.
+
+In this module, you can track incoming queries from your email using Support
+Ticket. You can keep track on Customer Issues raised by Customers on specific
+Serial No and respond to them based on their warranty and other information.
+You can also make Maintenance Schedules for Serial Nos and keep a record of
+all Maintenance Visits made to your Customers.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/support/index.txt b/erpnext/docs/user/manual/en/support/index.txt
new file mode 100644
index 0000000..eaff69e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/index.txt
@@ -0,0 +1,4 @@
+issue
+warranty-claim
+maintenance-visit
+maintenance-schedule
diff --git a/erpnext/docs/user/manual/en/support/issue.md b/erpnext/docs/user/manual/en/support/issue.md
new file mode 100644
index 0000000..246af8d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/issue.md
@@ -0,0 +1,47 @@
+Issue is an incoming query from your Customer, usually via email or
+from the “Contact” section of your website. (To fully integrate the Support
+Ticket to email, see the Email Settings section).
+
+> Tip: A dedicated support email id is a good way to integrate incoming
+queries via email. For example, you can send support queries to ERPNext at
+support@erpnext.com and it will automatically create a Issue in the
+Frappe system.
+
+
+
+> Support > Issue > New Issue
+
+<img class="screenshot" alt="Issue" src="{{docs_base_url}}/assets/img/support/issue.png">
+
+#### Discussion Thread
+
+When a new email is fetched from your mailbox, a new Issue record is
+created and an automatic reply is sent to the sender indicating the Support
+Ticket Number. The sender can send additional information to this email. All
+subsequent emails containing this Issue number in the subject will be
+added to this Issue thread. The sender can also add attachments to
+the email.
+
+Issue maintains all the emails which are sent back and forth against
+this issue in the system so that you can track what transpired between the
+sender and the person responding.
+
+#### Status
+
+When a new Issue is created, its status is “Open”, when it is
+replied, its status becomes “Waiting for Reply”. If the sender replies back
+its status again becomes “Open”.
+
+#### Closing
+
+You can either “Close” the Issue manually by clicking on “Close
+Ticket” in the toolbar or if its status is “Waiting For Reply” . If the sender
+does not reply in 7 days, then the Issue closes automatically.
+
+#### Allocation
+
+You can allocate the Issue by using the “Assign To” feature in the
+right sidebar. This will add a new To Do to the user and also send a message
+indicating that this Issue is allocated.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/support/maintenance-schedule.md b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
new file mode 100644
index 0000000..e211562
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
@@ -0,0 +1,31 @@
+All machines require regular maintenance, specially those that contain a lot
+of moving parts, so if you are in the business of maintaining those or have
+some of them in your own premises, this is a useful tool to plan a calendar of
+activities for its maintenance.
+
+If the Customer Issue refers to “Breakdown Maintenance”, this refers to
+“Preventive Maintenance”.
+
+To create a new Maintenance Schedule go to:
+
+> Support > Maintenance Schedule > New Maintenance Schedule
+
+<img class="screenshot" alt="Maintenance Schedule" src="{{docs_base_url}}/assets/img/support/maintenance-schedule.png">
+
+In the Maintenance Schedule, there are two sections:
+
+In the first section, you select the Items for which you want to generate the
+schedule and set how frequently you want to plan a visit or a maintenance.
+These can be optionally fetched from a Sales Order. After selecting the Items,
+“Save” the record.
+
+The second section contains the maintenance activities planned in the
+schedule. “Generate Schedule” will generate a separate row for each
+maintenance activity.
+
+Each Item in a Maintenance Schedule is allocated to a Sales Person.
+
+When the document is “Submitted” Calendar events are created in the User of
+the Sales Person for each maintenance.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/support/maintenance-visit.md b/erpnext/docs/user/manual/en/support/maintenance-visit.md
new file mode 100644
index 0000000..e93260d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/maintenance-visit.md
@@ -0,0 +1,17 @@
+A Maintenance Visit is a record of a visit made by an engineer to a
+Customer’s premise usually against a Customer Issue. You can create a new
+Maintenance Visit from:
+
+> Support > Maintenance Visit > New Maintenance Visit
+
+<img class="screenshot" alt="Maintenance Visit" src="{{docs_base_url}}/assets/img/support/maintenance-visit.png">
+
+The Maintenance Visit contains information about the:
+
+ * Customer.
+ * The Items that were inspected / maintenance activity was carried out on.
+ * Details of actions taken.
+ * The person who carried out the actions.
+ * Feedback from the Customer.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/support/warranty-claim.md b/erpnext/docs/user/manual/en/support/warranty-claim.md
new file mode 100644
index 0000000..0a58e18
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/warranty-claim.md
@@ -0,0 +1,23 @@
+If you are selling **Items** under warranty or if you have sold and extended
+service contract like the Annual Maintenance Contract (AMC), your **Customer**
+may call you about an issue or a break-down and give you the Serial No of this
+Item.
+
+To record this, you can create a new **Warranty Claim** and add the
+**Customer** and **Item** / **Serial No**. The system will then automatically
+fetch the Serial No’s details and indicate whether this is under warranty or
+AMC.
+
+You must also add a description of the **Customer**’s issue and assign it to
+the person who needs to look into solving the issue.
+
+To create a new **Warranty Claim**:
+
+> Support > Warranty Claim > New Warranty Claim
+
+
+
+If a Customer visit is required to address the issue, you can create a new
+Maintenance Visit record from this.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
new file mode 100644
index 0000000..91f7950
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
@@ -0,0 +1,10 @@
+<h1>Adding Attachments to Outgoing Messages</h1>
+
+ERPNext has in-built file manage system. Click [here](https://erpnext.com/kb/tools/managing-attachments) to learn more on how attachments are managed in ERPNext.
+
+If you have some files attached in your transaction (say Purchase Order), which needs to be emailed with Purchase Order details. When click on Email option, at the end of the Communication dialog box, you will find all the attachments listed with check-box option. You should check files which needs to be emailed as an attachment to recipient.
+
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
new file mode 100644
index 0000000..27ad650
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
@@ -0,0 +1,27 @@
+<h1>Checking Link Between Documents</h1>
+
+Linked With function in ERPNext allows you checking a document is linked with which other documents. You will find Linked With function in the every document.
+
+
+
+####Scenario
+
+If you need to check which Delivery Note and Sales Invoice has been created against Sales Order, you should open Sales Order document, and click on Linked With in it.
+
+
+
+Since Sales Order is a centralize transaction, using linked-with option in the Sales Order, you can track complete deal, like billing done, purchases made, manufacturing development against this particular order.
+
+####How It Works?
+
+When you check Linked With in for a Sales Order, it lists all the record where this Sales Order ID is updated. It will not show documents where this Sales Order Id is entered as text, and not in the link field.
+
+####Backward Links
+
+If I check Linked With in the Delivery Note, will it list Sales Order created before this delivery note?
+
+Linked With function works only for the forward linkages. For the backward linkages, you should check current document itself. In the Delivery Note, you can check Item table to see which Sales Order it is linked with.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
new file mode 100644
index 0000000..dad85ad
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
@@ -0,0 +1,27 @@
+<h1>Delete Submitted Document</h1>
+
+ERPNext allows you to assign deletion permission exclusively to User. Only those users will be able to delete records. Click [here](/user-guide/setting-up/permissions/role-based-permissions) to learn more about permissions.
+
+To delete any document from system you should cancel all linked documents. For example if you need to delete Sales Order, but Delivery Note and Sales Invoice has already been created against that Sales Order. Then you should cancel and delete documents in reverse order, i.e. Sales Invoice, Delivery Note and then Sales Order. If payment entry was also made against Sales Invoice, then you should first Cancel and Delete that Journal Voucher, and then come to Sales Invoice.
+
+Following are step to delete submitted documents.
+
+####1. Cancel Document
+
+To be able to delete Submitted document, it must be cancelled first. After document is cancelled, you will find option to delete it.
+
+
+
+####2. Delete Document
+
+After cancellation, go to File menu and click on Delete option.
+
+
+
+#### Deleting from List
+
+For bulk deletion, you can select multiple Cancelled records and delete them at once from the list.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
new file mode 100644
index 0000000..2a1c0b4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
@@ -0,0 +1,17 @@
+<h1>Duplicate a Record</h1>
+
+ERPNext allows you to duplicate existing record. With this, you get values of existing record into new form, and create entries faster.
+
+####Scenario
+
+An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you can open previous order, and Copy it to create new order faster. On copying, details of the previous transaction will be updated in the new form. You can make changes where needed and submit the transaction.
+
+You will find Copy option under:
+
+File > Copy
+
+
+
+When Copy function is executed, values are mapped field-by-field from existing to new form.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.md b/erpnext/docs/user/manual/en/using-erpnext/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
new file mode 100644
index 0000000..460fa16
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
@@ -0,0 +1,10 @@
+adding-attachments-to-outgoing-messages
+check-link-between-documents
+delete-submitted-document
+duplicate-record
+managing-attachments
+merging-documents
+rename-tool
+renaming-documents
+search-filters
+tree-master-renaming
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
new file mode 100644
index 0000000..e7420b7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
@@ -0,0 +1,20 @@
+<h1>Adding Attachments in a Documents</h1>
+
+ERPNext allows to attach files with documents like Order, Invoices, Items etc. User with a read permission on particular document will also be able to access files attached with it. For example, Sales Order can have text file attached detailing item description and specification as decided with customers. Also it can be image file of drawing as per which product is to be manufactured.
+
+Open to attach file is at the footer of a form.
+
+
+
+Click on Attach to browse and select the file.
+
+
+
+If you maintain separate server for the files, or use online service like Dropbox, you can provide link of a particular file in the document in ERPNext.
+
+
+
+`For hosted users, limit of 1 MB is applied on file size.`
+
+To ensure there are not many files attached against the document, which can lead to your system slowing down, you can set limit as how many files can be attached against particular document. Click [here](https://erpnext.com/kb/customize/increase-max-attachments) to learn more about it.
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
new file mode 100644
index 0000000..08a2620
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -0,0 +1,32 @@
+<h1>Merging Documents </h1>
+
+Document merging feature is available in ERPNext. You can done this via 'Rename' feature in ERPNext.
+
+Following are step to merge document in existing document. Let's assume we are merging Account Ledger.
+
+#### 1: Go to Chart of Account
+
+`Accounts > Setup > Chart of Accounts`
+
+#### 2: Go to Account
+
+Click on Rename option of that account, which you want to merge in existing account.
+
+#### 3: Merge Account
+
+Enter existing account name in New Name field and check Mark on "Merge with existing" option. Then press 'Rename' button to merge.
+
+
+
+Following is how merged account will appear in the Chart of Account master.
+
+
+
+###Effect of Merging
+
+Merging document affects existing transaction where this record is selected. As well as it will affected on existing document balance.
+
+<div class="well"> Note: You can't merge Group into Ledger documents. As well as Ledger into Group documents. Also this feature is applicable for few documents only.</div>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
new file mode 100644
index 0000000..3bae21d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
@@ -0,0 +1,37 @@
+<h1>Rename Tool</h1>
+
+ERPNext has Renaming Tool which allows you to rectify/change record id for existing records. This facility can be only performed by User with System Manager's role.
+
+There are two ways you can rename records in your account. You can follow the approach based on how many records needs to be renamed.
+
+###Rename Record via Rename Tool
+
+Using this tool you can correct/rectify primary ids of 500 records at a time.
+
+Following are step to rename bulk records in ERPNext. Let's assume we are renaming Item Codes for existing Items.
+
+#### Step 1: Open Excel File
+
+In new excel file enter old Item Ids in one column and enter new Item Ids in exact next column. Then save data file in .csv format.
+
+
+
+#### Step 2: Upload Data File
+
+To upload data file go to,
+
+`Setup > Data > Rename Tool`
+
+Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
+
+
+
+Following are the renamed Item Codes.
+
+
+
+###Rename Individual Document
+
+Click [here](https://erpnext.com/kb/tools/renaming-documents) for detailed steps on how to rename document one by one.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
new file mode 100644
index 0000000..064f41d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
@@ -0,0 +1,69 @@
+<h1>Renaming Documents</h1>
+
+ERPNext has Renaming feature which allows you to correct primary id of a record.
+
+Following are step to rename document in ERPNext. Let's assume we are renaming Item Code for existing Item.
+
+#### 1. Go to Item
+
+`Stock > Documents > Item List > (Open Item)`
+
+Open Item for which Item Code needs to be renamed.
+
+#### 2. Go to File
+
+
+
+#### 3. Rename
+
+Enter desired Item Code, and click on "Rename".
+
+
+
+###Effect of Renaming
+
+Renaming document affects existing transaction where this record is selected. Consider given example, Item Code for a given item will be updated in the existing transaction as well.
+
+###See Also
+
+1. [Bulk Renaming](https://erpnext.com/kb/tools/rename-tool)
+2. [Document Merging](https://erpnext.com/kb/tools/merging-documents)
+
+**List of Renamable Documents**
+
+1. Contact
+2. Address
+3. Warehouse
+4. Supplier
+5. Customer
+6. User
+7. Sales Partner
+8. Project
+9. Cost Center
+10. Item Group
+11. Item
+12. Company
+13. Role
+14. Earning Type
+15. Note
+16. Serial No
+17. Account
+18. Territory
+19. Terms and Conditions
+20. Supplier Type
+21. Workstation
+22. Employee
+23. Sales Taxes and Charges Master
+24. Purchase Taxes and Charges Master
+25. Price List
+26. Party Type
+27. Mode of Payment
+28. Designation
+29. Department
+30. Deduction Type
+31. Customer Group
+32. Brand
+33. Branch
+34. Sales Person
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
new file mode 100644
index 0000000..0853ab1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
@@ -0,0 +1,39 @@
+<h1>Search Filters</h1>
+
+Search Filter option allows user to filter records based on value in the specific fields of that form.
+
+Search Filter option is available on the List View page of transactions.
+
+
+
+Each filter option has three fields to select value in.
+
+#### Field
+
+Select field of the form based on which you wish to filter records.
+
+
+
+#### Based On
+
+With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
+
+
+
+#### Value
+
+A value should be entered in this field based on while records will be filtered.
+
+
+
+After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
+
+
+
+On the transactions, Document Status - Not Equal To - Cancelled is applied by default. With this, Cancelled transactions are hidden from the list.
+
+
+
+You can apply multiple filters on a list of transactions one-by-one. To remove specific filter, just click on cancelled (X) sign ahead of it.
+
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
new file mode 100644
index 0000000..30aa979
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
@@ -0,0 +1,29 @@
+<h1>Tree Master Renaming</h1>
+
+There are various master which are maintained in tree structure. Click [here](https://erpnext.com/kb/setup/managing-tree-structure-masters) to learn more about tree structured masters in ERPNext.
+
+Following are the steps to be followed for renaming Account/Ledger ID, master which is maintained in tree structure. These steps will be applicable for renaming any master which is maintained in tree structure.
+
+#### Step 1: Go to Chart of Account
+
+`Accounts > Setup > Chart of Accounts`
+
+#### Step 2: Go to Account
+
+Expand Chart of Accounts and click on that account which you want to rename. When you click on that account, you will find Rename option.
+
+
+
+#### Step 2: Rename Account
+
+On clicking Rename option, dialog box will give you field to enter New Name for this Account. You should enter new name for the Account/Ledger and click on "Rename" button. On clicking Rename button, existing account will be renamed.
+
+
+
+Following is how renamed account will appear in the Chart of Account master.
+
+
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
new file mode 100644
index 0000000..6ecd377
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
@@ -0,0 +1,40 @@
+Assign To feature in ERPNext allows you to allocate particular document to specific user, whom needs to further work on that document.
+
+For example, if Sales Order needs to be approved/submitted by Sales Manager, first draft user can allocate that Sales Order to Sales Manager. On allocating document to Sales Manager, it will be added to that user's ToDo list. Same way, allocation can also be done to Material User and Account user who needs to create Delivery Note and Sales Invoice respectively against this Sales Note.
+
+<div class=well>Permissions restriction cannot be done based on Assigned To</div>
+
+Following are the steps to assign document to another user.
+
+#### Step 1: Click on the Assign To Button
+
+Assign to option is located at the footer of document. Clicking on Assignment Icon on the tool bar will fast-forward you to footer of same document.
+
+
+
+
+
+
+#### Step 2: Assign to User
+
+In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time.
+
+
+
+With assignment, you can also leave a comment for the review of asignee.
+
+####ToDo List of Assignee
+
+This transaction will appear in the To-do list of the ser in “Todo” section.
+
+
+
+####Removing Assignment
+
+User will be able to remove assignment by clicking on "Assignment Completed" button in the document.
+
+
+
+Once assignment is set as completed, Status of its ToDo record will be set as Closed.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
new file mode 100644
index 0000000..de564be
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
@@ -0,0 +1,63 @@
+The Calendar is a tool where you can create and share Events and also see
+auto-generated events from the system.
+
+You can switch calender view based on Month, Week and Day.
+
+###Creating Events in Calender
+
+####Creating Event Manually
+
+To create event manually, you should first determine Calender View. If Event's start and end time will be within one day, then you should first switch to Day view.
+
+This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time.
+
+
+
+Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it.
+
+####Event Based on Lead
+
+In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person person specified in this field.
+
+
+
+####Birthday Event
+
+Birthday Event is created based on Date of Birth specified in the Employee master.
+
+###Recurring Events
+
+You can set events as recurring in specific interval by Checking the "Repeat This
+Event".
+
+
+
+###Permission for Event
+
+You can set Event as Private or Public. Private Events will be visible only to you, and if any other user selected in the participants table. Instead of User, you can also assign permission for event based on Role.
+
+Public Event, like Birthday will be visible to all.
+
+
+
+###Event Reminders
+
+There are two ways you can receive email reminder for an event.
+
+####Enable Reminder in Event
+
+In the Event master, checking "Send an email reminder in the morning" will trigger notifcation email to all the participants for this event.
+
+
+
+####Create Email Digest
+
+To get email reminders for event, you should set Email Digest for Calender Events.
+
+Email Digest can be set from:
+
+`Setup > Email > Email Digest`
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
new file mode 100644
index 0000000..2de6f12
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
@@ -0,0 +1,19 @@
+### Assigned to
+
+You can email any transaction from the system by clicking on the “Assigned to”
+button in the right sidebar. A log of all your sent emails will be maintained
+in Communication.
+
+
+
+### Comments
+
+Comments are a great way to add information about a transaction that is not a
+part of the transactions. Like some background information etc. Comments can
+be added in the right sidebar.
+
+### Tags
+
+[Read more about Tags]({{docs_base_url}}/user/guides/collaboration-tools/tags.html)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.md b/erpnext/docs/user/manual/en/using-erpnext/index.md
new file mode 100644
index 0000000..93f080e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.md
@@ -0,0 +1,15 @@
+We live in an era when people are very comfortable communicating, discussing,
+asking, assigning work and getting feedback electronically. The Internet acts
+as a great medium to collaborate on work too. Taking this concept into ERP
+system, we have designed a bunch of tools whereby you can Assign transactions,
+manage your To Dos, share and maintain a Calendar, maintain a company wise
+Knowledge Base, Tag and Comment on transactions and send your Orders, Invoices
+etc via Email. You can also send instant messages to other users using the
+Messaging tool.
+
+These tools are integrated into all aspects of the product so that you can
+effectively manage your data and collaborate with your co-workers.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.txt b/erpnext/docs/user/manual/en/using-erpnext/index.txt
new file mode 100644
index 0000000..259835e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt
@@ -0,0 +1,8 @@
+to-do
+collaborating-around-forms
+messages
+notes
+calendar
+assignment
+tags
+articles
diff --git a/erpnext/docs/user/manual/en/using-erpnext/messages.md b/erpnext/docs/user/manual/en/using-erpnext/messages.md
new file mode 100644
index 0000000..dfa0526
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/messages.md
@@ -0,0 +1,12 @@
+You can send and receive messages from the system by using the Messages tool.
+If you send a message to a user, and the user is logged in, it will appear as
+a popup message and the unread messages counter in the top toolbar will be
+updated.
+
+
+
+You can choose to send message to all the users, or to specific user.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/notes.md b/erpnext/docs/user/manual/en/using-erpnext/notes.md
new file mode 100644
index 0000000..cc88aec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/notes.md
@@ -0,0 +1,21 @@
+You can store your long notes under this section. It can contain your partner lists, frequently used passwords, terms and conditions, or any other document which needs to be shared. Following are the steps to create new Note.
+
+####Go to Note
+
+`Home > Note > New`
+
+####Notes Details
+
+Enter Title and Context.
+
+
+
+####Set Permissions to select Users
+
+To make Note accessible for all, check "Public" under links section. If specific Note is to be made accessible to specific user, they shall be selected in the Share With table.
+
+
+
+<div class=well>Notes can also be used as a knowledge base internally. You can also attach file in the Notes, and make it accessible to specific set of users only.</div>
+
+{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/tags.md b/erpnext/docs/user/manual/en/using-erpnext/tags.md
new file mode 100644
index 0000000..6f6c983
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/tags.md
@@ -0,0 +1,5 @@
+Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. ERPNext will also show you all the important tags in the document list.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/to-do.md b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
new file mode 100644
index 0000000..03f84d5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
@@ -0,0 +1,10 @@
+To Do is a simple tool where all the activities [assigned](https://erpnext.com/collaboration-tools/assignment) to you and assigned
+by you are listed. You can also add your own to-do items in the list.
+
+
+
+When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo record itself.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
new file mode 100644
index 0000000..3bad0df
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md
@@ -0,0 +1,69 @@
+### Add Products to the Website
+
+To list your Item on the Website, fill the Item details and save the file.
+Once the file is saved, a plus (+) button will appear next to the Image icon.
+Click on the plus button and add your Item image. The html code will be
+generated automatically.
+
+##### Step 1: Save Image
+
+
+
+
+
+##### Step 2: Check the 'Show in Website' box.
+
+Under the Website section, please check the box that says 'show in Website'.
+Once the box is checked, the page will display other fields for entering
+information.
+
+
+
+
+
+##### Step 3: Enter Website Details
+
+
+
+The page name will be generated automatically. Mention the Item-Group under
+which the Item will be displayed.
+
+#### Item Groups
+
+Mention the Item Group under this column. If you wish to list your Item under
+the broad category products, name your Item Group as Products. In case you
+have various varieties of Item and want to classify them under different
+names, make Item Groups with those names and check the box that says 'show in
+Website'. For Example, if you wish to create a category called 'Bags', create
+a Item Group named Bags.
+
+
+
+Once the Item Group is created go to the Website Settings page under Website.
+Enter the Label, Url, and Parent Label.
+
+
+
+
+
+#### Webpage labels
+
+
+
+Add more Items under a particular Item Group.
+
+To add more Items under a certain Label, mention the Item Group on the Item
+Page. The Items will be added automatically on the Webpage, under the Item
+Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag,
+check the 'Show in Website'box. The Items will be placed under the Label Bags
+on the Webpage.
+
+
+
+
+
+Item Group Display
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/website/articles/index.md b/erpnext/docs/user/manual/en/website/articles/index.md
new file mode 100644
index 0000000..4e1be28
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/index.md
@@ -0,0 +1 @@
+{content}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/index.txt b/erpnext/docs/user/manual/en/website/articles/index.txt
new file mode 100644
index 0000000..a89040a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/index.txt
@@ -0,0 +1,3 @@
+managing-user-sign-up-via-website
+website-security
+wesite-home-page
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html
new file mode 100644
index 0000000..cef6b7a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html
@@ -0,0 +1,6 @@
+<h1>Managing User Sign Up via Website</h1>
+
+Users can sign up for ERPNext account via the ERPNext Website.<div><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-10 at 4.45.27 pm.jpg"><br></div><div><br></div><div>As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.</div><div>One might want to disable this feature to prevent anonymous users from signing up via the web.</div><div>To do so -</div><div>1. Go to <span style="line-height: 1.42857143;">` Website > Setup > Website Settings ` </span></div><div>2. In website settings doctype navigate to the misc section.</div><div>3. Check the disable SignUp check-box and save the doc.</div><div><br></div><div>Now only the login button shall appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.</div><div><br></div>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.html b/erpnext/docs/user/manual/en/website/articles/website-security.html
new file mode 100644
index 0000000..1371ca5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/website-security.html
@@ -0,0 +1,3 @@
+<h1>Website Security</h1>
+
+<div><span style="line-height: 1.42857143;">One can easily generate a website using erpnext. We can list out Products on the website and also create blogs. Products are directly fetched from the Item Master records of your erpnext account. some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to public.</span><br></div><div><span style="line-height: 1.42857143;"><br></span></div><div>Well at the moment this feature is not available. You cannot <span style="line-height: 1.42857143;">limit the access of the website generated by ERPNext to certain people. </span><span style="line-height: 1.42857143;">If you publish the website it will be </span><span style="line-height: 1.42857143;">publicly</span><span style="line-height: 1.42857143;"> visible.</span></div><div><span style="line-height: 1.42857143;"><br></span></div><div><span style="line-height: 1.42857143;">However while you cannot control who can view the website, you can always choose which items to display on the website.</span></div><div><span style="line-height: 1.42857143;"><br></span></div><div><ul><li><span style="line-height: 1.42857143;">To show or not show an Item on your website go to 'Item Master' and in the Item form check the 'show in website' checkbox.</span><br></li></ul></div><div><span style="line-height: 1.42857143;"><br></span></div><div><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-26 at 10.43.51 am.png"></div></blockquote></div><div><ul><li><span style="line-height: 1.42857143;">You can also fill in the details of the product as to be shown on the website here.</span><br></li></ul></div>
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md b/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
new file mode 100644
index 0000000..363926e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
@@ -0,0 +1,23 @@
+<h1>Wesite Home Page</h1>
+
+It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
+
+#### **Step 1: Open Website Settings Page.**
+To Open website settings page go to:
+
+`Website > Setup > Website Settings`
+
+
+#### **Step 2: Set Home page.**
+
+Enter standard page like, index, login, products, blog, about, contact etc. as Home Page in Landing Page section of Website Settings page. For e.g consider you want login page as your default website home page.
+
+
+
+#### **Step 3: Save Website Settings Form.**
+
+After setting up Home Page Press 'Save' button from website settings page and refresh the system from Help menu.Like this you can set any standard page as your default website home page. When some one visited to your website, he/she will see home page as default landing page on your website.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/blog-post.md b/erpnext/docs/user/manual/en/website/blog-post.md
new file mode 100644
index 0000000..dbf7b17
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/blog-post.md
@@ -0,0 +1,20 @@
+Blogs are a great way to share your thoughts about your business and keep your
+customers and readers updated of what you are up to.
+
+In the age of internet, writing assumes a lot of significance because when
+people come to your website, they want to read about you and your product.
+
+To create a new blog, just create a new Blog from:
+
+> Website > Blog > New Blog
+
+<img class="screenshot" alt="Blog Post" src="{{docs_base_url}}/assets/img/website/blog-post.png">
+
+You can format a blog using the Markdown format.You can also access your blog
+by going to the page “blog.html”.
+
+#### A sample blog-page.
+
+<img class="screenshot" alt="Blog Sample" src="{{docs_base_url}}/assets/img/website/blog-sample.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/website/blogger.md b/erpnext/docs/user/manual/en/website/blogger.md
new file mode 100644
index 0000000..cb39f80
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/blogger.md
@@ -0,0 +1,6 @@
+Blogger is a user who can post blogs.
+You can mention a shori bio about the blogger and also set a avatar here.
+
+<img class="screenshot" alt="Blogger" src="{{docs_base_url}}/assets/img/website/blogger.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/index.md b/erpnext/docs/user/manual/en/website/index.md
new file mode 100644
index 0000000..a499316
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/index.md
@@ -0,0 +1,30 @@
+Websites are a core component of any business and having a good website
+usually means:
+
+ * Invest lot of money.
+ * Difficult to update.
+ * Not interactive.
+
+Unless you are a web designer yourself.
+
+Wouldn't it be nice if there was a way to update your product catalog on your
+site automatically from your ERP?
+
+We thought exactly the same and hence built a small Website Development app
+right inside ERPNext! Using ERPNext’s Website module, you can
+
+ 1. Create Web Pages
+ 2. Write a Blog
+ 3. Publish your Product Catalog using the Item master
+
+We will soon be adding a shopping cart facility so that your customers can
+place orders and pay you online!
+
+Though not necessary, to make a good website, you might have to know a bit of
+HTML / CSS or hire the services of a professional. The good part is that once
+this is setup, you can add and edit content, blogs and products directly from
+your ERP.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/website/index.txt b/erpnext/docs/user/manual/en/website/index.txt
new file mode 100644
index 0000000..846011d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/index.txt
@@ -0,0 +1,8 @@
+web-page
+blog-post
+web-form
+blogger
+setup
+add-products-to-website
+shopping-cart
+articles
diff --git a/erpnext/docs/user/manual/en/website/setup/index.md b/erpnext/docs/user/manual/en/website/setup/index.md
new file mode 100644
index 0000000..e14b2fd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/setup/index.md
@@ -0,0 +1,5 @@
+Settings for your website can be mentioned under setup.
+
+###Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/setup/index.txt b/erpnext/docs/user/manual/en/website/setup/index.txt
new file mode 100644
index 0000000..c3aaac9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/setup/index.txt
@@ -0,0 +1,2 @@
+website-settings
+social-login-keys
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/setup/social-login-keys.md b/erpnext/docs/user/manual/en/website/setup/social-login-keys.md
new file mode 100644
index 0000000..b8784a3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/setup/social-login-keys.md
@@ -0,0 +1,11 @@
+Social Login enables users to login to ERPNext via their Google, Facebook or GitHub account.
+
+### Enabling Social Logins.
+
+Checkout the following Video Tutorials to understand how to enable social logins on ERPNext
+
+* for FaceBook - https://www.youtube.com/watch?v=zC6Q6gIfiw8
+* for Google - https://www.youtube.com/watch?v=w_EAttrE9sw
+* for GitHub - https://www.youtube.com/watch?v=bG71DxxkVjQ
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/setup/website-settings.md b/erpnext/docs/user/manual/en/website/setup/website-settings.md
new file mode 100644
index 0000000..0868e8c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/setup/website-settings.md
@@ -0,0 +1,45 @@
+Most of the website related settings can be defined here.
+
+<img class="screenshot" alt="Website Settings" src="{{docs_base_url}}/assets/img/website/website-settings.png">
+
+####Landing Page
+
+* Home Page: You can specify which [Web Page]({{docs_base_url}}/user/guides/website/web-page.html) must be the homepage of the website
+
+* Home Page is Products: if Checked, the Home page will be the default Item Group for the website.
+
+* Title Prefix: Set the browser title.
+
+####Website Theme
+
+Select the theme for the website. You can create new Theme for you website also.
+
+<img class="screenshot" alt="Website Theme" src="{{docs_base_url}}/assets/img/website/website-theme.png">
+
+* Select 'create new website theme' if you wish to customize the default website theme.
+
+####Banner
+
+You can add a banner/ logo to your website here. Attach the image and click on set banner from Image.
+An HTML code will be generated by the system under Banner HTML.
+
+<img class="screenshot" alt="Banner" src="{{docs_base_url}}/assets/img/website/banner.png">
+
+####Top Bar
+
+You can set the menus items in the Top Bar here.
+
+<img class="screenshot" alt="Top Bar" src="{{docs_base_url}}/assets/img/website/top-bar.png">
+
+ * Similarlly you can also set sidebar and footer links.
+
+####Integrations & Miscellaneous Settings
+
+You can integrate the website using Google Analytics and enable social media sharing for post shared on the website.
+
+<img class="screenshot" alt="Integrations" src="{{docs_base_url}}/assets/img/website/integrations.png">
+
+* You can disable public signup to your ERPNext account by checking 'disable signup'
+
+{next}
+
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
new file mode 100644
index 0000000..773e162
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -0,0 +1,41 @@
+On the Webpage, a shopping cart is an icon that allows you to store all the
+things that you have earmarked for purchasing. It is a graphical
+representation of a shopping basket or a shopping cart that allows you to save
+the items you intend to buy.
+
+This software displays the price of the product . It also displays shipping
+and handling charges, along with taxes, if applicable.
+
+To set up a shopping cart, go to the selling module.
+
+> Selling > Shopping Cart Settings
+
+#### Step 1: Enter Company Details and Default Territory.
+
+
+
+
+
+#### Step 2: Enter Price List, Tax Master and Shipping Rule.
+
+
+
+
+
+#### Shopping Cart Display
+
+On the Website, the shopping cart image will be seen below the Item price.
+Customers can click on the cart and enter the amount of quantity they wish to
+buy. The Item number will be stored on the right hand corner of the page, next
+to the flower sign.
+
+
+
+
+
+Click on the flower sign on the right hand side to see the cart details. Click
+on the cart to get the final amount details.
+
+
+
+{next}
diff --git a/erpnext/docs/user/manual/en/website/web-form.md b/erpnext/docs/user/manual/en/website/web-form.md
new file mode 100644
index 0000000..1668ac0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/web-form.md
@@ -0,0 +1,36 @@
+# Web Forms
+
+<p class="lead">Add forms to the website that will add / update data in your tables. Allow users to edit / manage multiple web forms</p>
+
+You can add forms in your website for example, Contact Us, Inquiry, Complaint etc. Data from these can fill up records like Lead, Opportunity, Issue etc. The user can also be allowed manage multiple records (like Complaints etc.)
+
+---
+
+### Creating
+
+To create a new **Web Form** go to:
+
+> Website > Web Form > New
+
+1. Set the Web Form title and url.
+1. Select the **DocType** in which you want the user to store the records.
+1. Select if you require the user to login, edit records, manage multiple records etc.
+1. Add the fields you want in the record.
+
+<img class="screenshot" alt="Web Form" src="{{docs_base_url}}/assets/img/website/web-form.png">
+
+---
+
+### Viewing
+
+Once you create the web form, you can view it on the url and test it out!
+
+<img class="screenshot" alt="Web form" src="{{docs_base_url}}/assets/img/website/web-form-view.png">
+
+---
+
+### Results
+
+Your data will be stored in the table you have selected
+
+{next}
diff --git a/erpnext/docs/user/manual/en/website/web-page.md b/erpnext/docs/user/manual/en/website/web-page.md
new file mode 100644
index 0000000..947891e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/web-page.md
@@ -0,0 +1,32 @@
+<p class="lead">Static Content like your Home Page, About Us, Contact Us, Terms pages can be created using the Web Page. </p>
+
+To create a new Web Page, go to:
+
+> Website > Web Page > New
+
+<img class="screenshot" alt="Web Page" src="{{docs_base_url}}/assets/img/website/web-page.png">
+
+#### Title
+
+The first thing to set is the title of your page. The title has the maximum
+weight for search engines so choose a title that reflects the keywords that
+you are targeting for your audience.
+
+#### Content
+
+After selecting your layout, you can add content (text, images, etc) to each
+of your content boxes. You can add content in Markdown or HTML format. Read
+the section on how to format using Markdown, for more details.
+
+#### Page Link
+
+The web link to your page will be the value of the “Page Name” field +
+“.html”. For example if your page name is contact-us, the web link of your
+page will be yoursite.com/contact-us.html.
+
+#### Images
+
+You can attach images to your web page and show them using the HTML tag or
+using markdown format. the link to your file will be assets/manual_erpnext_com/old_images/erpnext/filename
+
+{next}
diff --git a/erpnext/docs/user/manual/index.md b/erpnext/docs/user/manual/index.md
new file mode 100644
index 0000000..47fc2c2
--- /dev/null
+++ b/erpnext/docs/user/manual/index.md
@@ -0,0 +1,5 @@
+# ERPNext User Manual
+
+Select your language
+
+1. [English](en)
diff --git a/erpnext/docs/user/manual/index.txt b/erpnext/docs/user/manual/index.txt
new file mode 100644
index 0000000..c574d07
--- /dev/null
+++ b/erpnext/docs/user/manual/index.txt
@@ -0,0 +1 @@
+en