Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.14.1'
+__version__ = '6.15.0'

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -62,7 +62,7 @@ def auto_create_fiscal_year():
 			start_year = cstr(new_fy.year_start_date.year)
 			end_year = cstr(new_fy.year_end_date.year)
 			new_fy.year = start_year if start_year==end_year else (start_year + "-" + end_year)
-
-			new_fy.insert()
+			
+			new_fy.insert(ignore_permissions=True)
 		except frappe.NameError:
 			pass

erpnext/accounts/page/accounts_browser/accounts_browser.js

@@ -66,7 +66,7 @@ frappe.pages["Accounts Browser"].on_page_load  = function(wrapper){
 			$.each(r.message, function(i, v) {
 				$('<option>').html(v).attr('value', v).appendTo(wrapper.$company_select);
 			});
-			wrapper.$company_select.val(frappe.defaults.get_user_default("company") || r.message[0]).change();
+			wrapper.$company_select.val(frappe.defaults.get_user_default("Company") || r.message[0]).change();
 		}
 	});
 }

erpnext/accounts/report/accounts_payable/accounts_payable.js

@@ -8,7 +8,7 @@ frappe.query_reports["Accounts Payable"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"supplier",

erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js

@@ -8,7 +8,7 @@ frappe.query_reports["Accounts Payable Summary"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"supplier",

erpnext/accounts/report/accounts_receivable/accounts_receivable.js

@@ -8,7 +8,7 @@ frappe.query_reports["Accounts Receivable"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"customer",

erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js

@@ -8,7 +8,7 @@ frappe.query_reports["Accounts Receivable Summary"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"customer",

erpnext/accounts/report/budget_variance_report/budget_variance_report.js

@@ -22,7 +22,7 @@ frappe.query_reports["Budget Variance Report"] = {
 			label: __("Company"),
 			fieldtype: "Link",
 			options: "Company",
-			default: frappe.defaults.get_user_default("company")
+			default: frappe.defaults.get_user_default("Company")
 		},
 	]
 }

erpnext/accounts/report/general_ledger/general_ledger.js

@@ -8,7 +8,7 @@ frappe.query_reports["General Ledger"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{

erpnext/accounts/report/gross_profit/gross_profit.js

@@ -9,7 +9,7 @@ frappe.query_reports["Gross Profit"] = {
 			"fieldtype": "Link",
 			"options": "Company",
 			"reqd": 1,
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
 			"fieldname":"from_date",

erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js

@@ -33,7 +33,7 @@ frappe.query_reports["Item-wise Purchase Register"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }

erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js

@@ -27,7 +27,7 @@ frappe.query_reports["Item-wise Sales Register"] = frappe.query_reports["Sales R
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js

@@ -9,7 +9,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
 			fieldtype: "Link",
 			options: "Company",
 			reqd: 1,
-			default: frappe.defaults.get_user_default("company")
+			default: frappe.defaults.get_user_default("Company")
 		},
 		{
 			fieldname: "from_date",

erpnext/accounts/report/purchase_register/purchase_register.js

@@ -27,7 +27,7 @@ frappe.query_reports["Purchase Register"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }

erpnext/accounts/report/sales_register/sales_register.js

@@ -27,7 +27,7 @@ frappe.query_reports["Sales Register"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company")
+			"default": frappe.defaults.get_user_default("Company")
 		}
 	]
 }

erpnext/accounts/report/trial_balance/trial_balance.js

@@ -10,7 +10,7 @@ frappe.query_reports["Trial Balance"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{

erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js

@@ -8,7 +8,7 @@ frappe.query_reports["Trial Balance for Party"] = {
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
-			"default": frappe.defaults.get_user_default("company"),
+			"default": frappe.defaults.get_user_default("Company"),
 			"reqd": 1
 		},
 		{

erpnext/accounts/utils.py

@@ -383,7 +383,7 @@ def get_actual_expense(args):
 def get_currency_precision(currency=None):
 	if not currency:
 		currency = frappe.db.get_value("Company",
-			frappe.db.get_default("company"), "default_currency", cache=True)
+			frappe.db.get_default("Company"), "default_currency", cache=True)
 	currency_format = frappe.db.get_value("Currency", currency, "number_format", cache=True)
 
 	from frappe.utils import get_number_format_info

erpnext/crm/doctype/lead/lead.py

@@ -90,7 +90,7 @@ def _make_customer(source_name, target_doc=None, ignore_permissions=False):
 			target.customer_type = "Individual"
 			target.customer_name = source.lead_name
 
-		target.customer_group = frappe.db.get_default("customer_group")
+		target.customer_group = frappe.db.get_default("Customer Group")
 
 	doclist = get_mapped_doc("Lead", source_name,
 		{"Lead": {

erpnext/crm/doctype/newsletter/newsletter.py

@@ -121,7 +121,7 @@ def create_lead(email_id):
 		"lead_name": real_name or email_id,
 		"status": "Lead",
 		"naming_series": get_default_naming_series("Lead"),
-		"company": frappe.db.get_default("company"),
+		"company": frappe.db.get_default("Company"),
 		"source": "Email"
 	})
 	lead.insert()

erpnext/crm/doctype/opportunity/opportunity.js

@@ -29,8 +29,8 @@ erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
 
 		if(!this.frm.doc.status)
 			set_multiple(cdt, cdn, { status:'Draft' });
-		if(!this.frm.doc.company && frappe.defaults.get_user_default("company"))
-			set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("company") });
+		if(!this.frm.doc.company && frappe.defaults.get_user_default("Company"))
+			set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("Company") });
 		if(!this.frm.doc.fiscal_year && sys_defaults.fiscal_year)
 			set_multiple(cdt, cdn, { fiscal_year:sys_defaults.fiscal_year });
 

erpnext/docs/current/index.html

@@ -35,7 +35,7 @@
 			Version
 		</td>
 		<td>
-			<code>6.14.0</code>
+			<code>6.14.1</code>
 		</td>
 	</tr>
 </table>

erpnext/docs/current/models/accounts/account.html

@@ -946,6 +946,10 @@ Credit</pre>
 			
         
 			
+        
+			
+        
+			
             <li>
 
 

erpnext/docs/current/models/accounts/shipping_rule.html

@@ -413,6 +413,15 @@ Net Weight</pre>
 </li>
 			
         
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/shopping_cart/shopping_cart_shipping_rule">Shopping Cart Shipping Rule</a>
+
+</li>
+			
+        
         </ul>
     
 

erpnext/docs/current/models/hr/department.html

@@ -106,8 +106,6 @@
         <ul>
         
 			
-        
-			
             <li>
 
 
@@ -126,8 +124,6 @@
 			
         
 			
-        
-			
             <li>
 
 
@@ -146,8 +142,6 @@
 			
         
 			
-        
-			
             <li>
 
 

erpnext/docs/current/models/hr/employee.html

@@ -1622,8 +1622,6 @@ Health Concerns</pre>
 			
         
 			
-        
-			
             <li>
 
 

erpnext/docs/current/models/setup/company.html

@@ -111,7 +111,8 @@ Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Org
                 <pre>Distribution
 Manufacturing
 Retail
-Services</pre>
+Services
+Education</pre>
             </td>
         </tr>
         

erpnext/docs/current/models/stock/price_list.html

@@ -391,6 +391,8 @@ Price List Master
 			
         
 			
+        
+			
             <li>
 
 

erpnext/docs/current/models/stock/warehouse.html

@@ -629,6 +629,8 @@ A logical Warehouse against which stock entries are made.
 			
         
 			
+        
+			
             <li>
 
 

erpnext/docs/current/models/utilities/contact.html

@@ -588,10 +588,6 @@ Replied</pre>
 			
         
 			
-        
-			
-        
-			
             <li>
 
 

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

@@ -1,26 +1,29 @@
-<h1>Allow Fields to be Changed After Submit</h1>
+#Editing Value in Submitted Document
 
-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.
+Once document is submitted, fields are frozen, and no editing is allowd. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted.
 
-**Note:** Standard Fields cannot be set as Allow On Submit by a User
+<div class="well"> Standard fields cannot be set as Allow on Submit.</div>
 
-#### Step 1: Go to Customize Form in Setup Module.
+#### Step 1: Go To
 
-```Setup >> Customize >> Customize Form```
+`Setup > Customize > Customize Form`
 
-#### 
-####Step 2: Select the form containing the desired Custom Field in _Enter Form Type_ field.
+####Step 2: Select Form
 
-![]({{docs_base_url}}/assets/img/articles/kb_custom_name.png)
+In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.)
 
-#### **Step 3:** In the _Fields_ section, scroll down, click on the Custom field and check the _Allow On Submit._
+<img alt="select docytpe" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-1.png">
 
-![]({{docs_base_url}}/assets/img/articles/kb_allowonsubmit_checkinform.png)
+#### Step 3: Edit Field Property
 
-_This field can now be changed even after the Document is submitted_.
+In the fields section, click on the Custom field and check the **Allow On Submit**.
 
-**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.
-![]({{docs_base_url}}/assets/img/articles/kb_allowonsubmit_checkinfield.png)
+<img alt="Check Allow on Submit" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-2.png">
 
+#### Step 3: Update Customize Form
+
+<img alt="Update" class="screenshot" src="{{docs_base_url}}/assets/img/articles/allow-on-submit-3.png">
+
+After updating Customize Form, you should reload your ERPNext account. Then check form, and field to confirm it its editbale in submitted form as well.
 
 <!-- markdown -->

erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html

@@ -1,7 +0,0 @@
-<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 &gt;&gt; Customize &gt;&gt; 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 -->

erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md

@@ -0,0 +1,29 @@
+#Creating Custom Link Fields
+
+Links field are the ones linked to another document type. For example, customer field is a link field in Sales Order. This field is linked to the Customer master.
+
+You can insert Custom Link Field by following steps below.
+
+
+####Step 1: Go to Customize Form
+
+`Setup > Customize > Customize Form`
+
+####Step 2: Select Form
+
+In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.). Once field are updated in table, open field before which you wish to insert Custom Field. Then click on "Insert Above" to insert new Custom Field.
+
+<img alt="Select Docytpe" class="screenshot" src="{{docs_base_url}}/assets/img/articles/link-field-1.gif">
+
+####Step 4: Custom Field Values
+
+To set field as Link, enter values as below.
+
+1. Label: Desired label that user wishes to display in the form.
+1. Type: Set as 'Link'
+1. Name: Desired name for the field
+1. Options: Enter the name of the Doctype to which the field is linked
+
+<img alt="Enter Values" class="screenshot" src="{{docs_base_url}}/assets/img/articles/link-field-2.png">
+
+<!-- markdown -->

erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md

@@ -1,4 +1,4 @@
-<h1>Customizing Sorting Order in the List View</h1>
+#Customizing Sorting Order in the List View
 
 **Question:** I want records in my Item List sorted based on Desc Order of Item Code.
 
@@ -10,20 +10,17 @@
 
 ####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.
+Select document type for which Sort Order is to be customized.
+
+<img alt="Sort Order field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/sort-order-2.png">
 
 ####Step 3: Update Sort Details
 
 In the Customize Form, you will find these fields.
 
-![Sort Order field]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png)
+<img alt="Sort Order field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/sort-order-1.png">
 
-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.
+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 -->

erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md

@@ -1,23 +1,23 @@
-<h1>Deleting Custom Reports</h1>
+#Deleting Custom Reports
 
-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.
+ERPNext has several [types of reports]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/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.
+If there is a report custom report which needs to be deleted, it can be achieved by following steps. Please note that its applicable only for the Custom Reports, and not for the standard reports.
 
-####Report List
+#### Step 1: Go to Report List
 
 In the Awesome Bar, type and select "Report List" for an option.
 
-![Report Search]({{docs_base_url}}/assets/img/articles/$SGrab_316.png)
+<img alt="Report Search" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-1.png">
 
 ####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.
 
-![Report List]({{docs_base_url}}/assets/img/articles/$SGrab_317.png)
+<img alt="Report List" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-2.png">
 
 Or you can open that report, and delete it from File menu option.
 
-![Report Delete]({{docs_base_url}}/assets/img/articles/$SGrab_318.png)
+<img alt="Report Delete" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-report-3.png">
 
 <!-- markdown -->

erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md

@@ -1,20 +1,20 @@
-<h1>Disable Rounded Total</h1>
+#Disable Rounded Total
 
-Each transaction in ERPNext has Standard print format. For transactions, Standard print format covers Rounded Total for that transaction by default.
+All the sales transactions like Sales Order, Sales Invoice has Rounded Total in it. It calculated based on the value of Grand Total. Also Rounded Total is also visible in the Standard Print Formats. 
 
-![Print Preview]({{docs_base_url}}/assets/img/articles/Selection_053.png)
+<img alt="Print Preview" class="screenshot" src="{{docs_base_url}}/assets/img/articles/hide-rounded-total-1.png">
 
-If you don't wish rounded total to be shown in the Standard Print Format, please complete following settings.
+Follow steps given below to hide rounded total from Standard Print Formats, for all the sales transactions.
 
-####1. Go to Global Settings
+#### Step 1: Global Settings
 
 `Setup > Settings > Global Settings`
 
-####2. Set Global Defaults
+#### Step 2: Disable Rounded Total
 
 Check Disable Rounded Total, and Save Global Defaults.
 
-![Global Default]({{docs_base_url}}/assets/img/articles/Selection_052.png)
+<img alt="Print Preview" class="screenshot" src="{{docs_base_url}}/assets/img/articles/hide-rounded-total-2.png">
 
 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.
    

erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html

@@ -1,168 +0,0 @@
-<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 &gt;&gt; Settings &gt;&gt; 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>

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

@@ -0,0 +1,87 @@
+#Field Types
+
+Following are the types of fields you can define while creating new ones, or while amend standard ones.
+
+- Attach: 
+
+Attach field allows you browsing file from File Manager and attach in the transaction.
+
+- Button: 
+
+It will be a Button, on clicking which you can execute some functions like Save, Submit etc. 
+
+- Check:
+
+It will be a check box field. 
+
+- Column Break
+
+Since ERPNext has multiple column layout, using Column Breaks, you can divide set of fields side-by-side. 
+
+- Currency
+
+Currency field holds numeric value, like item price, amount etc. Currency field can have value upto six decimal places. Also you can have currency symbol being shown for the currency field.
+
+- Data
+
+Data field will be simple text field. It allows entering value upto 255 characters.
+
+- Date and Time
+
+This field will give you date and time picker. Current date and time (as provided by your computer) is set by default. 
+
+- Dynamic Link
+
+Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.html) to learn how Dynamic Link Field function.
+
+- Float
+
+Float field carries numeric value, upto six decimal place. Precision for the float field is set in
+ 
+`Setup > Settings > System`
+
+Setting will be applicable on all the float field. 
+
+- Image
+
+Image field will render an image file selected in another attach field. 
+
+For the Image field, under Option (in Doctype),field name should be provide where image file is attached. By referring to the value in that field, image will be reference in the Image field.
+
+- Int (Integer)
+
+Integer field holds numeric value, without decimal place.
+
+- Link
+
+Link field is connected to another master from where it fetches data. For example, in the Quotation master, Customer is a Link field.
+
+- Password
+
+Password field will have decode value in it.
+
+- Read Only
+
+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.
+
+- Section Break
+
+Section Break is used to divide form into multiple sections. 
+
+- Select
+
+Select will be a drop-down field. You can add muliple results in the Option field, separated by row.
+
+- Small Text
+
+Small Text field carries text content, has more character limit than the Data field.
+
+- Table
+
+Table will be (sort of) Link field which renders another docytpe within the current form. For example, Item table in the Sales Order is a Table field, which is linked to Sales Order Item doctype.
+
+- Text Editor
+
+Text Editor is text field. It has text-formatting options. In ERPNext, this field is generally used for defining Terms and Conditions.
+
+<!-- markdown -->

erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html

@@ -1,24 +0,0 @@
-<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 &gt; Customize &gt; Customize Form.
-    <br>
-    <br><b>Step 2</b>: Enter Form Type.<br>&nbsp;
-    <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 -->

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

@@ -0,0 +1,25 @@
+#Increase Max Attachments
+
+In ERPNext, you can limit how many files can be attached to specific Document. Using Custmize Form, you can set **Max(imum) Attachments** which can be added to a particular documents.
+
+Let's assume we need to update Max Attachment for Quotation to five.
+
+#### Step 1: Setup
+
+`Setup > Customize > Customize Form`
+
+#### Step 2: Select Document Type
+ 
+<img alt="Select Doctype" class="screenshot" src="{{docs_base_url}}/assets/img/articles/max-attachment-1.png">
+
+#### Step 3: Set Limit
+
+Set Maximum Attachments as five.
+
+<img alt="Set Max Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/max-attachment-2.png">
+
+After update Max Attachments, Update Customization Form. Reload your ERPNext account and then check specific Quotation to confirm if Max Attachment limit is applied.
+
+<div class="well">Note: Maximum limit/size of an attachment is 1MB.</div>
+
+<!-- markdown -->

erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html

@@ -1,5 +0,0 @@
-<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 &gt;&gt; Customize &gt;&gt; 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>

erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md

@@ -0,0 +1,27 @@
+#Make Fields Visible In Print Format
+
+Each transaction has Standard Print Format. In the Standard format, only certain fields are displayed by default. If  user needs field in the Standard format to be visible, it can be customized by using Customize Form tool.
+
+Let's assume in the Sales order, we need to make Shipping Address field visible in the standard print format.
+
+#### Step 1: Customize Form
+
+Go to:
+
+`Setup > Customize > Customize Form`
+
+#### Step 2: Document Type
+
+As per our scenario, Sales Order will be selected as Document Type.
+field-visible-2.gif
+<img alt="Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/articles/print-visible-1.png">
+
+#### Step 3: Uncheck Print Hide
+
+click to open field to be made visible in the Standard Print Format. Uncheck **Print Hide** field.
+
+<img alt="Uncheck Print Hide " class="screenshot" src="{{docs_base_url}}/assets/img/articles/print-visible-2.gif">
+
+#### Step 5: Update
+
+Customize Customize Form to save changed. Reload your ERPNext account, and then check Print Format for confirmation.

erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md

@@ -1,53 +1,23 @@
-<h1>Reports in ERPNext</h1>
+#Reports in ERPNext
 
 There are three kind of reports in ERPNext.
 
-###1. Query Report
+###1. Report Builder
 
-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.
+Report Builder is an in-built report customization tool in ERPNext. This allows you to define specific fields of the form which shall be added in the report. Also you can set required filters, sorting and give preferred name to report.
 
-Check Purchase Order Item to be Received report in Stock module for example of Query report.
+<iframe width="660" height="371" src="https://www.youtube.com/embed/y0o5iYZOioU" frameborder="0" allowfullscreen></iframe>
 
-###2. Script Report
+### 2. Query 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.
+Query Report is written in SQL which pull values from account's database and fetch in the report. Though SQL queries can be written from front end, like HTML, its restricted in hosted users. Because it will allow users with no access to specific report to query data directly from the database.
 
-Check Financial Analytics report in Accounts module for example of Script Report.
+Check Purchase Order Item to be Received report in Stock module for example of Query report. Click [here](https://frappe.github.io/frappe/user/guides/reports-and-printing/how-to-make-query-report.html) to learn how to create Query Report.
 
-###3. Report Builder
+### 3. Script Report
 
-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.
+Script Reports are written in Python and stored on server side. These are complex reports which involves logic and calculation. Since these reports are written on server side, customizing it from hosted account is not possible. 
 
-Each form in ERPNext has Report Builder option in its list view.
-
-![Report Builder Icon]({{docs_base_url}}/assets/img/articles/Selection_046.png)
-
-####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.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/Selection_050.png)
-
-####Applying Filters
-
-All the fields of the form will be applicable for setting filter as well.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_238.png)
-
-####Sorting
-
-Select field based on which report will be sorted.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/Selection_052f7b160.png)
-
-####Save Report
-
-Go to Menu and click on Save button to have this report saved with selected column, filters and sorting.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_241.png)
-
-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.
-
-![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_242.png)
+Check Financial Analytics report in Accounts module for example of Script Report. Click [here](https://frappe.github.io/frappe/user/guides/reports-and-printing/how-to-make-script-reports.html) to learn how to create Script Report.
 
 <!-- markdown --> 

erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md

@@ -2,19 +2,19 @@
 
 To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
 
-Step 1: Cancel Submitted Document
+####Step 1: Cancel Submitted Document
 
 You will find Cancel button on upper right corner of submitted document.
 
 <img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-1.png">
 
-Step 2: Amend the document
+####Step 2: Amend the document
 
 On cancellation of submitted document, Amend button will be became visible.
 
 <img alt="Amend Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/edit-submitted-doc-2.png">
 
-Step 3: Save and Submit the document
+####Step 3: Save and Submit the document
 
 On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
 

erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md

@@ -1,14 +1,7 @@
 #Integrating ERPNext with other Applications
 
-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://community.eprnext.com/service-providers](https://community.erpnext.com/service-providers)
+For now, ERPNext has out-of-the-box integration available for some applications like Shopify, your SMS gateway and payment gateway. To integrate ERPNext with other application, you can use REST API of Frappe. Check following links to learn more about REST API of Frappe.
 
+[Frappe Rest API](https://frappe.github.io/frappe/user/guides/integration/rest_api.html)
 
 <!-- markdown -->

erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md

@@ -2,8 +2,8 @@
 
 Check following to learn how to setup Letter Head in ERPNext.
 
-[Managing Letter Head](https://frappe.github.io/erpnext/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.html)
+[Managing Letter head]({{docs_base_url}}/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.html)
 
 ERPNext doesn't have option to define standard Footer. As a work around, you can use Terms and Condition master for footer. Content of Terms and Condition is already the last to appear in the standard print formats on transactions. Check following link to learn how to manage Terms and Conditions in ERPNext.
 
-[Terms and Condition](https://frappe.github.io/erpnext/user/manual/en/setting-up/print/terms-and-conditions.html)
+[Terms and Condition]({{docs_base_url}}/user/manual/en/setting-up/print/terms-and-conditions.html)

erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md

@@ -4,7 +4,7 @@ ERPNext allows you to create multiple companies in a single ERPNext instance.
 
 In one account has multiple companies, you will find option to select Company in each transactions. While most of the records (mostly transactions) will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which are common among all the companies.
 
-If you have separate teams working on each company, you can restrict access of the User to the data of specific Company. Click [here](http://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/) to know how to set permission rules for giving restricted access to the User.
+If you have separate teams working on each company, you can restrict access of the User to the data of specific Company. Click [here]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/) to know how to set permission rules for giving restricted access to the User.
 
 Following are the steps to add new Company.
 

erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md

@@ -2,7 +2,7 @@
 
 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://frappe.github.io/erpnext/user/manual/en/customize-erpnext/customize-form.html).
+Perm Level for a field can be defined in the [Customize Form](docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html).
 
 <img alt="Perm Level Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-1.gif">
 

erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md

@@ -1,6 +1,6 @@
 #Managing Tree Structure Masters
 
-Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set parent master, and child masters under those parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy. 
+Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent master, 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.
 
@@ -22,17 +22,13 @@ Following are the steps to manage and create record in the tree structured maste
 
 `Selling > Setup > Territory`
 
-Also you can type master name in Awesome Bar to go to the related master.
+####Step 2 : Parent Territory
 
-Tree master allows you to set parent Territories, and Child Territories Groups under those parents.
+<img alt="Default Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-2.png">
 
-####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.
 
-![Territory Group]({{docs_base_url}}/assets/img/articles/Sselection_013.png)
-
-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
+####Step 3: Add new Territory
 
 When click on Add Child, a dialog box will provide two fields.
 
@@ -45,12 +41,13 @@ Territory will be saved with Territory Name provided here.
 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>
-![Child Territory]({{docs_base_url}}/assets/img/articles/Selection_0124080f1.png)
+
+<img alt="Default Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-1.gif">
 
 Following is how Child Territories will be listed under a Parent Territory.
 
-![Territory Tree]({{docs_base_url}}/assets/img/articles/Selection_014.png)
+<img alt="Adding new Territories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/territory-3.png">
 
-Following this steps, you can manage other tree masters in ERPNext.
+Following this steps, you can manage other tree masters as well in ERPNext.
 
 <!-- markdown -->

erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md

@@ -1,8 +1,6 @@
-<h1>Setting the Current Value for Naming Series</h1>
+#Setting the Current Value for Naming Series
 
-<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.
+Naming Series feature allows you to define prefix for naming of a documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO-00001, SO-00002... and so on. Click [here]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html) to learn how you can customize Number Series for a transaction/master in ERPNext.
 
 ### 1. Setting the Current Value
 
@@ -16,19 +14,19 @@ For example, you have 322 Sales Orders created in your old system with SO00322 a
 
 #### Update Series Section
 
-![Update Series Section]({{docs_base_url}}/assets/img/articles/$SGrab_420.png)
+<img alt="Update Series Section" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-1.png">
 
 #### Select Prefix
 
 Considering our scenario, prefix for Sales Order will be "SO".
 
-![Series Prefix]({{docs_base_url}}/assets/img/articles/$SGrab_418.png)
+<img alt="Series Prefix" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-2.png">
 
 #### 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.
 
-![Series Current Value]({{docs_base_url}}/assets/img/articles/$SGrab_419.png)
+<img alt="Series Current Value" class="screenshot" src="{{docs_base_url}}/assets/img/articles/current-no-3.png">
 
 With this setting, you will have numbering for the New Sales Orders starting with #323.
 

erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html

@@ -1,11 +0,0 @@
-<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 &gt;&gt; Data &gt;&gt; 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>

erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md

@@ -0,0 +1,49 @@
+#Overwriting Data from Data Import Tool
+
+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.
+
+<div class="well">Overwriting data from Data Import Tool works only for the 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.
+
+####Step 1: Download Template
+
+Template Used for overwriting data will be same as one used for importing new items. Hence, you should first download template from.
+
+`Setup > Data > Import/Export Data'
+
+Since items to be over-written will be already available in the system, while downloading template, click on "Download with data" to get all the existing items in the template.
+
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-1.gif">
+	
+####Step 2: Prepare Data
+
+In the template, we can only keep rows of the items to be overwritten and delete the rest. 
+
+Enter new value in the Item Group column for an item. Since Item Group is a master in itself, ensure Item Group entered in the spreadsheet file is already added in the Item Group master.
+
+<img alt="Update Values" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-2.png">
+
+Since we are overwriting only Item Group, only following columns will be mandatory.
+
+1. Column A (since it has main values of template)
+1. Name (Column B)
+1. Item Group
+
+Columns of other field which won't have any impact can be removed, even if they are mandatory. This is applicable only for overwriting, and not when importing new records.
+
+####Step 3: Browse Template
+
+After updating Item Groups in spreadheet, come back to Data Import Tool in ERPNext. Browser and select the File/template which has data to be overwritten.
+
+<img alt="Browse template" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-3.gif">
+
+####Step 4: Upload
+
+On clicking Import, Item Group will be over-written.
+
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/articles/overwrite-4.png">
+
+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 of spreadsheet, and then import same file again. If validation fails even for one row, none of the records are imported/overwritten.
+
+<!-- markdown -->