Validates Attributes and their Values, then looks for an exactly matching Item Variant
diff --git a/erpnext/docs/current/api/setup/erpnext.setup.install.html b/erpnext/docs/current/api/setup/erpnext.setup.install.html index a1c18af0024..02c58d287e4 100644 --- a/erpnext/docs/current/api/setup/erpnext.setup.install.html +++ b/erpnext/docs/current/api/setup/erpnext.setup.install.html @@ -49,6 +49,22 @@ ++ + + erpnext.setup.install.check_setup_wizard_not_completed + () +
+No docs
++ + + + + + +
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 83a4a2390b6..db1c3f313cb 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 @@ -33,6 +33,22 @@ +
+ + + erpnext.setup.setup_wizard.setup_wizard.create_bank_account + (args) +
+No docs
++ + + + + + +
diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index 4247622382f..10582bef30c 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -35,7 +35,7 @@ Version
6.15.0
+ 6.15.1
+ + + is_against_so + (self) +
+No docs
++ + + + +
diff --git a/erpnext/docs/current/models/setup/company.html b/erpnext/docs/current/models/setup/company.html index bafb0191aeb..27e22949660 100644 --- a/erpnext/docs/current/models/setup/company.html +++ b/erpnext/docs/current/models/setup/company.html @@ -111,7 +111,8 @@ Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Org
Distribution Manufacturing Retail -Services+Services +Education diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html index 64a872b0061..2213e24150c 100644 --- a/erpnext/docs/current/models/stock/delivery_note.html +++ b/erpnext/docs/current/models/stock/delivery_note.html @@ -1316,8 +1316,20 @@ Campaign -
per_billedprinting_detailsletter_headselect_print_headingcolumn_break_88print_without_amountsection_break_83statusDraft -Submitted +To Bill +Completed Cancelled Closed
per_installedinstallation_statuscolumn_break_89to_warehouseexcise_pageinstructionssales_team_section_breaksales_partnercolumn_break7commission_ratetotal_commissionsection_break1sales_teambilled_amtcurrency+
page_breakDraft -Submitted +To Bill +Completed Cancelled Closed
per_billedcompanyfiscal_yearprinting_settingsletter_headselect_print_headingother_detailsinstructionsremarkstransporter_infotransporter_namecolumn_break5lr_nolr_datebilled_amtbranditem_grouprm_supp_costitem_tax_amountlanded_cost_voucher_amountvaluation_rateitem_tax_ratepage_break
+
+**Max Days Leave Allowed:** It refers to maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days under a particular Leave Type, his/her extended leave may be considered as ‘Leave Without Pay’ and this may affect his/her salary calculation.
+
+**Is Carry Forward:** If checked, the balance leave will be carried forwarded to the next allocation period.
+
+**Is Leave Without Pay:** This ensures that the Leave Type will be treated as leaves whithout pay and salary will get deducted for this Leave Type.
+
+**Allow Nagative Balance:** If checked, system will always allow to approve leave application for the Leave Type, even if there is no leave balance.
+
+**Include holidays within leaves as leaves:** Check this option if you wish to count holidays within leaves as a ‘leave’. Such holidays will be deducted from the total number of leaves.
+
+###Default Leave Types
+There are some pre-loaded Leave Types in the system, as below:
+
+- **Leave Without Pay:** You can avail these leaves for different purposes, such as, extended medical issues, educational purpose or unavoidable personal reason. Employee does not get paid for such leaves.
+- **Privilege leave:** These are like earned leaves which can be availed for the purpose of travel, family vacation and so on.
+- **Sick leave:** You can avail these leaves if you are unwell.
+- **Compensatory off:** These are compensatory leave allotted to employees for overtime work.
+- **Casual leave:** You can avail this leave to take care of urgent and unseen matters.
+
+---
+
+#Leave Allocation
+
+Leave Allocation enables you to allot a specific number of leaves to a particular employee. You can allocate a number of leaves to different types of leave. You also have the option to allocate leaves to your employees manually or via the Leave Allocation Tool.
+
+###Manual Allocation
+> Human Resources > Setup > Leave Allocation > New Leave Allocation
+
+To allocate leaves to an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period.
+
+
+
+###Via Leave Allocation Tool
+> Human Resources > Tools > Leave Allocation Tool
+
+This tool enables you to allocate leaves for a category of employees, instead of individual ones. You can allocate leaves based on Employee Type, Branch, Department and Designation. Leave Allocation Tool is also known as Leave Control Panel.
+
+
+
+---
+
+#Leave Application
+> Human Resources > Documents > Leave Application > New Leave Application
+
+Leave Application section enables an employee to apply for leaves. Employee can select the type of leave and the Leave Approver who will authorize the Leave Application. User with "Leave Approver" role are considered as Leave approver. Leave Approvers can also be restricted/pre-defined in the Employee record. Based on selected dates and applicable Holiday List, total leave days is calculated automatically.
+
+**Basic Workflow:**
+
+- Employee applies for leave through Leave Application
+- Approver gets notification via email, "Follow via Email" should be checked for this.
+- Approver reviews Leave Application
+- Approver approves/rejects Leave Application
+- Employee gets notification on the status of his/her Leave Application
+
+
+
+
+**Notes:**
+
+- Leave Application period must be within a single Leave Allocation period. In case, you are applying for leave across leave allocation period, you have to create two Leave Application records.
+- Application period must be in the latest Allocation period.
+- Employee can't apply for leave on the dates which are added in the "Leave Block List".
+
+---
+
+#Leave Block List
+
+> Human Resources > Setup > Leave Block List > New Leave Block List
+
+Leave Block List is a list of dates in a year, on which employees can not apply for leave. You can define a list of users who can approve Leave Application on blocked days, in case of urgency. You can also define whether the list will applied on entire company or any specific departments.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.txt b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
index 550236a2b37..b8681864b4e 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
@@ -5,6 +5,4 @@ department
designation
earning-type
deduction-type
-leave-allocation
-leave-type
holiday-list
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
deleted file mode 100644
index 0e8ee945b30..00000000000
--- a/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Helps you allocate Leaves to a particular Employee
-
-
-
-To assign leaves to multiple employees use the [Leave Allocation Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/leave-allocation-tool.html)
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
deleted file mode 100644
index d52cb2e8a23..00000000000
--- a/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Specify the Type of Leave that can be allocated against an Employee
-
-
-
-* 'Max Days Leave Allowed' specifies the maximum number of days this type of leave can be taken at a strech.
-* 'Is LWP' specifies if the Leave is without Pay.
-* 'Allow Negative Balance' specifies if system can maintain negative leaves.
-
-{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 3da2e7166a5..0d74de7e120 100644
--- a/erpnext/docs/user/manual/en/human-resources/tools/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
@@ -1,2 +1 @@
-upload-attendance
-leave-allocation-tool
\ No newline at end of file
+upload-attendance
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
deleted file mode 100644
index 56e8d3dee09..00000000000
--- a/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Leave Allocation tool helps you allocated a specific number of leaves for your employees.
-
-
-
-{next}
\ No newline at end of file