diff --git a/erpnext/docs/current/api/buying/print_format/drop_shipping/index.txt b/erpnext/docs/current/api/buying/print_format/drop_shipping/index.txt
deleted file mode 100644
index 5c383bd71a..0000000000
--- a/erpnext/docs/current/api/buying/print_format/drop_shipping/index.txt
+++ /dev/null
@@ -1 +0,0 @@
-erpnext.buying.print_format.drop_shipping
\ No newline at end of file
diff --git a/erpnext/docs/current/api/buying/print_format/drop_shipping/erpnext.buying.print_format.drop_shipping.html b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/erpnext.buying.print_format.drop_shipping_format.html
similarity index 78%
rename from erpnext/docs/current/api/buying/print_format/drop_shipping/erpnext.buying.print_format.drop_shipping.html
rename to erpnext/docs/current/api/buying/print_format/drop_shipping_format/erpnext.buying.print_format.drop_shipping_format.html
index d84423e568..9c2648b78a 100644
--- a/erpnext/docs/current/api/buying/print_format/drop_shipping/erpnext.buying.print_format.drop_shipping.html
+++ b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/erpnext.buying.print_format.drop_shipping_format.html
@@ -1,10 +1,10 @@
-<!-- title: erpnext.buying.print_format.drop_shipping --><div class="dev-header">
+<!-- title: erpnext.buying.print_format.drop_shipping_format --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
 	Version 6.x.x</a>
 
 
-	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/buying/print_format/drop_shipping.py"
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/buying/print_format/drop_shipping_format.py"
 		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
 
 </div>
diff --git a/erpnext/docs/current/api/buying/print_format/drop_shipping/index.html b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.html
similarity index 81%
rename from erpnext/docs/current/api/buying/print_format/drop_shipping/index.html
rename to erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.html
index 47647f0475..ef09e77f40 100644
--- a/erpnext/docs/current/api/buying/print_format/drop_shipping/index.html
+++ b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.html
@@ -1,4 +1,4 @@
-<!-- title: drop_shipping -->
+<!-- title: drop_shipping_format -->
 
 
 <div class="dev-header">
@@ -7,7 +7,7 @@
 	Version 6.x.x</a>
 
 
-	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/drop_shipping"
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/drop_shipping_format"
 		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
 
 </div>
diff --git a/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.txt b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.txt
new file mode 100644
index 0000000000..590a2c9618
--- /dev/null
+++ b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.txt
@@ -0,0 +1 @@
+erpnext.buying.print_format.drop_shipping_format
\ No newline at end of file
diff --git a/erpnext/docs/current/api/stock/erpnext.stock.utils.html b/erpnext/docs/current/api/stock/erpnext.stock.utils.html
index 7f2d4e2557..1fb0155d7d 100644
--- a/erpnext/docs/current/api/stock/erpnext.stock.utils.html
+++ b/erpnext/docs/current/api/stock/erpnext.stock.utils.html
@@ -79,7 +79,9 @@
 	
         
     
-    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.utils.get_incoming_rate</code>
+    </p>
 	<p class="docs-attr-name">
         <a name="erpnext.stock.utils.get_incoming_rate" href="#erpnext.stock.utils.get_incoming_rate" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
diff --git a/erpnext/docs/current/models/accounts/sales_invoice.html b/erpnext/docs/current/models/accounts/sales_invoice.html
index 8f0f364ac2..76924c3ee2 100644
--- a/erpnext/docs/current/models/accounts/sales_invoice.html
+++ b/erpnext/docs/current/models/accounts/sales_invoice.html
@@ -2475,6 +2475,20 @@ Yearly</pre>
         
     
     
+	<p class="docs-attr-name">
+        <a name="validate_dropship_item" href="#validate_dropship_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dropship_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
 	<p class="docs-attr-name">
         <a name="validate_fixed_asset_account" href="#validate_fixed_asset_account" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
diff --git a/erpnext/docs/current/models/home/index.html b/erpnext/docs/current/models/home/index.html
deleted file mode 100644
index e21468e274..0000000000
--- a/erpnext/docs/current/models/home/index.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- title: Module home -->
-
-
-<div class="dev-header">
-
-<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.x.x</a>
-
-
-	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/home"
-		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
-
-</div>
-
-<h3>DocTypes for home</h3>
-
-{index}
-
-<!-- autodoc -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/home/index.txt b/erpnext/docs/current/models/home/index.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/docs/current/models/hr/leave_application.html b/erpnext/docs/current/models/hr/leave_application.html
index bc91ea5060..e40ce3a4d3 100644
--- a/erpnext/docs/current/models/hr/leave_application.html
+++ b/erpnext/docs/current/models/hr/leave_application.html
@@ -867,7 +867,7 @@ Rejected</pre>
         <a name="erpnext.hr.doctype.leave_application.leave_application.get_leave_balance_on" href="#erpnext.hr.doctype.leave_application.leave_application.get_leave_balance_on" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.hr.doctype.leave_application.leave_application.<b>get_leave_balance_on</b>
-        <i class="text-muted">(employee, leave_type, date, allocation_records=None)</i>
+        <i class="text-muted">(employee, leave_type, date, allocation_records=None, consider_all_leaves_in_the_allocation_period=False)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
index 3ac0897283..a810705e38 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
@@ -9,8 +9,8 @@ make-field-visible-in-print-format
 making-custom-reports-in-erpnext
 managing-dynamic-link-fields
 module-visibility
-perm-level-error-in-permission-manager-1
+perm-level-error-in-permission-manager
 search-record-by-specific-field
 set-language
 set-precision-for-float-currency-and-percent-fields
-user-restriction
\ No newline at end of file
+user-restriction
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.md
similarity index 100%
rename from erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager-1.md
rename to erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md