Merge pull request #4729 from vjFaLk/doc-update

Updated documentation for new features

erpnext/docs/current/api/accounts/index.txt

@@ -1,4 +1,4 @@
 erpnext.accounts.general_ledger
-erpnext.accounts
+erpnext.accounts.utils
 erpnext.accounts.party
-erpnext.accounts.utils
+erpnext.accounts

erpnext/docs/current/api/config/index.txt

@@ -1,15 +1,15 @@
-erpnext.config.accounts
+erpnext.config.stock
-erpnext.config.buying
-erpnext.config.crm
-erpnext.config.desktop
-erpnext.config.docs
 erpnext.config.hr
+erpnext.config.buying
+erpnext.config.support
 erpnext.config
 erpnext.config.learn
-erpnext.config.manufacturing
+erpnext.config.website
-erpnext.config.projects
+erpnext.config.desktop
+erpnext.config.docs
 erpnext.config.selling
+erpnext.config.projects
 erpnext.config.setup
-erpnext.config.stock
+erpnext.config.accounts
-erpnext.config.support
+erpnext.config.manufacturing
-erpnext.config.website
+erpnext.config.crm

erpnext/docs/current/api/controllers/index.txt

@@ -1,14 +1,14 @@
-erpnext.controllers.accounts_controller
-erpnext.controllers.buying_controller
-erpnext.controllers
 erpnext.controllers.item_variant
 erpnext.controllers.print_settings
-erpnext.controllers.queries
+erpnext.controllers
 erpnext.controllers.recurring_document
+erpnext.controllers.accounts_controller
 erpnext.controllers.sales_and_purchase_return
-erpnext.controllers.selling_controller
+erpnext.controllers.buying_controller
-erpnext.controllers.status_updater
+erpnext.controllers.website_list_for_contact
 erpnext.controllers.stock_controller
-erpnext.controllers.taxes_and_totals
 erpnext.controllers.trends
-erpnext.controllers.website_list_for_contact
+erpnext.controllers.status_updater
+erpnext.controllers.queries
+erpnext.controllers.taxes_and_totals
+erpnext.controllers.selling_controller

erpnext/docs/current/api/hr/index.txt

@@ -1,2 +1,2 @@
-erpnext.hr
+erpnext.hr.utils
-erpnext.hr.utils
+erpnext.hr

erpnext/docs/current/api/index.txt

@@ -1,5 +1,5 @@
-erpnext.__init__
-erpnext.__version__
 erpnext.exceptions
 erpnext.hooks
-erpnext.tasks
+erpnext.tasks
+erpnext.__init__
+erpnext.__version__

erpnext/docs/current/api/setup/index.txt

@@ -1,3 +1,3 @@
-erpnext.setup
+erpnext.setup.utils
 erpnext.setup.install
-erpnext.setup.utils
+erpnext.setup

erpnext/docs/current/api/setup/setup_wizard/index.txt

@@ -1,8 +1,8 @@
-erpnext.setup.setup_wizard.default_website
+erpnext.setup.setup_wizard.test_setup_wizard
 erpnext.setup.setup_wizard
-erpnext.setup.setup_wizard.industry_type
+erpnext.setup.setup_wizard.test_setup_data
 erpnext.setup.setup_wizard.install_fixtures
 erpnext.setup.setup_wizard.sample_data
+erpnext.setup.setup_wizard.default_website
 erpnext.setup.setup_wizard.setup_wizard
-erpnext.setup.setup_wizard.test_setup_data
+erpnext.setup.setup_wizard.industry_type
-erpnext.setup.setup_wizard.test_setup_wizard

erpnext/docs/current/api/shopping_cart/index.txt

@@ -1,5 +1,5 @@
 erpnext.shopping_cart.cart
 erpnext.shopping_cart
 erpnext.shopping_cart.product
-erpnext.shopping_cart.test_shopping_cart
+erpnext.shopping_cart.utils
-erpnext.shopping_cart.utils
+erpnext.shopping_cart.test_shopping_cart

erpnext/docs/current/api/startup/index.txt

@@ -1,4 +1,4 @@
 erpnext.startup.boot
-erpnext.startup
+erpnext.startup.report_data_map
 erpnext.startup.notifications
-erpnext.startup.report_data_map
+erpnext.startup

erpnext/docs/current/api/stock/index.txt

@@ -1,6 +1,6 @@
-erpnext.stock.get_item_details
-erpnext.stock
-erpnext.stock.reorder_item
-erpnext.stock.stock_balance
 erpnext.stock.stock_ledger
-erpnext.stock.utils
+erpnext.stock
+erpnext.stock.utils
+erpnext.stock.get_item_details
+erpnext.stock.stock_balance
+erpnext.stock.reorder_item

erpnext/docs/current/api/utilities/index.txt

@@ -1,3 +1,3 @@
+erpnext.utilities.transaction_base
 erpnext.utilities.address_and_contact
-erpnext.utilities
+erpnext.utilities
-erpnext.utilities.transaction_base

erpnext/docs/current/index.html

@@ -35,7 +35,7 @@
 			Version
 		</td>
 		<td>
-			<code>6.18.4</code>
+			<code>6.19.0</code>
 		</td>
 	</tr>
 </table>

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>
                 

erpnext/docs/current/models/buying/purchase_order.html

@@ -964,18 +964,6 @@ Net Total</pre>
         
         <tr >
             <td>65</td>
-            <td ><code>advance_paid</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Advance Paid
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>66</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -987,7 +975,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>66</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -1001,7 +989,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>67</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -1012,6 +1000,20 @@ Net Total</pre>
             <td></td>
         </tr>
         
+        <tr >
+            <td>68</td>
+            <td ><code>advance_paid</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Advance Paid
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
         <tr class="info">
             <td>69</td>
             <td ><code>terms_section_break</code></td>
@@ -1197,6 +1199,27 @@ Delivered</pre>
         
         <tr >
             <td>80</td>
+            <td ><code>party_account_currency</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Party Account Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>81</td>
             <td ><code>column_break_74</code></td>
             <td class="info">
                 Column Break</td>
@@ -1208,7 +1231,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>82</td>
             <td ><code>per_received</code></td>
             <td >
                 Percent</td>
@@ -1220,7 +1243,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>83</td>
             <td ><code>per_billed</code></td>
             <td >
                 Percent</td>
@@ -1232,7 +1255,7 @@ Delivered</pre>
         </tr>
         
         <tr class="info">
-            <td>83</td>
+            <td>84</td>
             <td ><code>column_break5</code></td>
             <td >
                 Section Break</td>
@@ -1244,7 +1267,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>85</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1265,7 +1288,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>85</td>
+            <td>86</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1286,7 +1309,7 @@ Delivered</pre>
         </tr>
         
         <tr class="info">
-            <td>86</td>
+            <td>87</td>
             <td ><code>raw_material_details</code></td>
             <td >
                 Section Break</td>
@@ -1300,7 +1323,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>88</td>
             <td ><code>supplied_items</code></td>
             <td >
                 Table</td>
@@ -1321,7 +1344,7 @@ Delivered</pre>
         </tr>
         
         <tr class="info">
-            <td>88</td>
+            <td>89</td>
             <td ><code>recurring_order</code></td>
             <td >
                 Section Break</td>
@@ -1335,7 +1358,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>90</td>
             <td ><code>column_break</code></td>
             <td class="info">
                 Column Break</td>
@@ -1347,7 +1370,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>91</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1359,7 +1382,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>92</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1376,7 +1399,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>93</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1389,7 +1412,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>94</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1402,7 +1425,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>95</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1415,7 +1438,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>96</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1428,7 +1451,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>97</td>
             <td ><code>column_break83</code></td>
             <td class="info">
                 Column Break</td>
@@ -1440,7 +1463,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>98</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1453,7 +1476,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>98</td>
+            <td>99</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1465,7 +1488,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>99</td>
+            <td>100</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1478,7 +1501,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>100</td>
+            <td>101</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>

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

@@ -93,6 +93,15 @@
 			
         
 			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_attendance_tool">Employee Attendance Tool</a>
+
+</li>
+			
+        
+			
             <li>
 
 

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

@@ -115,6 +115,15 @@
 			
         
 			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_attendance_tool">Employee Attendance Tool</a>
+
+</li>
+			
+        
+			
             <li>
 
 

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

@@ -0,0 +1,244 @@
+<!-- title: Employee Attendance Tool -->
+
+
+
+
+
+<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/hr/doctype/employee_attendance_tool"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<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 ><code>date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>department</code></td>
+            <td >
+                Link</td>
+            <td >
+                Department
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>branch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Branch
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/branch">Branch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>unmarked_attendance_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Unmarked Attendance
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>employees_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Employees HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>marked_attendance_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Marked Attendance
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>marked_attendance_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Marked Attendance HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>EmployeeAttendanceTool</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>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.get_employees</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.get_employees" href="#erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.get_employees" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.<b>get_employees</b>
+        <i class="text-muted">(date, department=None, branch=None, company=None)</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.hr.doctype.employee_attendance_tool.employee_attendance_tool.mark_employee_attendance</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.mark_employee_attendance" href="#erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.mark_employee_attendance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.<b>mark_employee_attendance</b>
+        <i class="text-muted">(employee_list, status, date, company=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->

erpnext/docs/current/models/selling/sales_order.html

@@ -939,7 +939,7 @@ Net Total</pre>
                 
             </td>
             <td>
-                <pre>Company:company:default_currency</pre>
+                <pre>party_account_currency</pre>
             </td>
         </tr>
         
@@ -1206,6 +1206,27 @@ Net Total</pre>
         
         <tr >
             <td>79</td>
+            <td ><code>party_account_currency</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Party Account Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
             <td ><code>column_break_77</code></td>
             <td class="info">
                 Column Break</td>
@@ -1217,7 +1238,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>81</td>
             <td ><code>source</code></td>
             <td >
                 Select</td>
@@ -1240,7 +1261,7 @@ Campaign</pre>
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>82</td>
             <td ><code>campaign</code></td>
             <td >
                 Link</td>
@@ -1261,7 +1282,7 @@ Campaign</pre>
         </tr>
         
         <tr class="info">
-            <td>82</td>
+            <td>83</td>
             <td ><code>printing_details</code></td>
             <td >
                 Section Break</td>
@@ -1273,7 +1294,7 @@ Campaign</pre>
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>84</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1294,7 +1315,7 @@ Campaign</pre>
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>85</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -1306,7 +1327,7 @@ Campaign</pre>
         </tr>
         
         <tr >
-            <td>85</td>
+            <td>86</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1327,7 +1348,7 @@ Campaign</pre>
         </tr>
         
         <tr class="info">
-            <td>86</td>
+            <td>87</td>
             <td ><code>section_break_78</code></td>
             <td >
                 Section Break</td>
@@ -1339,7 +1360,7 @@ Campaign</pre>
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>88</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1361,7 +1382,7 @@ Closed</pre>
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>89</td>
             <td ><code>delivery_status</code></td>
             <td >
                 Select</td>
@@ -1379,7 +1400,7 @@ Not Applicable</pre>
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>90</td>
             <td ><code>per_delivered</code></td>
             <td >
                 Percent</td>
@@ -1392,7 +1413,7 @@ Not Applicable</pre>
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>91</td>
             <td ><code>column_break_81</code></td>
             <td class="info">
                 Column Break</td>
@@ -1404,7 +1425,7 @@ Not Applicable</pre>
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>92</td>
             <td ><code>per_billed</code></td>
             <td >
                 Percent</td>
@@ -1417,7 +1438,7 @@ Not Applicable</pre>
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>93</td>
             <td ><code>billing_status</code></td>
             <td >
                 Select</td>
@@ -1434,7 +1455,7 @@ Closed</pre>
         </tr>
         
         <tr class="info">
-            <td>93</td>
+            <td>94</td>
             <td ><code>sales_team_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1448,7 +1469,7 @@ Closed</pre>
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>95</td>
             <td ><code>sales_partner</code></td>
             <td >
                 Link</td>
@@ -1469,7 +1490,7 @@ Closed</pre>
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>96</td>
             <td ><code>column_break7</code></td>
             <td class="info">
                 Column Break</td>
@@ -1481,7 +1502,7 @@ Closed</pre>
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>97</td>
             <td ><code>commission_rate</code></td>
             <td >
                 Float</td>
@@ -1493,7 +1514,7 @@ Closed</pre>
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>98</td>
             <td ><code>total_commission</code></td>
             <td >
                 Currency</td>
@@ -1507,7 +1528,7 @@ Closed</pre>
         </tr>
         
         <tr class="info">
-            <td>98</td>
+            <td>99</td>
             <td ><code>section_break1</code></td>
             <td >
                 Section Break</td>
@@ -1519,7 +1540,7 @@ Closed</pre>
         </tr>
         
         <tr >
-            <td>99</td>
+            <td>100</td>
             <td ><code>sales_team</code></td>
             <td >
                 Table</td>
@@ -1540,7 +1561,7 @@ Closed</pre>
         </tr>
         
         <tr class="info">
-            <td>100</td>
+            <td>101</td>
             <td ><code>recurring_order</code></td>
             <td >
                 Section Break</td>
@@ -1554,7 +1575,7 @@ Closed</pre>
         </tr>
         
         <tr >
-            <td>101</td>
+            <td>102</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1567,7 +1588,7 @@ Closed</pre>
         </tr>
         
         <tr >
-            <td>102</td>
+            <td>103</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1586,7 +1607,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>103</td>
+            <td>104</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1599,7 +1620,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>104</td>
+            <td>105</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1612,7 +1633,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>105</td>
+            <td>106</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1625,7 +1646,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>106</td>
+            <td>107</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1638,7 +1659,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>107</td>
+            <td>108</td>
             <td ><code>column_break83</code></td>
             <td class="info">
                 Column Break</td>
@@ -1650,7 +1671,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>108</td>
+            <td>109</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1663,7 +1684,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>109</td>
+            <td>110</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1675,7 +1696,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>110</td>
+            <td>111</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1688,7 +1709,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>111</td>
+            <td>112</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>

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

@@ -824,6 +824,20 @@ Stop</pre>
         
     
     
+	<p class="docs-attr-name">
+        <a name="abbreviate" href="#abbreviate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>abbreviate</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="after_rename" href="#after_rename" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
@@ -992,6 +1006,20 @@ Stop</pre>
         
     
     
+	<p class="docs-attr-name">
+        <a name="validate_abbr" href="#validate_abbr" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_abbr</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>
@@ -1169,6 +1197,15 @@ Stop</pre>
 			
         
 			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_attendance_tool">Employee Attendance Tool</a>
+
+</li>
+			
+        
+			
             <li>
 
 

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

@@ -867,19 +867,6 @@ Moving Average</pre>
         
         <tr >
             <td>57</td>
-            <td ><code>is_service_item</code></td>
-            <td >
-                Check</td>
-            <td >
-                Is Service Item
-                <p class="text-muted small">
-                    Allow in Sales Order of type "Service"</p>
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>58</td>
             <td ><code>publish_in_hub</code></td>
             <td >
                 Check</td>
@@ -892,7 +879,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>58</td>
             <td ><code>synced_with_hub</code></td>
             <td >
                 Check</td>
@@ -904,7 +891,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>59</td>
             <td ><code>income_account</code></td>
             <td >
                 Link</td>
@@ -925,7 +912,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>60</td>
             <td ><code>selling_cost_center</code></td>
             <td >
                 Link</td>
@@ -946,7 +933,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>61</td>
             <td ><code>column_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -958,7 +945,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>62</td>
             <td ><code>customer_items</code></td>
             <td >
                 Table</td>
@@ -979,7 +966,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>63</td>
             <td ><code>max_discount</code></td>
             <td >
                 Float</td>
@@ -991,7 +978,7 @@ Moving Average</pre>
         </tr>
         
         <tr class="info">
-            <td>65</td>
+            <td>64</td>
             <td ><code>item_tax_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1005,7 +992,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>65</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -1027,7 +1014,7 @@ Moving Average</pre>
         </tr>
         
         <tr class="info">
-            <td>67</td>
+            <td>66</td>
             <td ><code>inspection_criteria</code></td>
             <td >
                 Section Break</td>
@@ -1041,7 +1028,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>67</td>
             <td ><code>inspection_required</code></td>
             <td >
                 Check</td>
@@ -1053,7 +1040,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>68</td>
             <td ><code>quality_parameters</code></td>
             <td >
                 Table</td>
@@ -1075,7 +1062,7 @@ Moving Average</pre>
         </tr>
         
         <tr class="info">
-            <td>70</td>
+            <td>69</td>
             <td ><code>manufacturing</code></td>
             <td >
                 Section Break</td>
@@ -1089,7 +1076,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>70</td>
             <td ><code>is_pro_applicable</code></td>
             <td >
                 Check</td>
@@ -1101,7 +1088,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>71</td>
             <td ><code>is_sub_contracted_item</code></td>
             <td >
                 Check</td>
@@ -1114,7 +1101,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>72</td>
             <td ><code>column_break_74</code></td>
             <td class="info">
                 Column Break</td>
@@ -1126,7 +1113,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>73</td>
             <td ><code>default_bom</code></td>
             <td >
                 Link</td>
@@ -1147,7 +1134,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>75</td>
+            <td>74</td>
             <td ><code>customer_code</code></td>
             <td >
                 Data</td>
@@ -1159,7 +1146,7 @@ Moving Average</pre>
         </tr>
         
         <tr class="info">
-            <td>76</td>
+            <td>75</td>
             <td ><code>website_section</code></td>
             <td >
                 Section Break</td>
@@ -1173,7 +1160,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>76</td>
             <td ><code>show_in_website</code></td>
             <td >
                 Check</td>
@@ -1185,7 +1172,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>77</td>
             <td ><code>page_name</code></td>
             <td >
                 Data</td>
@@ -1198,7 +1185,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>78</td>
             <td ><code>weightage</code></td>
             <td >
                 Int</td>
@@ -1211,7 +1198,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>79</td>
             <td ><code>slideshow</code></td>
             <td >
                 Link</td>
@@ -1233,7 +1220,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>80</td>
             <td ><code>website_image</code></td>
             <td >
                 Attach</td>
@@ -1246,7 +1233,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>81</td>
             <td ><code>thumbnail</code></td>
             <td >
                 Data</td>
@@ -1258,7 +1245,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>82</td>
             <td ><code>cb72</code></td>
             <td class="info">
                 Column Break</td>
@@ -1270,7 +1257,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>83</td>
             <td ><code>website_warehouse</code></td>
             <td >
                 Link</td>
@@ -1292,7 +1279,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>85</td>
+            <td>84</td>
             <td ><code>website_item_groups</code></td>
             <td >
                 Table</td>
@@ -1314,7 +1301,7 @@ Moving Average</pre>
         </tr>
         
         <tr class="info">
-            <td>86</td>
+            <td>85</td>
             <td ><code>sb72</code></td>
             <td >
                 Section Break</td>
@@ -1326,7 +1313,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>86</td>
             <td ><code>copy_from_item_group</code></td>
             <td >
                 Button</td>
@@ -1338,7 +1325,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>87</td>
             <td ><code>website_specifications</code></td>
             <td >
                 Table</td>
@@ -1359,7 +1346,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>88</td>
             <td ><code>web_long_description</code></td>
             <td >
                 Text Editor</td>
@@ -1371,7 +1358,7 @@ Moving Average</pre>
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>89</td>
             <td ><code>parent_website_route</code></td>
             <td >
                 Read Only</td>

erpnext/docs/user/manual/en/human-resources/attendance.md

@@ -1,14 +1,15 @@
 An Attendance record stating that an Employee has been present on a particular
 day can be created manually by:
 
-> Human Resources > Attendance > New Attendance
+> Human Resources > Documents > Attendance > New Attendance
 
 <img class="screenshot" alt="Attendence" src="{{docs_base_url}}/assets/img/human-resources/attendence.png">
 
 You can get a monthly report of your Attendance data by going to the “Monthly
 Attendance Details” report.
 
-You can also bulk uppload attendence using the [Upload Attendence Tool ]({{docs_base_url}}/user/manual/en/human-resources/tools/upload-attendance.html)
+You can easily set attendance for Employees using the [Employee Attendance Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/employee-attendance-tool.html)
+
+You can also bulk upload attendence using the [Upload Attendence Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/upload-attendance.html)
 
 {next}
-

erpnext/docs/user/manual/en/human-resources/human-resources-reports.md

@@ -18,6 +18,12 @@ Employee Information Report shows Report View of important information recorded
 
 <img alt="Employee Information" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-information-report.png">
 
+### Employee Holiday Attendance
+
+Employee Holiday Attendance shows the list of Employees who attended on Holidays.
+
+<img alt="Employee Information" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-holiday-report.png">
+
 ### Monthly Salary Register
 
 Monthly Salary Register shows net pay and its components of employee(s) at a glance.

erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md

@@ -0,0 +1,9 @@
+To go the attendance tool, go to:
+
+> Human Resources > Tools > Employee Attendance Tool
+
+This tool allows you to add attendance records for multiple employees quickly.
+
+<img class="screenshot" alt="Attendence upload" src="{{docs_base_url}}/assets/img/human-resources/employee-attendance-tool.png">
+
+{next}

erpnext/docs/user/manual/en/human-resources/tools/index.txt

@@ -1 +1,2 @@
+employee-attendance-tool
 upload-attendance