[fix] make setup_wizard.create_bank_account multi-company safe
diff --git a/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html b/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html
index 8724808..bce01a4 100644
--- a/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html
+++ b/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html
@@ -23,23 +23,34 @@
<a name="erpnext.stock.get_item_details.apply_price_list" href="#erpnext.stock.get_item_details.apply_price_list" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.stock.get_item_details.<b>apply_price_list</b>
- <i class="text-muted">(args)</i>
+ <i class="text-muted">(args, as_doc=False)</i>
</p>
- <div class="docs-attr-desc"><p>args = {
- "item<em>list": [{"doctype": "", "name": "", "item</em>code": "", "brand": "", "item<em>group": ""}, ...],
- "conversion</em>rate": 1.0,
- "selling<em>price</em>list": None,
- "price<em>list</em>currency": None,
- "plc<em>conversion</em>rate": 1.0,
- "parenttype": "",
- "parent": "",
+ <div class="docs-attr-desc"><p>Apply pricelist on a document-like dict object and return as
+{'parent': dict, 'children': list}</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>args</code></strong> - See below</li>
+<li><p><strong><code>as_doc</code></strong> - Updates value in the passed dict</p>
+
+<p>args = {
+ "doctype": "",
+ "name": "",
+ "items": [{"doctype": "", "name": "", "item<em>code": "", "brand": "", "item</em>group": ""}, ...],
+ "conversion<em>rate": 1.0,
+ "selling</em>price<em>list": None,
+ "price</em>list<em>currency": None,
+ "plc</em>conversion<em>rate": 1.0,
+ "doctype": "",
+ "name": "",
"supplier": None,
- "transaction<em>date": None,
- "conversion</em>rate": 1.0,
- "buying<em>price</em>list": None,
- "transaction<em>type": "selling",
+ "transaction</em>date": None,
+ "conversion<em>rate": 1.0,
+ "buying</em>price<em>list": None,
"ignore</em>pricing_rule": 0/1
-}</p>
+}</p></li>
+</ul>
</div>
<br>
@@ -251,16 +262,15 @@
"selling<em>price</em>list": None,
"price<em>list</em>currency": None,
"plc<em>conversion</em>rate": 1.0,
- "parenttype": "",
- "parent": "",
+ "doctype": "",
+ "name": "",
"supplier": None,
"transaction<em>date": None,
"conversion</em>rate": 1.0,
"buying<em>price</em>list": None,
"is<em>subcontracted": "Yes" / "No",
- "transaction</em>type": "selling",
- "ignore<em>pricing</em>rule": 0/1
- "project_name": ""
+ "ignore</em>pricing<em>rule": 0/1
+ "project</em>name": ""
}</p>
</div>
<br>
@@ -373,7 +383,7 @@
<a name="erpnext.stock.get_item_details.get_price_list_rate_for" href="#erpnext.stock.get_item_details.get_price_list_rate_for" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.stock.get_item_details.<b>get_price_list_rate_for</b>
- <i class="text-muted">(args, item_code)</i>
+ <i class="text-muted">(price_list, item_code)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html
index 4c021c1..01071ee 100644
--- a/erpnext/docs/current/index.html
+++ b/erpnext/docs/current/index.html
@@ -35,7 +35,7 @@
Version
</td>
<td>
- <code>6.16.4</code>
+ <code>6.17.0</code>
</td>
</tr>
</table>
diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html
index 5b3103d..37c774e 100644
--- a/erpnext/docs/current/models/accounts/account.html
+++ b/erpnext/docs/current/models/accounts/account.html
@@ -582,6 +582,20 @@
<p class="docs-attr-name">
+ <a name="validate_group_or_ledger" href="#validate_group_or_ledger" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>validate_group_or_ledger</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_mandatory" href="#validate_mandatory" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>validate_mandatory</b>
@@ -850,6 +864,15 @@
<li>
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway_account">Payment Gateway Account</a>
+
+</li>
+
+
+
+ <li>
+
+
<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation">Payment Reconciliation</a>
</li>
diff --git a/erpnext/docs/current/models/accounts/journal_entry.html b/erpnext/docs/current/models/accounts/journal_entry.html
index 4aab93c..fb29c5c 100644
--- a/erpnext/docs/current/models/accounts/journal_entry.html
+++ b/erpnext/docs/current/models/accounts/journal_entry.html
@@ -1215,7 +1215,7 @@
<a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_default_bank_cash_account</b>
- <i class="text-muted">(company, voucher_type, mode_of_payment=None)</i>
+ <i class="text-muted">(company, voucher_type, mode_of_payment=None, account=None)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
@@ -1321,7 +1321,7 @@
<a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_payment_entry_against_invoice</b>
- <i class="text-muted">(dt, dn)</i>
+ <i class="text-muted">(dt, dn, amount=None, journal_entry=False, bank_account=None)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
@@ -1339,7 +1339,7 @@
<a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_payment_entry_against_order</b>
- <i class="text-muted">(dt, dn)</i>
+ <i class="text-muted">(dt, dn, amount=None, journal_entry=False, bank_account=None)</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/payment_gateway.html b/erpnext/docs/current/models/accounts/payment_gateway.html
new file mode 100644
index 0000000..9707ba6
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_gateway.html
@@ -0,0 +1,101 @@
+<!-- title: Payment Gateway -->
+
+
+
+
+
+<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/accounts/doctype/payment_gateway"
+ 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>tabPayment Gateway</code></p>
+
+
+
+
+<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>gateway</code></td>
+ <td >
+ Data</td>
+ <td >
+ Gateway
+
+ </td>
+ <td></td>
+ </tr>
+
+ </tbody>
+</table>
+
+
+ <hr>
+ <h3>Controller</h3>
+ <h4>erpnext.accounts.doctype.payment_gateway.payment_gateway</h4>
+
+
+
+
+
+
+
+ <h3 style="font-weight: normal;">Class <b>PaymentGateway</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/accounts/payment_gateway_account">Payment Gateway Account</a>
+
+</li>
+
+
+ </ul>
+
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/accounts/payment_gateway_account.html b/erpnext/docs/current/models/accounts/payment_gateway_account.html
new file mode 100644
index 0000000..68d369b
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_gateway_account.html
@@ -0,0 +1,273 @@
+<!-- title: Payment Gateway Account -->
+
+
+
+
+
+<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/accounts/doctype/payment_gateway_account"
+ 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>tabPayment Gateway Account</code></p>
+
+
+
+
+<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 class="info">
+ <td>1</td>
+ <td ><code>gateway_acount_details</code></td>
+ <td >
+ Section Break</td>
+ <td >
+ Gateway Acount Details
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>2</td>
+ <td ><code>is_default</code></td>
+ <td >
+ Check</td>
+ <td >
+ Is Default
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>3</td>
+ <td class="danger" title="Mandatory"><code>gateway</code></td>
+ <td >
+ Link</td>
+ <td >
+ Gateway
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway">Payment Gateway</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
+ <td>4</td>
+ <td class="danger" title="Mandatory"><code>payment_account</code></td>
+ <td >
+ Link</td>
+ <td >
+ Payment Account
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
+ <td>5</td>
+ <td ><code>currency</code></td>
+ <td >
+ Read Only</td>
+ <td >
+ Currency
+
+ </td>
+ <td>
+ <pre>payment_account.account_currency</pre>
+ </td>
+ </tr>
+
+ <tr class="info">
+ <td>6</td>
+ <td ><code>payment_request_message</code></td>
+ <td >
+ Section Break</td>
+ <td >
+ Payment Request Message
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>7</td>
+ <td ><code>message</code></td>
+ <td >
+ Text Editor</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>8</td>
+ <td ><code>payment_url_message</code></td>
+ <td >
+ Data</td>
+ <td >
+ Payment URL Message
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>9</td>
+ <td ><code>payment_success_url</code></td>
+ <td >
+ Data</td>
+ <td >
+ Payment Success URL
+
+ </td>
+ <td></td>
+ </tr>
+
+ </tbody>
+</table>
+
+
+ <hr>
+ <h3>Controller</h3>
+ <h4>erpnext.accounts.doctype.payment_gateway_account.payment_gateway_account</h4>
+
+
+
+
+
+
+
+ <h3 style="font-weight: normal;">Class <b>PaymentGatewayAccount</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;">
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="autoname" href="#autoname" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>autoname</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_as_default_if_not_set" href="#set_as_default_if_not_set" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>set_as_default_if_not_set</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="update_default_payment_gateway" href="#update_default_payment_gateway" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>update_default_payment_gateway</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" href="#validate" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>validate</b>
+ <i class="text-muted">(self)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+ </div>
+ <hr>
+
+
+
+
+
+
+ <h4>Linked In:</h4>
+ <ul>
+
+
+ <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_request">Payment Request</a>
+
+</li>
+
+
+ </ul>
+
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/accounts/payment_request.html b/erpnext/docs/current/models/accounts/payment_request.html
new file mode 100644
index 0000000..668fff8
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_request.html
@@ -0,0 +1,810 @@
+<!-- title: Payment Request -->
+
+
+
+
+
+<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/accounts/doctype/payment_request"
+ 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>tabPayment Request</code></p>
+
+
+
+
+<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 class="info">
+ <td>1</td>
+ <td ><code>payment_details</code></td>
+ <td >
+ Section Break</td>
+ <td >
+ Payment Details
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>2</td>
+ <td ><code>amount</code></td>
+ <td >
+ Currency</td>
+ <td >
+ Amount
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>3</td>
+ <td ><code>currency</code></td>
+ <td >
+ Link</td>
+ <td >
+ Currency
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
+ <td>4</td>
+ <td ><code>make_sales_invoice</code></td>
+ <td >
+ Check</td>
+ <td >
+ Make Sales Invoice
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>5</td>
+ <td ><code>column_break_5</code></td>
+ <td class="info">
+ Column Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>6</td>
+ <td ><code>status</code></td>
+ <td >
+ Select</td>
+ <td >
+ Status
+
+ </td>
+ <td>
+ <pre>
+Draft
+Initiated
+Paid
+Failed
+Cancelled</pre>
+ </td>
+ </tr>
+
+ <tr class="info">
+ <td>7</td>
+ <td ><code>section_break_7</code></td>
+ <td >
+ Section Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>8</td>
+ <td ><code>payment_gateway</code></td>
+ <td >
+ Link</td>
+ <td >
+ Payment Gateway
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_gateway_account">Payment Gateway Account</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
+ <td>9</td>
+ <td ><code>payment_success_url</code></td>
+ <td >
+ Data</td>
+ <td >
+ Payment Success URL
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>10</td>
+ <td ><code>column_break_9</code></td>
+ <td class="info">
+ Column Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>11</td>
+ <td ><code>gateway</code></td>
+ <td >
+ Read Only</td>
+ <td >
+ Gateway
+
+ </td>
+ <td>
+ <pre>payment_gateway.gateway</pre>
+ </td>
+ </tr>
+
+ <tr >
+ <td>12</td>
+ <td ><code>payment_account</code></td>
+ <td >
+ Read Only</td>
+ <td >
+ Payment Account
+
+ </td>
+ <td>
+ <pre>payment_gateway.payment_account</pre>
+ </td>
+ </tr>
+
+ <tr class="info">
+ <td>13</td>
+ <td ><code>recipient_and_message</code></td>
+ <td >
+ Section Break</td>
+ <td >
+ Recipient and Message
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>14</td>
+ <td ><code>print_format</code></td>
+ <td >
+ Select</td>
+ <td >
+ Print Format
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>15</td>
+ <td ><code>mute_email</code></td>
+ <td >
+ Check</td>
+ <td class="text-muted" title="Hidden">
+ Mute Email
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>16</td>
+ <td ><code>email_to</code></td>
+ <td >
+ Data</td>
+ <td >
+ Email To
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>17</td>
+ <td ><code>subject</code></td>
+ <td >
+ Data</td>
+ <td >
+ Subject
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>18</td>
+ <td ><code>message</code></td>
+ <td >
+ Text Editor</td>
+ <td >
+ Message
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>19</td>
+ <td ><code>payment_url_message</code></td>
+ <td >
+ Data</td>
+ <td >
+ Payment URL Message
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>20</td>
+ <td ><code>payment_url</code></td>
+ <td >
+ Data</td>
+ <td class="text-muted" title="Hidden">
+ payment_url
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr class="info">
+ <td>21</td>
+ <td ><code>reference_details</code></td>
+ <td >
+ Section Break</td>
+ <td >
+ Reference Details
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>22</td>
+ <td ><code>reference_doctype</code></td>
+ <td >
+ Link</td>
+ <td >
+ Reference Doctype
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
+ <td>23</td>
+ <td ><code>reference_name</code></td>
+ <td >
+ Dynamic Link</td>
+ <td >
+ Reference Name
+
+ </td>
+ <td>
+ <pre>reference_doctype</pre>
+ </td>
+ </tr>
+
+ <tr >
+ <td>24</td>
+ <td ><code>amended_from</code></td>
+ <td >
+ Link</td>
+ <td >
+ Amended From
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_request">Payment Request</a>
+
+
+
+ </td>
+ </tr>
+
+ </tbody>
+</table>
+
+
+ <hr>
+ <h3>Controller</h3>
+ <h4>erpnext.accounts.doctype.payment_request.payment_request</h4>
+
+
+
+
+
+
+
+ <h3 style="font-weight: normal;">Class <b>PaymentRequest</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;">
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="create_journal_entry" href="#create_journal_entry" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>create_journal_entry</b>
+ <i class="text-muted">(self)</i>
+ </p>
+ <div class="docs-attr-desc"><p>create entry</p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="get_message" href="#get_message" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>get_message</b>
+ <i class="text-muted">(self)</i>
+ </p>
+ <div class="docs-attr-desc"><p>return message with payment gateway link</p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="get_payment_success_url" href="#get_payment_success_url" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>get_payment_success_url</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="get_payment_url" href="#get_payment_url" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>get_payment_url</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="make_communication_entry" href="#make_communication_entry" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>make_communication_entry</b>
+ <i class="text-muted">(self)</i>
+ </p>
+ <div class="docs-attr-desc"><p>Make communication entry</p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="make_invoice" href="#make_invoice" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>make_invoice</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="on_cancel" href="#on_cancel" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>on_cancel</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="on_submit" href="#on_submit" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>on_submit</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="on_update_after_submit" href="#on_update_after_submit" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>on_update_after_submit</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="send_email" href="#send_email" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>send_email</b>
+ <i class="text-muted">(self)</i>
+ </p>
+ <div class="docs-attr-desc"><p>send email with payment link</p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="send_payment_request" href="#send_payment_request" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>send_payment_request</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_as_cancelled" href="#set_as_cancelled" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>set_as_cancelled</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_as_paid" href="#set_as_paid" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>set_as_paid</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_failed" href="#set_failed" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>set_failed</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_status" href="#set_status" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>set_status</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" href="#validate" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>validate</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_currency" href="#validate_currency" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>validate_currency</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_payment_gateway" href="#validate_payment_gateway" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>validate_payment_gateway</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_payment_gateway_account" href="#validate_payment_gateway_account" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>validate_payment_gateway_account</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_payment_request" href="#validate_payment_request" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>validate_payment_request</b>
+ <i class="text-muted">(self)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+ </div>
+ <hr>
+
+
+
+
+
+
+ <p><span class="label label-info">Public API</span>
+ <br><code>/api/method/erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request</code>
+ </p>
+ <p class="docs-attr-name">
+ <a name="erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request" href="#erpnext.accounts.doctype.payment_request.payment_request.generate_payment_request" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.accounts.doctype.payment_request.payment_request.<b>generate_payment_request</b>
+ <i class="text-muted">(name)</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="erpnext.accounts.doctype.payment_request.payment_request.get_amount" href="#erpnext.accounts.doctype.payment_request.payment_request.get_amount" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.accounts.doctype.payment_request.payment_request.<b>get_amount</b>
+ <i class="text-muted">(ref_doc, dt)</i>
+ </p>
+ <div class="docs-attr-desc"><p>get amount based on doctype</p>
+</div>
+ <br>
+
+
+
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="erpnext.accounts.doctype.payment_request.payment_request.get_gateway_details" href="#erpnext.accounts.doctype.payment_request.payment_request.get_gateway_details" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.accounts.doctype.payment_request.payment_request.<b>get_gateway_details</b>
+ <i class="text-muted">(args)</i>
+ </p>
+ <div class="docs-attr-desc"><p>return gateway and payment account of default payment gateway</p>
+</div>
+ <br>
+
+
+
+
+
+
+ <p><span class="label label-info">Public API</span>
+ <br><code>/api/method/erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list</code>
+ </p>
+ <p class="docs-attr-name">
+ <a name="erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list" href="#erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.accounts.doctype.payment_request.payment_request.<b>get_print_format_list</b>
+ <i class="text-muted">(ref_doctype)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
+
+
+
+ <p><span class="label label-info">Public API</span>
+ <br><code>/api/method/erpnext.accounts.doctype.payment_request.payment_request.make_payment_request</code>
+ </p>
+ <p class="docs-attr-name">
+ <a name="erpnext.accounts.doctype.payment_request.payment_request.make_payment_request" href="#erpnext.accounts.doctype.payment_request.payment_request.make_payment_request" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.accounts.doctype.payment_request.payment_request.<b>make_payment_request</b>
+ <i class="text-muted">()</i>
+ </p>
+ <div class="docs-attr-desc"><p>Make payment request</p>
+</div>
+ <br>
+
+
+
+
+
+
+ <p><span class="label label-info">Public API</span>
+ <br><code>/api/method/erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email</code>
+ </p>
+ <p class="docs-attr-name">
+ <a name="erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email" href="#erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.accounts.doctype.payment_request.payment_request.<b>resend_payment_email</b>
+ <i class="text-muted">(docname)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
+
+
+
+ <h4>Linked In:</h4>
+ <ul>
+
+
+ <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_request">Payment Request</a>
+
+</li>
+
+
+ </ul>
+
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/accounts/pricing_rule.html b/erpnext/docs/current/models/accounts/pricing_rule.html
index 67e561f..5539128 100644
--- a/erpnext/docs/current/models/accounts/pricing_rule.html
+++ b/erpnext/docs/current/models/accounts/pricing_rule.html
@@ -814,21 +814,21 @@
<i class="text-muted">(args)</i>
</p>
<div class="docs-attr-desc"><p>args = {
- "item<em>list": [{"doctype": "", "name": "", "item</em>code": "", "brand": "", "item<em>group": ""}, ...],
+ "items": [{"doctype": "", "name": "", "item<em>code": "", "brand": "", "item</em>group": ""}, ...],
"customer": "something",
- "customer</em>group": "something",
+ "customer<em>group": "something",
"territory": "something",
"supplier": "something",
- "supplier<em>type": "something",
+ "supplier</em>type": "something",
"currency": "something",
- "conversion</em>rate": "something",
- "price<em>list": "something",
- "plc</em>conversion<em>rate": "something",
+ "conversion<em>rate": "something",
+ "price</em>list": "something",
+ "plc<em>conversion</em>rate": "something",
"company": "something",
- "transaction</em>date": "something",
+ "transaction<em>date": "something",
"campaign": "something",
- "sales<em>partner": "something",
- "ignore</em>pricing_rule": "something"
+ "sales</em>partner": "something",
+ "ignore<em>pricing</em>rule": "something"
}</p>
</div>
<br>
diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html
index bbf1dce..c627191 100644
--- a/erpnext/docs/current/models/buying/purchase_order.html
+++ b/erpnext/docs/current/models/buying/purchase_order.html
@@ -101,6 +101,18 @@
<tr >
<td>5</td>
+ <td ><code>get_items_from_open_material_requests</code></td>
+ <td >
+ Button</td>
+ <td >
+ Get Items from Open Material Requests
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>6</td>
<td ><code>is_subcontracted</code></td>
<td >
Select</td>
@@ -115,7 +127,7 @@
</tr>
<tr >
- <td>6</td>
+ <td>7</td>
<td ><code>supplier_name</code></td>
<td >
Data</td>
@@ -127,7 +139,7 @@
</tr>
<tr >
- <td>7</td>
+ <td>8</td>
<td ><code>address_display</code></td>
<td >
Small Text</td>
@@ -139,7 +151,7 @@
</tr>
<tr >
- <td>8</td>
+ <td>9</td>
<td ><code>contact_display</code></td>
<td >
Small Text</td>
@@ -151,7 +163,7 @@
</tr>
<tr >
- <td>9</td>
+ <td>10</td>
<td ><code>contact_mobile</code></td>
<td >
Small Text</td>
@@ -163,7 +175,7 @@
</tr>
<tr >
- <td>10</td>
+ <td>11</td>
<td ><code>contact_email</code></td>
<td >
Small Text</td>
@@ -175,7 +187,7 @@
</tr>
<tr >
- <td>11</td>
+ <td>12</td>
<td ><code>column_break1</code></td>
<td class="info">
Column Break</td>
@@ -187,7 +199,7 @@
</tr>
<tr >
- <td>12</td>
+ <td>13</td>
<td class="danger" title="Mandatory"><code>transaction_date</code></td>
<td >
Date</td>
@@ -199,7 +211,7 @@
</tr>
<tr >
- <td>13</td>
+ <td>14</td>
<td ><code>amended_from</code></td>
<td >
Link</td>
@@ -220,7 +232,7 @@
</tr>
<tr >
- <td>14</td>
+ <td>15</td>
<td class="danger" title="Mandatory"><code>company</code></td>
<td >
Link</td>
@@ -241,7 +253,7 @@
</tr>
<tr class="info">
- <td>15</td>
+ <td>16</td>
<td ><code>drop_ship</code></td>
<td >
Section Break</td>
@@ -253,7 +265,7 @@
</tr>
<tr >
- <td>16</td>
+ <td>17</td>
<td ><code>customer</code></td>
<td >
Link</td>
@@ -274,7 +286,7 @@
</tr>
<tr >
- <td>17</td>
+ <td>18</td>
<td ><code>customer_name</code></td>
<td >
Data</td>
@@ -286,7 +298,7 @@
</tr>
<tr >
- <td>18</td>
+ <td>19</td>
<td ><code>column_break_19</code></td>
<td class="info">
Column Break</td>
@@ -298,7 +310,7 @@
</tr>
<tr >
- <td>19</td>
+ <td>20</td>
<td ><code>customer_address</code></td>
<td >
Link</td>
@@ -319,7 +331,7 @@
</tr>
<tr >
- <td>20</td>
+ <td>21</td>
<td ><code>customer_contact_person</code></td>
<td >
Link</td>
@@ -340,7 +352,7 @@
</tr>
<tr >
- <td>21</td>
+ <td>22</td>
<td ><code>customer_address_display</code></td>
<td >
Small Text</td>
@@ -352,7 +364,7 @@
</tr>
<tr >
- <td>22</td>
+ <td>23</td>
<td ><code>customer_contact_display</code></td>
<td >
Small Text</td>
@@ -364,7 +376,7 @@
</tr>
<tr >
- <td>23</td>
+ <td>24</td>
<td ><code>customer_contact_mobile</code></td>
<td >
Small Text</td>
@@ -376,7 +388,7 @@
</tr>
<tr >
- <td>24</td>
+ <td>25</td>
<td ><code>customer_contact_email</code></td>
<td >
Small Text</td>
@@ -388,7 +400,7 @@
</tr>
<tr class="info">
- <td>25</td>
+ <td>26</td>
<td ><code>currency_and_price_list</code></td>
<td >
Section Break</td>
@@ -402,7 +414,7 @@
</tr>
<tr >
- <td>26</td>
+ <td>27</td>
<td class="danger" title="Mandatory"><code>currency</code></td>
<td >
Link</td>
@@ -423,7 +435,7 @@
</tr>
<tr >
- <td>27</td>
+ <td>28</td>
<td class="danger" title="Mandatory"><code>conversion_rate</code></td>
<td >
Float</td>
@@ -435,7 +447,7 @@
</tr>
<tr >
- <td>28</td>
+ <td>29</td>
<td ><code>cb_price_list</code></td>
<td class="info">
Column Break</td>
@@ -447,7 +459,7 @@
</tr>
<tr >
- <td>29</td>
+ <td>30</td>
<td ><code>buying_price_list</code></td>
<td >
Link</td>
@@ -468,7 +480,7 @@
</tr>
<tr >
- <td>30</td>
+ <td>31</td>
<td ><code>price_list_currency</code></td>
<td >
Link</td>
@@ -489,7 +501,7 @@
</tr>
<tr >
- <td>31</td>
+ <td>32</td>
<td ><code>plc_conversion_rate</code></td>
<td >
Float</td>
@@ -501,7 +513,7 @@
</tr>
<tr >
- <td>32</td>
+ <td>33</td>
<td ><code>ignore_pricing_rule</code></td>
<td >
Check</td>
@@ -513,7 +525,7 @@
</tr>
<tr class="info">
- <td>33</td>
+ <td>34</td>
<td ><code>items_section</code></td>
<td >
Section Break</td>
@@ -527,7 +539,7 @@
</tr>
<tr >
- <td>34</td>
+ <td>35</td>
<td ><code>items</code></td>
<td >
Table</td>
@@ -547,8 +559,20 @@
</td>
</tr>
+ <tr >
+ <td>36</td>
+ <td ><code>get_last_purchase_rate</code></td>
+ <td >
+ Button</td>
+ <td >
+ Get last purchase rate
+
+ </td>
+ <td></td>
+ </tr>
+
<tr class="info">
- <td>35</td>
+ <td>37</td>
<td ><code>sb_last_purchase</code></td>
<td >
Section Break</td>
@@ -560,7 +584,7 @@
</tr>
<tr >
- <td>36</td>
+ <td>38</td>
<td ><code>base_total</code></td>
<td >
Currency</td>
@@ -574,7 +598,7 @@
</tr>
<tr >
- <td>37</td>
+ <td>39</td>
<td ><code>base_net_total</code></td>
<td >
Currency</td>
@@ -588,7 +612,7 @@
</tr>
<tr >
- <td>38</td>
+ <td>40</td>
<td ><code>column_break_26</code></td>
<td class="info">
Column Break</td>
@@ -600,7 +624,7 @@
</tr>
<tr >
- <td>39</td>
+ <td>41</td>
<td ><code>total</code></td>
<td >
Currency</td>
@@ -614,7 +638,7 @@
</tr>
<tr >
- <td>40</td>
+ <td>42</td>
<td ><code>net_total</code></td>
<td >
Currency</td>
@@ -628,7 +652,7 @@
</tr>
<tr class="info">
- <td>41</td>
+ <td>43</td>
<td ><code>taxes_section</code></td>
<td >
Section Break</td>
@@ -642,7 +666,7 @@
</tr>
<tr >
- <td>42</td>
+ <td>44</td>
<td ><code>taxes_and_charges</code></td>
<td >
Link</td>
@@ -663,7 +687,7 @@
</tr>
<tr >
- <td>43</td>
+ <td>45</td>
<td ><code>taxes</code></td>
<td >
Table</td>
@@ -684,7 +708,7 @@
</tr>
<tr >
- <td>44</td>
+ <td>46</td>
<td ><code>other_charges_calculation</code></td>
<td >
HTML</td>
@@ -696,7 +720,7 @@
</tr>
<tr class="info">
- <td>45</td>
+ <td>47</td>
<td ><code>totals</code></td>
<td >
Section Break</td>
@@ -710,7 +734,7 @@
</tr>
<tr >
- <td>46</td>
+ <td>48</td>
<td ><code>base_taxes_and_charges_added</code></td>
<td >
Currency</td>
@@ -724,7 +748,7 @@
</tr>
<tr >
- <td>47</td>
+ <td>49</td>
<td ><code>base_taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@@ -738,7 +762,7 @@
</tr>
<tr >
- <td>48</td>
+ <td>50</td>
<td ><code>base_total_taxes_and_charges</code></td>
<td >
Currency</td>
@@ -752,7 +776,7 @@
</tr>
<tr >
- <td>49</td>
+ <td>51</td>
<td ><code>column_break_39</code></td>
<td class="info">
Column Break</td>
@@ -764,7 +788,7 @@
</tr>
<tr >
- <td>50</td>
+ <td>52</td>
<td ><code>taxes_and_charges_added</code></td>
<td >
Currency</td>
@@ -778,7 +802,7 @@
</tr>
<tr >
- <td>51</td>
+ <td>53</td>
<td ><code>taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@@ -792,7 +816,7 @@
</tr>
<tr >
- <td>52</td>
+ <td>54</td>
<td ><code>total_taxes_and_charges</code></td>
<td >
Currency</td>
@@ -806,7 +830,7 @@
</tr>
<tr class="info">
- <td>53</td>
+ <td>55</td>
<td ><code>discount_section</code></td>
<td >
Section Break</td>
@@ -818,7 +842,7 @@
</tr>
<tr >
- <td>54</td>
+ <td>56</td>
<td ><code>apply_discount_on</code></td>
<td >
Select</td>
@@ -834,7 +858,7 @@
</tr>
<tr >
- <td>55</td>
+ <td>57</td>
<td ><code>base_discount_amount</code></td>
<td >
Currency</td>
@@ -848,7 +872,7 @@
</tr>
<tr >
- <td>56</td>
+ <td>58</td>
<td ><code>column_break_45</code></td>
<td class="info">
Column Break</td>
@@ -860,7 +884,7 @@
</tr>
<tr >
- <td>57</td>
+ <td>59</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
@@ -872,7 +896,7 @@
</tr>
<tr >
- <td>58</td>
+ <td>60</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
@@ -886,7 +910,7 @@
</tr>
<tr class="info">
- <td>59</td>
+ <td>61</td>
<td ><code>totals_section</code></td>
<td >
Section Break</td>
@@ -898,7 +922,7 @@
</tr>
<tr >
- <td>60</td>
+ <td>62</td>
<td ><code>base_grand_total</code></td>
<td >
Currency</td>
@@ -912,7 +936,7 @@
</tr>
<tr >
- <td>61</td>
+ <td>63</td>
<td ><code>base_in_words</code></td>
<td >
Data</td>
@@ -925,7 +949,7 @@
</tr>
<tr >
- <td>62</td>
+ <td>64</td>
<td ><code>base_rounded_total</code></td>
<td >
Currency</td>
@@ -939,7 +963,7 @@
</tr>
<tr >
- <td>63</td>
+ <td>65</td>
<td ><code>advance_paid</code></td>
<td >
Currency</td>
@@ -951,7 +975,7 @@
</tr>
<tr >
- <td>64</td>
+ <td>66</td>
<td ><code>column_break4</code></td>
<td class="info">
Column Break</td>
@@ -963,7 +987,7 @@
</tr>
<tr >
- <td>65</td>
+ <td>67</td>
<td ><code>grand_total</code></td>
<td >
Currency</td>
@@ -977,7 +1001,7 @@
</tr>
<tr >
- <td>66</td>
+ <td>68</td>
<td ><code>in_words</code></td>
<td >
Data</td>
@@ -989,7 +1013,7 @@
</tr>
<tr class="info">
- <td>67</td>
+ <td>69</td>
<td ><code>terms_section_break</code></td>
<td >
Section Break</td>
@@ -1003,7 +1027,7 @@
</tr>
<tr >
- <td>68</td>
+ <td>70</td>
<td ><code>tc_name</code></td>
<td >
Link</td>
@@ -1024,7 +1048,7 @@
</tr>
<tr >
- <td>69</td>
+ <td>71</td>
<td ><code>terms</code></td>
<td >
Text Editor</td>
@@ -1036,7 +1060,7 @@
</tr>
<tr class="info">
- <td>70</td>
+ <td>72</td>
<td ><code>contact_section</code></td>
<td >
Section Break</td>
@@ -1050,7 +1074,7 @@
</tr>
<tr >
- <td>71</td>
+ <td>73</td>
<td ><code>supplier_address</code></td>
<td >
Link</td>
@@ -1071,7 +1095,7 @@
</tr>
<tr >
- <td>72</td>
+ <td>74</td>
<td ><code>cb_contact</code></td>
<td class="info">
Column Break</td>
@@ -1083,7 +1107,7 @@
</tr>
<tr >
- <td>73</td>
+ <td>75</td>
<td ><code>contact_person</code></td>
<td >
Link</td>
@@ -1104,7 +1128,7 @@
</tr>
<tr class="info">
- <td>74</td>
+ <td>76</td>
<td ><code>more_info</code></td>
<td >
Section Break</td>
@@ -1116,7 +1140,7 @@
</tr>
<tr >
- <td>75</td>
+ <td>77</td>
<td class="danger" title="Mandatory"><code>status</code></td>
<td >
Select</td>
@@ -1139,7 +1163,7 @@
</tr>
<tr >
- <td>76</td>
+ <td>78</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td >
Link</td>
@@ -1160,7 +1184,7 @@
</tr>
<tr >
- <td>77</td>
+ <td>79</td>
<td ><code>ref_sq</code></td>
<td >
Data</td>
@@ -1172,7 +1196,7 @@
</tr>
<tr >
- <td>78</td>
+ <td>80</td>
<td ><code>column_break_74</code></td>
<td class="info">
Column Break</td>
@@ -1184,7 +1208,7 @@
</tr>
<tr >
- <td>79</td>
+ <td>81</td>
<td ><code>per_received</code></td>
<td >
Percent</td>
@@ -1196,7 +1220,7 @@
</tr>
<tr >
- <td>80</td>
+ <td>82</td>
<td ><code>per_billed</code></td>
<td >
Percent</td>
@@ -1208,7 +1232,7 @@
</tr>
<tr class="info">
- <td>81</td>
+ <td>83</td>
<td ><code>column_break5</code></td>
<td >
Section Break</td>
@@ -1220,7 +1244,7 @@
</tr>
<tr >
- <td>82</td>
+ <td>84</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@@ -1241,7 +1265,7 @@
</tr>
<tr >
- <td>83</td>
+ <td>85</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@@ -1262,7 +1286,7 @@
</tr>
<tr class="info">
- <td>84</td>
+ <td>86</td>
<td ><code>raw_material_details</code></td>
<td >
Section Break</td>
@@ -1276,7 +1300,7 @@
</tr>
<tr >
- <td>85</td>
+ <td>87</td>
<td ><code>supplied_items</code></td>
<td >
Table</td>
@@ -1297,7 +1321,7 @@
</tr>
<tr class="info">
- <td>86</td>
+ <td>88</td>
<td ><code>recurring_order</code></td>
<td >
Section Break</td>
@@ -1311,7 +1335,7 @@
</tr>
<tr >
- <td>87</td>
+ <td>89</td>
<td ><code>column_break</code></td>
<td class="info">
Column Break</td>
@@ -1323,7 +1347,7 @@
</tr>
<tr >
- <td>88</td>
+ <td>90</td>
<td ><code>is_recurring</code></td>
<td >
Check</td>
@@ -1335,7 +1359,7 @@
</tr>
<tr >
- <td>89</td>
+ <td>91</td>
<td ><code>recurring_type</code></td>
<td >
Select</td>
@@ -1352,7 +1376,7 @@
</tr>
<tr >
- <td>90</td>
+ <td>92</td>
<td ><code>from_date</code></td>
<td >
Date</td>
@@ -1365,7 +1389,7 @@
</tr>
<tr >
- <td>91</td>
+ <td>93</td>
<td ><code>to_date</code></td>
<td >
Date</td>
@@ -1378,7 +1402,7 @@
</tr>
<tr >
- <td>92</td>
+ <td>94</td>
<td ><code>repeat_on_day_of_month</code></td>
<td >
Int</td>
@@ -1391,7 +1415,7 @@
</tr>
<tr >
- <td>93</td>
+ <td>95</td>
<td ><code>end_date</code></td>
<td >
Date</td>
@@ -1404,7 +1428,7 @@
</tr>
<tr >
- <td>94</td>
+ <td>96</td>
<td ><code>column_break83</code></td>
<td class="info">
Column Break</td>
@@ -1416,7 +1440,7 @@
</tr>
<tr >
- <td>95</td>
+ <td>97</td>
<td ><code>next_date</code></td>
<td >
Date</td>
@@ -1429,7 +1453,7 @@
</tr>
<tr >
- <td>96</td>
+ <td>98</td>
<td ><code>recurring_id</code></td>
<td >
Data</td>
@@ -1441,7 +1465,7 @@
</tr>
<tr >
- <td>97</td>
+ <td>99</td>
<td ><code>notification_email_address</code></td>
<td >
Small Text</td>
@@ -1454,7 +1478,7 @@
</tr>
<tr >
- <td>98</td>
+ <td>100</td>
<td ><code>recurring_print_format</code></td>
<td >
Link</td>
diff --git a/erpnext/docs/current/models/projects/time_log.html b/erpnext/docs/current/models/projects/time_log.html
index 2276314..b37e0b5 100644
--- a/erpnext/docs/current/models/projects/time_log.html
+++ b/erpnext/docs/current/models/projects/time_log.html
@@ -40,110 +40,6 @@
<tr >
<td>1</td>
- <td class="danger" title="Mandatory"><code>naming_series</code></td>
- <td >
- Select</td>
- <td >
- Series
-
- </td>
- <td>
- <pre>TL-</pre>
- </td>
- </tr>
-
- <tr >
- <td>2</td>
- <td ><code>column_break_2</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>3</td>
- <td ><code>status</code></td>
- <td >
- Select</td>
- <td >
- Status
-
- </td>
- <td>
- <pre>Draft
-Submitted
-Batched for Billing
-Billed
-Cancelled</pre>
- </td>
- </tr>
-
- <tr class="info">
- <td>4</td>
- <td ><code>section_break_4</code></td>
- <td >
- Section Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>5</td>
- <td class="danger" title="Mandatory"><code>from_time</code></td>
- <td >
- Datetime</td>
- <td >
- From Time
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>6</td>
- <td ><code>hours</code></td>
- <td >
- Float</td>
- <td >
- Hours
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>7</td>
- <td class="danger" title="Mandatory"><code>to_time</code></td>
- <td >
- Datetime</td>
- <td >
- To Time
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>8</td>
- <td ><code>column_break_8</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>9</td>
<td ><code>activity_type</code></td>
<td >
Link</td>
@@ -164,7 +60,21 @@
</tr>
<tr >
- <td>10</td>
+ <td>2</td>
+ <td class="danger" title="Mandatory"><code>naming_series</code></td>
+ <td >
+ Select</td>
+ <td >
+ Series
+
+ </td>
+ <td>
+ <pre>TL-</pre>
+ </td>
+ </tr>
+
+ <tr >
+ <td>3</td>
<td ><code>project</code></td>
<td >
Link</td>
@@ -185,7 +95,7 @@
</tr>
<tr >
- <td>11</td>
+ <td>4</td>
<td ><code>task</code></td>
<td >
Link</td>
@@ -205,8 +115,110 @@
</td>
</tr>
+ <tr >
+ <td>5</td>
+ <td ><code>status</code></td>
+ <td >
+ Select</td>
+ <td >
+ Status
+
+ </td>
+ <td>
+ <pre>Draft
+Submitted
+Batched for Billing
+Billed
+Cancelled</pre>
+ </td>
+ </tr>
+
+ <tr >
+ <td>6</td>
+ <td ><code>column_break_2</code></td>
+ <td class="info">
+ Column Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>7</td>
+ <td class="danger" title="Mandatory"><code>from_time</code></td>
+ <td >
+ Datetime</td>
+ <td >
+ From Time
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>8</td>
+ <td ><code>hours</code></td>
+ <td >
+ Float</td>
+ <td >
+ Hours
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>9</td>
+ <td class="danger" title="Mandatory"><code>to_time</code></td>
+ <td >
+ Datetime</td>
+ <td >
+ To Time
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>10</td>
+ <td ><code>billable</code></td>
+ <td >
+ Check</td>
+ <td >
+ Billable
+
+ </td>
+ <td></td>
+ </tr>
+
<tr class="info">
+ <td>11</td>
+ <td ><code>section_break_7</code></td>
+ <td >
+ Section Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
<td>12</td>
+ <td ><code>note</code></td>
+ <td >
+ Text Editor</td>
+ <td >
+ Note
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr class="info">
+ <td>13</td>
<td ><code>section_break_12</code></td>
<td >
Section Break</td>
@@ -218,7 +230,7 @@
</tr>
<tr >
- <td>13</td>
+ <td>14</td>
<td ><code>user</code></td>
<td >
Link</td>
@@ -239,7 +251,7 @@
</tr>
<tr >
- <td>14</td>
+ <td>15</td>
<td ><code>employee</code></td>
<td >
Link</td>
@@ -260,7 +272,7 @@
</tr>
<tr >
- <td>15</td>
+ <td>16</td>
<td ><code>column_break_3</code></td>
<td class="info">
Column Break</td>
@@ -272,7 +284,7 @@
</tr>
<tr >
- <td>16</td>
+ <td>17</td>
<td ><code>for_manufacturing</code></td>
<td >
Check</td>
@@ -283,18 +295,6 @@
<td></td>
</tr>
- <tr >
- <td>17</td>
- <td ><code>billable</code></td>
- <td >
- Check</td>
- <td >
- Billable
-
- </td>
- <td></td>
- </tr>
-
<tr class="info">
<td>18</td>
<td ><code>section_break_11</code></td>
@@ -409,30 +409,6 @@
<tr class="info">
<td>25</td>
- <td ><code>section_break_7</code></td>
- <td >
- Section Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>26</td>
- <td ><code>note</code></td>
- <td >
- Text Editor</td>
- <td >
- Note
-
- </td>
- <td></td>
- </tr>
-
- <tr class="info">
- <td>27</td>
<td ><code>section_break_24</code></td>
<td >
Section Break</td>
@@ -444,7 +420,7 @@
</tr>
<tr >
- <td>28</td>
+ <td>26</td>
<td ><code>costing_rate</code></td>
<td >
Currency</td>
@@ -456,7 +432,7 @@
</tr>
<tr >
- <td>29</td>
+ <td>27</td>
<td ><code>costing_amount</code></td>
<td >
Currency</td>
@@ -468,7 +444,7 @@
</tr>
<tr >
- <td>30</td>
+ <td>28</td>
<td ><code>column_break_25</code></td>
<td class="info">
Column Break</td>
@@ -480,7 +456,7 @@
</tr>
<tr >
- <td>31</td>
+ <td>29</td>
<td ><code>billing_rate</code></td>
<td >
Currency</td>
@@ -492,7 +468,19 @@
</tr>
<tr >
- <td>32</td>
+ <td>30</td>
+ <td ><code>additional_cost</code></td>
+ <td >
+ Currency</td>
+ <td >
+ Additional Cost
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>31</td>
<td ><code>billing_amount</code></td>
<td >
Currency</td>
@@ -505,7 +493,7 @@
</tr>
<tr class="info">
- <td>33</td>
+ <td>32</td>
<td ><code>section_break_29</code></td>
<td >
Section Break</td>
@@ -517,7 +505,7 @@
</tr>
<tr >
- <td>34</td>
+ <td>33</td>
<td ><code>time_log_batch</code></td>
<td >
Link</td>
@@ -539,7 +527,7 @@
</tr>
<tr >
- <td>35</td>
+ <td>34</td>
<td ><code>sales_invoice</code></td>
<td >
Link</td>
@@ -561,7 +549,7 @@
</tr>
<tr >
- <td>36</td>
+ <td>35</td>
<td ><code>amended_from</code></td>
<td >
Link</td>
@@ -582,7 +570,7 @@
</tr>
<tr >
- <td>37</td>
+ <td>36</td>
<td ><code>title</code></td>
<td >
Data</td>
diff --git a/erpnext/docs/current/models/selling/sales_order.html b/erpnext/docs/current/models/selling/sales_order.html
index d3b0e68..aadc664 100644
--- a/erpnext/docs/current/models/selling/sales_order.html
+++ b/erpnext/docs/current/models/selling/sales_order.html
@@ -1846,6 +1846,20 @@
<p class="docs-attr-name">
+ <a name="set_indicator" href="#set_indicator" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>set_indicator</b>
+ <i class="text-muted">(self)</i>
+ </p>
+ <div class="docs-attr-desc"><p>Set indicator for portal</p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
<a name="update_delivery_status" href="#update_delivery_status" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>update_delivery_status</b>
@@ -2260,7 +2274,7 @@
<a name="erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice" href="#erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.selling.doctype.sales_order.sales_order.<b>make_sales_invoice</b>
- <i class="text-muted">(source_name, target_doc=None)</i>
+ <i class="text-muted">(source_name, target_doc=None, ignore_permissions=False)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html
index dda3979..3a4ea2c 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html
@@ -409,7 +409,7 @@
<td >
Button</td>
<td >
- Get Current Stock
+ Get current stock
</td>
<td>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html
index 1ee6b14..2404597 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt_item.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html
@@ -584,48 +584,6 @@
<tr >
<td>40</td>
- <td ><code>project_name</code></td>
- <td >
- Link</td>
- <td >
- Project Name
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>41</td>
- <td ><code>cost_center</code></td>
- <td >
- Link</td>
- <td >
- Cost Center
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>42</td>
<td ><code>qa_no</code></td>
<td >
Link</td>
@@ -646,6 +604,39 @@
</tr>
<tr >
+ <td>41</td>
+ <td ><code>column_break_40</code></td>
+ <td class="info">
+ Column Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>42</td>
+ <td ><code>prevdoc_docname</code></td>
+ <td >
+ Link</td>
+ <td >
+ Purchase Order
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
<td>43</td>
<td ><code>schedule_date</code></td>
<td >
@@ -669,13 +660,13 @@
<td></td>
</tr>
- <tr >
+ <tr class="info">
<td>45</td>
- <td ><code>prevdoc_doctype</code></td>
+ <td ><code>section_break_45</code></td>
<td >
- Data</td>
- <td class="text-muted" title="Hidden">
- Prevdoc Doctype
+ Section Break</td>
+ <td >
+
</td>
<td></td>
@@ -683,72 +674,6 @@
<tr >
<td>46</td>
- <td ><code>prevdoc_docname</code></td>
- <td >
- Link</td>
- <td >
- Purchase Order
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>47</td>
- <td ><code>prevdoc_detail_docname</code></td>
- <td >
- Data</td>
- <td class="text-muted" title="Hidden">
- Purchase Order Item No
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>48</td>
- <td ><code>col_break5</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>49</td>
- <td ><code>bom</code></td>
- <td >
- Link</td>
- <td >
- BOM
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>50</td>
<td ><code>serial_no</code></td>
<td >
Text</td>
@@ -760,19 +685,7 @@
</tr>
<tr >
- <td>51</td>
- <td ><code>rejected_serial_no</code></td>
- <td >
- Text</td>
- <td >
- Rejected Serial No
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>52</td>
+ <td>47</td>
<td ><code>batch_no</code></td>
<td >
Link</td>
@@ -793,7 +706,142 @@
</tr>
<tr >
+ <td>48</td>
+ <td ><code>column_break_48</code></td>
+ <td class="info">
+ Column Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>49</td>
+ <td ><code>rejected_serial_no</code></td>
+ <td >
+ Text</td>
+ <td >
+ Rejected Serial No
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr class="info">
+ <td>50</td>
+ <td ><code>section_break_50</code></td>
+ <td >
+ Section Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>51</td>
+ <td ><code>project_name</code></td>
+ <td >
+ Link</td>
+ <td >
+ Project Name
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
+ <td>52</td>
+ <td ><code>cost_center</code></td>
+ <td >
+ Link</td>
+ <td >
+ Cost Center
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
<td>53</td>
+ <td ><code>prevdoc_doctype</code></td>
+ <td >
+ Data</td>
+ <td class="text-muted" title="Hidden">
+ Prevdoc Doctype
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>54</td>
+ <td ><code>prevdoc_detail_docname</code></td>
+ <td >
+ Data</td>
+ <td class="text-muted" title="Hidden">
+ Purchase Order Item No
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>55</td>
+ <td ><code>col_break5</code></td>
+ <td class="info">
+ Column Break</td>
+ <td >
+
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>56</td>
+ <td ><code>bom</code></td>
+ <td >
+ Link</td>
+ <td >
+ BOM
+
+ </td>
+ <td>
+
+
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+
+ </td>
+ </tr>
+
+ <tr >
+ <td>57</td>
<td ><code>billed_amt</code></td>
<td >
Currency</td>
@@ -805,7 +853,19 @@
</tr>
<tr >
- <td>54</td>
+ <td>58</td>
+ <td ><code>landed_cost_voucher_amount</code></td>
+ <td >
+ Currency</td>
+ <td >
+ Landed Cost Voucher Amount
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>59</td>
<td ><code>brand</code></td>
<td >
Link</td>
@@ -826,7 +886,7 @@
</tr>
<tr >
- <td>55</td>
+ <td>60</td>
<td ><code>item_group</code></td>
<td >
Link</td>
@@ -847,7 +907,7 @@
</tr>
<tr >
- <td>56</td>
+ <td>61</td>
<td ><code>rm_supp_cost</code></td>
<td >
Currency</td>
@@ -861,7 +921,7 @@
</tr>
<tr >
- <td>57</td>
+ <td>62</td>
<td ><code>item_tax_amount</code></td>
<td >
Currency</td>
@@ -875,19 +935,7 @@
</tr>
<tr >
- <td>58</td>
- <td ><code>landed_cost_voucher_amount</code></td>
- <td >
- Currency</td>
- <td >
- Landed Cost Voucher Amount
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>59</td>
+ <td>63</td>
<td ><code>valuation_rate</code></td>
<td >
Currency</td>
@@ -901,7 +949,7 @@
</tr>
<tr >
- <td>60</td>
+ <td>64</td>
<td ><code>item_tax_rate</code></td>
<td >
Small Text</td>
@@ -915,7 +963,7 @@
</tr>
<tr >
- <td>61</td>
+ <td>65</td>
<td ><code>page_break</code></td>
<td >
Check</td>
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 081afcc..b92dcf9 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -112,15 +112,17 @@
def create_bank_account(args):
if args.get("bank_account"):
+ company_name = args.get('company_name').strip()
bank_account_group = frappe.db.get_value("Account",
- {"account_type": "Bank", "is_group": 1, "root_type": "Asset"})
+ {"account_type": "Bank", "is_group": 1, "root_type": "Asset",
+ "company": company_name})
if bank_account_group:
bank_account = frappe.get_doc({
"doctype": "Account",
'account_name': args.get("bank_account"),
'parent_account': bank_account_group,
'is_group':0,
- 'company':args.get('company_name').strip(),
+ 'company': company_name,
"account_type": "Bank",
})
try: