diff --git a/foundation/www/assets/img/setup/data-import/__init__.py b/foundation/www/assets/img/setup/data-import /__init__.py
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/__init__.py
rename to foundation/www/assets/img/setup/data-import /__init__.py
diff --git a/foundation/www/assets/img/setup/data-import/data-import-1.png b/foundation/www/assets/img/setup/data-import /data-import-1.png
old mode 100644
new mode 100755
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/data-import-1.png
rename to foundation/www/assets/img/setup/data-import /data-import-1.png
diff --git a/foundation/www/assets/img/setup/data-import/data-import-2.png b/foundation/www/assets/img/setup/data-import /data-import-2.png
old mode 100644
new mode 100755
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/data-import-2.png
rename to foundation/www/assets/img/setup/data-import /data-import-2.png
diff --git a/foundation/www/assets/img/setup/data-import/data-import-3.png b/foundation/www/assets/img/setup/data-import /data-import-3.png
old mode 100644
new mode 100755
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/data-import-3.png
rename to foundation/www/assets/img/setup/data-import /data-import-3.png
diff --git a/foundation/www/assets/img/setup/data-import/data-import-4.png b/foundation/www/assets/img/setup/data-import /data-import-4.png
old mode 100644
new mode 100755
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/data-import-4.png
rename to foundation/www/assets/img/setup/data-import /data-import-4.png
diff --git a/foundation/www/assets/img/setup/data-import/data-import-excel.png b/foundation/www/assets/img/setup/data-import /data-import-excel.png
old mode 100644
new mode 100755
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/data-import-excel.png
rename to foundation/www/assets/img/setup/data-import /data-import-excel.png
diff --git a/foundation/www/assets/img/setup/data-import/data-import-tool-template.gif b/foundation/www/assets/img/setup/data-import /data-import-tool-template.gif
old mode 100644
new mode 100755
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/data-import-tool-template.gif
rename to foundation/www/assets/img/setup/data-import /data-import-tool-template.gif
diff --git a/foundation/www/assets/img/setup/data-import/import-csv.png b/foundation/www/assets/img/setup/data-import /import-csv.png
old mode 100644
new mode 100755
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/import-csv.png
rename to foundation/www/assets/img/setup/data-import /import-csv.png
diff --git a/foundation/www/assets/img/setup/data-import/import-file.png b/foundation/www/assets/img/setup/data-import /import-file.png
old mode 100644
new mode 100755
similarity index 100%
rename from foundation/www/assets/img/setup/data-import/import-file.png
rename to foundation/www/assets/img/setup/data-import /import-file.png
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-1-new.png b/foundation/www/docs/assets/img/setup/data-import/data-import-1-new.png
new file mode 100644
index 00000000..8ecfee63
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/data-import/data-import-1-new.png differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-1.png b/foundation/www/docs/assets/img/setup/data-import/data-import-1.png
deleted file mode 100755
index 96d7bb43..00000000
Binary files a/foundation/www/docs/assets/img/setup/data-import/data-import-1.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-2.png b/foundation/www/docs/assets/img/setup/data-import/data-import-2.png
deleted file mode 100755
index 90d0449f..00000000
Binary files a/foundation/www/docs/assets/img/setup/data-import/data-import-2.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-3-new.png b/foundation/www/docs/assets/img/setup/data-import/data-import-3-new.png
new file mode 100644
index 00000000..a1da49c5
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/data-import/data-import-3-new.png differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-3.png b/foundation/www/docs/assets/img/setup/data-import/data-import-3.png
deleted file mode 100755
index 971fff50..00000000
Binary files a/foundation/www/docs/assets/img/setup/data-import/data-import-3.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-4-new.png b/foundation/www/docs/assets/img/setup/data-import/data-import-4-new.png
new file mode 100644
index 00000000..6ef975ae
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/data-import/data-import-4-new.png differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-4.png b/foundation/www/docs/assets/img/setup/data-import/data-import-4.png
deleted file mode 100755
index 24e7ba08..00000000
Binary files a/foundation/www/docs/assets/img/setup/data-import/data-import-4.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-excel-new.png b/foundation/www/docs/assets/img/setup/data-import/data-import-excel-new.png
new file mode 100644
index 00000000..e05f8c41
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/data-import/data-import-excel-new.png differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-excel.png b/foundation/www/docs/assets/img/setup/data-import/data-import-excel.png
deleted file mode 100755
index f012f0ec..00000000
Binary files a/foundation/www/docs/assets/img/setup/data-import/data-import-excel.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-options.png b/foundation/www/docs/assets/img/setup/data-import/data-import-options.png
new file mode 100644
index 00000000..0198add6
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/data-import/data-import-options.png differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-steps.gif b/foundation/www/docs/assets/img/setup/data-import/data-import-steps.gif
new file mode 100644
index 00000000..8049d2da
Binary files /dev/null and b/foundation/www/docs/assets/img/setup/data-import/data-import-steps.gif differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/data-import-tool-template.gif b/foundation/www/docs/assets/img/setup/data-import/data-import-tool-template.gif
deleted file mode 100755
index c4d28f4b..00000000
Binary files a/foundation/www/docs/assets/img/setup/data-import/data-import-tool-template.gif and /dev/null differ
diff --git a/foundation/www/docs/assets/img/setup/data-import/import-csv.png b/foundation/www/docs/assets/img/setup/data-import/import-csv.png
old mode 100755
new mode 100644
diff --git a/foundation/www/docs/assets/img/setup/data-import/import-file.png b/foundation/www/docs/assets/img/setup/data-import/import-file.png
old mode 100755
new mode 100644
diff --git a/foundation/www/docs/user/manual/en/setting-up/data/data-export-tool.md b/foundation/www/docs/user/manual/en/setting-up/data/data-export-tool.md
deleted file mode 100755
index 91cb1fc5..00000000
--- a/foundation/www/docs/user/manual/en/setting-up/data/data-export-tool.md
+++ /dev/null
@@ -1,33 +0,0 @@
-
-# Data Export Tool
-
-Use this tool to export data in Excel or CSV format
-
-To open the Data Export Tool, you can either go to Setup > Data Export OR simply type `Data Export` in Global Search.
-
-
-
-### Options
-
-1. Select Doctype
-
- You will be provided with the list of document types which you can export. Scroll through the list or type the name of the Doctype you want to export.
-
-2. File Type
-
- Select File format of the data to be exported (Excel or CSV).
-
-3. Add Filter (optional)
-
- Add filters to export only required data.
- This filter is similar to the filter in list view.
-
- eg. If you want the data of project related to specific company, you can use the filter to select the company.
-
-4. Field Multicheck (optional)
-
- Only checked fields will be exported.
-
-**Note:**
-
- If you do not want a child table to be exported simply deselect all the fields of that child table.
diff --git a/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md b/foundation/www/docs/user/manual/en/setting-up/data/data-import.md
old mode 100755
new mode 100644
similarity index 67%
rename from foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md
rename to foundation/www/docs/user/manual/en/setting-up/data/data-import.md
index 55397b3e..e6748afa
--- a/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md
+++ b/foundation/www/docs/user/manual/en/setting-up/data/data-import.md
@@ -1,19 +1,14 @@
-
-# Data Import Tool
+
-The Data Import Tool is a great way to upload (or edit) bulk data, specially master data, into the system.
+# Data Import
-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:
+Data Import (formerly known as the Data Import Tool) is a great way to upload (or edit) bulk data, specially master data, into the system.
-
+To begin importing the Data, go to either setup, or to the Transaction you want to import, or simply type so in Global Search!
-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
+## 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
@@ -23,15 +18,15 @@ Item can have multiple prices, An Invoice has multiple Items and so on.
* Select Doctype for which template should be downloaded.
* Check fields to be included in the template.
- * Click on "Download Blank Template".
- * For bulk editing, you can click on "Download With Data".
+ * Select the file format of the template file.
+ * For a blank template, make sure that the "Download with Data" field is unchecked.
+ * For bulk editing, you can check "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.
+After downloading the template, open it in a spreadsheet application (like Excel, Numbers or Libre Office) and fill in the data below the column headings.
@@ -40,19 +35,19 @@ file. To export the document in Excel tick the checkbox for Download in Excel Fi
-### Download in Excel
+### Download in Excel/CSV
-
+
-### 3\. Upload the File ethier in .xlsx or .csv
+### 3\. Upload the File either in .xlsx or .csv
Finally attach the file in the section. Click on the "Upload". Once the upload is successfull click Import"
button.
-
+
-
+
#### Notes:
@@ -81,17 +76,14 @@ row. See the example:
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.
+check on the “Update Records” 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.
+You can only upload upto 5000 records in one go. (may be less in some cases).
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
@@ -99,6 +91,26 @@ number of “writes” you can process in one request.
***
+### Import Options
+
+#### 1. Update records
+
+This option let's you edit/overwrite the current data on import.
+
+#### 2. Skip rows with errors
+
+If this is checked, rows with valid data will be imported and invalid rows will be dumped into a new file for you to import later.
+
+#### 3. Submit after importing
+
+If this is checked, in case there are submittable transactions which are imoported ()
+
+#### 4. Ignore encoding errors
+
+In case there are any unicode errors, a new file with the invalid rows will be created to be imported later.
+
+***
+
#### How to Attach files?
When you open a form, on the right sidebar, you will see a section to attach
@@ -120,7 +132,8 @@ Notepad, and save as “UTF-8”. (Sorry blame Microsoft for this!)
####Help Video on Importing Data in ERPNext from Spreadsheet file
+