[docs] Leave Management
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html b/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html
index 3720e82..39f6545 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html
@@ -100,7 +100,7 @@
<a name="erpnext.controllers.item_variant.find_variant" href="#erpnext.controllers.item_variant.find_variant" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.controllers.item_variant.<b>find_variant</b>
- <i class="text-muted">(item, args)</i>
+ <i class="text-muted">(template, args, variant_item_code=None)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
@@ -118,7 +118,7 @@
<a name="erpnext.controllers.item_variant.get_variant" href="#erpnext.controllers.item_variant.get_variant" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.controllers.item_variant.<b>get_variant</b>
- <i class="text-muted">(item, args)</i>
+ <i class="text-muted">(template, args, variant=None)</i>
</p>
<div class="docs-attr-desc"><p>Validates Attributes and their Values, then looks for an exactly matching Item Variant</p>
diff --git a/erpnext/docs/current/api/setup/erpnext.setup.install.html b/erpnext/docs/current/api/setup/erpnext.setup.install.html
index a1c18af..02c58d2 100644
--- a/erpnext/docs/current/api/setup/erpnext.setup.install.html
+++ b/erpnext/docs/current/api/setup/erpnext.setup.install.html
@@ -50,6 +50,22 @@
<p class="docs-attr-name">
+ <a name="erpnext.setup.install.check_setup_wizard_not_completed" href="#erpnext.setup.install.check_setup_wizard_not_completed" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.setup.install.<b>check_setup_wizard_not_completed</b>
+ <i class="text-muted">()</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.setup.install.feature_setup" href="#erpnext.setup.install.feature_setup" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.setup.install.<b>feature_setup</b>
diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html
index 83a4a23..db1c3f3 100644
--- a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html
@@ -34,6 +34,22 @@
<p class="docs-attr-name">
+ <a name="erpnext.setup.setup_wizard.setup_wizard.create_bank_account" href="#erpnext.setup.setup_wizard.setup_wizard.create_bank_account" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.setup.setup_wizard.setup_wizard.<b>create_bank_account</b>
+ <i class="text-muted">(args)</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.setup.setup_wizard.setup_wizard.create_contact" href="#erpnext.setup.setup_wizard.setup_wizard.create_contact" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.setup.setup_wizard.setup_wizard.<b>create_contact</b>
diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html
index 4247622..10582be 100644
--- a/erpnext/docs/current/index.html
+++ b/erpnext/docs/current/index.html
@@ -35,7 +35,7 @@
Version
</td>
<td>
- <code>6.15.0</code>
+ <code>6.15.1</code>
</td>
</tr>
</table>
diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html
index 5b3103d..bbc0203 100644
--- a/erpnext/docs/current/models/accounts/account.html
+++ b/erpnext/docs/current/models/accounts/account.html
@@ -946,6 +946,10 @@
+
+
+
+
<li>
diff --git a/erpnext/docs/current/models/accounts/shipping_rule.html b/erpnext/docs/current/models/accounts/shipping_rule.html
index beadc90..8f859cb 100644
--- a/erpnext/docs/current/models/accounts/shipping_rule.html
+++ b/erpnext/docs/current/models/accounts/shipping_rule.html
@@ -413,6 +413,15 @@
</li>
+
+ <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/shopping_cart/shopping_cart_shipping_rule">Shopping Cart Shipping Rule</a>
+
+</li>
+
+
</ul>
diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html
index dc502d1..202cb44 100644
--- a/erpnext/docs/current/models/buying/purchase_order.html
+++ b/erpnext/docs/current/models/buying/purchase_order.html
@@ -1584,6 +1584,20 @@
<p class="docs-attr-name">
+ <a name="is_against_so" href="#is_against_so" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>is_against_so</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>
diff --git a/erpnext/docs/current/models/setup/company.html b/erpnext/docs/current/models/setup/company.html
index bafb019..27e2294 100644
--- a/erpnext/docs/current/models/setup/company.html
+++ b/erpnext/docs/current/models/setup/company.html
@@ -111,7 +111,8 @@
<pre>Distribution
Manufacturing
Retail
-Services</pre>
+Services
+Education</pre>
</td>
</tr>
diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html
index 64a872b..2213e24 100644
--- a/erpnext/docs/current/models/stock/delivery_note.html
+++ b/erpnext/docs/current/models/stock/delivery_note.html
@@ -1316,8 +1316,20 @@
</td>
</tr>
- <tr class="info">
+ <tr >
<td>86</td>
+ <td ><code>per_billed</code></td>
+ <td >
+ Currency</td>
+ <td >
+ % Amount Billed
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr class="info">
+ <td>87</td>
<td ><code>printing_details</code></td>
<td >
Section Break</td>
@@ -1329,7 +1341,7 @@
</tr>
<tr >
- <td>87</td>
+ <td>88</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@@ -1350,7 +1362,7 @@
</tr>
<tr >
- <td>88</td>
+ <td>89</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@@ -1371,7 +1383,7 @@
</tr>
<tr >
- <td>89</td>
+ <td>90</td>
<td ><code>column_break_88</code></td>
<td class="info">
Column Break</td>
@@ -1383,7 +1395,7 @@
</tr>
<tr >
- <td>90</td>
+ <td>91</td>
<td ><code>print_without_amount</code></td>
<td >
Check</td>
@@ -1395,7 +1407,7 @@
</tr>
<tr class="info">
- <td>91</td>
+ <td>92</td>
<td ><code>section_break_83</code></td>
<td >
Section Break</td>
@@ -1407,7 +1419,7 @@
</tr>
<tr >
- <td>92</td>
+ <td>93</td>
<td class="danger" title="Mandatory"><code>status</code></td>
<td >
Select</td>
@@ -1418,14 +1430,15 @@
<td>
<pre>
Draft
-Submitted
+To Bill
+Completed
Cancelled
Closed</pre>
</td>
</tr>
<tr >
- <td>93</td>
+ <td>94</td>
<td ><code>per_installed</code></td>
<td >
Percent</td>
@@ -1438,7 +1451,7 @@
</tr>
<tr >
- <td>94</td>
+ <td>95</td>
<td ><code>installation_status</code></td>
<td >
Select</td>
@@ -1450,7 +1463,7 @@
</tr>
<tr >
- <td>95</td>
+ <td>96</td>
<td ><code>column_break_89</code></td>
<td class="info">
Column Break</td>
@@ -1462,7 +1475,7 @@
</tr>
<tr >
- <td>96</td>
+ <td>97</td>
<td ><code>to_warehouse</code></td>
<td >
Link</td>
@@ -1484,7 +1497,7 @@
</tr>
<tr >
- <td>97</td>
+ <td>98</td>
<td ><code>excise_page</code></td>
<td >
Data</td>
@@ -1496,7 +1509,7 @@
</tr>
<tr >
- <td>98</td>
+ <td>99</td>
<td ><code>instructions</code></td>
<td >
Text</td>
@@ -1508,7 +1521,7 @@
</tr>
<tr class="info">
- <td>99</td>
+ <td>100</td>
<td ><code>sales_team_section_break</code></td>
<td >
Section Break</td>
@@ -1522,7 +1535,7 @@
</tr>
<tr >
- <td>100</td>
+ <td>101</td>
<td ><code>sales_partner</code></td>
<td >
Link</td>
@@ -1543,7 +1556,7 @@
</tr>
<tr >
- <td>101</td>
+ <td>102</td>
<td ><code>column_break7</code></td>
<td class="info">
Column Break</td>
@@ -1555,7 +1568,7 @@
</tr>
<tr >
- <td>102</td>
+ <td>103</td>
<td ><code>commission_rate</code></td>
<td >
Float</td>
@@ -1567,7 +1580,7 @@
</tr>
<tr >
- <td>103</td>
+ <td>104</td>
<td ><code>total_commission</code></td>
<td >
Currency</td>
@@ -1581,7 +1594,7 @@
</tr>
<tr class="info">
- <td>104</td>
+ <td>105</td>
<td ><code>section_break1</code></td>
<td >
Section Break</td>
@@ -1593,7 +1606,7 @@
</tr>
<tr >
- <td>105</td>
+ <td>106</td>
<td ><code>sales_team</code></td>
<td >
Table</td>
diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html
index c7abefe..1c48c11 100644
--- a/erpnext/docs/current/models/stock/delivery_note_item.html
+++ b/erpnext/docs/current/models/stock/delivery_note_item.html
@@ -746,6 +746,20 @@
<tr >
<td>49</td>
+ <td ><code>billed_amt</code></td>
+ <td >
+ Currency</td>
+ <td >
+ Billed Amt
+
+ </td>
+ <td>
+ <pre>currency</pre>
+ </td>
+ </tr>
+
+ <tr >
+ <td>50</td>
<td ><code>page_break</code></td>
<td >
Check</td>
diff --git a/erpnext/docs/current/models/stock/price_list.html b/erpnext/docs/current/models/stock/price_list.html
index 60d5b2e..28e2cec 100644
--- a/erpnext/docs/current/models/stock/price_list.html
+++ b/erpnext/docs/current/models/stock/price_list.html
@@ -391,6 +391,8 @@
+
+
<li>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html
index ee9ed27..0a3cc11 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html
@@ -1082,7 +1082,8 @@
<td>
<pre>
Draft
-Submitted
+To Bill
+Completed
Cancelled
Closed</pre>
</td>
@@ -1157,6 +1158,18 @@
<tr >
<td>77</td>
+ <td ><code>per_billed</code></td>
+ <td >
+ Percent</td>
+ <td >
+ % Amount Billed
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>78</td>
<td class="danger" title="Mandatory"><code>company</code></td>
<td >
Link</td>
@@ -1177,7 +1190,7 @@
</tr>
<tr >
- <td>78</td>
+ <td>79</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td >
Link</td>
@@ -1198,7 +1211,7 @@
</tr>
<tr class="info">
- <td>79</td>
+ <td>80</td>
<td ><code>printing_settings</code></td>
<td >
Section Break</td>
@@ -1210,7 +1223,7 @@
</tr>
<tr >
- <td>80</td>
+ <td>81</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@@ -1231,7 +1244,7 @@
</tr>
<tr >
- <td>81</td>
+ <td>82</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@@ -1252,7 +1265,7 @@
</tr>
<tr >
- <td>82</td>
+ <td>83</td>
<td ><code>other_details</code></td>
<td >
HTML</td>
@@ -1264,7 +1277,7 @@
</tr>
<tr >
- <td>83</td>
+ <td>84</td>
<td ><code>instructions</code></td>
<td >
Small Text</td>
@@ -1276,7 +1289,7 @@
</tr>
<tr >
- <td>84</td>
+ <td>85</td>
<td ><code>remarks</code></td>
<td >
Small Text</td>
@@ -1288,7 +1301,7 @@
</tr>
<tr class="info">
- <td>85</td>
+ <td>86</td>
<td ><code>transporter_info</code></td>
<td >
Section Break</td>
@@ -1302,7 +1315,7 @@
</tr>
<tr >
- <td>86</td>
+ <td>87</td>
<td ><code>transporter_name</code></td>
<td >
Data</td>
@@ -1314,7 +1327,7 @@
</tr>
<tr >
- <td>87</td>
+ <td>88</td>
<td ><code>column_break5</code></td>
<td class="info">
Column Break</td>
@@ -1326,7 +1339,7 @@
</tr>
<tr >
- <td>88</td>
+ <td>89</td>
<td ><code>lr_no</code></td>
<td >
Data</td>
@@ -1338,7 +1351,7 @@
</tr>
<tr >
- <td>89</td>
+ <td>90</td>
<td ><code>lr_date</code></td>
<td >
Date</td>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html
index 025f291..1ee6b14 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt_item.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html
@@ -794,6 +794,18 @@
<tr >
<td>53</td>
+ <td ><code>billed_amt</code></td>
+ <td >
+ Currency</td>
+ <td >
+ Billed Amt
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>54</td>
<td ><code>brand</code></td>
<td >
Link</td>
@@ -814,7 +826,7 @@
</tr>
<tr >
- <td>54</td>
+ <td>55</td>
<td ><code>item_group</code></td>
<td >
Link</td>
@@ -835,7 +847,7 @@
</tr>
<tr >
- <td>55</td>
+ <td>56</td>
<td ><code>rm_supp_cost</code></td>
<td >
Currency</td>
@@ -849,7 +861,7 @@
</tr>
<tr >
- <td>56</td>
+ <td>57</td>
<td ><code>item_tax_amount</code></td>
<td >
Currency</td>
@@ -863,7 +875,7 @@
</tr>
<tr >
- <td>57</td>
+ <td>58</td>
<td ><code>landed_cost_voucher_amount</code></td>
<td >
Currency</td>
@@ -875,7 +887,7 @@
</tr>
<tr >
- <td>58</td>
+ <td>59</td>
<td ><code>valuation_rate</code></td>
<td >
Currency</td>
@@ -889,7 +901,7 @@
</tr>
<tr >
- <td>59</td>
+ <td>60</td>
<td ><code>item_tax_rate</code></td>
<td >
Small Text</td>
@@ -903,7 +915,7 @@
</tr>
<tr >
- <td>60</td>
+ <td>61</td>
<td ><code>page_break</code></td>
<td >
Check</td>
diff --git a/erpnext/docs/current/models/stock/warehouse.html b/erpnext/docs/current/models/stock/warehouse.html
index c0fa5d3..2d7108b 100644
--- a/erpnext/docs/current/models/stock/warehouse.html
+++ b/erpnext/docs/current/models/stock/warehouse.html
@@ -629,6 +629,8 @@
+
+
<li>