Merge branch 'master' of github.com:webnotes/erpnext

docs/user/accounts/docs.user.accounts.opening_stock.md

@@ -17,5 +17,28 @@ To make a Stock Reconciliation, go to:
 
 and follow the steps mentioned on the page.
 
-![Stock Reconciliation](img/stock-reconciliation1.png)
+#### Step 1: Download Template
 
+
+![Stock Reconciliation](img/stock-reconciliation-1.png)
+
+#### Step 2: Enter Data in csv file.
+
+
+![Stock Reconciliation](img/stock-reconciliation-csv-1.png)
+
+The csv format is case-sensitive. Thus special care should be taken to avoid spelling errors or wrong names. Even if you do not list some quantities or valuation rates, the file will still process the data.
+
+#### Step 3: Upload the csv file with data
+
+![Stock Reconciliation](img/stock-reconciliation-2.png)
+
+<br>
+
+#### Step 4: Attach the uploaded file.
+
+![Stock Reconciliation](img/stock-reconciliation-3.png)
+
+
+
+After reviewing saved Reconciliation Data, submit the Stock Reconciliation. On successful submission, the data will be updated in the system. To check the uploaded data go to Stock and view  Stock Level Report.

docs/user/docs.user.md

@@ -85,6 +85,7 @@ Contents
 	1. [Purchase Receipt](docs.user.stock.purchase_receipt.html)
 	1. [Delivery Note](docs.user.stock.delivery_note.html)
 	1. [Stock Entry / Material Transfer](docs.user.stock.stock_entry.html)
+	1. [Opening Stock](docs.user.accounts.opening_stock.html)
 	1. [Material Issue](docs.user.stock.material_issue.html)
 	1. [Sales Return](docs.user.stock.sales_return.html)
 	1. [Purchase Return](docs.user.stock.purchase_return.html)
@@ -100,7 +101,6 @@ Contents
 	1. [Payment Entry](docs.user.accounts.payments.html)
 	1. [Journal Voucher](docs.user.accounts.journal_voucher.html)
 	1. [Opening Entry](docs.user.accounts.opening_entry.html)
-	1. [Opening Stock](docs.user.accounts.opening_stock.html)
 	1. [Period Closing](docs.user.accounts.closing.html)
 	1. [Accounting Reports](docs.user.accounts.reports.html)
 	1. [Point of Sale (POS) Invoice](docs.user.accounts.pos.html)	

docs/user/stock/docs.user.stock.md

@@ -9,6 +9,7 @@
 		"docs.user.stock.purchase_receipt",
 		"docs.user.stock.delivery_note",
 		"docs.user.stock.stock_entry",
+		"docs.user.stock.opening_stock",
 		"docs.user.stock.material_issue",
 		"docs.user.stock.sales_return",
 		"docs.user.stock.purchase_return",