[docs]
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
index f0833eb..9ab6800 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
@@ -58,7 +58,7 @@
<a name="get_incoming_rate_for_sales_return" href="#get_incoming_rate_for_sales_return" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>get_incoming_rate_for_sales_return</b>
- <i class="text-muted">(self, item_code, warehouse, against_document)</i>
+ <i class="text-muted">(self, item_code, against_document)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
diff --git a/erpnext/docs/current/models/accounts/period_closing_voucher.html b/erpnext/docs/current/models/accounts/period_closing_voucher.html
index c14226e..1a3aac1 100644
--- a/erpnext/docs/current/models/accounts/period_closing_voucher.html
+++ b/erpnext/docs/current/models/accounts/period_closing_voucher.html
@@ -157,7 +157,7 @@
<td >
Closing Account Head
<p class="text-muted small">
- The account head under Liability, in which Profit/Loss will be booked</p>
+ The account head under Liability or Equity, in which Profit/Loss will be booked</p>
</td>
<td>
diff --git a/erpnext/docs/current/models/accounts/pricing_rule.html b/erpnext/docs/current/models/accounts/pricing_rule.html
index 5539128..d68b253 100644
--- a/erpnext/docs/current/models/accounts/pricing_rule.html
+++ b/erpnext/docs/current/models/accounts/pricing_rule.html
@@ -899,6 +899,22 @@
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="erpnext.accounts.doctype.pricing_rule.pricing_rule.set_transaction_type" href="#erpnext.accounts.doctype.pricing_rule.pricing_rule.set_transaction_type" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.accounts.doctype.pricing_rule.pricing_rule.<b>set_transaction_type</b>
+ <i class="text-muted">(args)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html
index 29b6b77..8da39c0 100644
--- a/erpnext/docs/current/models/stock/delivery_note.html
+++ b/erpnext/docs/current/models/stock/delivery_note.html
@@ -1750,20 +1750,6 @@
<p class="docs-attr-name">
- <a name="onload" href="#onload" class="text-muted small">
- <i class="icon-link small" style="color: #ccc;"></i></a>
- <b>onload</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="set_actual_qty" href="#set_actual_qty" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>set_actual_qty</b>
diff --git a/erpnext/docs/current/models/stock/item.html b/erpnext/docs/current/models/stock/item.html
index a2fb368..8a06f29 100644
--- a/erpnext/docs/current/models/stock/item.html
+++ b/erpnext/docs/current/models/stock/item.html
@@ -777,12 +777,21 @@
<td>51</td>
<td ><code>manufacturer</code></td>
<td >
- Data</td>
+ Link</td>
<td >
Manufacturer
</td>
- <td></td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/manufacturer">Manufacturer</a>
+
+
+
+ </td>
</tr>
<tr >
diff --git a/erpnext/docs/current/models/stock/manufacturer.html b/erpnext/docs/current/models/stock/manufacturer.html
new file mode 100644
index 0000000..654875e
--- /dev/null
+++ b/erpnext/docs/current/models/stock/manufacturer.html
@@ -0,0 +1,171 @@
+<!-- title: Manufacturer -->
+
+
+
+
+
+<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/stock/doctype/manufacturer"
+ target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+ <p><b>Table Name:</b> <code>tabManufacturer</code></p>
+
+
+Manufacturers used in Items
+
+<h3>Fields</h3>
+
+<table class="table table-bordered">
+ <thead>
+ <tr>
+ <th style="width: 5%">Sr</th>
+ <th style="width: 25%">Fieldname</th>
+ <th style="width: 20%">Type</th>
+ <th style="width: 25%">Label</th>
+ <th style="width: 25%">Options</th>
+ </tr>
+ </thead>
+ <tbody>
+
+ <tr >
+ <td>1</td>
+ <td class="danger" title="Mandatory"><code>short_name</code></td>
+ <td >
+ Data</td>
+ <td >
+ Short Name
+ <p class="text-muted small">
+ Limited to 12 characters</p>
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>2</td>
+ <td ><code>full_name</code></td>
+ <td >
+ Data</td>
+ <td >
+ Full Name
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>3</td>
+ <td ><code>website</code></td>
+ <td >
+ Data</td>
+ <td >
+ Website
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>4</td>
+ <td ><code>data_6</code></td>
+ <td >
+ Link</td>
+ <td >
+ Country
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
+ <td>5</td>
+ <td ><code>logo</code></td>
+ <td >
+ Attach Image</td>
+ <td >
+ Logo
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>6</td>
+ <td ><code>notes</code></td>
+ <td >
+ Small Text</td>
+ <td >
+ Notes
+
+ </td>
+ <td></td>
+ </tr>
+
+ </tbody>
+</table>
+
+
+ <hr>
+ <h3>Controller</h3>
+ <h4>erpnext.stock.doctype.manufacturer.manufacturer</h4>
+
+
+
+
+
+
+
+ <h3 style="font-weight: normal;">Class <b>Manufacturer</b></h3>
+
+ <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+
+ <div class="docs-attr-desc"><p></p>
+</div>
+ <div style="padding-left: 30px;">
+
+ </div>
+ <hr>
+
+
+
+
+
+
+ <h4>Linked In:</h4>
+ <ul>
+
+
+ <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+
+
+ </ul>
+
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html
index 3a4ea2c..5e59506 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html
@@ -1542,20 +1542,6 @@
<p class="docs-attr-name">
- <a name="onload" href="#onload" class="text-muted small">
- <i class="icon-link small" style="color: #ccc;"></i></a>
- <b>onload</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="po_required" href="#po_required" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>po_required</b>