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

docs/docs.user.setup.data_import.md

@@ -5,35 +5,70 @@
 ---
 The Data Import Tool is a great way to upload (or edit) bulk data, specially master data, into the system. To start the tool go to:
 
-> Setup > Data > Data Import Tool
+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:
+
+![Start Import](img/import-1.png)
 
 The tool has two sections, one to download a template and the second to upload the data.
 
-To upload any type of information, select a type from the drop-down. When you select, the system will give you one or more list of templates you can download. So why multiple templates?
+(Note: Only those DocTypes are allowed for Import whose Document Type is "Master" or Allow Import property is set.)
 
-In ERPNext, each master or transaction is defined by a “main table” and “child tables”. These child tables are there because some master tables could have multiple value of certain properties. For example, select Item. Here you will see a number of “child” tables linked to the item table. This is because an Item can have multiple prices, taxes and so on! You must import each table separately. In the child table, you must mention the parent of the row in the “parent” column so that ERPNext knows which Item’s price or tax you are trying to set.
+### 1. Downloading The Template
 
-### 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 are multiple values for any property. For example an Item can have multiple prices, An Invoice has multiple Items and so on.
 
-Here are a few tips to fill your template:
+You can import each table separately, or all at a time. In the child table, you must mention the parent of the row in the “parent” column so that ERPNext knows which Item’s price or tax you are trying to set if you are importing separately.
 
-- Don’t change any cells before the row “----Start entering data below this line----”.
-- Leave the first column blank.
-- Read the explanations of the columns.
-- Some columns are mandatory (the 5th row will tell you which ones those are).
-- Columns of type “Link” and “Select” will only accept values from a certain set.
-- For “Link” type columns, the value must be present in the table it links to.
-- For “Select” the options are given on the 6th row. The value must be one of those.
-- Dates: A number of standard date formats are accepted. Please make sure, your dates are added in one of those formats.
+![Download The Template](img/import-2.png)
 
-### Overwriting
+- Click on the table you want to download or "All Tables"
+- For bulk editing, you can click on "Download With Data"
 
-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.
+### 2. Fill in the Template
+
+After downloading the template, open it in a spreadsheet application and fill in the data below the column headings.
+
+![Spreadsheet](img/import-3.png)
+
+Then export your template or save it as a **Comma Separated Values** (CSV) file.
+
+![Spreadsheet](img/import-4.png)
+
+### 3. Upload the .csv File
+
+Finally attach the .csv file in the section section click on the "Upload and Import" button.
+
+![Attach and Upload](img/import-5.png)
+
+Notes:
+
+- Make sure that if your application allows, use encoding as UTF-8. 
+- Keep the ID column blank for new records.
+- Make sure you keep the modified column as it is for "All Tables".
+- "Parent" column is mandatory for child type tables.
+
+### 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.
 
-### Upload Limitations
+### 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 100-200 rows of a table at one go. If the system will not accept, then you will see an error.
+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.

docs/docs.user.setup.masters.md

@@ -0,0 +1,11 @@
+---
+{
+	"_label": "Setting Up Masters",
+	"_toc": [
+		"docs.user.stock.item",
+		"docs.user.selling.customer",
+		"docs.user.buying.supplier"
+	]
+}
+---
+First step is setting up your master data.

docs/docs.user.setup.price_list.md

@@ -0,0 +1,5 @@
+---
+{
+	"_label": "Price Lists"
+}
+---

docs/docs.user.stock.valuation.md

@@ -0,0 +1,27 @@
+---
+{
+	"_label": "Item Valuation: FIFO and Moving Average"
+}
+---
+### 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. Why is valuation important?
+
+- The buying price fluctuates.
+- The value changes because of some process (value add).
+- The value changes 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 that you bought first. For example, if you buy an Item at price X and then after a few days at price Y. Thus when you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y.
+
+![FIFO](img/fifo.png)
+
+- **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)

utilities/demo_docs/Lead.csv

@@ -29,8 +29,8 @@ Start entering data below this line,,,,,,,,,,,,,,,,,,,,,,,,,,,
 ,,Leo Mikulić,Passive,,Listen Up,LeoMikulic@gustr.com,,,,,,,,,,,,,,,,,,,,,
 ,,Denisa Jarošová,Passive,,I. Magnin,DenisaJarosova@teleworm.us,,,,,,,,,,,,,,,,,,,,,
 ,,Janek Rutkowski,Passive,,First Rate Choice,JanekRutkowski@dayrep.com,,,,,,,,,,,,,,,,,,,,,
-,,美月 宇藤,Passive,,Multi Tech Development,@gustr.com,,,,,,,,,,,,,,,,,,,,,
-,,Даниил Афанасьев,Passive,,National Auto Parts,@einrot.com,,,,,,,,,,,,,,,,,,,,,
+,,美月 宇藤,Passive,,Multi Tech Development,mm@gustr.com,,,,,,,,,,,,,,,,,,,,,
+,,Даниил Афанасьев,Passive,,National Auto Parts,dd@einrot.com,,,,,,,,,,,,,,,,,,,,,
 ,,Zorislav Petković,Passive,,Integra Investment Plan,ZorislavPetkovic@cuvox.de,,,,,,,,,,,,,,,,,,,,,
 ,,Nanao Niwa,Passive,,The Lawn Guru,NanaoNiwa@superrito.com,,,,,,,,,,,,,,,,,,,,,
 ,,Hreiðar Jörundsson,Passive,,Buena Vista Realty Service,HreiarJorundsson@armyspy.com,,,,,,,,,,,,,,,,,,,,,
@@ -60,7 +60,7 @@ Start entering data below this line,,,,,,,,,,,,,,,,,,,,,,,,,,,
 ,,Mekirinzukushitakufu ,Passive,,Choices,Mekirinzukushitakufu@teleworm.us,,,,,,,,,,,,,,,,,,,,,
 ,,Mukharbek Sultanovich,Passive,,Megatronic,MukharbekSultanovich@cuvox.de,,,,,,,,,,,,,,,,,,,,,
 ,,Osman Amanuel,Passive,,Handy Dan,OsmanAmanuel@dayrep.com,,,,,,,,,,,,,,,,,,,,,
-,,幸子 阪部,Passive,,Channel Home Centers,@armyspy.com,,,,,,,,,,,,,,,,,,,,,
+,,幸子 阪部,Passive,,Channel Home Centers,dd@armyspy.com,,,,,,,,,,,,,,,,,,,,,
 ,,Masakazu Kamitani,Passive,,Honest Air Group,MasakazuKamitani@superrito.com,,,,,,,,,,,,,,,,,,,,,
 ,,Omran Sabbagh,Passive,,Pleasures and Pasttimes,OmranNuhaidSabbagh@einrot.com,,,,,,,,,,,,,,,,,,,,,
 ,,Rikako Matsumura,Passive,,Lazysize,RikakoMatsumura@einrot.com,,,,,,,,,,,,,,,,,,,,,

utilities/make_demo.py

@@ -4,6 +4,7 @@ from core.page.data_import_tool.data_import_tool import upload
 
 def make():
 	webnotes.connect()
+	webnotes.print_messages = True
 	webnotes.mute_emails = True
 	install()
 	complete_setup()
@@ -37,6 +38,9 @@ def make_items():
 	print "Importing Items..."
 	webnotes.uploaded_file = os.path.join(os.path.dirname(__file__), "demo_docs", "Item.csv")
 	upload()
+	print "Importing Item Prices..."
+	webnotes.uploaded_file = os.path.join(os.path.dirname(__file__), "demo_docs", "Item_Price.csv")
+	upload()
 	
 def make_customers_suppliers_contacts():
 	print "Importing Customers..."