diff --git a/erpnext/docs/assets/img/human-resources/employee-attendance-tool.png b/erpnext/docs/assets/img/human-resources/employee-attendance-tool.png new file mode 100644 index 0000000000..179fb2404a Binary files /dev/null and b/erpnext/docs/assets/img/human-resources/employee-attendance-tool.png differ diff --git a/erpnext/docs/assets/img/human-resources/employee-holiday-report.png b/erpnext/docs/assets/img/human-resources/employee-holiday-report.png new file mode 100644 index 0000000000..c8a8f6b4a2 Binary files /dev/null and b/erpnext/docs/assets/img/human-resources/employee-holiday-report.png differ diff --git a/erpnext/docs/current/api/accounts/index.txt b/erpnext/docs/current/api/accounts/index.txt index 33f157c7ac..cf92d5a469 100644 --- a/erpnext/docs/current/api/accounts/index.txt +++ b/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 \ No newline at end of file +erpnext.accounts \ No newline at end of file diff --git a/erpnext/docs/current/api/config/index.txt b/erpnext/docs/current/api/config/index.txt index 7d4ebc5d65..b8e76b568e 100644 --- a/erpnext/docs/current/api/config/index.txt +++ b/erpnext/docs/current/api/config/index.txt @@ -1,15 +1,15 @@ -erpnext.config.accounts -erpnext.config.buying -erpnext.config.crm -erpnext.config.desktop -erpnext.config.docs +erpnext.config.stock erpnext.config.hr +erpnext.config.buying +erpnext.config.support erpnext.config erpnext.config.learn -erpnext.config.manufacturing -erpnext.config.projects +erpnext.config.website +erpnext.config.desktop +erpnext.config.docs erpnext.config.selling +erpnext.config.projects erpnext.config.setup -erpnext.config.stock -erpnext.config.support -erpnext.config.website \ No newline at end of file +erpnext.config.accounts +erpnext.config.manufacturing +erpnext.config.crm \ No newline at end of file diff --git a/erpnext/docs/current/api/controllers/index.txt b/erpnext/docs/current/api/controllers/index.txt index 3965811e80..ad58d1126c 100644 --- a/erpnext/docs/current/api/controllers/index.txt +++ b/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.status_updater +erpnext.controllers.buying_controller +erpnext.controllers.website_list_for_contact erpnext.controllers.stock_controller -erpnext.controllers.taxes_and_totals erpnext.controllers.trends -erpnext.controllers.website_list_for_contact \ No newline at end of file +erpnext.controllers.status_updater +erpnext.controllers.queries +erpnext.controllers.taxes_and_totals +erpnext.controllers.selling_controller \ No newline at end of file diff --git a/erpnext/docs/current/api/hr/index.txt b/erpnext/docs/current/api/hr/index.txt index c515b53205..bbd031146f 100644 --- a/erpnext/docs/current/api/hr/index.txt +++ b/erpnext/docs/current/api/hr/index.txt @@ -1,2 +1,2 @@ -erpnext.hr -erpnext.hr.utils \ No newline at end of file +erpnext.hr.utils +erpnext.hr \ No newline at end of file diff --git a/erpnext/docs/current/api/index.txt b/erpnext/docs/current/api/index.txt index f7f8f5e618..396033d494 100644 --- a/erpnext/docs/current/api/index.txt +++ b/erpnext/docs/current/api/index.txt @@ -1,5 +1,5 @@ -erpnext.__init__ -erpnext.__version__ erpnext.exceptions erpnext.hooks -erpnext.tasks \ No newline at end of file +erpnext.tasks +erpnext.__init__ +erpnext.__version__ \ No newline at end of file diff --git a/erpnext/docs/current/api/setup/index.txt b/erpnext/docs/current/api/setup/index.txt index 63162d85a9..f00d546c82 100644 --- a/erpnext/docs/current/api/setup/index.txt +++ b/erpnext/docs/current/api/setup/index.txt @@ -1,3 +1,3 @@ -erpnext.setup +erpnext.setup.utils erpnext.setup.install -erpnext.setup.utils \ No newline at end of file +erpnext.setup \ No newline at end of file diff --git a/erpnext/docs/current/api/setup/setup_wizard/index.txt b/erpnext/docs/current/api/setup/setup_wizard/index.txt index 6e21162d28..53da4fe315 100644 --- a/erpnext/docs/current/api/setup/setup_wizard/index.txt +++ b/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.test_setup_wizard \ No newline at end of file +erpnext.setup.setup_wizard.industry_type \ No newline at end of file diff --git a/erpnext/docs/current/api/shopping_cart/index.txt b/erpnext/docs/current/api/shopping_cart/index.txt index c95a01d0e4..cbbce0ac40 100644 --- a/erpnext/docs/current/api/shopping_cart/index.txt +++ b/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 \ No newline at end of file +erpnext.shopping_cart.utils +erpnext.shopping_cart.test_shopping_cart \ No newline at end of file diff --git a/erpnext/docs/current/api/startup/index.txt b/erpnext/docs/current/api/startup/index.txt index 40766bcbc3..0cf302ed91 100644 --- a/erpnext/docs/current/api/startup/index.txt +++ b/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 \ No newline at end of file +erpnext.startup \ No newline at end of file diff --git a/erpnext/docs/current/api/stock/index.txt b/erpnext/docs/current/api/stock/index.txt index 27cb1482d3..01082a7be2 100644 --- a/erpnext/docs/current/api/stock/index.txt +++ b/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 \ No newline at end of file +erpnext.stock +erpnext.stock.utils +erpnext.stock.get_item_details +erpnext.stock.stock_balance +erpnext.stock.reorder_item \ No newline at end of file diff --git a/erpnext/docs/current/api/utilities/index.txt b/erpnext/docs/current/api/utilities/index.txt index 86ae38fc1d..ec810e96e3 100644 --- a/erpnext/docs/current/api/utilities/index.txt +++ b/erpnext/docs/current/api/utilities/index.txt @@ -1,3 +1,3 @@ +erpnext.utilities.transaction_base erpnext.utilities.address_and_contact -erpnext.utilities -erpnext.utilities.transaction_base \ No newline at end of file +erpnext.utilities \ No newline at end of file diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index ec8d9545cd..7b41bcef74 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -35,7 +35,7 @@ Version
6.18.4
+ 6.19.0
- The account head under Liability, in which Profit/Loss will be booked
+ The account head under Liability or Equity, in which Profit/Loss will be bookedadvance_paidcolumn_break4grand_totalin_wordsadvance_paidparty_account_currency+
terms_section_breakparty_account_currencycolumn_break_74per_receivedper_billedcolumn_break5letter_headselect_print_headingraw_material_detailssupplied_itemsrecurring_ordercolumn_breakis_recurringrecurring_typefrom_dateto_daterepeat_on_day_of_monthend_datecolumn_break83next_daterecurring_idnotification_email_addressrecurring_print_format| Sr | +Fieldname | +Type | +Label | +Options | +
|---|---|---|---|---|
| 1 | +date |
+ + Date | ++ Date + + | ++ |
| 2 | +department |
+ + Link | ++ Department + + | ++ + + + +Department + + + + | +
| 3 | +column_break_3 |
+ + Column Break | ++ + + | ++ |
| 4 | +branch |
+ + Link | ++ Branch + + | ++ + + + +Branch + + + + | +
| 5 | +company |
+ + Link | ++ Company + + | ++ + + + +Company + + + + | +
| 6 | +unmarked_attendance_section |
+ + Section Break | ++ Unmarked Attendance + + | ++ |
| 7 | +employees_html |
+ + HTML | ++ Employees HTML + + | ++ |
| 8 | +marked_attendance_section |
+ + Section Break | ++ Marked Attendance + + | ++ |
| 9 | +marked_attendance_html |
+ + HTML | ++ Marked Attendance HTML + + | ++ |
Inherits from frappe.model.document.Document + +
Public API
+ /api/method/erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.get_employees
+
+ + + erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.get_employees + (date, department=None, branch=None, company=None) +
+No docs
+Public API
+ /api/method/erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.mark_employee_attendance
+
+ + + erpnext.hr.doctype.employee_attendance_tool.employee_attendance_tool.mark_employee_attendance + (employee_list, status, date, company=None) +
+No docs
+Company:company:default_currency+
party_account_currency
party_account_currencycolumn_break_77sourcecampaignprinting_detailsletter_headcolumn_break4select_print_headingsection_break_78statusdelivery_statusper_deliveredcolumn_break_81per_billedbilling_statussales_team_section_breaksales_partnercolumn_break7commission_ratetotal_commissionsection_break1sales_teamrecurring_orderis_recurringrecurring_typefrom_dateto_daterepeat_on_day_of_monthend_datecolumn_break83next_daterecurring_idnotification_email_addressrecurring_print_format+ + + abbreviate + (self) +
+No docs
++ + + validate_abbr + (self) +
+No docs
+is_service_item- Allow in Sales Order of type "Service"
-publish_in_hubsynced_with_hubincome_accountselling_cost_centercolumn_break3customer_itemsmax_discountitem_tax_section_breaktaxesinspection_criteriainspection_requiredquality_parametersmanufacturingis_pro_applicableis_sub_contracted_itemcolumn_break_74default_bomcustomer_codewebsite_sectionshow_in_websitepage_nameweightageslideshowwebsite_imagethumbnailcb72website_warehousewebsite_item_groupssb72copy_from_item_groupwebsite_specificationsweb_long_descriptionparent_website_route
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}
-
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
index 664c07de0f..de68bbf1e3 100644
--- a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
+++ b/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
+### Employee Holiday Attendance
+
+Employee Holiday Attendance shows the list of Employees who attended on Holidays.
+
+
+
### Monthly Salary Register
Monthly Salary Register shows net pay and its components of employee(s) at a glance.
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md
new file mode 100644
index 0000000000..f0d6e5f9e8
--- /dev/null
+++ b/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.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.txt b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
index 0d74de7e12..e3333227a6 100644
--- a/erpnext/docs/user/manual/en/human-resources/tools/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
@@ -1 +1,2 @@
+employee-attendance-tool
upload-attendance
\ No newline at end of file